diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-05-26 10:58:42 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-05-28 19:44:08 +0200 |
| commit | ef513fd4b049b214a03fbe6e62a5ea43680a7a9b (patch) | |
| tree | 82f2ce93bc8e5fde6dce8685b633c3d643c9f069 /oox | |
| parent | 826f1bca40a01f0a249d5b6cbb7c39c11638a060 (diff) | |
remove unnecessary use of OString::getStr
Change-Id: I0490efedf459190521f4339854b3394d57765fdb
Reviewed-on: https://gerrit.libreoffice.org/38058
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/source/export/chartexport.cxx | 18 | ||||
| -rw-r--r-- | oox/source/ppt/presentationfragmenthandler.cxx | 15 | ||||
| -rw-r--r-- | oox/source/ppt/slidefragmenthandler.cxx | 7 |
3 files changed, 9 insertions, 31 deletions
diff --git a/oox/source/export/chartexport.cxx b/oox/source/export/chartexport.cxx index 28f8c6c4d7f8..d6eeabb9a96d 100644 --- a/oox/source/export/chartexport.cxx +++ b/oox/source/export/chartexport.cxx @@ -193,11 +193,7 @@ Reference< chart2::data::XLabeledDataSequence > lcl_getCategories( const Referen catch( const uno::Exception & ex ) { (void)ex; // avoid warning for pro build - OSL_FAIL( OUStringToOString( - "Exception caught. Type: " + - OUString::createFromAscii( typeid( ex ).name()) + - ", Message: " + - ex.Message, RTL_TEXTENCODING_ASCII_US ).getStr()); + SAL_WARN( "oox", "Exception caught. " << ex.Message); } return xResult; @@ -303,11 +299,7 @@ bool lcl_isSeriesAttachedToFirstAxis( catch( const uno::Exception & ex ) { (void)ex; // avoid warning for pro build - OSL_FAIL( OUStringToOString( - "Exception caught. Type: " + - OUString::createFromAscii( typeid( ex ).name()) + - ", Message: " + - ex.Message, RTL_TEXTENCODING_ASCII_US ).getStr()); + SAL_WARN( "oox", "Exception caught. " << ex.Message); } return bResult; @@ -649,11 +641,7 @@ void ChartExport::InitRangeSegmentationProperties( const Reference< chart2::XCha catch( const uno::Exception & ex ) { (void)ex; // avoid warning for pro build - OSL_FAIL( OUStringToOString( - "Exception caught. Type: " + - OUString::createFromAscii( typeid( ex ).name()) + - ", Message: " + - ex.Message, RTL_TEXTENCODING_ASCII_US ).getStr()); + SAL_WARN( "oox", "Exception caught. " << ex.Message); } } diff --git a/oox/source/ppt/presentationfragmenthandler.cxx b/oox/source/ppt/presentationfragmenthandler.cxx index 8dc1392bed81..32a48548bac0 100644 --- a/oox/source/ppt/presentationfragmenthandler.cxx +++ b/oox/source/ppt/presentationfragmenthandler.cxx @@ -363,12 +363,8 @@ void PresentationFragmentHandler::importSlide(sal_uInt32 nSlide, bool bFirstPage } catch( uno::Exception& ) { - OSL_FAIL( OString("oox::ppt::PresentationFragmentHandler::EndDocument(), " - "exception caught: " + - OUStringToOString( - comphelper::anyToString( cppu::getCaughtException() ), - RTL_TEXTENCODING_UTF8 )).getStr() ); - + SAL_WARN( "oox", "oox::ppt::PresentationFragmentHandler::EndDocument(), " + "exception caught: " << comphelper::anyToString( cppu::getCaughtException() ) ); } } @@ -421,11 +417,8 @@ void PresentationFragmentHandler::finalizeImport() } catch( uno::Exception& ) { - OSL_FAIL( OString("oox::ppt::PresentationFragmentHandler::finalizeImport(), " - "exception caught: " + - OUStringToOString( - comphelper::anyToString( cppu::getCaughtException() ), - RTL_TEXTENCODING_UTF8 )).getStr() ); + SAL_WARN( "oox", "oox::ppt::PresentationFragmentHandler::finalizeImport(), " + "exception caught: " << comphelper::anyToString( cppu::getCaughtException() ) ); } // todo error handling; if ( rxStatusIndicator.is() ) diff --git a/oox/source/ppt/slidefragmenthandler.cxx b/oox/source/ppt/slidefragmenthandler.cxx index c9af6b5306d3..5b8a8b836377 100644 --- a/oox/source/ppt/slidefragmenthandler.cxx +++ b/oox/source/ppt/slidefragmenthandler.cxx @@ -249,11 +249,8 @@ void SlideFragmentHandler::finalizeImport() } catch( uno::Exception& ) { - OSL_FAIL( OString("oox::ppt::SlideFragmentHandler::EndElement(), " - "exception caught: " + - OUStringToOString( - comphelper::anyToString( cppu::getCaughtException() ), - RTL_TEXTENCODING_UTF8 )).getStr()); + SAL_WARN( "oox", "oox::ppt::SlideFragmentHandler::EndElement(), " + "exception caught: " << comphelper::anyToString( cppu::getCaughtException() ) ); } } |