mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

filter: convert OSL_FAIL to SAL_WARN

Browse Source 
That literal %s was irritating.

Change-Id: I2925b26b1f3d1c101106ca616d18b24b41210c72
This commit is contained in:
Michael Stahl
2015-10-09 16:51:25 +02:00
parent 5d826db15b
commit a8f053697c
2 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx
View File

@@ -109,7 +109,7 @@ bool SAL_CALL XmlFilterAdaptor::importImpl( const Sequence< css::beans::Property
Reference < XDocumentHandler > xHandler( mxContext->getServiceManager()->createInstanceWithArgumentsAndContext( sXMLImportService, aAnys, mxContext ), UNO_QUERY ); Reference < XDocumentHandler > xHandler( mxContext->getServiceManager()->createInstanceWithArgumentsAndContext( sXMLImportService, aAnys, mxContext ), UNO_QUERY );
if (!xHandler.is()) { if (!xHandler.is()) {
OSL_FAIL("XMLReader::Read: %s Unable to create service instance xHandler\n" ); SAL_WARN("filter.xmlfa", "XmlFilterAdaptor: unable to create service " << sXMLImportService);
return false; return false;
} }
Reference < XImporter > xImporter( xHandler, UNO_QUERY ); Reference < XImporter > xImporter( xHandler, UNO_QUERY );
@@ -124,7 +124,7 @@ bool SAL_CALL XmlFilterAdaptor::importImpl( const Sequence< css::beans::Property
Reference< XInterface > xConvBridge(mxContext->getServiceManager()->createInstanceWithContext(udConvertClass, mxContext), UNO_QUERY); Reference< XInterface > xConvBridge(mxContext->getServiceManager()->createInstanceWithContext(udConvertClass, mxContext), UNO_QUERY);
if (!xConvBridge.is()) { if (!xConvBridge.is()) {
OSL_FAIL( "XMLReader::Read: %s service missing\n" ); SAL_WARN("filter.xmlfa", "XmlFilterAdaptor: unable to create service " << udConvertClass);
return false; return false;
} }
if (xStatusIndicator.is()) if (xStatusIndicator.is())
@@ -174,7 +174,7 @@ bool SAL_CALL XmlFilterAdaptor::importImpl( const Sequence< css::beans::Property
if (xStatusIndicator.is()) if (xStatusIndicator.is())
xStatusIndicator->end(); xStatusIndicator->end();
OSL_FAIL( OUStringToOString( e.Message, RTL_TEXTENCODING_ASCII_US).getStr()); SAL_WARN("filter.xmlfa", "XmlFilterAdaptor: exception: " << e.Message);
return false; return false;
} }
if (xStatusIndicator.is()) { if (xStatusIndicator.is()) {
@@ -204,7 +204,7 @@ bool SAL_CALL XmlFilterAdaptor::exportImpl( const Sequence< css::beans::Property
// Set up converter bridge. // Set up converter bridge.
Reference< css::xml::XExportFilter > xConverter(mxContext->getServiceManager()->createInstanceWithContext( udConvertClass, mxContext ), UNO_QUERY); Reference< css::xml::XExportFilter > xConverter(mxContext->getServiceManager()->createInstanceWithContext( udConvertClass, mxContext ), UNO_QUERY);
if (!xConverter.is()) { if (!xConverter.is()) {
OSL_FAIL( "xml export sub service missing" ); SAL_WARN("filter.xmlfa", "XmlFilterAdaptor: unable to create service " << udConvertClass);
return false; return false;
} }
@@ -287,9 +287,9 @@ bool SAL_CALL XmlFilterAdaptor::exportImpl( const Sequence< css::beans::Property
return false; return false;
} }
} }
catch( const Exception& exE ) catch (const Exception& e)
{ {
OSL_FAIL( OUStringToOString( exE.Message, RTL_TEXTENCODING_ASCII_US).getStr()); SAL_WARN("filter.xmlfa", "XmlFilterAdaptor: exception: " << e.Message);
if (xStatusIndicator.is()) if (xStatusIndicator.is())
xStatusIndicator->end(); xStatusIndicator->end();
return false; return false;

1
include/sal/log-areas.dox
View File

@@ -179,6 +179,7 @@ certain functionality.
@li @c filter.pdf @li @c filter.pdf
@li @c filter.pict @li @c filter.pict
@li @c filter.tiff @li @c filter.tiff
@li @c filter.xmlfa
@li @c filter.xslt - xslt import/export @li @c filter.xslt - xslt import/export
@section oox @section oox