diff options
Diffstat (limited to 'sc/source')
| -rw-r--r-- | sc/source/core/data/dpsave.cxx | 3 | ||||
| -rw-r--r-- | sc/source/filter/oox/excelfilter.cxx | 3 | ||||
| -rw-r--r-- | sc/source/filter/oox/pivotcachebuffer.cxx | 6 | ||||
| -rw-r--r-- | sc/source/filter/xml/xmlwrap.cxx | 9 | ||||
| -rw-r--r-- | sc/source/ui/Accessibility/DrawModelBroadcaster.cxx | 3 |
5 files changed, 8 insertions, 16 deletions
diff --git a/sc/source/core/data/dpsave.cxx b/sc/source/core/data/dpsave.cxx index 7a2d7d45b27e..4977643c71a8 100644 --- a/sc/source/core/data/dpsave.cxx +++ b/sc/source/core/data/dpsave.cxx @@ -1142,8 +1142,7 @@ void ScDPSaveData::WriteToSource( const uno::Reference<sheet::XDimensionsSupplie } catch(uno::Exception const &) { - css::uno::Any ex( cppu::getCaughtException() ); - SAL_WARN("sc.core", "exception in WriteToSource " << exceptionToString(ex)); + TOOLS_WARN_EXCEPTION("sc.core", "WriteToSource"); } } diff --git a/sc/source/filter/oox/excelfilter.cxx b/sc/source/filter/oox/excelfilter.cxx index dfca3600283a..2183233b0bee 100644 --- a/sc/source/filter/oox/excelfilter.cxx +++ b/sc/source/filter/oox/excelfilter.cxx @@ -97,8 +97,7 @@ bool ExcelFilter::importDocument() } catch( const Exception& ) { - css::uno::Any ex( cppu::getCaughtException() ); - SAL_WARN("sc", "exception when importing document properties " << exceptionToString(ex)); + TOOLS_WARN_EXCEPTION("sc", "exception when importing document properties"); } catch( ... ) { diff --git a/sc/source/filter/oox/pivotcachebuffer.cxx b/sc/source/filter/oox/pivotcachebuffer.cxx index a4f033510e6f..fdb7b15da2e2 100644 --- a/sc/source/filter/oox/pivotcachebuffer.cxx +++ b/sc/source/filter/oox/pivotcachebuffer.cxx @@ -737,8 +737,7 @@ OUString PivotCacheField::createParentGroupField( const Reference< XDataPilotFie } catch( Exception const & ) { - css::uno::Any ex( cppu::getCaughtException() ); - SAL_WARN("sc", "PivotCacheField::createParentGroupField - exception was thrown " << exceptionToString(ex) ); + TOOLS_WARN_EXCEPTION("sc", "PivotCacheField::createParentGroupField" ); } SAL_WARN_IF( aAutoName.isEmpty(), "sc", "PivotCacheField::createParentGroupField - cannot find auto-generated group name" ); @@ -766,8 +765,7 @@ OUString PivotCacheField::createParentGroupField( const Reference< XDataPilotFie } catch( Exception const & ) { - css::uno::Any ex( cppu::getCaughtException() ); - SAL_WARN("sc", "PivotCacheField::createParentGroupField - exception was thrown " << exceptionToString(ex) ); + TOOLS_WARN_EXCEPTION("sc", "PivotCacheField::createParentGroupField" ); } } ++nIndex; diff --git a/sc/source/filter/xml/xmlwrap.cxx b/sc/source/filter/xml/xmlwrap.cxx index 57aa6d71d4cc..70af552b730c 100644 --- a/sc/source/filter/xml/xmlwrap.cxx +++ b/sc/source/filter/xml/xmlwrap.cxx @@ -253,22 +253,19 @@ ErrCode ScXMLImportWrapper::ImportFromComponent(const uno::Reference<uno::XCompo } catch( const packages::zip::ZipIOException& ) { - css::uno::Any ex( cppu::getCaughtException() ); - SAL_WARN("sc.filter", "Zip exception caught while importing: " << exceptionToString(ex)); + TOOLS_WARN_EXCEPTION("sc.filter", "Zip exception caught while importing"); nReturn = ERRCODE_IO_BROKENPACKAGE; } catch( const io::IOException& ) { - css::uno::Any ex( cppu::getCaughtException() ); - SAL_WARN("sc.filter", "IO exception caught while importing: " << exceptionToString(ex)); + TOOLS_WARN_EXCEPTION("sc.filter", "IO exception caught while importing"); nReturn = SCERR_IMPORT_OPEN; } catch( const uno::Exception& ) { - css::uno::Any ex( cppu::getCaughtException() ); - SAL_WARN("sc.filter", "uno exception caught while importing: " << exceptionToString(ex)); + TOOLS_WARN_EXCEPTION("sc.filter", "uno exception caught while importing"); nReturn = SCERR_IMPORT_UNKNOWN; } diff --git a/sc/source/ui/Accessibility/DrawModelBroadcaster.cxx b/sc/source/ui/Accessibility/DrawModelBroadcaster.cxx index 52d8c5f1e1b5..0135865c361a 100644 --- a/sc/source/ui/Accessibility/DrawModelBroadcaster.cxx +++ b/sc/source/ui/Accessibility/DrawModelBroadcaster.cxx @@ -70,8 +70,7 @@ void ScDrawModelBroadcaster::Notify( SfxBroadcaster&, } catch( const uno::RuntimeException& ) { - css::uno::Any ex( cppu::getCaughtException() ); - SAL_WARN("sc.ui", "Runtime exception caught while notifying shape. : " << exceptionToString(ex)); + TOOLS_WARN_EXCEPTION("sc.ui", "Runtime exception caught while notifying shape"); } } } |