summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--accessibility/source/extended/textwindowaccessibility.cxx2
-rw-r--r--avmedia/source/framework/modeltools.cxx2
-rw-r--r--avmedia/source/viewer/mediawindow_impl.cxx3
-rw-r--r--basctl/source/basicide/scriptdocument.cxx2
-rw-r--r--basic/source/basmgr/basmgr.cxx4
-rw-r--r--basic/source/classes/eventatt.cxx5
-rw-r--r--basic/source/uno/namecont.cxx8
-rw-r--r--binaryurp/source/bridge.cxx11
-rw-r--r--binaryurp/source/bridgefactory.cxx4
-rw-r--r--binaryurp/source/incomingrequest.cxx7
-rw-r--r--binaryurp/source/reader.cxx2
-rw-r--r--binaryurp/source/writer.cxx2
-rw-r--r--chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx8
-rw-r--r--chart2/source/controller/itemsetwrapper/ItemConverter.cxx6
-rw-r--r--chart2/source/controller/main/ChartController.cxx2
-rw-r--r--chart2/source/inc/macros.hxx5
-rw-r--r--cli_ure/source/uno_bridge/cli_proxy.cxx2
-rw-r--r--codemaker/source/cppumaker/cpputype.cxx31
-rw-r--r--comphelper/source/container/embeddedobjectcontainer.cxx14
-rw-r--r--comphelper/source/misc/documentinfo.cxx2
-rw-r--r--comphelper/source/misc/logging.cxx1
-rw-r--r--comphelper/source/misc/scopeguard.cxx2
-rw-r--r--comphelper/source/misc/threadpool.cxx2
-rw-r--r--comphelper/source/property/property.cxx15
-rw-r--r--configmgr/source/components.cxx15
-rw-r--r--connectivity/source/commontools/dbtools.cxx5
-rw-r--r--connectivity/source/cpool/ZPoolCollection.cxx4
-rw-r--r--connectivity/source/drivers/firebird/Blob.cxx2
-rw-r--r--connectivity/source/drivers/hsqldb/HStorageMap.cxx2
-rw-r--r--connectivity/source/drivers/hsqldb/StorageFileAccess.cxx4
-rw-r--r--connectivity/source/drivers/writer/WConnection.cxx2
-rw-r--r--cppu/qa/cppumaker/test_cppumaker.cxx11
-rw-r--r--cppuhelper/source/component.cxx2
-rw-r--r--cppuhelper/source/component_context.cxx4
-rw-r--r--cppuhelper/source/implbase.cxx4
-rw-r--r--cppuhelper/source/propshlp.cxx6
-rw-r--r--cppuhelper/source/servicemanager.cxx5
-rw-r--r--cppuhelper/source/tdmgr.cxx4
-rw-r--r--cppuhelper/source/weak.cxx2
-rw-r--r--cui/source/customize/SvxToolbarConfigPage.cxx6
-rw-r--r--cui/source/customize/cfg.cxx6
-rw-r--r--cui/source/customize/cfgutil.cxx2
-rw-r--r--cui/source/dialogs/linkdlg.cxx2
-rw-r--r--cui/source/dialogs/scriptdlg.cxx10
-rw-r--r--cui/source/options/certpath.cxx6
-rw-r--r--cui/source/options/optaboutconfig.cxx2
-rw-r--r--cui/source/options/optgdlg.cxx4
-rw-r--r--cui/source/options/optinet2.cxx2
-rw-r--r--cui/source/options/optjava.cxx2
-rw-r--r--cui/source/options/optpath.cxx4
-rw-r--r--cui/source/options/optsave.cxx2
-rw-r--r--cui/source/options/optupdt.cxx2
-rw-r--r--cui/source/options/treeopt.cxx4
-rw-r--r--cui/source/options/tsaurls.cxx2
-rw-r--r--dbaccess/source/core/api/RowSetCache.cxx12
-rw-r--r--dbaccess/source/core/dataaccess/databasedocument.cxx2
-rw-r--r--dbaccess/source/filter/xml/xmlfilter.cxx2
-rw-r--r--dbaccess/source/ui/browser/sbagrid.cxx4
-rw-r--r--desktop/source/app/app.cxx12
-rw-r--r--desktop/source/app/appinit.cxx2
-rw-r--r--desktop/source/app/check_ext_deps.cxx2
-rw-r--r--desktop/source/app/dispatchwatcher.cxx7
-rw-r--r--desktop/source/app/langselect.cxx7
-rw-r--r--desktop/source/app/opencl.cxx2
-rw-r--r--desktop/source/app/userinstall.cxx2
-rw-r--r--desktop/source/deployment/dp_log.cxx4
-rw-r--r--desktop/source/deployment/gui/dp_gui_dialog2.cxx4
-rw-r--r--desktop/source/deployment/gui/dp_gui_theextmgr.cxx2
-rw-r--r--desktop/source/deployment/manager/dp_informationprovider.cxx8
-rw-r--r--desktop/source/deployment/manager/dp_manager.cxx10
-rw-r--r--desktop/source/deployment/registry/component/dp_component.cxx6
-rw-r--r--desktop/source/deployment/registry/dp_backend.cxx4
-rw-r--r--desktop/source/deployment/registry/package/dp_package.cxx4
-rw-r--r--desktop/source/lib/init.cxx2
-rw-r--r--desktop/source/migration/migration.cxx8
-rw-r--r--desktop/source/migration/services/oo3extensionmigration.cxx2
-rw-r--r--desktop/source/offacc/acceptor.cxx2
-rw-r--r--desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx2
-rw-r--r--desktop/test/deployment/active/active_native.cxx2
-rw-r--r--editeng/source/editeng/impedit2.cxx2
-rw-r--r--editeng/source/misc/svxacorr.cxx2
-rw-r--r--editeng/source/xml/xmltxtexp.cxx2
-rw-r--r--embeddedobj/source/msole/oleembed.cxx3
-rw-r--r--embeddedobj/source/msole/olevisual.cxx4
-rw-r--r--embeddedobj/source/msole/ownview.cxx3
-rw-r--r--extensions/source/bibliography/datman.cxx4
-rw-r--r--extensions/source/config/ldap/ldapuserprofilebe.cxx2
-rw-r--r--extensions/source/update/check/updatecheck.cxx4
-rw-r--r--extensions/source/update/check/updatecheckjob.cxx4
-rw-r--r--extensions/source/update/feed/test/updatefeedtest.cxx2
-rw-r--r--filter/qa/cppunit/xslt-test.cxx2
-rw-r--r--filter/source/config/cache/filtercache.cxx2
-rw-r--r--filter/source/config/cache/typedetection.cxx6
-rw-r--r--filter/source/msfilter/eschesdo.cxx2
-rw-r--r--filter/source/odfflatxml/OdfFlatXml.cxx4
-rw-r--r--filter/source/pdf/impdialog.cxx2
-rw-r--r--filter/source/svg/svgfilter.cxx2
-rw-r--r--filter/source/svg/test/svg2odf.cxx2
-rw-r--r--filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx4
-rw-r--r--filter/source/xsltfilter/XSLTFilter.cxx4
-rw-r--r--forms/source/component/Edit.cxx2
-rw-r--r--forms/source/xforms/submission/replace.cxx2
-rw-r--r--framework/source/dispatch/servicehandler.cxx3
-rw-r--r--framework/source/fwi/jobs/configaccess.cxx2
-rw-r--r--framework/source/jobs/job.cxx2
-rw-r--r--framework/source/services/sessionlistener.cxx6
-rw-r--r--framework/source/uielement/popuptoolbarcontroller.cxx4
-rw-r--r--include/toolkit/helper/macros.hxx2
-rw-r--r--io/source/stm/opump.cxx10
-rw-r--r--javaunohelper/source/bootstrap.cxx4
-rw-r--r--linguistic/source/gciterator.cxx5
-rw-r--r--oox/source/drawingml/shape.cxx6
-rw-r--r--oox/source/drawingml/textfield.cxx2
-rw-r--r--oox/source/export/chartexport.cxx12
-rw-r--r--oox/source/export/shapes.cxx8
-rw-r--r--oox/source/helper/propertyset.cxx4
-rw-r--r--oox/source/helper/zipstorage.cxx16
-rw-r--r--oox/source/ole/axcontrol.cxx15
-rw-r--r--oox/source/ppt/timenode.cxx6
-rw-r--r--oox/source/vml/vmldrawing.cxx4
-rw-r--r--package/source/manifest/ManifestReader.cxx6
-rw-r--r--package/source/xstor/owriteablestream.cxx60
-rw-r--r--package/source/xstor/xstorage.cxx426
-rw-r--r--package/source/zipapi/XBufferedThreadedStream.cxx6
-rw-r--r--package/source/zipapi/XUnbufferedStream.cxx2
-rw-r--r--package/source/zippackage/ZipPackageStream.cxx2
-rw-r--r--reportdesign/source/filter/xml/xmlfilter.cxx2
-rw-r--r--sax/source/fastparser/fastparser.cxx2
-rw-r--r--sc/source/filter/excel/xlroot.cxx2
-rw-r--r--sc/source/filter/oox/excelfilter.cxx2
-rw-r--r--sc/source/filter/xml/xmlwrap.cxx10
-rw-r--r--sc/source/ui/Accessibility/DrawModelBroadcaster.cxx2
-rw-r--r--sc/source/ui/docshell/docsh8.cxx2
-rw-r--r--sc/source/ui/drawfunc/fuins2.cxx2
-rw-r--r--sc/source/ui/miscdlgs/solverutil.cxx2
-rw-r--r--sc/source/ui/unoobj/docuno.cxx4
-rw-r--r--sc/source/ui/unoobj/exceldetect.cxx2
-rw-r--r--sc/source/ui/vba/vbachartobjects.cxx2
-rw-r--r--sc/source/ui/vba/vbarange.cxx2
-rw-r--r--sc/source/ui/view/tabvwshb.cxx2
-rw-r--r--scripting/source/protocolhandler/scripthandler.cxx4
-rw-r--r--scripting/source/provider/BrowseNodeFactoryImpl.cxx2
-rw-r--r--scripting/source/provider/MasterScriptProvider.cxx5
-rw-r--r--scripting/source/vbaevents/eventhelper.cxx2
-rw-r--r--sd/source/core/stlsheet.cxx2
-rw-r--r--sd/source/filter/xml/sdxmlwrp.cxx12
-rw-r--r--sd/source/helper/simplereferencecomponent.cxx2
-rw-r--r--sd/source/ui/tools/ConfigurationAccess.cxx2
-rw-r--r--sd/source/ui/unoidl/DrawController.cxx2
-rw-r--r--sd/source/ui/unoidl/unomodel.cxx2
-rw-r--r--sd/source/ui/view/drviewsa.cxx2
-rw-r--r--sdext/source/minimizer/configurationaccess.cxx2
-rw-r--r--sdext/source/pdfimport/filterdet.cxx2
-rw-r--r--sdext/source/pdfimport/pdfiadaptor.cxx2
-rw-r--r--sdext/source/pdfimport/test/pdf2xml.cxx4
-rw-r--r--sdext/source/presenter/PresenterConfigurationAccess.cxx4
-rw-r--r--sfx2/source/appl/appserv.cxx8
-rw-r--r--sfx2/source/bastyp/helper.cxx2
-rw-r--r--sfx2/source/control/thumbnailview.cxx6
-rw-r--r--sfx2/source/dialog/backingwindow.cxx2
-rw-r--r--sfx2/source/doc/SfxDocumentMetaData.cxx2
-rw-r--r--sfx2/source/doc/docfile.cxx4
-rw-r--r--sfx2/source/doc/doctemplates.cxx2
-rw-r--r--sfx2/source/doc/guisaveas.cxx6
-rw-r--r--sfx2/source/doc/objcont.cxx2
-rw-r--r--sfx2/source/doc/objxtor.cxx8
-rw-r--r--sfx2/source/sidebar/PanelTitleBar.cxx2
-rw-r--r--sfx2/source/sidebar/SidebarController.cxx2
-rw-r--r--sfx2/source/sidebar/Theme.cxx3
-rw-r--r--sfx2/source/view/classificationhelper.cxx4
-rw-r--r--sfx2/source/view/ipclient.cxx6
-rw-r--r--sfx2/source/view/viewsh.cxx2
-rw-r--r--shell/source/backends/desktopbe/desktopbackend.cxx2
-rw-r--r--shell/source/cmdmail/cmdmailsuppl.cxx2
-rw-r--r--slideshow/source/engine/activitiesqueue.cxx2
-rw-r--r--slideshow/source/engine/eventqueue.cxx2
-rw-r--r--slideshow/source/engine/rehearsetimingsactivity.cxx2
-rw-r--r--slideshow/source/engine/shapes/viewappletshape.cxx2
-rw-r--r--slideshow/source/engine/shapes/viewmediashape.cxx2
-rw-r--r--slideshow/source/engine/shapesubset.cxx2
-rw-r--r--slideshow/source/engine/slide/userpaintoverlay.cxx2
-rw-r--r--slideshow/source/engine/transitions/shapetransitionfactory.cxx2
-rw-r--r--slideshow/source/engine/usereventqueue.cxx2
-rw-r--r--slideshow/test/demoshow.cxx6
-rw-r--r--sot/source/sdstor/ucbstorage.cxx6
-rw-r--r--starmath/source/mathmlexport.cxx2
-rw-r--r--starmath/source/mathmlimport.cxx2
-rw-r--r--starmath/source/smdetect.cxx2
-rw-r--r--starmath/source/unofilter.cxx2
-rw-r--r--stoc/source/javaloader/javaloader.cxx2
-rw-r--r--stoc/source/javavm/javavm.cxx8
-rw-r--r--stoc/source/servicemanager/servicemanager.cxx6
-rw-r--r--stoc/test/javavm/testjavavm.cxx2
-rw-r--r--stoc/test/testconv.cxx2
-rw-r--r--stoc/test/testcorefl.cxx2
-rw-r--r--stoc/test/testintrosp.cxx2
-rw-r--r--svgio/source/svguno/xsvgparser.cxx2
-rw-r--r--svl/source/config/itemholder2.cxx3
-rw-r--r--svtools/langsupport/langsupport.cxx4
-rw-r--r--svtools/source/config/accessibilityoptions.cxx24
-rw-r--r--svtools/source/config/itemholder2.cxx2
-rw-r--r--svtools/source/config/printoptions.cxx28
-rw-r--r--svtools/source/contnr/DocumentInfoPreview.cxx2
-rw-r--r--svtools/source/control/inettbc.cxx10
-rw-r--r--svtools/source/misc/embedhlp.cxx10
-rw-r--r--svtools/source/misc/imagemgr.cxx2
-rw-r--r--svx/source/core/extedit.cxx2
-rw-r--r--svx/source/core/graphichelper.cxx2
-rw-r--r--svx/source/fmcomp/fmgridcl.cxx3
-rw-r--r--svx/source/fmcomp/gridcell.cxx2
-rw-r--r--svx/source/form/fmsrcimp.cxx4
-rw-r--r--svx/source/gallery2/galtheme.cxx4
-rw-r--r--svx/source/gengal/gengal.cxx4
-rw-r--r--svx/source/svdraw/svdmodel.cxx2
-rw-r--r--svx/source/svdraw/svdomedia.cxx6
-rw-r--r--svx/source/svdraw/svdoole2.cxx3
-rw-r--r--svx/workben/pixelctl.cxx4
-rw-r--r--sw/source/core/access/accmap.cxx2
-rw-r--r--sw/source/core/edit/edundo.cxx9
-rw-r--r--sw/source/core/layout/layact.cxx2
-rw-r--r--sw/source/core/tox/toxhlp.cxx12
-rw-r--r--sw/source/core/view/viewimp.cxx2
-rw-r--r--sw/source/filter/docx/swdocxreader.cxx2
-rw-r--r--sw/source/filter/rtf/swparrtf.cxx2
-rw-r--r--sw/source/filter/writer/writer.cxx2
-rw-r--r--sw/source/filter/ww8/docxexport.cxx2
-rw-r--r--sw/source/filter/ww8/docxsdrexport.cxx2
-rw-r--r--sw/source/filter/ww8/rtfsdrexport.cxx2
-rw-r--r--sw/source/filter/ww8/ww8par.cxx2
-rw-r--r--sw/source/filter/ww8/ww8toolbar.cxx2
-rw-r--r--sw/source/filter/xml/swxml.cxx10
-rw-r--r--sw/source/filter/xml/xmlfmt.cxx2
-rw-r--r--sw/source/ui/dbui/dbinsdlg.cxx2
-rw-r--r--sw/source/ui/dbui/mmaddressblockpage.cxx2
-rw-r--r--sw/source/uibase/app/apphdl.cxx4
-rw-r--r--sw/source/uibase/config/StoredChapterNumbering.cxx6
-rw-r--r--sw/source/uibase/dbui/dbmgr.cxx16
-rw-r--r--sw/source/uibase/dbui/mmconfigitem.cxx6
-rw-r--r--toolkit/source/awt/vclxtoolkit.cxx8
-rw-r--r--toolkit/source/controls/unocontrols.cxx4
-rw-r--r--ucb/source/core/provprox.cxx2
-rw-r--r--ucb/source/ucp/expand/ucpexpand.cxx2
-rw-r--r--ucbhelper/source/client/content.cxx2
-rw-r--r--unotools/source/config/configitem.cxx45
-rw-r--r--unotools/source/config/historyoptions.cxx18
-rw-r--r--unotools/source/config/itemholder1.cxx2
-rw-r--r--unotools/source/config/pathoptions.cxx2
-rw-r--r--unotools/source/config/useroptions.cxx6
-rw-r--r--unotools/source/i18n/calendarwrapper.cxx42
-rw-r--r--unotools/source/i18n/charclass.cxx4
-rw-r--r--unotools/source/i18n/localedatawrapper.cxx20
-rw-r--r--unotools/source/i18n/transliterationwrapper.cxx8
-rw-r--r--unotools/source/misc/mediadescriptor.cxx19
-rw-r--r--unotools/source/ucbhelper/ucbhelper.cxx20
-rw-r--r--unoxml/source/dom/documentbuilder.cxx12
-rw-r--r--unoxml/source/dom/elementlist.cxx3
-rw-r--r--uui/source/logindlg.cxx2
-rw-r--r--vcl/backendtest/VisualBackendTest.cxx2
-rw-r--r--vcl/source/app/session.cxx3
-rw-r--r--vcl/source/app/svdata.cxx4
-rw-r--r--vcl/source/app/svmain.cxx2
-rw-r--r--vcl/source/gdi/gdimtf.cxx3
-rw-r--r--vcl/source/gdi/vectorgraphicdata.cxx2
-rw-r--r--vcl/source/image/ImplImageTree.cxx6
-rw-r--r--vcl/source/window/builder.cxx2
-rw-r--r--vcl/source/window/window.cxx8
-rw-r--r--vcl/unx/gtk/gtksalframe.cxx2
-rw-r--r--vcl/unx/gtk3/gtk3gtkframe.cxx2
-rw-r--r--vcl/workben/mtfdemo.cxx4
-rw-r--r--vcl/workben/outdevgrind.cxx4
-rw-r--r--vcl/workben/svdem.cxx2
-rw-r--r--vcl/workben/svpclient.cxx4
-rw-r--r--vcl/workben/svptest.cxx2
-rw-r--r--vcl/workben/vcldemo.cxx4
-rw-r--r--writerfilter/source/dmapper/DomainMapper.cxx6
-rw-r--r--writerfilter/source/dmapper/DomainMapperTableHandler.cxx6
-rw-r--r--writerfilter/source/dmapper/DomainMapper_Impl.cxx20
-rw-r--r--writerfilter/source/dmapper/GraphicImport.cxx4
-rw-r--r--writerfilter/source/dmapper/ModelEventListener.cxx2
-rw-r--r--writerfilter/source/dmapper/NumberingManager.cxx6
-rw-r--r--writerfilter/source/dmapper/OLEHandler.cxx4
-rw-r--r--writerfilter/source/dmapper/PropertyMap.cxx4
-rw-r--r--writerfilter/source/dmapper/StyleSheetTable.cxx4
-rw-r--r--writerfilter/source/dmapper/TableManager.cxx2
-rw-r--r--writerfilter/source/filter/RtfFilter.cxx2
-rw-r--r--writerfilter/source/filter/WriterFilter.cxx3
-rw-r--r--writerfilter/source/ooxml/OOXMLDocumentImpl.cxx19
-rw-r--r--writerfilter/source/rtftok/rtfdocumentimpl.cxx2
-rw-r--r--writerperfect/source/writer/MSWorksImportFilter.cxx2
-rw-r--r--xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx2
-rw-r--r--xmloff/source/chart/SchXMLChartContext.cxx6
-rw-r--r--xmloff/source/chart/SchXMLExport.cxx28
-rw-r--r--xmloff/source/chart/SchXMLImport.cxx7
-rw-r--r--xmloff/source/chart/SchXMLPlotAreaContext.cxx12
-rw-r--r--xmloff/source/chart/SchXMLSeries2Context.cxx10
-rw-r--r--xmloff/source/chart/SchXMLSeriesHelper.cxx6
-rw-r--r--xmloff/source/chart/SchXMLTools.cxx6
-rw-r--r--xmloff/source/core/DocumentSettingsContext.cxx2
-rw-r--r--xmloff/source/draw/animationexport.cxx2
-rw-r--r--xmloff/source/draw/shapeexport.cxx7
-rw-r--r--xmloff/source/draw/shapeimport.cxx2
-rw-r--r--xmloff/source/forms/officeforms.cxx2
-rw-r--r--xmloff/source/style/XMLFontAutoStylePool.cxx2
-rw-r--r--xmloff/source/text/XMLTextFrameContext.cxx4
-rw-r--r--xmloff/source/text/txtparai.cxx2
-rw-r--r--xmlscript/source/xmlflat_imexp/xmlbas_export.cxx8
-rw-r--r--xmlscript/source/xmlflat_imexp/xmlbas_import.cxx14
-rw-r--r--xmlscript/test/imexp.cxx8
-rw-r--r--xmlsecurity/source/helper/documentsignaturehelper.cxx2
-rw-r--r--xmlsecurity/source/helper/pdfsignaturehelper.cxx2
-rw-r--r--xmlsecurity/source/helper/xmlsignaturehelper.cxx2
-rw-r--r--xmlsecurity/source/xmlsec/nss/nssinitializer.cxx4
-rw-r--r--xmlsecurity/workben/pdfverify.cxx4
313 files changed, 958 insertions, 1042 deletions
diff --git a/accessibility/source/extended/textwindowaccessibility.cxx b/accessibility/source/extended/textwindowaccessibility.cxx
index dcf95d8211f6..3a1d4860292d 100644
--- a/accessibility/source/extended/textwindowaccessibility.cxx
+++ b/accessibility/source/extended/textwindowaccessibility.cxx
@@ -266,7 +266,7 @@ void SAL_CALL Paragraph::grabFocus()
{
SAL_INFO("accessibility",
"textwindowaccessibility.cxx: Paragraph::grabFocus: caught unexpected "
- << rEx.Message);
+ << rEx);
}
}
diff --git a/avmedia/source/framework/modeltools.cxx b/avmedia/source/framework/modeltools.cxx
index 729d19298446..8addb30967e5 100644
--- a/avmedia/source/framework/modeltools.cxx
+++ b/avmedia/source/framework/modeltools.cxx
@@ -159,7 +159,7 @@ static void lcl_EmbedExternals(const OUString& rSourceURL, const uno::Reference<
}
catch (uno::Exception const& e)
{
- SAL_WARN("avmedia.opengl", "Exception: '" << e.Message << "'");
+ SAL_WARN("avmedia.opengl", e);
return;
}
diff --git a/avmedia/source/viewer/mediawindow_impl.cxx b/avmedia/source/viewer/mediawindow_impl.cxx
index 4ddb201ee72a..d5bc7a50ef63 100644
--- a/avmedia/source/viewer/mediawindow_impl.cxx
+++ b/avmedia/source/viewer/mediawindow_impl.cxx
@@ -251,8 +251,7 @@ uno::Reference< media::XPlayer > MediaWindowImpl::createPlayer(
SAL_INFO( "avmedia", "failed to create media player service " << rManagerServName );
} catch ( const uno::Exception &e )
{
- SAL_WARN( "avmedia", "couldn't create media player " << rManagerServName
- << ", exception '" << e.Message << '\'');
+ SAL_WARN( "avmedia", "couldn't create media player " << rManagerServName << ", " << e);
}
return xPlayer;
}
diff --git a/basctl/source/basicide/scriptdocument.cxx b/basctl/source/basicide/scriptdocument.cxx
index 5bbbc0a9ee1a..1b1d720b6e17 100644
--- a/basctl/source/basicide/scriptdocument.cxx
+++ b/basctl/source/basicide/scriptdocument.cxx
@@ -413,7 +413,7 @@ namespace basctl
}
catch (const css::ucb::ContentCreationException& e)
{
- SAL_WARN( "basctl.basicide", "ScriptDocument::getBasicManager: Caught exception: " << e.Message );
+ SAL_WARN( "basctl.basicide", "ScriptDocument::getBasicManager: Caught exception: " << e );
}
return nullptr;
}
diff --git a/basic/source/basmgr/basmgr.cxx b/basic/source/basmgr/basmgr.cxx
index 2342510bbd54..211daeb8ccfa 100644
--- a/basic/source/basmgr/basmgr.cxx
+++ b/basic/source/basmgr/basmgr.cxx
@@ -1141,7 +1141,7 @@ bool BasicManager::RemoveLib( sal_uInt16 nLib, bool bDelBasicFromStorage )
}
catch (const css::ucb::ContentCreationException& e)
{
- SAL_WARN("basic", "BasicManager::RemoveLib: Caught exception: " << e.Message);
+ SAL_WARN("basic", "BasicManager::RemoveLib: " << e);
}
if (xStorage.is() && xStorage->IsStorage(szBasicStorage))
@@ -1328,7 +1328,7 @@ StarBASIC* BasicManager::CreateLib( const OUString& rLibName, const OUString& Pa
}
catch (const css::ucb::ContentCreationException& e)
{
- SAL_WARN("basic", "BasicManager::RemoveLib: Caught exception: " << e.Message);
+ SAL_WARN("basic", "BasicManager::RemoveLib: " << e);
}
DBG_ASSERT( pLib, "XML Import: Linked basic library could not be loaded");
}
diff --git a/basic/source/classes/eventatt.cxx b/basic/source/classes/eventatt.cxx
index 7dc252a9d58b..e7003e7eb550 100644
--- a/basic/source/classes/eventatt.cxx
+++ b/basic/source/classes/eventatt.cxx
@@ -51,6 +51,7 @@
#include <eventatt.hxx>
#include <cppuhelper/implbase.hxx>
+
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::script;
@@ -117,11 +118,11 @@ void SFURL_firing_impl( const ScriptEvent& aScriptEvent, Any* pRet, const Refere
}
catch ( const RuntimeException& re )
{
- SAL_INFO("basic", "Caught RuntimeException reason " << re.Message);
+ SAL_INFO("basic", "Caught RuntimeException reason " << re);
}
catch ( const Exception& e )
{
- SAL_INFO("basic", "Caught Exception reason " << e.Message);
+ SAL_INFO("basic", "Caught Exception reason " << e);
}
}
diff --git a/basic/source/uno/namecont.cxx b/basic/source/uno/namecont.cxx
index 64de45125e2b..fb26916676f6 100644
--- a/basic/source/uno/namecont.cxx
+++ b/basic/source/uno/namecont.cxx
@@ -421,7 +421,7 @@ BasicManager* SfxLibraryContainer::getBasicManager()
}
catch (const css::ucb::ContentCreationException& e)
{
- SAL_WARN( "basic", "SfxLibraryContainer::getBasicManager : Caught exception: " << e.Message );
+ SAL_WARN( "basic", "SfxLibraryContainer::getBasicManager: " << e );
}
return mpBasMgr;
}
@@ -808,12 +808,12 @@ void SfxLibraryContainer::init_Impl( const OUString& rInitialDocumentURL,
}
catch ( const xml::sax::SAXException& e )
{
- SAL_WARN("basic", e.Message);
+ SAL_WARN("basic", e);
return;
}
catch ( const io::IOException& e )
{
- SAL_WARN("basic", e.Message);
+ SAL_WARN("basic", e);
return;
}
@@ -1177,7 +1177,7 @@ void SfxLibraryContainer::init_Impl( const OUString& rInitialDocumentURL,
catch(const Exception& e)
{
bCleanUp = true;
- SAL_WARN("basic", "Upgrade of Basic installation failed somehow: " << e.Message);
+ SAL_WARN("basic", "Upgrade of Basic installation failed somehow: " << e);
}
// #i93163
diff --git a/binaryurp/source/bridge.cxx b/binaryurp/source/bridge.cxx
index 9a02085b3182..a31722418864 100644
--- a/binaryurp/source/bridge.cxx
+++ b/binaryurp/source/bridge.cxx
@@ -296,7 +296,7 @@ void Bridge::terminate(bool final) {
try {
connection_->close();
} catch (const css::io::IOException & e) {
- SAL_INFO("binaryurp", "caught IO exception '" << e.Message << '\'');
+ SAL_INFO("binaryurp", "caught IO exception '" << e << '\'');
}
assert(w.is());
w->stop();
@@ -331,9 +331,7 @@ void Bridge::terminate(bool final) {
css::lang::EventObject(
static_cast< cppu::OWeakObject * >(this)));
} catch (const css::uno::RuntimeException & e) {
- SAL_WARN(
- "binaryurp",
- "caught runtime exception '" << e.Message << '\'');
+ SAL_WARN("binaryurp", "caught " << e);
}
}
}
@@ -532,7 +530,7 @@ void Bridge::freeProxy(Proxy & proxy) {
makeReleaseCall(proxy.getOid(), proxy.getType());
} catch (const css::uno::RuntimeException & e) {
SAL_INFO(
- "binaryurp", "caught runtime exception '" << e.Message << '\'');
+ "binaryurp", "caught runtime exception '" << e << '\'');
} catch (const std::exception & e) {
SAL_WARN("binaryurp", "caught C++ exception '" << e.what() << '\'');
}
@@ -642,8 +640,7 @@ void Bridge::handleRequestChangeReply(
}
SAL_WARN(
"binaryurp",
- "requestChange caught RuntimeException \'" << e.Message
- << "' in state 'requested'");
+ "requestChange caught " << e << " in state 'requested'");
mode_ = MODE_NORMAL;
getWriter()->unblock();
decrementCalls();
diff --git a/binaryurp/source/bridgefactory.cxx b/binaryurp/source/bridgefactory.cxx
index fdf80873ac2b..b531910403e7 100644
--- a/binaryurp/source/bridgefactory.cxx
+++ b/binaryurp/source/bridgefactory.cxx
@@ -183,7 +183,7 @@ void BridgeFactory::disposing() {
css::uno::Reference<css::lang::XComponent>(
*i, css::uno::UNO_QUERY_THROW)->dispose();
} catch (css::uno::Exception & e) {
- SAL_WARN("binaryurp", "ignoring Exception " << e.Message);
+ SAL_WARN("binaryurp", "ignoring " << e);
}
}
for (BridgeMap::iterator i(l2.begin()); i != l2.end(); ++i) {
@@ -191,7 +191,7 @@ void BridgeFactory::disposing() {
css::uno::Reference<css::lang::XComponent>(
i->second, css::uno::UNO_QUERY_THROW)->dispose();
} catch (css::uno::Exception & e) {
- SAL_WARN("binaryurp", "ignoring Exception " << e.Message);
+ SAL_WARN("binaryurp", "ignoring " << e);
}
}
}
diff --git a/binaryurp/source/incomingrequest.cxx b/binaryurp/source/incomingrequest.cxx
index 9043b22daadf..2a94ed2c7611 100644
--- a/binaryurp/source/incomingrequest.cxx
+++ b/binaryurp/source/incomingrequest.cxx
@@ -102,7 +102,7 @@ void IncomingRequest::execute() const {
tid_, member_, setter_, isExc, ret, outArgs, false);
return;
} catch (const css::uno::RuntimeException & e) {
- SAL_INFO("binaryurp", "caught UNO runtime exception " << e.Message);
+ SAL_INFO("binaryurp", "caught " << e);
} catch (const std::exception & e) {
SAL_INFO("binaryurp", "caught C++ exception " << e.what());
}
@@ -146,10 +146,7 @@ bool IncomingRequest::execute_throw(
try {
ifc = prov->getInstance(oid_);
} catch (const css::container::NoSuchElementException & e) {
- SAL_INFO(
- "binaryurp",
- "initial element " << oid_
- << ": NoSuchElementException " << e.Message);
+ SAL_INFO("binaryurp", "initial element " << oid_ << ": " << e);
}
}
if (ifc.is()) {
diff --git a/binaryurp/source/reader.cxx b/binaryurp/source/reader.cxx
index 75c3a1f7d467..b50d3d50c187 100644
--- a/binaryurp/source/reader.cxx
+++ b/binaryurp/source/reader.cxx
@@ -120,7 +120,7 @@ void Reader::execute() {
block.done();
}
} catch (const css::uno::Exception & e) {
- SAL_WARN("binaryurp", "caught UNO exception '" << e.Message << '\'');
+ SAL_WARN("binaryurp", "caught UNO exception '" << e << '\'');
} catch (const std::exception & e) {
SAL_WARN("binaryurp", "caught C++ exception '" << e.what() << '\'');
}
diff --git a/binaryurp/source/writer.cxx b/binaryurp/source/writer.cxx
index ba79ee096d55..9c71763c738d 100644
--- a/binaryurp/source/writer.cxx
+++ b/binaryurp/source/writer.cxx
@@ -180,7 +180,7 @@ void Writer::execute() {
}
}
} catch (const css::uno::Exception & e) {
- SAL_INFO("binaryurp", "caught UNO exception " << e.Message);
+ SAL_INFO("binaryurp", "caught " << e);
} catch (const std::exception & e) {
SAL_INFO("binaryurp", "caught C++ exception " << e.what());
}
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
index 7f9d4fe106c6..d1dca8371e59 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
+++ b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
@@ -141,7 +141,7 @@ namespace
}
catch( const uno::Exception & ex )
{
- SAL_WARN( "chart2", "Property Exception caught. Message: " << ex.Message);
+ SAL_WARN( "chart2", "Property Exception caught. Message: " << ex);
}
}
return aResult;
@@ -167,7 +167,7 @@ namespace
}
catch( const uno::Exception & ex )
{
- SAL_WARN( "chart2", "Property Exception caught. Message: " << ex.Message);
+ SAL_WARN( "chart2", "Property Exception caught. Message: " << ex);
}
}
}
@@ -182,7 +182,7 @@ namespace
}
catch( const uno::Exception & ex )
{
- SAL_WARN( "chart2", "Property Exception caught. Message: " << ex.Message);
+ SAL_WARN( "chart2", "Property Exception caught. Message: " << ex);
}
return Color( nResult );
}
@@ -198,7 +198,7 @@ namespace
}
catch( const uno::Exception & ex )
{
- SAL_WARN( "chart2", "Property Exception caught. Message: " << ex.Message);
+ SAL_WARN( "chart2", "Property Exception caught. Message: " << ex);
}
}
}
diff --git a/chart2/source/controller/itemsetwrapper/ItemConverter.cxx b/chart2/source/controller/itemsetwrapper/ItemConverter.cxx
index fe339e917399..aa4747728b18 100644
--- a/chart2/source/controller/itemsetwrapper/ItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/ItemConverter.cxx
@@ -118,7 +118,7 @@ void ItemConverter::FillItemSet( SfxItemSet & rOutItemSet ) const
catch( const beans::UnknownPropertyException &ex )
{
delete pItem;
- SAL_WARN( "chart2", ex.Message << " - unknown Property: " << aProperty.first);
+ SAL_WARN( "chart2", ex << " - unknown Property: " << aProperty.first);
}
catch( const uno::Exception &ex )
{
@@ -182,11 +182,11 @@ bool ItemConverter::ApplyItemSet( const SfxItemSet & rItemSet )
}
catch( const beans::UnknownPropertyException &ex )
{
- SAL_WARN( "chart2", ex.Message << " - unknown Property: " << aProperty.first);
+ SAL_WARN( "chart2", ex << " - unknown Property: " << aProperty.first);
}
catch( const uno::Exception &ex )
{
- SAL_WARN( "chart2", ex.Message );
+ SAL_WARN( "chart2", ex );
}
}
else
diff --git a/chart2/source/controller/main/ChartController.cxx b/chart2/source/controller/main/ChartController.cxx
index e660dfb24be7..9cd74635a90a 100644
--- a/chart2/source/controller/main/ChartController.cxx
+++ b/chart2/source/controller/main/ChartController.cxx
@@ -215,7 +215,7 @@ void ChartController::TheModel::tryTermination()
}
catch(const uno::Exception& ex)
{
- SAL_WARN( "chart2", "Termination of model failed: " << ex.Message );
+ SAL_WARN( "chart2", "Termination of model failed: " << ex );
}
}
diff --git a/chart2/source/inc/macros.hxx b/chart2/source/inc/macros.hxx
index daf66c45b9a2..6b435c71c6f8 100644
--- a/chart2/source/inc/macros.hxx
+++ b/chart2/source/inc/macros.hxx
@@ -25,10 +25,7 @@
#include "sal/log.hxx"
-#define ASSERT_EXCEPTION(ex) \
- SAL_WARN("chart2", "Exception caught. Type: " <<\
- typeid( ex ).name() << ", Message: " << \
- ex.Message )
+#define ASSERT_EXCEPTION(ex) SAL_WARN("chart2", "Exception caught. " << ex )
#endif
diff --git a/cli_ure/source/uno_bridge/cli_proxy.cxx b/cli_ure/source/uno_bridge/cli_proxy.cxx
index 453880298485..9225c9bf3272 100644
--- a/cli_ure/source/uno_bridge/cli_proxy.cxx
+++ b/cli_ure/source/uno_bridge/cli_proxy.cxx
@@ -1096,7 +1096,7 @@ void SAL_CALL cli_proxy_dispatch(
css::uno::XInterface >() );
css::uno::Type const & exc_type = cppu::UnoType<decltype(exc)>::get();
uno_type_any_construct( *uno_exc, &exc, exc_type.getTypeLibType(), 0);
- SAL_WARN( "cli", exc.Message);
+ SAL_WARN( "cli", exc);
}
}
diff --git a/codemaker/source/cppumaker/cpputype.cxx b/codemaker/source/cppumaker/cpputype.cxx
index 28efa3fbf1f9..dafbe682fd8b 100644
--- a/codemaker/source/cppumaker/cpputype.cxx
+++ b/codemaker/source/cppumaker/cpputype.cxx
@@ -2738,7 +2738,18 @@ void ExceptionType::dumpHppFile(
out << "\n";
addDefaultHxxIncludes(includes);
includes.dump(out, &name_, true);
+
+ // for the output operator below
+ if (name_ == "com.sun.star.uno.Exception")
+ {
+ out << "#if defined LIBO_INTERNAL_ONLY\n";
+ out << "#include <ostream>\n";
+ out << "#include <typeinfo>\n";
+ out << "#endif\n";
+ }
+
out << "\n";
+
if (codemaker::cppumaker::dumpNamespaceOpen(out, name_, false)) {
out << "\n";
}
@@ -2837,10 +2848,30 @@ void ExceptionType::dumpHppFile(
out << indent() << "return *this;\n";
dec();
out << indent() << "}\n#endif\n\n";
+
+ // Provide an output operator for printing Exception information to SAL_WARN/SAL_INFO.
+ if (name_ == "com.sun.star.uno.Exception")
+ {
+ out << "#if defined LIBO_INTERNAL_ONLY\n";
+ out << "template< typename charT, typename traits >\n";
+ out << "inline ::std::basic_ostream<charT, traits> & operator<<(\n";
+ out << " ::std::basic_ostream<charT, traits> & os, ::com::sun::star::uno::Exception const & exception)\n";
+ out << "{\n";
+ out << " // the class name is useful because exception throwing code does not always pass in a useful message\n";
+ out << " os << typeid(exception).name();\n";
+ out << " if (!exception.Message.isEmpty())\n";
+ out << " os << \" msg: \" << exception.Message;\n";
+ out << " return os;\n";
+ out << "}\n";
+ out << "#endif\n";
+ out << "\n";
+ }
+
if (codemaker::cppumaker::dumpNamespaceClose(out, name_, false)) {
out << "\n";
}
out << "\n";
+
dumpGetCppuType(out);
out << "\n#endif // "<< headerDefine << "\n";
}
diff --git a/comphelper/source/container/embeddedobjectcontainer.cxx b/comphelper/source/container/embeddedobjectcontainer.cxx
index 530872c1a714..a3fce00e1c7b 100644
--- a/comphelper/source/container/embeddedobjectcontainer.cxx
+++ b/comphelper/source/container/embeddedobjectcontainer.cxx
@@ -358,7 +358,7 @@ uno::Reference<embed::XEmbeddedObject> EmbeddedObjectContainer::Get_Impl(
}
catch (uno::Exception const& e)
{
- SAL_WARN("comphelper.container", "EmbeddedObjectContainer::Get_Impl: exception caught: " << e.Message);
+ SAL_WARN("comphelper.container", "EmbeddedObjectContainer::Get_Impl: exception caught: " << e);
}
return xObj;
@@ -399,7 +399,7 @@ uno::Reference < embed::XEmbeddedObject > EmbeddedObjectContainer::CreateEmbedde
}
catch (uno::Exception const& e)
{
- SAL_WARN("comphelper.container", "EmbeddedObjectContainer::CreateEmbeddedObject: exception caught: " << e.Message);
+ SAL_WARN("comphelper.container", "EmbeddedObjectContainer::CreateEmbeddedObject: exception caught: " << e);
}
return xObj;
@@ -511,7 +511,7 @@ bool EmbeddedObjectContainer::StoreEmbeddedObject(
}
catch (uno::Exception const& e)
{
- SAL_WARN("comphelper.container", "EmbeddedObjectContainer::StoreEmbeddedObject: exception caught: " << e.Message);
+ SAL_WARN("comphelper.container", "EmbeddedObjectContainer::StoreEmbeddedObject: exception caught: " << e);
// TODO/LATER: better error recovery should keep storage intact
return false;
}
@@ -572,7 +572,7 @@ uno::Reference < embed::XEmbeddedObject > EmbeddedObjectContainer::InsertEmbedde
catch (uno::Exception const& e)
{
// complete disaster!
- SAL_WARN("comphelper.container", "EmbeddedObjectContainer::InsertEmbeddedObject: exception caught: " << e.Message);
+ SAL_WARN("comphelper.container", "EmbeddedObjectContainer::InsertEmbeddedObject: exception caught: " << e);
return uno::Reference < embed::XEmbeddedObject >();
}
}
@@ -657,7 +657,7 @@ uno::Reference < embed::XEmbeddedObject > EmbeddedObjectContainer::InsertEmbedde
catch (uno::Exception const& e)
{
SAL_WARN("comphelper.container", "EmbeddedObjectContainer::InsertEmbeddedLink: "
- "exception caught: " << e.Message);
+ "exception caught: " << e);
}
return xObj;
@@ -1126,7 +1126,7 @@ uno::Reference < io::XInputStream > EmbeddedObjectContainer::GetGraphicStream( c
catch (uno::Exception const& e)
{
SAL_INFO("comphelper.container",
- "EmbeddedObjectContainer::GetGraphicStream(): exception: " << e.Message);
+ "EmbeddedObjectContainer::GetGraphicStream(): " << e);
}
}
@@ -1348,7 +1348,7 @@ bool EmbeddedObjectContainer::StoreAsChildren(bool _bOasisFormat,bool _bCreateEm
{
// TODO/LATER: error handling
bResult = false;
- SAL_WARN("comphelper.container", "failed. Message: " << e.Message);
+ SAL_WARN("comphelper.container", "failed. Message: " << e);
}
// the old SO6 format does not store graphical replacements
diff --git a/comphelper/source/misc/documentinfo.cxx b/comphelper/source/misc/documentinfo.cxx
index e309da6d74ed..b63450590554 100644
--- a/comphelper/source/misc/documentinfo.cxx
+++ b/comphelper/source/misc/documentinfo.cxx
@@ -150,7 +150,7 @@ namespace comphelper {
css::uno::Exception exception;
caught >>= exception;
SAL_WARN( "comphelper", "caught an exception!\ntype : " << caught.getValueTypeName()
- << "\nmessage: " << exception.Message
+ << "\nmessage: " << exception
<< "\nin function:\n" << OSL_THIS_FUNC);
}
diff --git a/comphelper/source/misc/logging.cxx b/comphelper/source/misc/logging.cxx
index 3744d9580727..e08d9d540a99 100644
--- a/comphelper/source/misc/logging.cxx
+++ b/comphelper/source/misc/logging.cxx
@@ -164,5 +164,4 @@ namespace comphelper
}
} // namespace comphelper
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/comphelper/source/misc/scopeguard.cxx b/comphelper/source/misc/scopeguard.cxx
index 2224c0993fff..d1f48f959fd2 100644
--- a/comphelper/source/misc/scopeguard.cxx
+++ b/comphelper/source/misc/scopeguard.cxx
@@ -32,7 +32,7 @@ ScopeGuard::~ScopeGuard()
m_func();
}
catch (css::uno::Exception & exc) {
- SAL_WARN( "comphelper", "UNO exception occurred: " << exc.Message );
+ SAL_WARN( "comphelper", "UNO exception occurred: " << exc );
}
catch (...) {
OSL_FAIL( "unknown exception occurred!" );
diff --git a/comphelper/source/misc/threadpool.cxx b/comphelper/source/misc/threadpool.cxx
index 7368544a14b1..23e363213206 100644
--- a/comphelper/source/misc/threadpool.cxx
+++ b/comphelper/source/misc/threadpool.cxx
@@ -268,7 +268,7 @@ void ThreadTask::execAndDelete()
}
catch (const css::uno::Exception &e)
{
- SAL_WARN("comphelper", "exception in thread worker while calling doWork(): " << e.Message);
+ SAL_WARN("comphelper", "exception in thread worker while calling doWork(): " << e);
}
delete this;
diff --git a/comphelper/source/property/property.cxx b/comphelper/source/property/property.cxx
index 5e3fd29dc01b..f5e369808d2a 100644
--- a/comphelper/source/property/property.cxx
+++ b/comphelper/source/property/property.cxx
@@ -32,7 +32,7 @@
#include <com/sun/star/beans/PropertyAttribute.hpp>
#include <com/sun/star/lang/IllegalArgumentException.hpp>
#include <com/sun/star/uno/genfunc.h>
-
+#include <rtl/ustrbuf.hxx>
#include <algorithm>
@@ -90,15 +90,15 @@ void copyProperties(const Reference<XPropertySet>& _rxSource,
catch (Exception&)
{
#if OSL_DEBUG_LEVEL > 0
- OStringBuffer aBuffer;
+ OUStringBuffer aBuffer;
aBuffer.append( "::comphelper::copyProperties: could not copy property '" );
- aBuffer.append( OString( pSourceProps->Name.getStr(), pSourceProps->Name.getLength(), RTL_TEXTENCODING_ASCII_US ) );
+ aBuffer.append( pSourceProps->Name );
aBuffer.append( "' to the destination set (a '" );
Reference< XServiceInfo > xSI( _rxDest, UNO_QUERY );
if ( xSI.is() )
{
- aBuffer.append( OUStringToOString( xSI->getImplementationName(), osl_getThreadTextEncoding() ) );
+ aBuffer.append( xSI->getImplementationName() );
}
else
{
@@ -108,20 +108,19 @@ void copyProperties(const Reference<XPropertySet>& _rxSource,
Any aException( ::cppu::getCaughtException() );
aBuffer.append( "Caught an exception of type '" );
- OUString sExceptionType( aException.getValueTypeName() );
- aBuffer.append( OString( sExceptionType.getStr(), sExceptionType.getLength(), RTL_TEXTENCODING_ASCII_US ) );
+ aBuffer.append( aException.getValueTypeName() );
aBuffer.append( "'" );
Exception aBaseException;
if ( ( aException >>= aBaseException ) && !aBaseException.Message.isEmpty() )
{
aBuffer.append( ", saying '" );
- aBuffer.append( OString( aBaseException.Message.getStr(), aBaseException.Message.getLength(), osl_getThreadTextEncoding() ) );
+ aBuffer.append( aBaseException.Message );
aBuffer.append( "'" );
}
aBuffer.append( "." );
- OSL_FAIL( aBuffer.getStr() );
+ SAL_WARN( "comphelper", aBuffer.makeStringAndClear() );
#endif
}
}
diff --git a/configmgr/source/components.cxx b/configmgr/source/components.cxx
index 19516773173a..3b4111bc0fb9 100644
--- a/configmgr/source/components.cxx
+++ b/configmgr/source/components.cxx
@@ -186,9 +186,7 @@ void Components::WriteThread::execute() {
writeModFile(components_, url_, data_);
} catch (css::uno::RuntimeException & e) {
// Ignore write errors, instead of aborting:
- SAL_WARN(
- "configmgr",
- "error writing modifications: \"" << e.Message << '"');
+ SAL_WARN("configmgr", "error writing modifications: " << e);
}
} catch (...) {
reference_->clear();
@@ -404,8 +402,7 @@ void Components::insertModificationXcuFile(
} catch (css::container::NoSuchElementException & e) {
SAL_WARN(
"configmgr",
- "error inserting non-existing \"" << fileUri << "\": \""
- << e.Message << '"');
+ "error inserting non-existing \"" << fileUri << "\": " << e);
}
}
@@ -433,8 +430,7 @@ css::beans::Optional< css::uno::Any > Components::getExternalValue(
// installed:
SAL_WARN(
"configmgr",
- "createInstance(" << name << ") failed with \"" << e.Message
- << '"');
+ "createInstance(" << name << ") failed with " << e);
}
css::uno::Reference< css::beans::XPropertySet > propset;
if (service.is()) {
@@ -662,7 +658,7 @@ void Components::parseFileLeniently(
// starting:
SAL_WARN(
"configmgr",
- "error reading \"" << url << "\": \"" << e.Message << '"');
+ "error reading \"" << url << "\": " << e);
}
}
@@ -731,8 +727,7 @@ void Components::parseFileList(
try {
parseFileLeniently(parseFile, url, layer, nullptr, nullptr, adds);
} catch (css::container::NoSuchElementException & e) {
- SAL_WARN(
- "configmgr", "file does not exist: \"" << e.Message << '"');
+ SAL_WARN("configmgr", "file does not exist: " << e);
if (adds != nullptr) {
data_.removeExtensionXcuAdditions(url);
}
diff --git a/connectivity/source/commontools/dbtools.cxx b/connectivity/source/commontools/dbtools.cxx
index 445d0e639275..08770018bbfd 100644
--- a/connectivity/source/commontools/dbtools.cxx
+++ b/connectivity/source/commontools/dbtools.cxx
@@ -974,7 +974,7 @@ try
catch(IllegalArgumentException const & exc)
{
SAL_WARN( "connectivity.commontools", "TransferFormComponentProperties : could not transfer the value for property \""
- << pResult->Name << "\" " << exc.Message);
+ << pResult->Name << "\" " << exc);
}
}
}
@@ -1972,8 +1972,7 @@ void release(oslInterlockedCount& _refCount,
_pObject->dispose();
} catch (css::uno::RuntimeException & e) {
SAL_WARN(
- "connectivity.commontools",
- "Caught exception during dispose, " << e.Message);
+ "connectivity.commontools", "Caught exception during dispose, " << e);
}
// only the alive ref holds the object
diff --git a/connectivity/source/cpool/ZPoolCollection.cxx b/connectivity/source/cpool/ZPoolCollection.cxx
index 811be298bb07..313ee07246ef 100644
--- a/connectivity/source/cpool/ZPoolCollection.cxx
+++ b/connectivity/source/cpool/ZPoolCollection.cxx
@@ -386,9 +386,7 @@ Any OPoolCollection::getNodeValue(const OUString& _rPath,const Reference<XInterf
}
catch(NoSuchElementException& e)
{
- SAL_WARN("connectivity.cpool", "::getNodeValue: caught a "
- "NoSuchElementException while trying to open " <<
- e.Message << "!" );
+ SAL_WARN("connectivity.cpool", e );
}
return aReturn;
}
diff --git a/connectivity/source/drivers/firebird/Blob.cxx b/connectivity/source/drivers/firebird/Blob.cxx
index b71c8844cb72..0cd5697992fd 100644
--- a/connectivity/source/drivers/firebird/Blob.cxx
+++ b/connectivity/source/drivers/firebird/Blob.cxx
@@ -125,7 +125,7 @@ void SAL_CALL Blob::disposing()
catch (SQLException &e)
{
// we cannot throw any exceptions here...
- SAL_WARN("connectivity.firebird", "isc_close_blob failed " << e.Message);
+ SAL_WARN("connectivity.firebird", "isc_close_blob failed " << e);
assert(false);
}
Blob_BASE::disposing();
diff --git a/connectivity/source/drivers/hsqldb/HStorageMap.cxx b/connectivity/source/drivers/hsqldb/HStorageMap.cxx
index 4f53c25fc35c..d93fbb363d8a 100644
--- a/connectivity/source/drivers/hsqldb/HStorageMap.cxx
+++ b/connectivity/source/drivers/hsqldb/HStorageMap.cxx
@@ -352,7 +352,7 @@ namespace connectivity
{
if (env->ExceptionCheck())
env->ExceptionClear();
- SAL_WARN("connectivity.hsqldb", "forwarding Exception: " << _aException.Message );
+ SAL_WARN("connectivity.hsqldb", "forwarding Exception: " << _aException );
OString cstr( OUStringToOString(_aException.Message, RTL_TEXTENCODING_JAVA_UTF8 ) );
env->ThrowNew(env->FindClass("java/io/IOException"), cstr.getStr());
}
diff --git a/connectivity/source/drivers/hsqldb/StorageFileAccess.cxx b/connectivity/source/drivers/hsqldb/StorageFileAccess.cxx
index ef9a3304534e..769cea7001df 100644
--- a/connectivity/source/drivers/hsqldb/StorageFileAccess.cxx
+++ b/connectivity/source/drivers/hsqldb/StorageFileAccess.cxx
@@ -80,7 +80,7 @@ extern "C" SAL_JNI_EXPORT jboolean JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_S
OSL_FAIL("Exception caught! : Java_com_sun_star_sdbcx_comp_hsqldb_StorageFileAccess_isStreamElement");
if (env->ExceptionCheck())
env->ExceptionClear();
- SAL_WARN("connectivity.hsqldb", "forwarding Exception: " << e.Message);
+ SAL_WARN("connectivity.hsqldb", "forwarding Exception: " << e);
}
}
return JNI_FALSE;
@@ -116,7 +116,7 @@ extern "C" SAL_JNI_EXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_Stora
}
catch(const Exception& e)
{
- SAL_WARN("connectivity.hsqldb", "Exception caught! : Java_com_sun_star_sdbcx_comp_hsqldb_StorageFileAccess_removeElement " << e.Message);
+ SAL_WARN("connectivity.hsqldb", "Exception caught! : Java_com_sun_star_sdbcx_comp_hsqldb_StorageFileAccess_removeElement " << e);
StorageContainer::throwJavaException(e,env);
}
}
diff --git a/connectivity/source/drivers/writer/WConnection.cxx b/connectivity/source/drivers/writer/WConnection.cxx
index 70fae3a0d04f..0a4763e43618 100644
--- a/connectivity/source/drivers/writer/WConnection.cxx
+++ b/connectivity/source/drivers/writer/WConnection.cxx
@@ -138,7 +138,7 @@ uno::Reference<text::XTextDocument> const& OWriterConnection::acquireDoc()
uno::Exception aLoaderError;
OSL_VERIFY(aLoaderException >>= aLoaderError);
- SAL_WARN("connectivity.writer", "empty m_xDoc, exception type: " << aLoaderException.getValueTypeName() << ", error message: " << aLoaderError.Message);
+ SAL_WARN("connectivity.writer", "empty m_xDoc, exception type: " << aLoaderException.getValueTypeName() << ", error message: " << aLoaderError);
}
const OUString sError(m_aResources.getResourceStringWithSubstitution(
diff --git a/cppu/qa/cppumaker/test_cppumaker.cxx b/cppu/qa/cppumaker/test_cppumaker.cxx
index d0fde124bf13..e214e6deb4ff 100644
--- a/cppu/qa/cppumaker/test_cppumaker.cxx
+++ b/cppu/qa/cppumaker/test_cppumaker.cxx
@@ -365,17 +365,6 @@
#include <cstddef>
#include <iostream>
-namespace com { namespace sun { namespace star { namespace uno {
-
-std::ostream & operator <<(
- std::ostream & out,
- SAL_UNUSED_PARAMETER css::uno::Exception const &)
-{
- return out << "<UNO exception>";
-}
-
-} } } }
-
namespace test { namespace codemaker { namespace cppumaker {
bool operator ==(
diff --git a/cppuhelper/source/component.cxx b/cppuhelper/source/component.cxx
index 7b974ec76586..d906243bfddb 100644
--- a/cppuhelper/source/component.cxx
+++ b/cppuhelper/source/component.cxx
@@ -92,7 +92,7 @@ void OComponentHelper::release() throw()
catch (css::uno::RuntimeException & exc)
{
// release should not throw exceptions
- SAL_WARN( "cppuhelper", exc.Message );
+ SAL_WARN( "cppuhelper", exc );
}
// only the alive ref holds the object
diff --git a/cppuhelper/source/component_context.cxx b/cppuhelper/source/component_context.cxx
index 8555feaef4c9..7d9ecd97b3c6 100644
--- a/cppuhelper/source/component_context.cxx
+++ b/cppuhelper/source/component_context.cxx
@@ -341,7 +341,7 @@ Any ComponentContext::lookupMap( OUString const & rName )
SAL_WARN(
"cppuhelper",
"exception occurred raising singleton \"" << rName << "\": "
- << exc.Message);
+ << exc);
}
SAL_WARN_IF(!xInstance.is(),
@@ -573,7 +573,7 @@ extern "C" { static void s_createComponentContext_v(va_list * pParam)
}
catch (Exception & exc)
{
- SAL_WARN( "cppuhelper", exc.Message );
+ SAL_WARN( "cppuhelper", exc );
xContext.clear();
}
}
diff --git a/cppuhelper/source/implbase.cxx b/cppuhelper/source/implbase.cxx
index a64418ffaccd..b8bc91b769b1 100644
--- a/cppuhelper/source/implbase.cxx
+++ b/cppuhelper/source/implbase.cxx
@@ -77,7 +77,7 @@ void WeakComponentImplHelperBase::release()
dispose();
}
catch (RuntimeException const& exc) { // don't break throw ()
- SAL_WARN( "cppuhelper", exc.Message );
+ SAL_WARN( "cppuhelper", exc );
}
OSL_ASSERT( rBHelper.bDisposed );
}
@@ -201,7 +201,7 @@ void WeakAggComponentImplHelperBase::release()
dispose();
}
catch (RuntimeException const& exc) { // don't break throw ()
- SAL_WARN( "cppuhelper", exc.Message );
+ SAL_WARN( "cppuhelper", exc );
}
OSL_ASSERT( rBHelper.bDisposed );
}
diff --git a/cppuhelper/source/propshlp.cxx b/cppuhelper/source/propshlp.cxx
index 91e777249f4a..eea33d133aaf 100644
--- a/cppuhelper/source/propshlp.cxx
+++ b/cppuhelper/source/propshlp.cxx
@@ -693,7 +693,7 @@ void OPropertySetHelper::fire
}
catch (RuntimeException & exc)
{
- SAL_INFO("cppuhelper", "caught RuntimeException while firing listeners: " << exc.Message);
+ SAL_INFO("cppuhelper", "caught RuntimeException while firing listeners: " << exc);
if (! bIgnoreRuntimeExceptionsWhileFiring)
throw;
}
@@ -745,7 +745,7 @@ void OPropertySetHelper::fire
}
catch (RuntimeException & exc)
{
- SAL_INFO("cppuhelper", "caught RuntimeException while firing listeners: " << exc.Message);
+ SAL_INFO("cppuhelper", "caught RuntimeException while firing listeners: " << exc);
if (! bIgnoreRuntimeExceptionsWhileFiring)
throw;
}
@@ -790,7 +790,7 @@ void OPropertySetHelper::fire
}
catch (RuntimeException & exc)
{
- SAL_INFO("cppuhelper", "caught RuntimeException while firing listeners: " << exc.Message);
+ SAL_INFO("cppuhelper", "caught RuntimeException while firing listeners: " << exc);
if (! bIgnoreRuntimeExceptionsWhileFiring)
throw;
}
diff --git a/cppuhelper/source/servicemanager.cxx b/cppuhelper/source/servicemanager.cxx
index 7e6c178c4e7c..1478010d3434 100644
--- a/cppuhelper/source/servicemanager.cxx
+++ b/cppuhelper/source/servicemanager.cxx
@@ -890,10 +890,7 @@ void cppuhelper::ServiceManager::disposing() {
try {
(*i)->dispose();
} catch (css::uno::RuntimeException & e) {
- SAL_WARN(
- "cppuhelper",
- "Ignoring RuntimeException \"" << e.Message
- << "\" while disposing singleton");
+ SAL_WARN("cppuhelper", "Ignoring " << e << " while disposing singleton");
}
}
for (std::vector<
diff --git a/cppuhelper/source/tdmgr.cxx b/cppuhelper/source/tdmgr.cxx
index 02da05163732..f86dca136753 100644
--- a/cppuhelper/source/tdmgr.cxx
+++ b/cppuhelper/source/tdmgr.cxx
@@ -591,11 +591,11 @@ static void SAL_CALL typelib_callback(
}
catch (const container::NoSuchElementException & exc)
{
- SAL_INFO("cppuhelper", "typelibrary type not available: " << exc.Message );
+ SAL_INFO("cppuhelper", "typelibrary type not available: " << exc );
}
catch (const Exception & exc)
{
- SAL_INFO("cppuhelper", exc.Message );
+ SAL_INFO("cppuhelper", exc );
}
}
}
diff --git a/cppuhelper/source/weak.cxx b/cppuhelper/source/weak.cxx
index 81de170130a9..acbbb94a4551 100644
--- a/cppuhelper/source/weak.cxx
+++ b/cppuhelper/source/weak.cxx
@@ -243,7 +243,7 @@ void OWeakObject::disposeWeakConnectionPoint()
p->dispose();
}
catch (RuntimeException const& exc) {
- SAL_WARN( "cppuhelper", exc.Message );
+ SAL_WARN( "cppuhelper", exc );
}
p->release();
}
diff --git a/cui/source/customize/SvxToolbarConfigPage.cxx b/cui/source/customize/SvxToolbarConfigPage.cxx
index abc741297ff7..ceb00d6e4d29 100644
--- a/cui/source/customize/SvxToolbarConfigPage.cxx
+++ b/cui/source/customize/SvxToolbarConfigPage.cxx
@@ -552,7 +552,7 @@ IMPL_LINK( SvxToolbarConfigPage, ModifyItemHdl, MenuButton *, pButton, void )
}
catch ( css::uno::Exception& e)
{
- SAL_WARN("cui.customize", "Error replacing image: " << e.Message);
+ SAL_WARN("cui.customize", "Error replacing image: " << e);
}
}
}
@@ -602,7 +602,7 @@ IMPL_LINK( SvxToolbarConfigPage, ModifyItemHdl, MenuButton *, pButton, void )
}
catch ( css::uno::Exception& e )
{
- SAL_WARN("cui.customize", "Error resetting image: " << e.Message);
+ SAL_WARN("cui.customize", "Error resetting image: " << e);
}
}
else if (sIdent == "restoreItem")
@@ -659,7 +659,7 @@ IMPL_LINK( SvxToolbarConfigPage, ModifyItemHdl, MenuButton *, pButton, void )
}
catch ( css::uno::Exception& e )
{
- SAL_WARN("cui.customize", "Error restoring image: " << e.Message);
+ SAL_WARN("cui.customize", "Error restoring image: " << e);
}
}
else
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index b342c42e327e..51bab76a9843 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -926,7 +926,7 @@ void ContextMenuSaveInData::Reset()
}
catch ( const css::uno::Exception& e )
{
- SAL_WARN("cui.customize", "Exception caught while resetting context menus: " << e.Message);
+ SAL_WARN("cui.customize", "Exception caught while resetting context menus: " << e);
}
}
PersistChanges( GetConfigManager() );
@@ -941,7 +941,7 @@ void ContextMenuSaveInData::ResetContextMenu( const SvxConfigEntry* pEntry )
}
catch ( const css::uno::Exception& e )
{
- SAL_WARN("cui.customize", "Exception caught while resetting context menu: " << e.Message);
+ SAL_WARN("cui.customize", "Exception caught while resetting context menu: " << e);
}
PersistChanges( GetConfigManager() );
m_pRootEntry.reset();
@@ -3517,7 +3517,7 @@ bool SvxIconSelectorDialog::ImportGraphic( const OUString& aURL )
}
catch( uno::Exception& e )
{
- SAL_WARN("cui.customize", "Caught exception importing XGraphic: " << e.Message);
+ SAL_WARN("cui.customize", "Caught exception importing XGraphic: " << e);
}
return result;
}
diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx
index 02a34d9daf34..fe02b8b0497a 100644
--- a/cui/source/customize/cfgutil.cxx
+++ b/cui/source/customize/cfgutil.cxx
@@ -695,7 +695,7 @@ void SfxConfigGroupListBox::Init(const css::uno::Reference< css::uno::XComponent
}
catch( Exception& e )
{
- SAL_INFO("cui.customize", "Caught some exception whilst retrieving browse nodes from factory... Exception: " << e.Message);
+ SAL_INFO("cui.customize", "Caught some exception whilst retrieving browse nodes from factory... Exception: " << e);
// TODO exception handling
}
diff --git a/cui/source/dialogs/linkdlg.cxx b/cui/source/dialogs/linkdlg.cxx
index 062585193e89..59b9191b2a58 100644
--- a/cui/source/dialogs/linkdlg.cxx
+++ b/cui/source/dialogs/linkdlg.cxx
@@ -400,7 +400,7 @@ IMPL_LINK_NOARG( SvBaseLinksDlg, ChangeSourceClickHdl, Button *, void )
}
catch (uno::Exception & e)
{
- SAL_WARN("cui.dialogs", "SvBaseLinksDlg: caught UNO exception: " << e.Message);
+ SAL_WARN("cui.dialogs", "SvBaseLinksDlg: " << e);
}
}
else
diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx
index 35a40f3be0bd..3d24e337251e 100644
--- a/cui/source/dialogs/scriptdlg.cxx
+++ b/cui/source/dialogs/scriptdlg.cxx
@@ -182,7 +182,7 @@ void SFTreeListBox::Init( const OUString& language )
}
catch( Exception& e )
{
- SAL_WARN("cui.dialogs", "Exception getting root browse node from factory: " << e.Message );
+ SAL_WARN("cui.dialogs", "Exception getting root browse node from factory: " << e );
// TODO exception handling
}
@@ -755,7 +755,7 @@ IMPL_LINK( SvxScriptOrgDialog, ButtonHdl, Button *, pButton, void )
}
catch( Exception& e )
{
- SAL_WARN("cui.dialogs", "Caught exception trying to invoke " << e.Message );
+ SAL_WARN("cui.dialogs", "Caught exception trying to invoke " << e );
}
}
}
@@ -932,7 +932,7 @@ void SvxScriptOrgDialog::createEntry( SvTreeListEntry* pEntry )
}
catch( Exception& e )
{
- SAL_WARN("cui.dialogs", "Caught exception trying to Create " << e.Message );
+ SAL_WARN("cui.dialogs", "Caught exception trying to Create " << e );
}
}
if ( aChildNode.is() )
@@ -1021,7 +1021,7 @@ void SvxScriptOrgDialog::renameEntry( SvTreeListEntry* pEntry )
}
catch( Exception& e )
{
- SAL_WARN("cui.dialogs", "Caught exception trying to Rename " << e.Message );
+ SAL_WARN("cui.dialogs", "Caught exception trying to Rename " << e );
}
}
if ( aChildNode.is() )
@@ -1067,7 +1067,7 @@ void SvxScriptOrgDialog::deleteEntry( SvTreeListEntry* pEntry )
}
catch( Exception& e )
{
- SAL_WARN("cui.dialogs", "Caught exception trying to delete " << e.Message );
+ SAL_WARN("cui.dialogs", "Caught exception trying to delete " << e );
}
}
diff --git a/cui/source/options/certpath.cxx b/cui/source/options/certpath.cxx
index 67f541a6363e..1a222613bcb4 100644
--- a/cui/source/options/certpath.cxx
+++ b/cui/source/options/certpath.cxx
@@ -103,7 +103,7 @@ CertPathDialog::CertPathDialog(vcl::Window* pParent)
}
catch (const uno::Exception &e)
{
- SAL_WARN("cui.options", "CertPathDialog::CertPathDialog(): caught exception" << e.Message);
+ SAL_WARN("cui.options", "CertPathDialog::CertPathDialog(): " << e);
}
const char* pEnv = getenv("MOZILLA_CERTIFICATE_FOLDER");
@@ -123,7 +123,7 @@ IMPL_LINK_NOARG(CertPathDialog, OKHdl_Impl, Button*, void)
}
catch (const uno::Exception &e)
{
- SAL_WARN("cui.options", "CertPathDialog::OKHdl_Impl(): caught exception" << e.Message);
+ SAL_WARN("cui.options", "CertPathDialog::OKHdl_Impl(): " << e);
}
EndDialog(RET_OK);
@@ -230,7 +230,7 @@ IMPL_LINK_NOARG(CertPathDialog, AddHdl_Impl, Button*, void)
}
catch (uno::Exception & e)
{
- SAL_WARN("cui.options", "caught UNO exception: " << e.Message);
+ SAL_WARN("cui.options", e);
}
}
diff --git a/cui/source/options/optaboutconfig.cxx b/cui/source/options/optaboutconfig.cxx
index 85b4a8631487..df500a2c28b8 100644
--- a/cui/source/options/optaboutconfig.cxx
+++ b/cui/source/options/optaboutconfig.cxx
@@ -272,7 +272,7 @@ void CuiAboutConfigTabPage::FillItems(const Reference< XNameAccess >& xNameAcces
}
catch (const RuntimeException& e)
{
- SAL_WARN( "cui.options", "CuiAboutConfigTabPage: exception " << e.Message);
+ SAL_WARN( "cui.options", "CuiAboutConfigTabPage: " << e);
}
if (bNotLeaf)
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index 95dcafddabc9..fb2ea14f4a16 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -1178,7 +1178,7 @@ OfaLanguagesTabPage::OfaLanguagesTabPage(vcl::Window* pParent, const SfxItemSet&
{
// we'll just leave the box in its default setting and won't
// even give it event handler...
- SAL_WARN("cui.options", "ignoring Exception \"" << e.Message << "\"");
+ SAL_WARN("cui.options", "ignoring " << e);
}
m_pWesternLanguageLB->SetLanguageList( SvxLanguageListFlags::WESTERN | SvxLanguageListFlags::ONLY_KNOWN, true, false, true );
@@ -1363,7 +1363,7 @@ bool OfaLanguagesTabPage::FillItemSet( SfxItemSet* rSet )
{
// we'll just leave the box in its default setting and won't
// even give it event handler...
- SAL_WARN("cui.options", "ignoring Exception \"" << e.Message << "\"");
+ SAL_WARN("cui.options", "ignoring Exception \"" << e << "\"");
}
LanguageTag aLanguageTag( pLangConfig->aSysLocaleOptions.GetLanguageTag());
diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx
index 4e6e90b6e998..d68e04cc3de5 100644
--- a/cui/source/options/optinet2.cxx
+++ b/cui/source/options/optinet2.cxx
@@ -781,7 +781,7 @@ IMPL_STATIC_LINK_NOARG(SvxSecurityTabPage, MacroSecPBHdl, Button*, void)
}
catch (const Exception& e)
{
- SAL_WARN( "cui.options", e.Message);
+ SAL_WARN( "cui.options", e);
}
}
diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx
index 323313c748d3..f448511d3e43 100644
--- a/cui/source/options/optjava.cxx
+++ b/cui/source/options/optjava.cxx
@@ -255,7 +255,7 @@ IMPL_LINK_NOARG(SvxJavaOptionsPage, AddHdl_Impl, Button*, void)
}
catch (const Exception& e)
{
- SAL_WARN( "cui.options", "SvxJavaOptionsPage::AddHdl_Impl(): caught exception: " << e.Message);
+ SAL_WARN( "cui.options", "SvxJavaOptionsPage::AddHdl_Impl(): " << e);
}
}
diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx
index 683683cd8e74..96034786c0b5 100644
--- a/cui/source/options/optpath.cxx
+++ b/cui/source/options/optpath.cxx
@@ -652,7 +652,7 @@ IMPL_LINK_NOARG(SvxPathTabPage, PathHdl_Impl, Button*, void)
}
catch (const uno::Exception& rException)
{
- SAL_WARN("cui.options", "SvxPathTabPage::PathHdl_Impl: exception from file picker: " << rException.Message);
+ SAL_WARN("cui.options", "SvxPathTabPage::PathHdl_Impl: exception from file picker: " << rException);
}
}
}
@@ -820,7 +820,7 @@ void SvxPathTabPage::SetPathList(
}
catch( const Exception& e )
{
- SAL_WARN("cui.options", "caught: " << e.Message);
+ SAL_WARN("cui.options", "caught: " << e);
}
}
diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx
index 276aa8d4ad78..ff9012d0c1f6 100644
--- a/cui/source/options/optsave.cxx
+++ b/cui/source/options/optsave.cxx
@@ -453,7 +453,7 @@ void SvxSaveTabPage::Reset( const SfxItemSet* )
}
catch(Exception& e)
{
- SAL_WARN( "cui.options", "exception in FilterFactory access: " << e.Message );
+ SAL_WARN( "cui.options", "exception in FilterFactory access: " << e );
}
pImpl->bInitialized = true;
diff --git a/cui/source/options/optupdt.cxx b/cui/source/options/optupdt.cxx
index e5576efbcb4d..f0287be40e27 100644
--- a/cui/source/options/optupdt.cxx
+++ b/cui/source/options/optupdt.cxx
@@ -413,7 +413,7 @@ IMPL_LINK_NOARG(SvxOnlineUpdateTabPage, CheckNowHdl_Impl, Button*, void)
}
catch( const uno::Exception& e )
{
- SAL_WARN("cui.options", "Caught exception, thread terminated. " << e.Message);
+ SAL_WARN("cui.options", "Caught exception, thread terminated. " << e);
}
}
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index fe88b2a8b7a6..32ad04310ffe 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -2132,11 +2132,11 @@ void ExtensionsTabPage::CreateDialogWithHandler()
}
catch (const css::lang::IllegalArgumentException& e)
{
- SAL_WARN("cui.options", "ExtensionsTabPage::CreateDialogWithHandler(): illegal argument:" << e.Message);
+ SAL_WARN("cui.options", "ExtensionsTabPage::CreateDialogWithHandler(): illegal argument:" << e);
}
catch (const Exception& e)
{
- SAL_WARN( "cui.options", "ExtensionsTabPage::CreateDialogWithHandler(): exception of XDialogProvider2::createDialogWithHandler(): " << e.Message);
+ SAL_WARN( "cui.options", "ExtensionsTabPage::CreateDialogWithHandler(): exception of XDialogProvider2::createDialogWithHandler(): " << e);
}
}
diff --git a/cui/source/options/tsaurls.cxx b/cui/source/options/tsaurls.cxx
index 683151215a5f..7674c64581f6 100644
--- a/cui/source/options/tsaurls.cxx
+++ b/cui/source/options/tsaurls.cxx
@@ -48,7 +48,7 @@ TSAURLsDialog::TSAURLsDialog(vcl::Window* pParent)
}
catch (const uno::Exception &e)
{
- SAL_WARN("cui.options", "TSAURLsDialog::TSAURLsDialog(): caught exception" << e.Message);
+ SAL_WARN("cui.options", "TSAURLsDialog::TSAURLsDialog(): " << e);
}
if ( m_pURLListBox->GetSelectedEntryCount() == 0 )
diff --git a/dbaccess/source/core/api/RowSetCache.cxx b/dbaccess/source/core/api/RowSetCache.cxx
index 529b33917463..4c6130706e59 100644
--- a/dbaccess/source/core/api/RowSetCache.cxx
+++ b/dbaccess/source/core/api/RowSetCache.cxx
@@ -129,7 +129,7 @@ ORowSetCache::ORowSetCache(const Reference< XResultSet >& _xRs,
}
catch(const Exception& ex)
{
- SAL_WARN("dbaccess.core", "ORowSetCache: exception: " << ex.Message);
+ SAL_WARN("dbaccess.core", "ORowSetCache: " << ex);
}
try
{
@@ -139,7 +139,7 @@ ORowSetCache::ORowSetCache(const Reference< XResultSet >& _xRs,
}
catch(const SQLException& e)
{
- SAL_WARN("dbaccess.core", "ORowSetCache: exception: " << e.Message);
+ SAL_WARN("dbaccess.core", "ORowSetCache: " << e);
}
// check if all keys of the updateable table are fetched
@@ -185,7 +185,7 @@ ORowSetCache::ORowSetCache(const Reference< XResultSet >& _xRs,
}
catch (const Exception& e)
{
- SAL_WARN("dbaccess.core", "ORowSetCache: exception: " << e.Message);
+ SAL_WARN("dbaccess.core", "ORowSetCache: " << e);
}
m_xCacheSet.clear();
}
@@ -225,7 +225,7 @@ ORowSetCache::ORowSetCache(const Reference< XResultSet >& _xRs,
}
catch (Exception const& e)
{
- SAL_WARN("dbaccess.core", "ORowSetCache: exception: " << e.Message);
+ SAL_WARN("dbaccess.core", "ORowSetCache: " << e);
}
}
@@ -253,7 +253,7 @@ ORowSetCache::ORowSetCache(const Reference< XResultSet >& _xRs,
}
catch (const SQLException& e)
{
- SAL_WARN("dbaccess.core", "ORowSetCache: exception: " << e.Message);
+ SAL_WARN("dbaccess.core", "ORowSetCache: " << e);
bNeedKeySet = true;
}
@@ -332,7 +332,7 @@ ORowSetCache::ORowSetCache(const Reference< XResultSet >& _xRs,
}
catch (const SQLException& e)
{
- SAL_WARN("dbaccess.core", "ORowSetCache: exception: " << e.Message);
+ SAL_WARN("dbaccess.core", "ORowSetCache: " << e);
// we couldn't create a keyset here so we have to create a static cache
m_xCacheSet = new OStaticSet(i_nMaxRows);
m_xCacheSet->construct(_xRs,i_sRowSetFilter);
diff --git a/dbaccess/source/core/dataaccess/databasedocument.cxx b/dbaccess/source/core/dataaccess/databasedocument.cxx
index 75b3b4f65189..27538722ef70 100644
--- a/dbaccess/source/core/dataaccess/databasedocument.cxx
+++ b/dbaccess/source/core/dataaccess/databasedocument.cxx
@@ -1659,7 +1659,7 @@ void ODatabaseDocument::impl_writeStorage_throw( const Reference< XStorage >& _r
}
catch (const uno::Exception& e)
{
- SAL_WARN("dbaccess", "exception setting Version: " << e.Message);
+ SAL_WARN("dbaccess", "exception setting Version: " << e);
}
}
diff --git a/dbaccess/source/filter/xml/xmlfilter.cxx b/dbaccess/source/filter/xml/xmlfilter.cxx
index e0c94c6d7b43..641cb60dd4db 100644
--- a/dbaccess/source/filter/xml/xmlfilter.cxx
+++ b/dbaccess/source/filter/xml/xmlfilter.cxx
@@ -113,7 +113,7 @@ ErrCode ReadThroughComponent(
catch (const SAXParseException& r)
{
#if OSL_DEBUG_LEVEL > 0
- SAL_WARN("dbaccess", "SAX parse exception caught while importing: " << r.Message << r.LineNumber << "," << r.ColumnNumber);
+ SAL_WARN("dbaccess", "SAX parse exception caught while importing: " << r << r.LineNumber << "," << r.ColumnNumber);
#else
(void)r;
#endif
diff --git a/dbaccess/source/ui/browser/sbagrid.cxx b/dbaccess/source/ui/browser/sbagrid.cxx
index eb00026614fe..cff038d39462 100644
--- a/dbaccess/source/ui/browser/sbagrid.cxx
+++ b/dbaccess/source/ui/browser/sbagrid.cxx
@@ -964,7 +964,7 @@ Reference< XPropertySet > SbaGridControl::getField(sal_uInt16 nModelPos)
}
catch (const Exception& e)
{
- SAL_WARN("dbaccess", "SbaGridControl::getField Exception occurred: " << e.Message);
+ SAL_WARN("dbaccess", "SbaGridControl::getField Exception occurred: " << e);
}
return xEmptyReturn;
@@ -999,7 +999,7 @@ bool SbaGridControl::IsReadOnlyDB() const
}
catch (const Exception& e)
{
- SAL_WARN("dbaccess", "SbaGridControl::IsReadOnlyDB Exception occurred: " << e.Message);
+ SAL_WARN("dbaccess", "SbaGridControl::IsReadOnlyDB Exception occurred: " << e);
}
return bDBIsReadOnly;
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 7c194f890db9..cae1d3ce8b22 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -306,7 +306,7 @@ void SetRestartState() {
officecfg::Setup::Office::OfficeRestartInProgress::set(true, batch);
batch->commit();
} catch (css::uno::Exception & e) {
- SAL_WARN("desktop.app", "ignoring Exception \"" << e.Message << "\"");
+ SAL_WARN("desktop.app", "ignoring " << e);
}
}
@@ -325,7 +325,7 @@ void DoRestartActionsIfNecessary(bool quickstart) {
}
} catch (css::uno::Exception & e) {
SAL_WARN(
- "desktop.app", "ignoring Exception \"" << e.Message << "\"");
+ "desktop.app", "ignoring " << e);
}
}
}
@@ -2087,7 +2087,7 @@ void Desktop::OpenClients()
}
catch(const css::uno::Exception& e)
{
- SAL_WARN( "desktop.app", "Could not disable AutoRecovery." << e.Message);
+ SAL_WARN( "desktop.app", "Could not disable AutoRecovery." << e);
}
}
else
@@ -2114,7 +2114,7 @@ void Desktop::OpenClients()
}
catch(const css::uno::Exception& e)
{
- SAL_WARN( "desktop.app", "Error during recovery" << e.Message);
+ SAL_WARN( "desktop.app", "Error during recovery" << e);
}
}
else if (bExistsRecoveryData && bDisableRecovery && !rArgs.HasModuleParam())
@@ -2131,7 +2131,7 @@ void Desktop::OpenClients()
}
catch(const css::uno::Exception& e)
{
- SAL_WARN( "desktop.app", "Registration of session listener failed" << e.Message);
+ SAL_WARN( "desktop.app", "Registration of session listener failed" << e);
}
if ( !bExistsRecoveryData && xSessionListener.is() )
@@ -2143,7 +2143,7 @@ void Desktop::OpenClients()
}
catch(const css::uno::Exception& e)
{
- SAL_WARN( "desktop.app", "Error in session management" << e.Message);
+ SAL_WARN( "desktop.app", "Error in session management" << e);
}
}
}
diff --git a/desktop/source/app/appinit.cxx b/desktop/source/app/appinit.cxx
index 7512b31d0dbb..b21b98349b7f 100644
--- a/desktop/source/app/appinit.cxx
+++ b/desktop/source/app/appinit.cxx
@@ -157,7 +157,7 @@ void Desktop::createAcceptor(const OUString& aAcceptString)
{
// no error handling needed...
// acceptor just won't come up
- SAL_WARN( "desktop.app", "Acceptor could not be created: " << e.Message);
+ SAL_WARN( "desktop.app", "Acceptor could not be created: " << e);
}
}
else
diff --git a/desktop/source/app/check_ext_deps.cxx b/desktop/source/app/check_ext_deps.cxx
index 788686c5528a..86f6385cf4ab 100644
--- a/desktop/source/app/check_ext_deps.cxx
+++ b/desktop/source/app/check_ext_deps.cxx
@@ -290,7 +290,7 @@ static bool impl_checkDependencies( const uno::Reference< uno::XComponentContext
}
catch ( const uno::RuntimeException & ) { throw; }
catch (const uno::Exception & exc) {
- SAL_WARN( "desktop.app", "" << exc.Message );
+ SAL_WARN( "desktop.app", exc );
}
if ( bRegistered )
diff --git a/desktop/source/app/dispatchwatcher.cxx b/desktop/source/app/dispatchwatcher.cxx
index 6cd75c0d5f4d..466e6eeeae11 100644
--- a/desktop/source/app/dispatchwatcher.cxx
+++ b/desktop/source/app/dispatchwatcher.cxx
@@ -473,8 +473,7 @@ bool DispatchWatcher::executeDispatchRequests( const std::vector<DispatchRequest
SAL_WARN(
"desktop.app",
"Desktop::OpenDefault() ignoring Exception while"
- " calling XNotifyingDispatch: \"" << e.Message
- << "\"");
+ " calling XNotifyingDispatch: " << e);
}
}
}
@@ -546,14 +545,14 @@ bool DispatchWatcher::executeDispatchRequests( const std::vector<DispatchRequest
SAL_WARN(
"desktop.app",
"Dispatchwatcher IllegalArgumentException while calling"
- " loadComponentFromURL: \"" << iae.Message << "\"");
+ " loadComponentFromURL: " << iae);
}
catch (const css::io::IOException& ioe)
{
SAL_WARN(
"desktop.app",
"Dispatchwatcher IOException while calling"
- " loadComponentFromURL: \"" << ioe.Message << "\"");
+ " loadComponentFromURL: " << ioe);
}
if ( aDispatchRequest.aRequestType == REQUEST_OPEN ||
aDispatchRequest.aRequestType == REQUEST_VIEW ||
diff --git a/desktop/source/app/langselect.cxx b/desktop/source/app/langselect.cxx
index 3af3652de083..8d826ab3674e 100644
--- a/desktop/source/app/langselect.cxx
+++ b/desktop/source/app/langselect.cxx
@@ -90,9 +90,7 @@ bool prepareLocale() {
"", batch);
batch->commit();
} catch (css::uno::Exception & e) {
- SAL_WARN(
- "desktop.app",
- "ignoring Exception \"" << e.Message << "\"");
+ SAL_WARN("desktop.app", "ignoring " << e);
}
}
}
@@ -125,8 +123,7 @@ bool prepareLocale() {
officecfg::Setup::L10N::ooLocale::set(locale, batch);
batch->commit();
} catch (css::uno::Exception & e) {
- SAL_WARN(
- "desktop.app", "ignoring Exception \"" << e.Message << "\"");
+ SAL_WARN("desktop.app", "ignoring " << e);
}
}
MsLangId::setConfiguredSystemUILanguage(tag.getLanguageType(false));
diff --git a/desktop/source/app/opencl.cxx b/desktop/source/app/opencl.cxx
index 1dfc338b51d3..9f17673ed5e5 100644
--- a/desktop/source/app/opencl.cxx
+++ b/desktop/source/app/opencl.cxx
@@ -96,7 +96,7 @@ bool testOpenCLCompute(const Reference< XDesktop2 > &xDesktop, const OUString &r
}
catch (const css::uno::Exception &e)
{
- SAL_WARN("opencl", "OpenCL testing failed - disabling: " << e.Message);
+ SAL_WARN("opencl", "OpenCL testing failed - disabling: " << e);
}
if (nKernelFailures != openclwrapper::kernelFailures)
diff --git a/desktop/source/app/userinstall.cxx b/desktop/source/app/userinstall.cxx
index 86ca552355e9..ad55d6848f7a 100644
--- a/desktop/source/app/userinstall.cxx
+++ b/desktop/source/app/userinstall.cxx
@@ -140,7 +140,7 @@ bool isCreated() {
try {
return officecfg::Setup::Office::ooSetupInstCompleted::get();
} catch (css::uno::Exception & e) {
- SAL_WARN("desktop.app", "ignoring Exception \"" << e.Message << "\"");
+ SAL_WARN("desktop.app", "ignoring " << e);
return false;
}
}
diff --git a/desktop/source/deployment/dp_log.cxx b/desktop/source/deployment/dp_log.cxx
index c03caaef2461..c3de88643003 100644
--- a/desktop/source/deployment/dp_log.cxx
+++ b/desktop/source/deployment/dp_log.cxx
@@ -78,7 +78,7 @@ void ProgressLogImpl::disposing()
}
}
catch (const Exception & exc) {
- SAL_WARN( "desktop", exc.Message );
+ SAL_WARN( "desktop", exc );
}
}
@@ -136,7 +136,7 @@ void ProgressLogImpl::log_write( OString const & text )
}
}
catch (const io::IOException & exc) {
- SAL_WARN( "desktop", exc.Message );
+ SAL_WARN( "desktop", exc );
}
}
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
index 8b311528e7ce..59138ad44214 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
@@ -724,7 +724,7 @@ uno::Sequence< OUString > ExtMgrDialog::raiseAddPicker()
xFilePicker->appendFilter( iPos->first, iPos->second );
}
catch (const lang::IllegalArgumentException & exc) {
- SAL_WARN( "desktop", exc.Message );
+ SAL_WARN( "desktop", exc );
}
}
xFilePicker->setCurrentFilter( sDefaultFilter );
@@ -1377,7 +1377,7 @@ bool UpdateRequiredDialog::isEnabled( const uno::Reference< deployment::XPackage
}
catch ( const uno::RuntimeException & ) { throw; }
catch (const uno::Exception & exc) {
- SAL_WARN( "desktop", exc.Message );
+ SAL_WARN( "desktop", exc );
bRegistered = false;
}
diff --git a/desktop/source/deployment/gui/dp_gui_theextmgr.cxx b/desktop/source/deployment/gui/dp_gui_theextmgr.cxx
index fa8724c84ccb..137d2358a02c 100644
--- a/desktop/source/deployment/gui/dp_gui_theextmgr.cxx
+++ b/desktop/source/deployment/gui/dp_gui_theextmgr.cxx
@@ -342,7 +342,7 @@ PackageState TheExtensionManager::getPackageState( const uno::Reference< deploym
throw;
}
catch (const uno::Exception & exc) {
- SAL_WARN( "desktop", exc.Message );
+ SAL_WARN( "desktop", exc );
return NOT_AVAILABLE;
}
}
diff --git a/desktop/source/deployment/manager/dp_informationprovider.cxx b/desktop/source/deployment/manager/dp_informationprovider.cxx
index a19a5c728516..5aaee07a2194 100644
--- a/desktop/source/deployment/manager/dp_informationprovider.cxx
+++ b/desktop/source/deployment/manager/dp_informationprovider.cxx
@@ -145,9 +145,7 @@ PackageInformationProvider::getPackageLocation( const OUString& _sExtensionId )
}
catch (const css::ucb::ContentCreationException& e)
{
- SAL_WARN(
- "desktop.deployment",
- "ignoring ContentCreationException \"" << e.Message << "\"");
+ SAL_WARN("desktop.deployment", "ignoring " << e);
}
}
return aLocationURL;
@@ -217,9 +215,7 @@ PackageInformationProvider::isUpdateAvailable( const OUString& _sExtensionId )
dp_misc::getIdentifier(info.extension), info.extension->getName(),
uno::Reference<css_ucb::XCommandEnvironment>());
} catch (const lang::IllegalArgumentException& e) {
- SAL_WARN(
- "desktop.deployment",
- "ignoring IllegalArgumentException \"" << e.Message << "\"");
+ SAL_WARN("desktop.deployment", "ignoring " << e);
continue;
}
OSL_ASSERT(extensions.getLength() == 3);
diff --git a/desktop/source/deployment/manager/dp_manager.cxx b/desktop/source/deployment/manager/dp_manager.cxx
index b9b849d31b8a..5667ffc126fb 100644
--- a/desktop/source/deployment/manager/dp_manager.cxx
+++ b/desktop/source/deployment/manager/dp_manager.cxx
@@ -583,7 +583,7 @@ OUString PackageManagerImpl::detectMediaType(
catch (const lang::IllegalArgumentException & exc) {
if (throw_exc)
throw;
- SAL_WARN( "desktop", exc.Message );
+ SAL_WARN( "desktop", exc );
}
}
return mediaType;
@@ -1026,11 +1026,11 @@ PackageManagerImpl::getDeployedPackages_(
}
catch (const lang::IllegalArgumentException & exc) {
// ignore
- SAL_WARN( "desktop", exc.Message );
+ SAL_WARN( "desktop", exc );
}
catch (const deployment::DeploymentException& exc) {
// ignore
- SAL_WARN( "desktop", exc.Message );
+ SAL_WARN( "desktop", exc );
}
}
return comphelper::containerToSequence(packages);
@@ -1265,7 +1265,7 @@ bool PackageManagerImpl::synchronizeRemovedExtensions(
}
catch( const uno::Exception & e )
{
- SAL_WARN("desktop.deployment", e.Message);
+ SAL_WARN("desktop.deployment", e);
}
}
return bModified;
@@ -1403,7 +1403,7 @@ bool PackageManagerImpl::synchronizeAddedExtensions(
catch (const uno::Exception & e)
{
// Looks like exceptions being caught here is not an uncommon case.
- SAL_WARN("desktop.deployment", e.Message);
+ SAL_WARN("desktop.deployment", e);
}
}
return bModified;
diff --git a/desktop/source/deployment/registry/component/dp_component.cxx b/desktop/source/deployment/registry/component/dp_component.cxx
index 4c5805b4b54a..bfac300cd95e 100644
--- a/desktop/source/deployment/registry/component/dp_component.cxx
+++ b/desktop/source/deployment/registry/component/dp_component.cxx
@@ -1394,13 +1394,11 @@ void BackendImpl::ComponentPackageImpl::processPackage_(
componentLiveInsertion(data, factories);
} catch (css::uno::Exception & e) {
SAL_INFO(
- "desktop.deployment", "caught Exception " << e.Message);
+ "desktop.deployment", "caught " << e);
try {
impreg->revokeImplementation(url, rdb);
} catch (css::uno::RuntimeException & e2) {
- SAL_WARN(
- "desktop.deployment",
- "ignored RuntimeException " << e2.Message);
+ SAL_WARN("desktop.deployment", "ignored " << e2);
}
throw;
}
diff --git a/desktop/source/deployment/registry/dp_backend.cxx b/desktop/source/deployment/registry/dp_backend.cxx
index f55910f13699..8bebe6cbec98 100644
--- a/desktop/source/deployment/registry/dp_backend.cxx
+++ b/desktop/source/deployment/registry/dp_backend.cxx
@@ -648,9 +648,7 @@ void Package::processPackage_impl(
static_cast< OWeakObject * >(this), e);
}
catch (const RuntimeException &e) {
- SAL_WARN(
- "desktop.deployment",
- "unexpected RuntimeException \"" << e.Message << '"');
+ SAL_WARN("desktop.deployment", "unexpected " << e);
throw;
}
catch (const CommandFailedException &) {
diff --git a/desktop/source/deployment/registry/package/dp_package.cxx b/desktop/source/deployment/registry/package/dp_package.cxx
index d3d29d904dfc..af12c6b09f3f 100644
--- a/desktop/source/deployment/registry/package/dp_package.cxx
+++ b/desktop/source/deployment/registry/package/dp_package.cxx
@@ -1059,7 +1059,7 @@ void BackendImpl::PackageImpl::exportTo(
::cppu::getCaughtException() ) );
}
catch (const lang::IllegalArgumentException & exc) {
- SAL_WARN( "desktop", exc.Message );
+ SAL_WARN( "desktop", exc );
}
std::vector< Sequence<beans::PropertyValue> > manifest;
@@ -1141,7 +1141,7 @@ void BackendImpl::PackageImpl::exportTo(
catch (const css::ucb::ContentCreationException &e)
{
SAL_WARN(
- "desktop.deployment", "exception on overwriting manifest: " << e.Message);
+ "desktop.deployment", "exception on overwriting manifest: " << e);
}
if (!bSuccess)
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 70e2372097b1..d84e09c9c7d9 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -1299,7 +1299,7 @@ static LibreOfficeKitDocument* lo_documentLoadWithOptions(LibreOfficeKit* pThis,
catch (const uno::Exception& exception)
{
pLib->maLastExceptionMsg = exception.Message;
- SAL_INFO("lok", "Document can't be loaded - exception: " << exception.Message);
+ SAL_INFO("lok", "Document can't be loaded: " << exception);
}
return nullptr;
diff --git a/desktop/source/migration/migration.cxx b/desktop/source/migration/migration.cxx
index 7361419637f9..e03a103766bd 100644
--- a/desktop/source/migration/migration.cxx
+++ b/desktop/source/migration/migration.cxx
@@ -206,7 +206,7 @@ void Migration::migrateSettingsIfNecessary()
try {
bResult = aImpl.doMigration();
} catch (const Exception& e) {
- SAL_WARN( "desktop", "doMigration() exception: " << e.Message);
+ SAL_WARN( "desktop", "doMigration(): " << e);
}
OSL_ENSURE(bResult, "Migration has not been successful");
}
@@ -294,7 +294,7 @@ bool MigrationImpl::doMigration()
} catch (css::uno::Exception & e) {
SAL_WARN(
"desktop.migration",
- "ignored Exception \"" << e.Message
+ "ignored Exception \"" << e
<< "\" while migrating from version \"" << m_aInfo.productname
<< "\" data \"" << m_aInfo.userdata << "\"");
}
@@ -805,7 +805,7 @@ uno::Reference< XNameAccess > MigrationImpl::getConfigAccess(const sal_Char* pPa
sAccessSrvc, theArgs ), uno::UNO_QUERY_THROW );
} catch (const css::uno::Exception& e) {
SAL_WARN(
- "desktop.migration", "ignoring Exception \"" << e.Message << "\"");
+ "desktop.migration", "ignoring Exception \"" << e << "\"");
}
return xNameAccess;
}
@@ -884,7 +884,7 @@ void MigrationImpl::runServices()
} catch (const Exception& e) {
SAL_WARN( "desktop", "Execution of migration service failed (Exception caught).\nService: "
<< i_mig->service
- << "\nMessage: " << e.Message);
+ << "\nMessage: " << e);
} catch (...) {
SAL_WARN( "desktop", "Execution of migration service failed (Exception caught).\nService: "
<< i_mig->service << "\nNo message available");
diff --git a/desktop/source/migration/services/oo3extensionmigration.cxx b/desktop/source/migration/services/oo3extensionmigration.cxx
index fb1458767139..98281a3ecc4e 100644
--- a/desktop/source/migration/services/oo3extensionmigration.cxx
+++ b/desktop/source/migration/services/oo3extensionmigration.cxx
@@ -287,7 +287,7 @@ void OO3ExtensionMigration::migrateExtension( const OUString& sSourceDir )
SAL_WARN(
"desktop.migration",
"Ignoring UNO Exception while migrating extension from <"
- << sSourceDir << ">: \"" << e.Message << "\"");
+ << sSourceDir << ">: " << e);
}
}
diff --git a/desktop/source/offacc/acceptor.cxx b/desktop/source/offacc/acceptor.cxx
index b7029d489f15..80c9a7cc722a 100644
--- a/desktop/source/offacc/acceptor.cxx
+++ b/desktop/source/offacc/acceptor.cxx
@@ -118,7 +118,7 @@ void Acceptor::run()
osl::MutexGuard g(m_aMutex);
m_bridges.add(rBridge);
} catch (const Exception& e) {
- SAL_WARN("desktop.offacc", "caught Exception \"" << e.Message << "\"");
+ SAL_WARN("desktop.offacc", "caught " << e);
// connection failed...
// something went wrong during connection setup.
// just wait for a new connection to accept
diff --git a/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx b/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx
index 30f5573ad038..49e2274b0056 100644
--- a/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx
+++ b/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx
@@ -125,7 +125,7 @@ CommandEnvironmentImpl::~CommandEnvironmentImpl()
xComp->dispose();
}
catch (const RuntimeException & exc) {
- SAL_WARN( "desktop", exc.Message );
+ SAL_WARN( "desktop", exc );
}
}
diff --git a/desktop/test/deployment/active/active_native.cxx b/desktop/test/deployment/active/active_native.cxx
index 0c1154bcc441..3a2af3f9c2dc 100644
--- a/desktop/test/deployment/active/active_native.cxx
+++ b/desktop/test/deployment/active/active_native.cxx
@@ -267,7 +267,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(
} catch (const css::uno::Exception & e) {
SAL_INFO(
"desktop.test",
- "active_native component_writeInfo exception: " << e.Message);
+ "active_native component_writeInfo: " << e);
return false;
}
return true;
diff --git a/editeng/source/editeng/impedit2.cxx b/editeng/source/editeng/impedit2.cxx
index af9c14b3340f..a2534ec2abfe 100644
--- a/editeng/source/editeng/impedit2.cxx
+++ b/editeng/source/editeng/impedit2.cxx
@@ -3536,7 +3536,7 @@ EditSelection ImpEditEngine::PasteText( uno::Reference< datatransfer::XTransfera
}
catch( const css::uno::Exception& e)
{
- SAL_WARN( "editeng", "Unable to paste EDITENGINE_ODF_TEXT_FLAT " << e.Message );
+ SAL_WARN( "editeng", "Unable to paste EDITENGINE_ODF_TEXT_FLAT " << e );
}
}
diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index d0488f7c90cb..3624f43423ee 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -2264,7 +2264,7 @@ SvStringsISortDtor* SvxAutoCorrectLanguageLists::LoadWrdSttExceptList()
}
catch (const css::ucb::ContentCreationException &e)
{
- SAL_WARN("editeng", "SvxAutoCorrectLanguageLists::LoadWrdSttExceptList: Caught exception: " << e.Message);
+ SAL_WARN("editeng", "SvxAutoCorrectLanguageLists::LoadWrdSttExceptList: Caught " << e);
}
return pWrdStt_ExcptLst;
}
diff --git a/editeng/source/xml/xmltxtexp.cxx b/editeng/source/xml/xmltxtexp.cxx
index f3ad19334540..e12a334cade1 100644
--- a/editeng/source/xml/xmltxtexp.cxx
+++ b/editeng/source/xml/xmltxtexp.cxx
@@ -337,7 +337,7 @@ void SvxWriteXML( EditEngine& rEditEngine, SvStream& rStream, const ESelection&
}
catch( const uno::Exception& e )
{
- SAL_WARN("editeng", "exception during xml export: " << e.Message);
+ SAL_WARN("editeng", "exception during xml export: " << e);
}
}
diff --git a/embeddedobj/source/msole/oleembed.cxx b/embeddedobj/source/msole/oleembed.cxx
index 43dcfa865662..c70c8b2a3fd1 100644
--- a/embeddedobj/source/msole/oleembed.cxx
+++ b/embeddedobj/source/msole/oleembed.cxx
@@ -934,8 +934,7 @@ void SAL_CALL OleEmbeddedObject::doVerb( sal_Int32 nVerbID )
}
catch (uno::Exception const& e)
{
- SAL_WARN("embeddedobj.ole", "OleEmbeddedObject::doVerb: "
- "-9 fallback path: exception caught: " << e.Message);
+ SAL_WARN("embeddedobj.ole", "OleEmbeddedObject::doVerb: -9 fallback path: " << e);
}
}
diff --git a/embeddedobj/source/msole/olevisual.cxx b/embeddedobj/source/msole/olevisual.cxx
index 49e41275c93b..1fc8255275f8 100644
--- a/embeddedobj/source/msole/olevisual.cxx
+++ b/embeddedobj/source/msole/olevisual.cxx
@@ -235,9 +235,7 @@ awt::Size SAL_CALL OleEmbeddedObject::getVisualAreaSize( sal_Int64 nAspect )
}
catch( const uno::Exception& e )
{
- SAL_WARN(
- "embeddedobj.ole",
- "ignoring Exception " << e.Message);
+ SAL_WARN("embeddedobj.ole", "ignoring " << e);
}
}
diff --git a/embeddedobj/source/msole/ownview.cxx b/embeddedobj/source/msole/ownview.cxx
index 2add5c4f3201..a22411f6342c 100644
--- a/embeddedobj/source/msole/ownview.cxx
+++ b/embeddedobj/source/msole/ownview.cxx
@@ -151,8 +151,7 @@ bool OwnView_Impl::CreateModelFromURL( const OUString& aFileURL )
}
catch (uno::Exception const& e)
{
- SAL_WARN("embeddedobj.ole", "OwnView_Impl::CreateModelFromURL:"
- " exception caught: " << e.Message);
+ SAL_WARN("embeddedobj.ole", "OwnView_Impl::CreateModelFromURL:" << e);
}
}
diff --git a/extensions/source/bibliography/datman.cxx b/extensions/source/bibliography/datman.cxx
index 161b24048040..9e2dd31805e8 100644
--- a/extensions/source/bibliography/datman.cxx
+++ b/extensions/source/bibliography/datman.cxx
@@ -179,7 +179,7 @@ Reference< XNameAccess > getColumns(const Reference< XForm > & _rxForm)
}
catch (const Exception& e)
{
- SAL_WARN( "extensions.biblio", "::getColumns : caught an exception. " << e.Message);
+ SAL_WARN( "extensions.biblio", "::getColumns : caught an exception. " << e);
}
}
@@ -497,7 +497,7 @@ DBChangeDialog_Impl::DBChangeDialog_Impl(vcl::Window* pParent, BibDataManager* p
{
SAL_WARN("extensions.biblio",
"Exception in BibDataManager::DBChangeDialog_Impl::DBChangeDialog_Impl "
- << e.Message);
+ << e);
}
}
diff --git a/extensions/source/config/ldap/ldapuserprofilebe.cxx b/extensions/source/config/ldap/ldapuserprofilebe.cxx
index 10f7ae002c47..a9ce79ebefce 100644
--- a/extensions/source/config/ldap/ldapuserprofilebe.cxx
+++ b/extensions/source/config/ldap/ldapuserprofilebe.cxx
@@ -140,7 +140,7 @@ bool LdapUserProfileBe::readLdapConfiguration(
}
catch (const uno::Exception & e)
{
- SAL_WARN("extensions.config", "LdapUserProfileBackend: access to configuration data failed: " << e.Message);
+ SAL_WARN("extensions.config", "LdapUserProfileBackend: access to configuration data failed: " << e);
return false;
}
diff --git a/extensions/source/update/check/updatecheck.cxx b/extensions/source/update/check/updatecheck.cxx
index e6d6a2cd0463..817fc5ac8175 100644
--- a/extensions/source/update/check/updatecheck.cxx
+++ b/extensions/source/update/check/updatecheck.cxx
@@ -534,7 +534,7 @@ UpdateCheckThread::run()
catch(const uno::Exception& e) {
// Silently catch all errors
- SAL_WARN("extensions.update", "Caught exception, thread terminated. " << e.Message );
+ SAL_WARN("extensions.update", "Caught exception, thread terminated. " << e );
}
}
@@ -549,7 +549,7 @@ ManualUpdateCheckThread::run()
}
catch(const uno::Exception& e) {
// Silently catch all errors
- SAL_WARN("extensions.update", "Caught exception, thread terminated. " << e.Message );
+ SAL_WARN("extensions.update", "Caught exception, thread terminated. " << e );
}
}
diff --git a/extensions/source/update/check/updatecheckjob.cxx b/extensions/source/update/check/updatecheckjob.cxx
index b4885c83ae9a..2bbdf182f631 100644
--- a/extensions/source/update/check/updatecheckjob.cxx
+++ b/extensions/source/update/check/updatecheckjob.cxx
@@ -133,7 +133,7 @@ void SAL_CALL InitUpdateCheckJobThread::run()
aController->showDialog( true );
} catch (const uno::Exception &e) {
// fdo#64962 - don't bring the app down on some unexpected exception.
- SAL_WARN("extensions.update", "Caught init update exception, thread terminated. " << e.Message );
+ SAL_WARN("extensions.update", "Caught init update exception, thread terminated. " << e );
}
}
@@ -236,7 +236,7 @@ void UpdateCheckJob::handleExtensionUpdates( const uno::Sequence< beans::NamedVa
}
catch( const uno::Exception& e )
{
- SAL_WARN("extensions.update", "Caught exception, thread terminated. " << e.Message);
+ SAL_WARN("extensions.update", "Caught exception, thread terminated. " << e);
}
}
diff --git a/extensions/source/update/feed/test/updatefeedtest.cxx b/extensions/source/update/feed/test/updatefeedtest.cxx
index a50cde2fa5a5..4c5efc97c5ba 100644
--- a/extensions/source/update/feed/test/updatefeedtest.cxx
+++ b/extensions/source/update/feed/test/updatefeedtest.cxx
@@ -73,7 +73,7 @@ SAL_IMPLEMENT_MAIN()
}
catch( const uno::Exception & e )
{
- SAL_WARN("extensions.update", "exception caught: " << e.Message);
+ SAL_WARN("extensions.update", "exception caught: " << e);
}
catch( ... )
{
diff --git a/filter/qa/cppunit/xslt-test.cxx b/filter/qa/cppunit/xslt-test.cxx
index 7354cc85374f..6ec1ef7cd60a 100644
--- a/filter/qa/cppunit/xslt-test.cxx
+++ b/filter/qa/cppunit/xslt-test.cxx
@@ -76,7 +76,7 @@ private:
virtual void SAL_CALL error(const uno::Any& e) override
{
notifyDone(); // set on error too, otherwise main thread waits forever
- SAL_WARN("filter.xslt", "exception " << e);
+ SAL_WARN("filter.xslt", e);
CPPUNIT_FAIL("exception while in XSLT");
}
diff --git a/filter/source/config/cache/filtercache.cxx b/filter/source/config/cache/filtercache.cxx
index 423a35c2e955..a844edeb132c 100644
--- a/filter/source/config/cache/filtercache.cxx
+++ b/filter/source/config/cache/filtercache.cxx
@@ -875,7 +875,7 @@ css::uno::Any FilterCache::impl_getDirectCFGValue(const OUString& sDirectKey)
{ throw; }
catch(const css::uno::Exception& ex)
{
- SAL_WARN( "filter.config", ex.Message);
+ SAL_WARN( "filter.config", ex);
aValue.clear();
}
diff --git a/filter/source/config/cache/typedetection.cxx b/filter/source/config/cache/typedetection.cxx
index d0c096ce28d8..3355618042c0 100644
--- a/filter/source/config/cache/typedetection.cxx
+++ b/filter/source/config/cache/typedetection.cxx
@@ -448,10 +448,8 @@ OUString SAL_CALL TypeDetection::queryTypeByDescriptor(css::uno::Sequence< css::
}
catch(const css::uno::Exception& e)
{
- SAL_WARN(
- "filter.config",
- "caught Exception \"" << e.Message
- << "\" while querying type of <" << sURL << ">");
+ SAL_WARN("filter.config", "caught " << e
+ << " while querying type of " << sURL);
sType.clear();
}
diff --git a/filter/source/msfilter/eschesdo.cxx b/filter/source/msfilter/eschesdo.cxx
index fa10575b506c..9e9ed04dcc3e 100644
--- a/filter/source/msfilter/eschesdo.cxx
+++ b/filter/source/msfilter/eschesdo.cxx
@@ -1234,7 +1234,7 @@ sal_uInt32 ImplEESdrObject::ImplGetText()
}
catch (const uno::RuntimeException& e)
{
- SAL_WARN("filter.ms", "ImplGetText exception: " << e.Message);
+ SAL_WARN("filter.ms", "ImplGetText: " << e);
}
}
return mnTextSize;
diff --git a/filter/source/odfflatxml/OdfFlatXml.cxx b/filter/source/odfflatxml/OdfFlatXml.cxx
index 685d6ebce9eb..381e8429e612 100644
--- a/filter/source/odfflatxml/OdfFlatXml.cxx
+++ b/filter/source/odfflatxml/OdfFlatXml.cxx
@@ -152,9 +152,7 @@ OdfFlatXml::importer(
}
catch (const Exception &exc)
{
- SAL_WARN(
- "filter.odfflatxml",
- "caught exception \"" << exc.Message << "\"");
+ SAL_WARN("filter.odfflatxml", exc);
return false;
}
return true;
diff --git a/filter/source/pdf/impdialog.cxx b/filter/source/pdf/impdialog.cxx
index 2655868a5645..67b195397e4e 100644
--- a/filter/source/pdf/impdialog.cxx
+++ b/filter/source/pdf/impdialog.cxx
@@ -1762,7 +1762,7 @@ IMPL_LINK_NOARG( ImpPDFTabSigningPage, ClickmaPbSignCertSelect, Button*, void )
}
catch (const uno::Exception &e)
{
- SAL_INFO("filter.pdf", "TSAURLsDialog::TSAURLsDialog(): caught exception" << e.Message);
+ SAL_INFO("filter.pdf", "TSAURLsDialog::TSAURLsDialog(): " << e);
}
// If more than only the "None" entry is there, enable the ListBox
diff --git a/filter/source/svg/svgfilter.cxx b/filter/source/svg/svgfilter.cxx
index 794fbd8ba502..cba3d3210ad9 100644
--- a/filter/source/svg/svgfilter.cxx
+++ b/filter/source/svg/svgfilter.cxx
@@ -374,7 +374,7 @@ OUString SAL_CALL SVGFilter::detect(Sequence<PropertyValue>& rDescriptor)
return OUString(constFilterName);
}
} catch (css::io::IOException & e) {
- SAL_WARN("filter.svg", "caught IOException " + e.Message);
+ SAL_WARN("filter.svg", "caught " << e);
}
return OUString();
}
diff --git a/filter/source/svg/test/svg2odf.cxx b/filter/source/svg/test/svg2odf.cxx
index d088d2552384..1f8f751d3751 100644
--- a/filter/source/svg/test/svg2odf.cxx
+++ b/filter/source/svg/test/svg2odf.cxx
@@ -120,7 +120,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
}
catch (const uno::Exception& e)
{
- SAL_WARN("filter.svg", "Fatal exception: " << e.Message);
+ SAL_WARN("filter.svg", "Fatal exception: " << e);
return 1;
}
catch (const std::exception &e)
diff --git a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx
index 03a3b2bc746b..892cb3989593 100644
--- a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx
+++ b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx
@@ -161,7 +161,7 @@ bool SAL_CALL XmlFilterAdaptor::importImpl( const Sequence< css::beans::Property
if (xStatusIndicator.is())
xStatusIndicator->end();
- SAL_WARN("filter.xmlfa", "XmlFilterAdaptor: exception: " << e.Message);
+ SAL_WARN("filter.xmlfa", "XmlFilterAdaptor: " << e);
return false;
}
if (xStatusIndicator.is()) {
@@ -272,7 +272,7 @@ bool SAL_CALL XmlFilterAdaptor::exportImpl( const Sequence< css::beans::Property
}
catch (const Exception& e)
{
- SAL_WARN("filter.xmlfa", "XmlFilterAdaptor: exception: " << e.Message);
+ SAL_WARN("filter.xmlfa", "XmlFilterAdaptor: " << e);
if (xStatusIndicator.is())
xStatusIndicator->end();
return false;
diff --git a/filter/source/xsltfilter/XSLTFilter.cxx b/filter/source/xsltfilter/XSLTFilter.cxx
index 5373db29aa73..20d552558c14 100644
--- a/filter/source/xsltfilter/XSLTFilter.cxx
+++ b/filter/source/xsltfilter/XSLTFilter.cxx
@@ -233,7 +233,7 @@ namespace XSLT
Exception e;
if (a >>= e)
{
- SAL_WARN("filter.xslt", "XSLTFilter::error was called: " << e.Message);
+ SAL_WARN("filter.xslt", "XSLTFilter::error was called: " << e);
}
m_bError = true;
m_cTransformed.set();
@@ -402,7 +402,7 @@ namespace XSLT
catch( const Exception& exc)
{
// something went wrong
- SAL_WARN("filter.xslt", exc.Message);
+ SAL_WARN("filter.xslt", exc);
return false;
}
}
diff --git a/forms/source/component/Edit.cxx b/forms/source/component/Edit.cxx
index 478c9b9c94f1..0b5dc04019a9 100644
--- a/forms/source/component/Edit.cxx
+++ b/forms/source/component/Edit.cxx
@@ -445,7 +445,7 @@ namespace
{
SAL_WARN( "forms.component", "could not transfer the property named '"
<< sourceprop.Name
- << "'. " << e.Message );
+ << "'. " << e );
}
}
}
diff --git a/forms/source/xforms/submission/replace.cxx b/forms/source/xforms/submission/replace.cxx
index e569e2634b63..8804c3c92b4b 100644
--- a/forms/source/xforms/submission/replace.cxx
+++ b/forms/source/xforms/submission/replace.cxx
@@ -101,7 +101,7 @@ CSubmission::SubmissionResult CSubmission::replace(const OUString& aReplace, con
return CSubmission::SUCCESS;
}
} catch (const Exception& e) {
- SAL_WARN( "forms.xforms", "Exception during replace: " << e.Message);
+ SAL_WARN( "forms.xforms", "Exception during replace: " << e);
}
return CSubmission::UNKNOWN_ERROR;
}
diff --git a/framework/source/dispatch/servicehandler.cxx b/framework/source/dispatch/servicehandler.cxx
index 83c7535cadf1..a6588bad7ec9 100644
--- a/framework/source/dispatch/servicehandler.cxx
+++ b/framework/source/dispatch/servicehandler.cxx
@@ -217,8 +217,7 @@ css::uno::Reference< css::uno::XInterface > ServiceHandler::implts_dispatch( con
// because it contains syntax errors, which was detected at runtime...
catch(const css::uno::Exception& e)
{
- SAL_WARN(
- "fwk.dispatch", "ignored UNO Exception \"" << e.Message << '"');
+ SAL_WARN("fwk.dispatch", "ignored " << e);
xService.clear();
}
diff --git a/framework/source/fwi/jobs/configaccess.cxx b/framework/source/fwi/jobs/configaccess.cxx
index 13d3118d1a4a..7ce56e433e38 100644
--- a/framework/source/fwi/jobs/configaccess.cxx
+++ b/framework/source/fwi/jobs/configaccess.cxx
@@ -128,7 +128,7 @@ void ConfigAccess::open( /*IN*/ EOpenMode eMode )
}
catch(const css::uno::Exception& ex)
{
- SAL_INFO("fwk", "open config: " << ex.Message);
+ SAL_INFO("fwk", "open config: " << ex);
}
m_eMode = E_CLOSED;
diff --git a/framework/source/jobs/job.cxx b/framework/source/jobs/job.cxx
index 0f8741f8c377..f7b18482dfa0 100644
--- a/framework/source/jobs/job.cxx
+++ b/framework/source/jobs/job.cxx
@@ -216,7 +216,7 @@ void Job::execute( /*IN*/ const css::uno::Sequence< css::beans::NamedValue >& lD
#if OSL_DEBUG_LEVEL > 0
catch(const css::uno::Exception& ex)
{
- SAL_INFO("fwk", "Job::execute(): Got exception during job execution. Original Message was: \"" << ex.Message << "\"");
+ SAL_INFO("fwk", "Job::execute(): Got exception during job execution. Original Message was: \"" << ex << "\"");
}
#else
catch(const css::uno::Exception&)
diff --git a/framework/source/services/sessionlistener.cxx b/framework/source/services/sessionlistener.cxx
index ec26813e814e..e47dae89135d 100644
--- a/framework/source/services/sessionlistener.cxx
+++ b/framework/source/services/sessionlistener.cxx
@@ -188,7 +188,7 @@ void SessionListener::StoreSession( bool bAsync )
args[0] = PropertyValue("DispatchAsynchron",-1,makeAny(bAsync),PropertyState_DIRECT_VALUE);
xDispatch->dispatch(aURL, args);
} catch (const css::uno::Exception& e) {
- SAL_WARN("fwk.session",e.Message);
+ SAL_WARN("fwk.session",e);
// save failed, but tell manager to go on if we haven't yet dispatched the request
// in case of synchronous saving the notification is done by the caller
if ( bAsync && m_rSessionManager.is() )
@@ -216,7 +216,7 @@ void SessionListener::QuitSessionQuietly()
args[0] = PropertyValue("DispatchAsynchron",-1,makeAny(false),PropertyState_DIRECT_VALUE);
xDispatch->dispatch(aURL, args);
} catch (const css::uno::Exception& e) {
- SAL_WARN("fwk.session",e.Message);
+ SAL_WARN("fwk.session",e);
}
}
@@ -304,7 +304,7 @@ sal_Bool SAL_CALL SessionListener::doRestore()
m_bRestored = true;
} catch (const css::uno::Exception& e) {
- SAL_WARN("fwk.session",e.Message);
+ SAL_WARN("fwk.session",e);
}
return m_bRestored;
diff --git a/framework/source/uielement/popuptoolbarcontroller.cxx b/framework/source/uielement/popuptoolbarcontroller.cxx
index 202f3fa85dc8..4d0ea6821b81 100644
--- a/framework/source/uielement/popuptoolbarcontroller.cxx
+++ b/framework/source/uielement/popuptoolbarcontroller.cxx
@@ -142,7 +142,7 @@ void SAL_CALL PopupMenuToolbarController::initialize(
}
catch (const css::uno::Exception& e)
{
- SAL_INFO( "fwk.uielement", "Caught an exception: " << e.Message );
+ SAL_INFO( "fwk.uielement", e );
}
SolarMutexGuard aSolarLock;
@@ -250,7 +250,7 @@ void PopupMenuToolbarController::createPopupMenuController()
catch ( const css::uno::Exception &e )
{
m_xPopupMenu.clear();
- SAL_INFO( "fwk.uielement", "Caught an exception: " << e.Message );
+ SAL_INFO( "fwk.uielement", e );
}
}
}
diff --git a/include/toolkit/helper/macros.hxx b/include/toolkit/helper/macros.hxx
index 25c3e3d4c33f..5730a7e35d3b 100644
--- a/include/toolkit/helper/macros.hxx
+++ b/include/toolkit/helper/macros.hxx
@@ -116,7 +116,7 @@ void ClassName::disposing( const css::lang::EventObject& ) \
#if OSL_DEBUG_LEVEL > 0
#define DISPLAY_EXCEPTION( ClassName, MethodName, e ) \
- SAL_WARN( "toolkit", #ClassName "::" #MethodName ": caught an exception! " << e.Message);
+ SAL_WARN( "toolkit", #ClassName "::" #MethodName ": caught an exception! " << e);
#else
#define DISPLAY_EXCEPTION( ClassName, MethodName, e ) (void)e;
#endif
diff --git a/io/source/stm/opump.cxx b/io/source/stm/opump.cxx
index cf8a356901e8..e7d5bf758b43 100644
--- a/io/source/stm/opump.cxx
+++ b/io/source/stm/opump.cxx
@@ -134,7 +134,7 @@ void Pump::fireError( const Any & exception )
}
catch ( const RuntimeException &e )
{
- SAL_WARN("io.streams","com.sun.star.comp.stoc.Pump: unexpected exception during calling listeners" << e.Message);
+ SAL_WARN("io.streams","com.sun.star.comp.stoc.Pump: unexpected exception during calling listeners" << e);
}
}
}
@@ -162,7 +162,7 @@ void Pump::fireClose()
}
catch ( const RuntimeException &e )
{
- SAL_WARN("io.streams","com.sun.star.comp.stoc.Pump: unexpected exception during calling listeners" << e.Message);
+ SAL_WARN("io.streams","com.sun.star.comp.stoc.Pump: unexpected exception during calling listeners" << e);
}
}
}
@@ -179,7 +179,7 @@ void Pump::fireStarted()
}
catch ( const RuntimeException &e )
{
- SAL_WARN("io.streams","com.sun.star.comp.stoc.Pump: unexpected exception during calling listeners" << e.Message);
+ SAL_WARN("io.streams","com.sun.star.comp.stoc.Pump: unexpected exception during calling listeners" << e);
}
}
}
@@ -195,7 +195,7 @@ void Pump::fireTerminated()
}
catch ( const RuntimeException &e )
{
- SAL_WARN("io.streams","com.sun.star.comp.stoc.Pump: unexpected exception during calling listeners" << e.Message);
+ SAL_WARN("io.streams","com.sun.star.comp.stoc.Pump: unexpected exception during calling listeners" << e);
}
}
}
@@ -297,7 +297,7 @@ void Pump::run()
{
// we are the last on the stack.
// this is to avoid crashing the program, when e.g. a bridge crashes
- SAL_WARN("io.streams","com.sun.star.comp.stoc.Pump: unexpected exception during calling listeners" << e.Message);
+ SAL_WARN("io.streams","com.sun.star.comp.stoc.Pump: unexpected exception during calling listeners" << e);
}
}
diff --git a/javaunohelper/source/bootstrap.cxx b/javaunohelper/source/bootstrap.cxx
index 6ec95eaa4484..e8e0107ac784 100644
--- a/javaunohelper/source/bootstrap.cxx
+++ b/javaunohelper/source/bootstrap.cxx
@@ -150,7 +150,7 @@ jobject Java_com_sun_star_comp_helper_Bootstrap_cppuhelper_1bootstrap(
jclass c = jni_env->FindClass( "com/sun/star/uno/RuntimeException" );
if (nullptr != c)
{
- SAL_WARN("javaunohelper", "forwarding RuntimeException: " << exc.Message );
+ SAL_WARN("javaunohelper", "forwarding RuntimeException: " << exc );
OString cstr( OUStringToOString(
exc.Message, RTL_TEXTENCODING_JAVA_UTF8 ) );
jni_env->ThrowNew( c, cstr.getStr() );
@@ -161,7 +161,7 @@ jobject Java_com_sun_star_comp_helper_Bootstrap_cppuhelper_1bootstrap(
jclass c = jni_env->FindClass( "com/sun/star/uno/Exception" );
if (nullptr != c)
{
- SAL_WARN("javaunohelper", "forwarding Exception: " << exc.Message );
+ SAL_WARN("javaunohelper", "forwarding Exception: " << exc );
OString cstr( OUStringToOString(
exc.Message, RTL_TEXTENCODING_JAVA_UTF8 ) );
jni_env->ThrowNew( c, cstr.getStr() );
diff --git a/linguistic/source/gciterator.cxx b/linguistic/source/gciterator.cxx
index c031a23657c1..c62076a74de8 100644
--- a/linguistic/source/gciterator.cxx
+++ b/linguistic/source/gciterator.cxx
@@ -606,8 +606,7 @@ void GrammarCheckingIterator::DequeueAndCheck()
{
SAL_WARN(
"linguistic",
- "GrammarCheckingIterator::DequeueAndCheck ignoring UNO"
- " exception " << e.Message);
+ "GrammarCheckingIterator::DequeueAndCheck ignoring " << e);
}
}
@@ -874,7 +873,7 @@ void SAL_CALL GrammarCheckingIterator::processLinguServiceEvent(
catch (const ::uno::Exception &rE)
{
// ignore
- SAL_WARN("linguistic", "processLinguServiceEvent: exception: " << rE.Message);
+ SAL_WARN("linguistic", "processLinguServiceEvent: exception: " << rE);
}
}
}
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index 292f2a2be8d0..6064220e602c 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -276,7 +276,7 @@ void Shape::addShape(
}
catch( const Exception& e )
{
- SAL_WARN( "oox.drawingml", "Shape::addShape: Exception: " << e.Message );
+ SAL_WARN( "oox.drawingml", "Shape::addShape: " << e );
}
}
@@ -1229,7 +1229,7 @@ void Shape::keepDiagramCompatibilityInfo( XmlFilterBase const & rFilterBase )
}
catch( const Exception& e )
{
- SAL_WARN( "oox.drawingml", "Shape::keepDiagramCompatibilityInfo: Exception: " << e.Message );
+ SAL_WARN( "oox.drawingml", "Shape::keepDiagramCompatibilityInfo: " << e );
}
}
@@ -1298,7 +1298,7 @@ Reference < XShape > Shape::renderDiagramToGraphic( XmlFilterBase const & rFilte
}
catch( const Exception& e )
{
- SAL_WARN( "oox.drawingml", "Shape::renderDiagramToGraphic: Exception: " << e.Message );
+ SAL_WARN( "oox.drawingml", "Shape::renderDiagramToGraphic: " << e );
}
return xShape;
diff --git a/oox/source/drawingml/textfield.cxx b/oox/source/drawingml/textfield.cxx
index 2a3527779e41..3fed73ce56d9 100644
--- a/oox/source/drawingml/textfield.cxx
+++ b/oox/source/drawingml/textfield.cxx
@@ -130,7 +130,7 @@ void lclCreateTextFields( std::list< Reference< XTextField > > & aFields,
}
catch(Exception & e)
{
- SAL_WARN("oox", "Exception " << e.Message );
+ SAL_WARN("oox", e );
}
}
else if ( sType == "slidenum" )
diff --git a/oox/source/export/chartexport.cxx b/oox/source/export/chartexport.cxx
index bbf0cf113f14..e3b69806df07 100644
--- a/oox/source/export/chartexport.cxx
+++ b/oox/source/export/chartexport.cxx
@@ -185,7 +185,7 @@ Reference< chart2::data::XLabeledDataSequence > lcl_getCategories( const Referen
}
catch( const uno::Exception & ex )
{
- SAL_WARN( "oox", "Exception caught. " << ex.Message);
+ SAL_WARN( "oox", "Exception caught. " << ex);
}
return xResult;
@@ -232,7 +232,7 @@ bool lcl_isSeriesAttachedToFirstAxis(
}
catch( const uno::Exception & ex )
{
- SAL_WARN( "oox", "Exception caught. " << ex.Message);
+ SAL_WARN( "oox", "Exception caught. " << ex);
}
return bResult;
@@ -540,7 +540,7 @@ void ChartExport::InitRangeSegmentationProperties( const Reference< chart2::XCha
}
catch( const uno::Exception & ex )
{
- SAL_WARN( "oox", "Exception caught. " << ex.Message);
+ SAL_WARN( "oox", "Exception caught. " << ex);
}
}
@@ -1289,7 +1289,7 @@ void ChartExport::exportBitmapFill( const Reference< XPropertySet >& xPropSet )
}
catch (const uno::Exception & rEx)
{
- SAL_INFO("oox", "ChartExport::exportBitmapFill " << rEx.Message);
+ SAL_INFO("oox", "ChartExport::exportBitmapFill " << rEx);
}
}
@@ -1318,7 +1318,7 @@ void ChartExport::exportGradientFill( const Reference< XPropertySet >& xPropSet
catch (const uno::Exception & rEx)
{
SAL_INFO("oox",
- "ChartExport::exportGradientFill " << rEx.Message);
+ "ChartExport::exportGradientFill " << rEx);
}
}
@@ -3036,7 +3036,7 @@ void ChartExport::exportDataPoints(
}
catch( const uno::Exception & rEx )
{
- SAL_WARN( "oox", "Exception caught during Export of data point: " << rEx.Message );
+ SAL_WARN( "oox", "Exception caught during Export of data point: " << rEx );
}
}
else
diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx
index f1073262da70..b5a44c754c11 100644
--- a/oox/source/export/shapes.cxx
+++ b/oox/source/export/shapes.cxx
@@ -289,7 +289,7 @@ static uno::Reference<io::XInputStream> lcl_StoreOwnAsOOXML(
}
catch (uno::Exception const& e)
{
- SAL_WARN("oox.shape", "oox::GetOLEObjectStream: exception: \"" << e.Message << "\"");
+ SAL_WARN("oox.shape", "oox::GetOLEObjectStream: " << e);
return nullptr;
}
xTempStream->getOutputStream()->closeOutput();
@@ -329,7 +329,7 @@ uno::Reference<io::XInputStream> GetOLEObjectStream(
}
catch (uno::Exception const& e)
{
- SAL_WARN("oox.shape", "oox::GetOLEObjectStream: exception: " << e.Message);
+ SAL_WARN("oox.shape", "oox::GetOLEObjectStream: " << e);
}
return xInStream;
}
@@ -1968,7 +1968,7 @@ ShapeExport& ShapeExport::WriteOLE2Shape( const Reference< XShape >& xShape )
}
catch (uno::Exception const& e)
{
- SAL_WARN("oox.shape", "ShapeExport::WriteOLE2Shape: exception: " << e.Message);
+ SAL_WARN("oox.shape", "ShapeExport::WriteOLE2Shape: " << e);
return *this;
}
@@ -2037,7 +2037,7 @@ ShapeExport& ShapeExport::WriteOLE2Shape( const Reference< XShape >& xShape )
try {
::comphelper::OStorageHelper::CopyInputToOutput(xInStream, xOutStream);
} catch (uno::Exception const& e) {
- SAL_WARN("oox.shape", "ShapeExport::WriteOLEObject: exception: " << e.Message);
+ SAL_WARN("oox.shape", "ShapeExport::WriteOLEObject: " << e);
}
OUString const sRelId = mpFB->addRelation(
diff --git a/oox/source/helper/propertyset.cxx b/oox/source/helper/propertyset.cxx
index 52b44d79cbcd..ce36308eb425 100644
--- a/oox/source/helper/propertyset.cxx
+++ b/oox/source/helper/propertyset.cxx
@@ -119,7 +119,7 @@ bool PropertySet::implGetPropertyValue( Any& orValue, const OUString& rPropName
catch( Exception& e)
{
SAL_WARN( "oox", "PropertySet::implGetPropertyValue - cannot get property \"" <<
- rPropName << "\" Error: " << e.Message);
+ rPropName << "\" Error: " << e);
}
return false;
}
@@ -134,7 +134,7 @@ bool PropertySet::implSetPropertyValue( const OUString& rPropName, const Any& rV
catch( Exception& e)
{
SAL_WARN( "oox", "PropertySet::implSetPropertyValue - cannot set property \"" <<
- rPropName << "\" Error: " << e.Message);
+ rPropName << "\" Error: " << e);
}
return false;
}
diff --git a/oox/source/helper/zipstorage.cxx b/oox/source/helper/zipstorage.cxx
index d60e24b8488b..90d38554c359 100644
--- a/oox/source/helper/zipstorage.cxx
+++ b/oox/source/helper/zipstorage.cxx
@@ -63,7 +63,7 @@ ZipStorage::ZipStorage( const Reference< XComponentContext >& rxContext, const R
catch (Exception const& e)
{
SAL_WARN("oox.storage", "ZipStorage::ZipStorage "
- "exception opening input storage: " << e.Message);
+ "exception opening input storage: " << e);
}
}
@@ -81,7 +81,7 @@ ZipStorage::ZipStorage( const Reference< XComponentContext >& rxContext, const R
catch (Exception const& e)
{
SAL_WARN("oox.storage", "ZipStorage::ZipStorage "
- "exception opening output storage: " << e.Message);
+ "exception opening output storage: " << e);
}
}
@@ -118,7 +118,7 @@ void ZipStorage::implGetElementNames( ::std::vector< OUString >& orElementNames
}
catch (Exception const& e)
{
- SAL_INFO("oox.storage", "getElementNames: exception: " << e.Message);
+ SAL_INFO("oox.storage", "getElementNames: " << e);
}
}
@@ -139,7 +139,7 @@ StorageRef ZipStorage::implOpenSubStorage( const OUString& rElementName, bool bC
}
catch (Exception const& e)
{
- SAL_INFO("oox.storage", "openStorageElement: exception: " << e.Message);
+ SAL_INFO("oox.storage", "openStorageElement: " << e);
}
if( bMissing && bCreateMissing ) try
@@ -149,7 +149,7 @@ StorageRef ZipStorage::implOpenSubStorage( const OUString& rElementName, bool bC
}
catch (Exception const& e)
{
- SAL_INFO("oox.storage", "openStorageElement: exception: " << e.Message);
+ SAL_INFO("oox.storage", "openStorageElement: " << e);
}
StorageRef xSubStorage;
@@ -167,7 +167,7 @@ Reference< XInputStream > ZipStorage::implOpenInputStream( const OUString& rElem
}
catch (Exception const& e)
{
- SAL_INFO("oox.storage", "openStreamElement: exception: " << e.Message);
+ SAL_INFO("oox.storage", "openStreamElement: " << e);
}
return xInStream;
}
@@ -181,7 +181,7 @@ Reference< XOutputStream > ZipStorage::implOpenOutputStream( const OUString& rEl
}
catch (Exception const& e)
{
- SAL_INFO("oox.storage", "openStreamElement: exception: " << e.Message);
+ SAL_INFO("oox.storage", "openStreamElement: " << e);
}
return xOutStream;
}
@@ -194,7 +194,7 @@ void ZipStorage::implCommit() const
}
catch (Exception const& e)
{
- SAL_WARN("oox.storage", "commit: exception: " << e.Message);
+ SAL_WARN("oox.storage", "commit: " << e);
}
}
diff --git a/oox/source/ole/axcontrol.cxx b/oox/source/ole/axcontrol.cxx
index efe55b582eeb..36cdfc2b10de 100644
--- a/oox/source/ole/axcontrol.cxx
+++ b/oox/source/ole/axcontrol.cxx
@@ -58,6 +58,7 @@
#include "oox/ole/axbinarywriter.hxx"
#include <oox/token/properties.hxx>
#include <oox/token/tokens.hxx>
+
namespace oox {
namespace ole {
@@ -174,7 +175,7 @@ bool lclExtractRangeFromName( CellRangeAddress& orRangeAddr, const Reference< XM
}
catch (const Exception& e)
{
- SAL_WARN("oox", "exception: " << e.Message);
+ SAL_WARN("oox", e);
}
return false;
}
@@ -207,7 +208,7 @@ void lclPrepareConverter( PropertySet& rConverter, const Reference< XModel >& rx
}
catch (const Exception& e)
{
- SAL_WARN("oox", "exception: " << e.Message);
+ SAL_WARN("oox", e);
}
rConverter.setProperty( PROP_XLA1Representation, rAddressString );
rConverter.setProperty( PROP_ReferenceSheet, nRefSheet );
@@ -351,7 +352,7 @@ void ControlConverter::bindToSources( const Reference< XControlModel >& rxCtrlMo
}
catch (const Exception& e)
{
- SAL_WARN("oox", "exception: " << e.Message);
+ SAL_WARN("oox", e);
}
// list entry source
@@ -383,7 +384,7 @@ void ControlConverter::bindToSources( const Reference< XControlModel >& rxCtrlMo
}
catch (const Exception& e)
{
- SAL_WARN("oox", "exception: " << e.Message);
+ SAL_WARN("oox", e);
}
}
@@ -2662,7 +2663,7 @@ bool EmbeddedControl::convertProperties( const Reference< XControlModel >& rxCtr
}
catch (const Exception& e)
{
- SAL_WARN("oox", "exception: " << e.Message);
+ SAL_WARN("oox", e);
}
mxModel->convertProperties( aPropMap, rConv );
PropertySet aPropSet( rxCtrlModel );
@@ -2711,7 +2712,7 @@ Reference< XControlModel > EmbeddedForm::convertAndInsert( const EmbeddedControl
}
catch (const Exception& e)
{
- SAL_WARN("oox", "exception creating Control: " << e.Message);
+ SAL_WARN("oox", "exception creating Control: " << e);
}
return xRet;
}
@@ -2737,7 +2738,7 @@ Reference< XIndexContainer > const & EmbeddedForm::createXForm()
}
catch (const Exception& e)
{
- SAL_WARN("oox", "exception creating Form: " << e.Message);
+ SAL_WARN("oox", "exception creating Form: " << e);
}
// always clear the forms supplier to not try to create the form again
mxFormsSupp.clear();
diff --git a/oox/source/ppt/timenode.cxx b/oox/source/ppt/timenode.cxx
index 223cf8b31f2e..b379b8d4a3c0 100644
--- a/oox/source/ppt/timenode.cxx
+++ b/oox/source/ppt/timenode.cxx
@@ -200,7 +200,7 @@ namespace oox { namespace ppt {
}
catch( const Exception& e )
{
- SAL_INFO("oox.ppt","OOX: exception raised in TimeNode::addNode() - " << e.Message );
+ SAL_INFO("oox.ppt","OOX: exception raised in TimeNode::addNode() - " << e );
}
}
@@ -558,7 +558,7 @@ namespace oox { namespace ppt {
}
catch( const Exception& e )
{
- SAL_INFO("oox.ppt","OOX: exception raised in TimeNode::setNode() - " << e.Message );
+ SAL_INFO("oox.ppt","OOX: exception raised in TimeNode::setNode() - " << e );
}
}
@@ -576,7 +576,7 @@ namespace oox { namespace ppt {
}
catch( const Exception& e )
{
- SAL_INFO("oox.ppt", "OOX: exception raised in TimeNode::createAndInsert() trying to create a service " << rServiceName << " = " << e.Message );
+ SAL_INFO("oox.ppt", "OOX: exception raised in TimeNode::createAndInsert() trying to create a service " << rServiceName << " = " << e );
}
return Reference< XAnimationNode >();
diff --git a/oox/source/vml/vmldrawing.cxx b/oox/source/vml/vmldrawing.cxx
index c95031d8f880..5c85cc199c4d 100644
--- a/oox/source/vml/vmldrawing.cxx
+++ b/oox/source/vml/vmldrawing.cxx
@@ -228,7 +228,7 @@ Reference< XShape > Drawing::createAndInsertXShape( const OUString& rService,
}
catch( Exception& e )
{
- SAL_WARN( "oox", "Drawing::createAndInsertXShape - error during shape object creation: " << e.Message );
+ SAL_WARN( "oox", "Drawing::createAndInsertXShape - error during shape object creation: " << e );
}
OSL_ENSURE( xShape.is(), "Drawing::createAndInsertXShape - cannot instantiate shape object" );
return xShape;
@@ -251,7 +251,7 @@ Reference< XShape > Drawing::createAndInsertXControlShape( const ::oox::ole::Emb
}
catch (Exception const& e)
{
- SAL_WARN("oox", "exception inserting Shape: " << e.Message);
+ SAL_WARN("oox", "exception inserting Shape: " << e);
}
return xShape;
}
diff --git a/package/source/manifest/ManifestReader.cxx b/package/source/manifest/ManifestReader.cxx
index 61140f6afc65..2ee8c1187de5 100644
--- a/package/source/manifest/ManifestReader.cxx
+++ b/package/source/manifest/ManifestReader.cxx
@@ -64,15 +64,15 @@ Sequence< Sequence< PropertyValue > > SAL_CALL ManifestReader::readManifestSeque
}
catch (SAXParseException& e)
{
- SAL_WARN("package", "ignoring SAXParseException " + e.Message);
+ SAL_WARN("package", "ignoring " << e);
}
catch (SAXException& e)
{
- SAL_WARN("package", "ignoring SAXException " + e.Message);
+ SAL_WARN("package", "ignoring " << e);
}
catch (IOException& e)
{
- SAL_WARN("package", "ignoring IOException " + e.Message);
+ SAL_WARN("package", "ignoring " << e);
}
xParser->setDocumentHandler ( Reference < XDocumentHandler > () );
return aManifestSequence;
diff --git a/package/source/xstor/owriteablestream.cxx b/package/source/xstor/owriteablestream.cxx
index 9c4c19cb9e91..8f03c20ff990 100644
--- a/package/source/xstor/owriteablestream.cxx
+++ b/package/source/xstor/owriteablestream.cxx
@@ -117,7 +117,7 @@ void SetEncryptionKeyProperty_Impl( const uno::Reference< beans::XPropertySet >&
}
catch ( const uno::Exception& rException )
{
- SAL_INFO("package.xstor", rException.Message);
+ SAL_INFO("package.xstor", rException);
SAL_INFO("package.xstor", "Can't set encryption");
SAL_WARN( "package.xstor", "Can't write encryption related properties!" );
throw io::IOException(); // TODO
@@ -135,7 +135,7 @@ uno::Any GetEncryptionKeyProperty_Impl( const uno::Reference< beans::XPropertySe
}
catch ( const uno::Exception& rException )
{
- SAL_INFO("package.xstor", rException.Message);
+ SAL_INFO("package.xstor", rException);
SAL_INFO("package.xstor", "Can't get encryption property");
SAL_WARN( "package.xstor", "Can't get encryption related properties!" );
@@ -219,7 +219,7 @@ bool KillFile( const OUString& aURL, const uno::Reference< uno::XComponentContex
}
catch( const uno::Exception& rException )
{
- SAL_INFO("package.xstor", rException.Message);
+ SAL_INFO("package.xstor", rException);
SAL_INFO("package.xstor", "Quiet exception");
}
@@ -241,7 +241,7 @@ OUString GetNewTempFileURL( const uno::Reference< uno::XComponentContext >& rCon
}
catch ( const uno::Exception& rException )
{
- SAL_INFO("package.xstor", rException.Message);
+ SAL_INFO("package.xstor", rException);
SAL_INFO("package.xstor", "Quiet exception");
}
@@ -471,7 +471,7 @@ void OWriteStream_Impl::DisposeWrappers()
}
catch ( const uno::RuntimeException& rRuntimeException )
{
- SAL_INFO("package.xstor", "Quiet exception: " << rRuntimeException.Message);
+ SAL_INFO("package.xstor", "Quiet exception: " << rRuntimeException);
}
m_pAntiImpl = nullptr;
@@ -516,13 +516,13 @@ OUString const & OWriteStream_Impl::GetFilledTempFileIfNo( const uno::Reference<
}
catch( const packages::WrongPasswordException& rWrongPasswordException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rWrongPasswordException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rWrongPasswordException);
KillFile( aTempURL, comphelper::getProcessComponentContext() );
throw;
}
catch( const uno::Exception& rException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rException);
KillFile( aTempURL, comphelper::getProcessComponentContext() );
throw;
}
@@ -633,7 +633,7 @@ uno::Reference< io::XStream > OWriteStream_Impl::GetTempFileAsStream()
}
catch( const uno::Exception& rException )
{
- SAL_INFO("package.xstor", "Quiet exception: " << rException.Message);
+ SAL_INFO("package.xstor", "Quiet exception: " << rException);
}
}
}
@@ -670,7 +670,7 @@ uno::Reference< io::XInputStream > OWriteStream_Impl::GetTempFileAsInputStream()
}
catch( const uno::Exception& rException )
{
- SAL_INFO("package.xstor", "Quiet exception: " << rException.Message);
+ SAL_INFO("package.xstor", "Quiet exception: " << rException);
}
}
}
@@ -1008,7 +1008,7 @@ void OWriteStream_Impl::ReadRelInfoIfNecessary()
}
catch( const uno::Exception& rException )
{
- SAL_INFO("package.xstor", "Quiet exception: " << rException.Message);
+ SAL_INFO("package.xstor", "Quiet exception: " << rException);
m_nRelInfoStatus = RELINFO_BROKEN;
m_bOrigRelInfoBroken = true;
@@ -1073,7 +1073,7 @@ uno::Sequence< beans::PropertyValue > OWriteStream_Impl::ReadPackageStreamProper
}
catch( const uno::Exception& rException )
{
- SAL_INFO("package.xstor", "Quiet exception: " << rException.Message);
+ SAL_INFO("package.xstor", "Quiet exception: " << rException);
SAL_WARN( "package.xstor", "A property can't be retrieved!" );
}
}
@@ -1180,12 +1180,12 @@ uno::Reference< io::XStream > OWriteStream_Impl::GetStream( sal_Int32 nStreamMod
catch( const packages::WrongPasswordException& rWrongPasswordException )
{
SetEncryptionKeyProperty_Impl( xPropertySet, uno::Sequence< beans::NamedValue >() );
- SAL_INFO("package.xstor", "Rethrow: " << rWrongPasswordException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rWrongPasswordException);
throw;
}
catch ( const uno::Exception& rException )
{
- SAL_INFO("package.xstor", "Quiet exception: " << rException.Message);
+ SAL_INFO("package.xstor", "Quiet exception: " << rException);
SAL_WARN( "package.xstor", "Can't write encryption related properties!" );
SetEncryptionKeyProperty_Impl( xPropertySet, uno::Sequence< beans::NamedValue >() );
throw io::IOException(); // TODO:
@@ -1217,7 +1217,7 @@ uno::Reference< io::XStream > OWriteStream_Impl::GetStream( sal_Int32 nStreamMod
}
catch( const packages::NoEncryptionException& rNoEncryptionException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rNoEncryptionException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rNoEncryptionException);
throw packages::WrongPasswordException();
}
@@ -1438,7 +1438,7 @@ void OWriteStream_Impl::GetCopyOfLastCommit( uno::Reference< io::XStream >& xTar
}
catch( const packages::NoEncryptionException& rNoEncryptionException )
{
- SAL_INFO("package.xstor", "No Element: " << rNoEncryptionException.Message);
+ SAL_INFO("package.xstor", "No Element: " << rNoEncryptionException);
throw packages::WrongPasswordException();
}
@@ -1507,7 +1507,7 @@ void OWriteStream_Impl::GetCopyOfLastCommit( uno::Reference< io::XStream >& xTar
{
SAL_WARN( "package.xstor", "Can't open encrypted stream!" );
SetEncryptionKeyProperty_Impl( xPropertySet, uno::Sequence< beans::NamedValue >() );
- SAL_INFO("package.xstor", "Rethrow: " << rException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rException);
throw;
}
@@ -1673,7 +1673,7 @@ OWriteStream::~OWriteStream()
}
catch( const uno::RuntimeException& rRuntimeException )
{
- SAL_INFO("package.xstor", "Quiet exception: " << rRuntimeException.Message);
+ SAL_INFO("package.xstor", "Quiet exception: " << rRuntimeException);
}
}
}
@@ -1756,7 +1756,7 @@ void OWriteStream::CopyToStreamInternally_Impl( const uno::Reference< io::XStrea
}
catch ( const uno::Exception& rException )
{
- SAL_INFO("package.xstor", "Quiet exception: " << rException.Message);
+ SAL_INFO("package.xstor", "Quiet exception: " << rException);
// TODO: set the stream in invalid state or dispose
SAL_WARN( "package.xstor", "The stream become invalid during copiing!" );
throw uno::RuntimeException();
@@ -2362,7 +2362,7 @@ void SAL_CALL OWriteStream::dispose()
}
catch( const uno::Exception& rException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rException);
uno::Any aCaught( ::cppu::getCaughtException() );
throw lang::WrappedTargetRuntimeException("Can not commit/revert the storage!",
static_cast< OWeakObject* >( this ),
@@ -2486,12 +2486,12 @@ sal_Bool SAL_CALL OWriteStream::hasEncryptionData()
}
catch( const uno::RuntimeException& rRuntimeException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rRuntimeException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rRuntimeException);
throw;
}
catch( const uno::Exception& rException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rException);
uno::Any aCaught( ::cppu::getCaughtException() );
throw lang::WrappedTargetRuntimeException( "Problems on hasEncryptionData!",
static_cast< ::cppu::OWeakObject* >( this ),
@@ -2521,7 +2521,7 @@ sal_Bool SAL_CALL OWriteStream::hasByID( const OUString& sID )
}
catch( const container::NoSuchElementException& rNoSuchElementException )
{
- SAL_INFO("package.xstor", "No Element: " << rNoSuchElementException.Message);
+ SAL_INFO("package.xstor", "No Element: " << rNoSuchElementException);
}
return false;
@@ -3156,22 +3156,22 @@ void SAL_CALL OWriteStream::commit()
}
catch( const io::IOException& rIOException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rIOException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rIOException);
throw;
}
catch( const embed::StorageWrappedTargetException& rStorageWrappedTargetException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rStorageWrappedTargetException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rStorageWrappedTargetException);
throw;
}
catch( const uno::RuntimeException& rRuntimeException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rRuntimeException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rRuntimeException);
throw;
}
catch( const uno::Exception& rException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rException);
uno::Any aCaught( ::cppu::getCaughtException() );
throw embed::StorageWrappedTargetException( "Problems on commit!",
static_cast< ::cppu::OWeakObject* >( this ),
@@ -3211,22 +3211,22 @@ void SAL_CALL OWriteStream::revert()
}
catch( const io::IOException& rIOException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rIOException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rIOException);
throw;
}
catch( const embed::StorageWrappedTargetException& rStorageWrappedTargetException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rStorageWrappedTargetException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rStorageWrappedTargetException);
throw;
}
catch( const uno::RuntimeException& rRuntimeException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rRuntimeException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rRuntimeException);
throw;
}
catch( const uno::Exception& rException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rException);
uno::Any aCaught( ::cppu::getCaughtException() );
throw embed::StorageWrappedTargetException( "Problems on revert!",
static_cast< ::cppu::OWeakObject* >( this ),
diff --git a/package/source/xstor/xstorage.cxx b/package/source/xstor/xstorage.cxx
index 9eab732a8d4f..5a58339077bd 100644
--- a/package/source/xstor/xstorage.cxx
+++ b/package/source/xstor/xstorage.cxx
@@ -296,7 +296,7 @@ OStorage_Impl::~OStorage_Impl()
}
catch ( const uno::Exception& rException )
{
- SAL_INFO("package.xstor", "Quiet exception: " << rException.Message);
+ SAL_INFO("package.xstor", "Quiet exception: " << rException);
}
m_pAntiImpl = nullptr;
}
@@ -311,7 +311,7 @@ OStorage_Impl::~OStorage_Impl()
pStorageIter->m_pPointer->InternalDispose( false );
} catch( const uno::Exception& rException )
{
- SAL_INFO("package.xstor", "Quiet exception: " << rException.Message);
+ SAL_INFO("package.xstor", "Quiet exception: " << rException);
}
}
@@ -365,7 +365,7 @@ OStorage_Impl::~OStorage_Impl()
}
catch (const uno::Exception& rException)
{
- SAL_INFO("package.xstor", "Quiet exception: " << rException.Message);
+ SAL_INFO("package.xstor", "Quiet exception: " << rException);
}
}
}
@@ -390,7 +390,7 @@ void OStorage_Impl::RemoveReadOnlyWrap( OStorage& aStorage )
pStorageIter->m_pPointer->InternalDispose( false );
} catch( const uno::Exception& rException )
{
- SAL_INFO("package.xstor", "Quiet exception: " << rException.Message);
+ SAL_INFO("package.xstor", "Quiet exception: " << rException);
}
pStorageIter = m_aReadOnlyWrapVector.erase(pStorageIter);
@@ -535,7 +535,7 @@ void OStorage_Impl::ReadRelInfoIfNecessary()
}
catch (css::uno::Exception & e)
{
- SAL_INFO("package.xstor", "caught Exception " << e.Message);
+ SAL_INFO("package.xstor", "caught " << e);
}
}
else if ( m_nRelInfoStatus == RELINFO_CHANGED_STREAM )
@@ -614,7 +614,7 @@ void OStorage_Impl::ReadContents()
}
catch( const container::NoSuchElementException& rNoSuchElementException )
{
- SAL_WARN( "package.xstor", "hasMoreElements() implementation has problems! " << rNoSuchElementException.Message);
+ SAL_WARN( "package.xstor", "hasMoreElements() implementation has problems! " << rNoSuchElementException);
break;
}
}
@@ -688,7 +688,7 @@ void OStorage_Impl::CopyToStorage( const uno::Reference< embed::XStorage >& xDes
}
catch( const packages::NoEncryptionException& rNoEncryptionException )
{
- SAL_INFO("package.xstor", "No Encryption: " << rNoEncryptionException.Message);
+ SAL_INFO("package.xstor", "No Encryption: " << rNoEncryptionException);
}
}
}
@@ -852,7 +852,7 @@ void OStorage_Impl::CopyStorageElement( SotElement_Impl* pElement,
}
catch( const packages::NoEncryptionException& rNoEncryptionException )
{
- SAL_INFO("package.xstor", "No Encryption: " << rNoEncryptionException.Message);
+ SAL_INFO("package.xstor", "No Encryption: " << rNoEncryptionException);
}
if (bHasCommonEncryptionData && ::package::PackageEncryptionDatasEqual(pElement->m_xStream->GetCachedEncryptionData(), aCommonEncryptionData))
@@ -906,7 +906,7 @@ void OStorage_Impl::CopyStorageElement( SotElement_Impl* pElement,
}
catch( const packages::WrongPasswordException& rWrongPasswordException )
{
- SAL_INFO("package.xstor", "Handled exception: " << rWrongPasswordException.Message);
+ SAL_INFO("package.xstor", "Handled exception: " << rWrongPasswordException);
// If the common storage password does not allow to open the stream
// it could be copied in raw way, the problem is that the StartKey should be the same
@@ -1188,7 +1188,7 @@ void OStorage_Impl::Commit()
throw aException;
}
- SAL_INFO("package.xstor", "Rethrow: " << aException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << aException);
throw;
}
}
@@ -1812,7 +1812,7 @@ OStorage::~OStorage()
}
catch( const uno::RuntimeException& rRuntimeException )
{
- SAL_INFO("package.xstor", "Handled exception: " << rRuntimeException.Message);
+ SAL_INFO("package.xstor", "Handled exception: " << rRuntimeException);
}
}
}
@@ -1857,7 +1857,7 @@ void SAL_CALL OStorage::InternalDispose( bool bNotifyImpl )
xTmp->dispose();
} catch( const uno::Exception& rException )
{
- SAL_INFO("package.xstor", "Quiet exception: " << rException.Message);
+ SAL_INFO("package.xstor", "Quiet exception: " << rException);
}
}
}
@@ -2209,32 +2209,32 @@ void SAL_CALL OStorage::copyToStorage( const uno::Reference< embed::XStorage >&
}
catch( const embed::InvalidStorageException& rInvalidStorageException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rInvalidStorageException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rInvalidStorageException);
throw;
}
catch( const lang::IllegalArgumentException& rIllegalArgumentException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rIllegalArgumentException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rIllegalArgumentException);
throw;
}
catch( const embed::StorageWrappedTargetException& rStorageWrappedTargetException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rStorageWrappedTargetException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rStorageWrappedTargetException);
throw;
}
catch( const io::IOException& rIOException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rIOException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rIOException);
throw;
}
catch( const uno::RuntimeException& rRuntimeException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rRuntimeException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rRuntimeException);
throw;
}
catch( const uno::Exception& rException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rException);
uno::Any aCaught( ::cppu::getCaughtException() );
throw embed::StorageWrappedTargetException( THROW_WHERE "Can't copy storage!",
@@ -2281,37 +2281,37 @@ uno::Reference< io::XStream > SAL_CALL OStorage::openStreamElement(
}
catch( const embed::InvalidStorageException& rInvalidStorageException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rInvalidStorageException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rInvalidStorageException);
throw;
}
catch( const lang::IllegalArgumentException& rIllegalArgumentException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rIllegalArgumentException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rIllegalArgumentException);
throw;
}
catch( const packages::WrongPasswordException& rWrongPasswordException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rWrongPasswordException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rWrongPasswordException);
throw;
}
catch( const embed::StorageWrappedTargetException& rStorageWrappedTargetException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rStorageWrappedTargetException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rStorageWrappedTargetException);
throw;
}
catch( const io::IOException& rIOException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rIOException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rIOException);
throw;
}
catch( const uno::RuntimeException& rRuntimeException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rRuntimeException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rRuntimeException);
throw;
}
catch( const uno::Exception& rException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rException);
uno::Any aCaught( ::cppu::getCaughtException() );
throw embed::StorageWrappedTargetException(THROW_WHERE "Can't open stream element!",
@@ -2433,32 +2433,32 @@ uno::Reference< embed::XStorage > SAL_CALL OStorage::openStorageElement(
}
catch( const embed::InvalidStorageException& rInvalidStorageException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rInvalidStorageException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rInvalidStorageException);
throw;
}
catch( const lang::IllegalArgumentException& rIllegalArgumentException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rIllegalArgumentException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rIllegalArgumentException);
throw;
}
catch( const embed::StorageWrappedTargetException& rStorageWrappedTargetException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rStorageWrappedTargetException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rStorageWrappedTargetException);
throw;
}
catch( const io::IOException& rIOException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rIOException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rIOException);
throw;
}
catch( const uno::RuntimeException& rRuntimeException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rRuntimeException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rRuntimeException);
throw;
}
catch( const uno::Exception& rException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rException);
uno::Any aCaught( ::cppu::getCaughtException() );
throw embed::StorageWrappedTargetException( THROW_WHERE "Can't open storage!",
@@ -2495,37 +2495,37 @@ uno::Reference< io::XStream > SAL_CALL OStorage::cloneStreamElement( const OUStr
}
catch( const embed::InvalidStorageException& rInvalidStorageException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rInvalidStorageException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rInvalidStorageException);
throw;
}
catch( const lang::IllegalArgumentException& rIllegalArgumentException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rIllegalArgumentException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rIllegalArgumentException);
throw;
}
catch( const packages::WrongPasswordException& rWrongPasswordException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rWrongPasswordException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rWrongPasswordException);
throw;
}
catch( const io::IOException& rIOException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rIOException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rIOException);
throw;
}
catch( const embed::StorageWrappedTargetException& rStorageWrappedTargetException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rStorageWrappedTargetException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rStorageWrappedTargetException);
throw;
}
catch( const uno::RuntimeException& rRuntimeException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rRuntimeException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rRuntimeException);
throw;
}
catch( const uno::Exception& rException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rException);
uno::Any aCaught( ::cppu::getCaughtException() );
throw embed::StorageWrappedTargetException( THROW_WHERE "Can't clone stream!",
@@ -2558,32 +2558,32 @@ void SAL_CALL OStorage::copyLastCommitTo(
}
catch( const embed::InvalidStorageException& rInvalidStorageException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rInvalidStorageException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rInvalidStorageException);
throw;
}
catch( const lang::IllegalArgumentException& rIllegalArgumentException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rIllegalArgumentException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rIllegalArgumentException);
throw;
}
catch( const embed::StorageWrappedTargetException& rStorageWrappedTargetException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rStorageWrappedTargetException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rStorageWrappedTargetException);
throw;
}
catch( const io::IOException& rIOException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rIOException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rIOException);
throw;
}
catch( const uno::RuntimeException& rRuntimeException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rRuntimeException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rRuntimeException);
throw;
}
catch( const uno::Exception& rException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rException);
uno::Any aCaught( ::cppu::getCaughtException() );
throw embed::StorageWrappedTargetException( THROW_WHERE "Can't copy last commit version!",
@@ -2637,32 +2637,32 @@ void SAL_CALL OStorage::copyStorageElementLastCommitTo(
}
catch( const embed::InvalidStorageException& rInvalidStorageException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rInvalidStorageException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rInvalidStorageException);
throw;
}
catch( const lang::IllegalArgumentException& rIllegalArgumentException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rIllegalArgumentException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rIllegalArgumentException);
throw;
}
catch( const io::IOException& rIOException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rIOException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rIOException);
throw;
}
catch( const embed::StorageWrappedTargetException& rStorageWrappedTargetException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rStorageWrappedTargetException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rStorageWrappedTargetException);
throw;
}
catch( const uno::RuntimeException& rRuntimeException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rRuntimeException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rRuntimeException);
throw;
}
catch( const uno::Exception& rException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rException);
uno::Any aCaught( ::cppu::getCaughtException() );
throw embed::StorageWrappedTargetException( THROW_WHERE "Can't copy last commit element version!",
@@ -2695,27 +2695,27 @@ sal_Bool SAL_CALL OStorage::isStreamElement( const OUString& aElementName )
}
catch( const embed::InvalidStorageException& rInvalidStorageException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rInvalidStorageException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rInvalidStorageException);
throw;
}
catch( const lang::IllegalArgumentException& rIllegalArgumentException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rIllegalArgumentException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rIllegalArgumentException);
throw;
}
catch( const container::NoSuchElementException& rNoSuchElementException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rNoSuchElementException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rNoSuchElementException);
throw;
}
catch( const uno::RuntimeException& rRuntimeException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rRuntimeException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rRuntimeException);
throw;
}
catch( const uno::Exception& rException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rException);
uno::Any aCaught( ::cppu::getCaughtException() );
throw lang::WrappedTargetRuntimeException( THROW_WHERE "Can't detect whether it is a stream!",
@@ -2753,27 +2753,27 @@ sal_Bool SAL_CALL OStorage::isStorageElement( const OUString& aElementName )
}
catch( const embed::InvalidStorageException& rInvalidStorageException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rInvalidStorageException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rInvalidStorageException);
throw;
}
catch( const lang::IllegalArgumentException& rIllegalArgumentException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rIllegalArgumentException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rIllegalArgumentException);
throw;
}
catch( const container::NoSuchElementException& rNoSuchElementException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rNoSuchElementException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rNoSuchElementException);
throw;
}
catch( const uno::RuntimeException& rRuntimeException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rRuntimeException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rRuntimeException);
throw;
}
catch( const uno::Exception& rException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rException);
uno::Any aCaught( ::cppu::getCaughtException() );
throw lang::WrappedTargetRuntimeException( THROW_WHERE "can't detect whether it is a storage",
@@ -2822,37 +2822,37 @@ void SAL_CALL OStorage::removeElement( const OUString& aElementName )
}
catch( const embed::InvalidStorageException& rInvalidStorageException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rInvalidStorageException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rInvalidStorageException);
throw;
}
catch( const lang::IllegalArgumentException& rIllegalArgumentException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rIllegalArgumentException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rIllegalArgumentException);
throw;
}
catch( const container::NoSuchElementException& rNoSuchElementException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rNoSuchElementException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rNoSuchElementException);
throw;
}
catch( const io::IOException& rIOException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rIOException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rIOException);
throw;
}
catch( const embed::StorageWrappedTargetException& rStorageWrappedTargetException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rStorageWrappedTargetException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rStorageWrappedTargetException);
throw;
}
catch( const uno::RuntimeException& rRuntimeException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rRuntimeException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rRuntimeException);
throw;
}
catch( const uno::Exception& rException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rException);
uno::Any aCaught( ::cppu::getCaughtException() );
throw embed::StorageWrappedTargetException( THROW_WHERE "Can't remove element!",
@@ -2902,42 +2902,42 @@ void SAL_CALL OStorage::renameElement( const OUString& aElementName, const OUStr
}
catch( const embed::InvalidStorageException& rInvalidStorageException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rInvalidStorageException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rInvalidStorageException);
throw;
}
catch( const lang::IllegalArgumentException& rIllegalArgumentException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rIllegalArgumentException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rIllegalArgumentException);
throw;
}
catch( const container::NoSuchElementException& rNoSuchElementException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rNoSuchElementException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rNoSuchElementException);
throw;
}
catch( const container::ElementExistException& rElementExistException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rElementExistException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rElementExistException);
throw;
}
catch( const io::IOException& rIOException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rIOException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rIOException);
throw;
}
catch( const embed::StorageWrappedTargetException& rStorageWrappedTargetException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rStorageWrappedTargetException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rStorageWrappedTargetException);
throw;
}
catch( const uno::RuntimeException& rRuntimeException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rRuntimeException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rRuntimeException);
throw;
}
catch( const uno::Exception& rException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rException);
uno::Any aCaught( ::cppu::getCaughtException() );
throw embed::StorageWrappedTargetException( THROW_WHERE "Can't rename element!",
@@ -2987,42 +2987,42 @@ void SAL_CALL OStorage::copyElementTo( const OUString& aElementName,
}
catch( const embed::InvalidStorageException& rInvalidStorageException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rInvalidStorageException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rInvalidStorageException);
throw;
}
catch( const lang::IllegalArgumentException& rIllegalArgumentException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rIllegalArgumentException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rIllegalArgumentException);
throw;
}
catch( const container::NoSuchElementException& rNoSuchElementException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rNoSuchElementException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rNoSuchElementException);
throw;
}
catch( const container::ElementExistException& rElementExistException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rElementExistException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rElementExistException);
throw;
}
catch( const embed::StorageWrappedTargetException& rStorageWrappedTargetException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rStorageWrappedTargetException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rStorageWrappedTargetException);
throw;
}
catch( const io::IOException& rIOException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rIOException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rIOException);
throw;
}
catch( const uno::RuntimeException& rRuntimeException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rRuntimeException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rRuntimeException);
throw;
}
catch( const uno::Exception& rException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rException);
uno::Any aCaught( ::cppu::getCaughtException() );
throw embed::StorageWrappedTargetException( THROW_WHERE "Can't copy element!",
@@ -3075,42 +3075,42 @@ void SAL_CALL OStorage::moveElementTo( const OUString& aElementName,
}
catch( const embed::InvalidStorageException& rInvalidStorageException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rInvalidStorageException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rInvalidStorageException);
throw;
}
catch( const lang::IllegalArgumentException& rIllegalArgumentException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rIllegalArgumentException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rIllegalArgumentException);
throw;
}
catch( const container::NoSuchElementException& rNoSuchElementException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rNoSuchElementException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rNoSuchElementException);
throw;
}
catch( const container::ElementExistException& rElementExistException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rElementExistException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rElementExistException);
throw;
}
catch( const embed::StorageWrappedTargetException& rStorageWrappedTargetException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rStorageWrappedTargetException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rStorageWrappedTargetException);
throw;
}
catch( const io::IOException& rIOException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rIOException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rIOException);
throw;
}
catch( const uno::RuntimeException& rRuntimeException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rRuntimeException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rRuntimeException);
throw;
}
catch( const uno::Exception& rException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rException);
uno::Any aCaught( ::cppu::getCaughtException() );
throw embed::StorageWrappedTargetException( THROW_WHERE "Can't move element!",
@@ -3162,42 +3162,42 @@ uno::Reference< io::XStream > SAL_CALL OStorage::openEncryptedStream(
}
catch( const embed::InvalidStorageException& rInvalidStorageException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rInvalidStorageException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rInvalidStorageException);
throw;
}
catch( const lang::IllegalArgumentException& rIllegalArgumentException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rIllegalArgumentException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rIllegalArgumentException);
throw;
}
catch( const packages::NoEncryptionException& rNoEncryptionException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rNoEncryptionException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rNoEncryptionException);
throw;
}
catch( const packages::WrongPasswordException& rWrongPasswordException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rWrongPasswordException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rWrongPasswordException);
throw;
}
catch( const embed::StorageWrappedTargetException& rStorageWrappedTargetException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rStorageWrappedTargetException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rStorageWrappedTargetException);
throw;
}
catch( const io::IOException& rIOException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rIOException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rIOException);
throw;
}
catch( const uno::RuntimeException& rRuntimeException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rRuntimeException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rRuntimeException);
throw;
}
catch( const uno::Exception& rException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rException);
uno::Any aCaught( ::cppu::getCaughtException() );
throw embed::StorageWrappedTargetException( THROW_WHERE "Can't open encrypted stream!",
@@ -3240,42 +3240,42 @@ uno::Reference< io::XStream > SAL_CALL OStorage::cloneEncryptedStream(
}
catch( const embed::InvalidStorageException& rInvalidStorageException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rInvalidStorageException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rInvalidStorageException);
throw;
}
catch( const lang::IllegalArgumentException& rIllegalArgumentException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rIllegalArgumentException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rIllegalArgumentException);
throw;
}
catch( const packages::NoEncryptionException& rNoEncryptionException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rNoEncryptionException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rNoEncryptionException);
throw;
}
catch( const packages::WrongPasswordException& rWrongPasswordException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rWrongPasswordException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rWrongPasswordException);
throw;
}
catch( const io::IOException& rIOException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rIOException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rIOException);
throw;
}
catch( const embed::StorageWrappedTargetException& rStorageWrappedTargetException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rStorageWrappedTargetException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rStorageWrappedTargetException);
throw;
}
catch( const uno::RuntimeException& rRuntimeException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rRuntimeException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rRuntimeException);
throw;
}
catch( const uno::Exception& rException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rException);
uno::Any aCaught( ::cppu::getCaughtException() );
throw embed::StorageWrappedTargetException( THROW_WHERE "Can't clone encrypted stream!",
@@ -3335,37 +3335,37 @@ uno::Reference< io::XInputStream > SAL_CALL OStorage::getPlainRawStreamElement(
}
catch( const embed::InvalidStorageException& rInvalidStorageException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rInvalidStorageException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rInvalidStorageException);
throw;
}
catch( const lang::IllegalArgumentException& rIllegalArgumentException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rIllegalArgumentException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rIllegalArgumentException);
throw;
}
catch( const container::NoSuchElementException& rNoSuchElementException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rNoSuchElementException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rNoSuchElementException);
throw;
}
catch( const embed::StorageWrappedTargetException& rStorageWrappedTargetException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rStorageWrappedTargetException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rStorageWrappedTargetException);
throw;
}
catch( const io::IOException& rIOException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rIOException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rIOException);
throw;
}
catch( const uno::RuntimeException& rRuntimeException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rRuntimeException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rRuntimeException);
throw;
}
catch( const uno::Exception& rException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rException);
uno::Any aCaught( ::cppu::getCaughtException() );
throw embed::StorageWrappedTargetException( THROW_WHERE "Can't get plain raw stream!",
@@ -3430,42 +3430,42 @@ uno::Reference< io::XInputStream > SAL_CALL OStorage::getRawEncrStreamElement(
}
catch( const embed::InvalidStorageException& rInvalidStorageException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rInvalidStorageException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rInvalidStorageException);
throw;
}
catch( const lang::IllegalArgumentException& rIllegalArgumentException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rIllegalArgumentException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rIllegalArgumentException);
throw;
}
catch( const packages::NoEncryptionException& rNoEncryptionException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rNoEncryptionException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rNoEncryptionException);
throw;
}
catch( const container::NoSuchElementException& rNoSuchElementException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rNoSuchElementException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rNoSuchElementException);
throw;
}
catch( const embed::StorageWrappedTargetException& rStorageWrappedTargetException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rStorageWrappedTargetException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rStorageWrappedTargetException);
throw;
}
catch( const io::IOException& rIOException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rIOException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rIOException);
throw;
}
catch( const uno::RuntimeException& rRuntimeException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rRuntimeException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rRuntimeException);
throw;
}
catch( const uno::Exception& rException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rException);
uno::Any aCaught( ::cppu::getCaughtException() );
throw embed::StorageWrappedTargetException( THROW_WHERE "Can't get raw stream!",
@@ -3509,42 +3509,42 @@ void SAL_CALL OStorage::insertRawEncrStreamElement( const OUString& aStreamName,
}
catch( const embed::InvalidStorageException& rInvalidStorageException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rInvalidStorageException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rInvalidStorageException);
throw;
}
catch( const lang::IllegalArgumentException& rIllegalArgumentException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rIllegalArgumentException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rIllegalArgumentException);
throw;
}
catch( const packages::NoRawFormatException& rNoRawFormatException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rNoRawFormatException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rNoRawFormatException);
throw;
}
catch( const container::ElementExistException& rElementExistException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rElementExistException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rElementExistException);
throw;
}
catch( const embed::StorageWrappedTargetException& rStorageWrappedTargetException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rStorageWrappedTargetException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rStorageWrappedTargetException);
throw;
}
catch( const io::IOException& rIOException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rIOException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rIOException);
throw;
}
catch( const uno::RuntimeException& rRuntimeException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rRuntimeException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rRuntimeException);
throw;
}
catch( const uno::Exception& rException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rException);
uno::Any aCaught( ::cppu::getCaughtException() );
throw embed::StorageWrappedTargetException( THROW_WHERE "Can't insert raw stream!",
@@ -3580,22 +3580,22 @@ void SAL_CALL OStorage::commit()
}
catch( const io::IOException& rIOException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rIOException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rIOException);
throw;
}
catch( const embed::StorageWrappedTargetException& rStorageWrappedTargetException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rStorageWrappedTargetException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rStorageWrappedTargetException);
throw;
}
catch( const uno::RuntimeException& rRuntimeException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rRuntimeException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rRuntimeException);
throw;
}
catch( const uno::Exception& rException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rException);
uno::Any aCaught( ::cppu::getCaughtException() );
throw embed::StorageWrappedTargetException( THROW_WHERE "Problems on commit!",
@@ -3644,22 +3644,22 @@ void SAL_CALL OStorage::revert()
}
catch( const io::IOException& rIOException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rIOException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rIOException);
throw;
}
catch( const embed::StorageWrappedTargetException& rStorageWrappedTargetException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rStorageWrappedTargetException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rStorageWrappedTargetException);
throw;
}
catch( const uno::RuntimeException& rRuntimeException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rRuntimeException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rRuntimeException);
throw;
}
catch( const uno::Exception& rException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rException);
uno::Any aCaught( ::cppu::getCaughtException() );
throw embed::StorageWrappedTargetException( THROW_WHERE "Problems on revert!",
@@ -3808,22 +3808,22 @@ uno::Any SAL_CALL OStorage::getByName( const OUString& aName )
}
catch( const container::NoSuchElementException& rNoSuchElementException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rNoSuchElementException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rNoSuchElementException);
throw;
}
catch( const lang::WrappedTargetException& rWrappedTargetException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rWrappedTargetException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rWrappedTargetException);
throw;
}
catch( const uno::RuntimeException& rRuntimeException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rRuntimeException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rRuntimeException);
throw;
}
catch( const uno::Exception& rException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rException);
uno::Any aCaught( ::cppu::getCaughtException() );
throw lang::WrappedTargetException( THROW_WHERE "Can not open storage!",
@@ -3850,12 +3850,12 @@ uno::Sequence< OUString > SAL_CALL OStorage::getElementNames()
}
catch( const uno::RuntimeException& rRuntimeException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rRuntimeException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rRuntimeException);
throw;
}
catch ( const uno::Exception& rException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rException);
uno::Any aCaught( ::cppu::getCaughtException() );
throw lang::WrappedTargetRuntimeException( THROW_WHERE "Can not open storage!",
@@ -3887,12 +3887,12 @@ sal_Bool SAL_CALL OStorage::hasByName( const OUString& aName )
}
catch( const uno::RuntimeException& rRuntimeException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rRuntimeException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rRuntimeException);
throw;
}
catch ( const uno::Exception& rException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rException);
uno::Any aCaught( ::cppu::getCaughtException() );
throw lang::WrappedTargetRuntimeException( THROW_WHERE "Can not open storage!",
@@ -3933,12 +3933,12 @@ sal_Bool SAL_CALL OStorage::hasElements()
}
catch( const uno::RuntimeException& rRuntimeException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rRuntimeException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rRuntimeException);
throw;
}
catch( const uno::Exception& rException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rException);
uno::Any aCaught( ::cppu::getCaughtException() );
throw lang::WrappedTargetRuntimeException( THROW_WHERE "Can not open storage!",
@@ -3964,12 +3964,12 @@ void SAL_CALL OStorage::dispose()
}
catch( const uno::RuntimeException& rRuntimeException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rRuntimeException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rRuntimeException);
throw;
}
catch( const uno::Exception& rException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rException);
uno::Any aCaught( ::cppu::getCaughtException() );
throw lang::WrappedTargetRuntimeException( THROW_WHERE "Can not open storage!",
@@ -4036,12 +4036,12 @@ void SAL_CALL OStorage::removeEncryption()
}
catch ( const uno::RuntimeException& rRuntimeException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rRuntimeException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rRuntimeException);
throw;
}
catch ( const uno::Exception& rException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rException);
uno::Any aCaught( ::cppu::getCaughtException() );
throw lang::WrappedTargetRuntimeException( THROW_WHERE "Can not open package!",
@@ -4063,14 +4063,14 @@ void SAL_CALL OStorage::removeEncryption()
}
catch( const uno::RuntimeException& rRException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rRException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rRException);
SAL_WARN( "package.xstor", "The call must not fail, it is pretty simple!" );
throw;
}
catch( const uno::Exception& rException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rException);
SAL_WARN( "package.xstor", "The call must not fail, it is pretty simple!" );
throw io::IOException( THROW_WHERE );
@@ -4104,12 +4104,12 @@ void SAL_CALL OStorage::setEncryptionData( const uno::Sequence< beans::NamedValu
}
catch ( const uno::RuntimeException& rRuntimeException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rRuntimeException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rRuntimeException);
throw;
}
catch ( const uno::Exception& rException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rException);
uno::Any aCaught( ::cppu::getCaughtException() );
throw lang::WrappedTargetRuntimeException( THROW_WHERE "Can not open package!",
@@ -4129,7 +4129,7 @@ void SAL_CALL OStorage::setEncryptionData( const uno::Sequence< beans::NamedValu
}
catch( const uno::Exception& rException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rException);
throw io::IOException( THROW_WHERE );
}
@@ -4169,12 +4169,12 @@ void SAL_CALL OStorage::setEncryptionAlgorithms( const uno::Sequence< beans::Nam
}
catch ( const uno::RuntimeException& aRuntimeException )
{
- SAL_INFO("package.xstor", "Rethrow: " << aRuntimeException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << aRuntimeException);
throw;
}
catch ( const uno::Exception& aException )
{
- SAL_INFO("package.xstor", "Rethrow: " << aException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << aException);
uno::Any aCaught( ::cppu::getCaughtException() );
throw lang::WrappedTargetRuntimeException( THROW_WHERE "Can not open package!",
@@ -4190,12 +4190,12 @@ void SAL_CALL OStorage::setEncryptionAlgorithms( const uno::Sequence< beans::Nam
}
catch ( const uno::RuntimeException& aRuntimeException )
{
- SAL_INFO("package.xstor", "Rethrow: " << aRuntimeException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << aRuntimeException);
throw;
}
catch( const uno::Exception& aException )
{
- SAL_INFO("package.xstor", "Rethrow: " << aException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << aException);
uno::Any aCaught( ::cppu::getCaughtException() );
throw lang::WrappedTargetRuntimeException( THROW_WHERE "Can not open package!",
@@ -4227,12 +4227,12 @@ uno::Sequence< beans::NamedValue > SAL_CALL OStorage::getEncryptionAlgorithms()
}
catch ( const uno::RuntimeException& aRuntimeException )
{
- SAL_INFO("package.xstor", "Rethrow: " << aRuntimeException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << aRuntimeException);
throw;
}
catch ( const uno::Exception& aException )
{
- SAL_INFO("package.xstor", "Rethrow: " << aException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << aException);
uno::Any aCaught( ::cppu::getCaughtException() );
throw lang::WrappedTargetRuntimeException( THROW_WHERE "Can not open package!",
@@ -4247,12 +4247,12 @@ uno::Sequence< beans::NamedValue > SAL_CALL OStorage::getEncryptionAlgorithms()
}
catch ( const uno::RuntimeException& aRuntimeException )
{
- SAL_INFO("package.xstor", "Rethrow: " << aRuntimeException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << aRuntimeException);
throw;
}
catch( const uno::Exception& aException )
{
- SAL_INFO("package.xstor", "Rethrow: " << aException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << aException);
uno::Any aCaught( ::cppu::getCaughtException() );
throw lang::WrappedTargetRuntimeException( THROW_WHERE "Can not open package!",
@@ -4397,12 +4397,12 @@ uno::Any SAL_CALL OStorage::getPropertyValue( const OUString& aPropertyName )
}
catch ( const uno::RuntimeException& rRuntimeException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rRuntimeException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rRuntimeException);
throw;
}
catch ( const uno::Exception& rException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rException);
uno::Any aCaught( ::cppu::getCaughtException() );
throw lang::WrappedTargetException(
@@ -4454,12 +4454,12 @@ uno::Any SAL_CALL OStorage::getPropertyValue( const OUString& aPropertyName )
}
catch ( const uno::RuntimeException& rRuntimeException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rRuntimeException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rRuntimeException);
throw;
}
catch ( const uno::Exception& rException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rException);
uno::Any aCaught( ::cppu::getCaughtException() );
throw lang::WrappedTargetException( THROW_WHERE "Can not open package!",
@@ -4556,7 +4556,7 @@ sal_Bool SAL_CALL OStorage::hasByID( const OUString& sID )
}
catch( const container::NoSuchElementException& rNoSuchElementException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rNoSuchElementException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rNoSuchElementException);
}
return false;
@@ -4941,37 +4941,37 @@ void SAL_CALL OStorage::insertStreamElementDirect(
}
catch( const embed::InvalidStorageException& rInvalidStorageException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rInvalidStorageException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rInvalidStorageException);
throw;
}
catch( const lang::IllegalArgumentException& rIllegalArgumentException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rIllegalArgumentException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rIllegalArgumentException);
throw;
}
catch( const container::ElementExistException& rElementExistException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rElementExistException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rElementExistException);
throw;
}
catch( const embed::StorageWrappedTargetException& rStorageWrappedTargetException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rStorageWrappedTargetException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rStorageWrappedTargetException);
throw;
}
catch( const io::IOException& rIOException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rIOException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rIOException);
throw;
}
catch( const uno::RuntimeException& rRuntimeException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rRuntimeException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rRuntimeException);
throw;
}
catch( const uno::Exception& rException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rException);
uno::Any aCaught( ::cppu::getCaughtException() );
throw embed::StorageWrappedTargetException( THROW_WHERE "Can't insert stream directly!",
@@ -5019,42 +5019,42 @@ void SAL_CALL OStorage::copyElementDirectlyTo(
}
catch( const embed::InvalidStorageException& rInvalidStorageException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rInvalidStorageException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rInvalidStorageException);
throw;
}
catch( const lang::IllegalArgumentException& rIllegalArgumentException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rIllegalArgumentException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rIllegalArgumentException);
throw;
}
catch( const container::NoSuchElementException& rNoSuchElementException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rNoSuchElementException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rNoSuchElementException);
throw;
}
catch( const container::ElementExistException& rElementExistException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rElementExistException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rElementExistException);
throw;
}
catch( const embed::StorageWrappedTargetException& rStorageWrappedTargetException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rStorageWrappedTargetException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rStorageWrappedTargetException);
throw;
}
catch( const io::IOException& rIOException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rIOException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rIOException);
throw;
}
catch( const uno::RuntimeException& rRuntimeException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rRuntimeException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rRuntimeException);
throw;
}
catch( const uno::Exception& rException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rException);
uno::Any aCaught( ::cppu::getCaughtException() );
throw embed::StorageWrappedTargetException( THROW_WHERE "Can't copy element direcly!",
@@ -5085,32 +5085,32 @@ void SAL_CALL OStorage::writeAndAttachToStream( const uno::Reference< io::XStrea
}
catch( const embed::InvalidStorageException& rInvalidStorageException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rInvalidStorageException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rInvalidStorageException);
throw;
}
catch( const lang::IllegalArgumentException& rIllegalArgumentException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rIllegalArgumentException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rIllegalArgumentException);
throw;
}
catch( const embed::StorageWrappedTargetException& rStorageWrappedTargetException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rStorageWrappedTargetException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rStorageWrappedTargetException);
throw;
}
catch( const io::IOException& rIOException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rIOException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rIOException);
throw;
}
catch( const uno::RuntimeException& rRuntimeException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rRuntimeException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rRuntimeException);
throw;
}
catch( const uno::Exception& rException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rException);
uno::Any aCaught( ::cppu::getCaughtException() );
throw embed::StorageWrappedTargetException( THROW_WHERE "Can't write and attach to stream!",
@@ -5155,32 +5155,32 @@ void SAL_CALL OStorage::attachToURL( const OUString& sURL,
}
catch( const embed::InvalidStorageException& rInvalidStorageException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rInvalidStorageException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rInvalidStorageException);
throw;
}
catch( const lang::IllegalArgumentException& rIllegalArgumentException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rIllegalArgumentException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rIllegalArgumentException);
throw;
}
catch( const embed::StorageWrappedTargetException& rStorageWrappedTargetException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rStorageWrappedTargetException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rStorageWrappedTargetException);
throw;
}
catch( const io::IOException& rIOException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rIOException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rIOException);
throw;
}
catch( const uno::RuntimeException& rRuntimeException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rRuntimeException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rRuntimeException);
throw;
}
catch( const uno::Exception& rException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rException);
uno::Any aCaught( ::cppu::getCaughtException() );
throw embed::StorageWrappedTargetException( THROW_WHERE "Can't attach to URL!",
@@ -5226,47 +5226,47 @@ uno::Any SAL_CALL OStorage::getElementPropertyValue( const OUString& aElementNam
}
catch( const embed::InvalidStorageException& rInvalidStorageException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rInvalidStorageException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rInvalidStorageException);
throw;
}
catch( const lang::IllegalArgumentException& rIllegalArgumentException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rIllegalArgumentException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rIllegalArgumentException);
throw;
}
catch( const container::NoSuchElementException& rNoSuchElementException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rNoSuchElementException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rNoSuchElementException);
throw;
}
catch( const beans::UnknownPropertyException& rUnknownPropertyException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rUnknownPropertyException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rUnknownPropertyException);
throw;
}
catch( const beans::PropertyVetoException& rPropertyVetoException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rPropertyVetoException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rPropertyVetoException);
throw;
}
catch( const embed::StorageWrappedTargetException& rStorageWrappedTargetException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rStorageWrappedTargetException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rStorageWrappedTargetException);
throw;
}
catch( const io::IOException& rIOException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rIOException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rIOException);
throw;
}
catch( const uno::RuntimeException& rRuntimeException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rRuntimeException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rRuntimeException);
throw;
}
catch( const uno::Exception& rException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rException);
uno::Any aCaught( ::cppu::getCaughtException() );
throw embed::StorageWrappedTargetException( THROW_WHERE "Can't get element property!",
@@ -5305,37 +5305,37 @@ void SAL_CALL OStorage::copyStreamElementData( const OUString& aStreamName, cons
}
catch( const embed::InvalidStorageException& rInvalidStorageException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rInvalidStorageException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rInvalidStorageException);
throw;
}
catch( const lang::IllegalArgumentException& rIllegalArgumentException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rIllegalArgumentException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rIllegalArgumentException);
throw;
}
catch( const packages::WrongPasswordException& rWrongPasswordException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rWrongPasswordException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rWrongPasswordException);
throw;
}
catch( const io::IOException& rIOException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rIOException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rIOException);
throw;
}
catch( const embed::StorageWrappedTargetException& rStorageWrappedTargetException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rStorageWrappedTargetException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rStorageWrappedTargetException);
throw;
}
catch( const uno::RuntimeException& rRuntimeException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rRuntimeException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rRuntimeException);
throw;
}
catch( const uno::Exception& rException )
{
- SAL_INFO("package.xstor", "Rethrow: " << rException.Message);
+ SAL_INFO("package.xstor", "Rethrow: " << rException);
uno::Any aCaught( ::cppu::getCaughtException() );
throw embed::StorageWrappedTargetException( THROW_WHERE "Can't copy stream data!",
diff --git a/package/source/zipapi/XBufferedThreadedStream.cxx b/package/source/zipapi/XBufferedThreadedStream.cxx
index 11428e076d44..57f88e7ccc83 100644
--- a/package/source/zipapi/XBufferedThreadedStream.cxx
+++ b/package/source/zipapi/XBufferedThreadedStream.cxx
@@ -29,17 +29,17 @@ private:
}
catch( const RuntimeException &e )
{
- SAL_WARN("package", "RuntimeException from unbuffered Stream " << e.Message );
+ SAL_WARN("package", "RuntimeException from unbuffered Stream " << e );
mxStream.saveException( new RuntimeException( e ) );
}
catch( const ZipIOException &e )
{
- SAL_WARN("package", "ZipIOException from unbuffered Stream " << e.Message );
+ SAL_WARN("package", "ZipIOException from unbuffered Stream " << e );
mxStream.saveException( new ZipIOException( e ) );
}
catch( const Exception &e )
{
- SAL_WARN("package", "Unexpected exception " << e.Message );
+ SAL_WARN("package", "Unexpected " << e );
mxStream.saveException( new Exception( e ) );
}
diff --git a/package/source/zipapi/XUnbufferedStream.cxx b/package/source/zipapi/XUnbufferedStream.cxx
index 0292217d966f..75bc769d69ec 100644
--- a/package/source/zipapi/XUnbufferedStream.cxx
+++ b/package/source/zipapi/XUnbufferedStream.cxx
@@ -137,7 +137,7 @@ XUnbufferedStream::XUnbufferedStream(
} catch( Exception& e )
{
// in case of problem the size will stay set to 0
- SAL_WARN("package", "ignoring Exception " + e.Message);
+ SAL_WARN("package", "ignoring " << e);
}
mnZipEnd = mnZipCurrent + mnZipSize;
diff --git a/package/source/zippackage/ZipPackageStream.cxx b/package/source/zippackage/ZipPackageStream.cxx
index 00efe9cf2610..160dfa8d310f 100644
--- a/package/source/zippackage/ZipPackageStream.cxx
+++ b/package/source/zippackage/ZipPackageStream.cxx
@@ -986,7 +986,7 @@ uno::Reference< io::XInputStream > SAL_CALL ZipPackageStream::getInputStream()
}
catch ( Exception &ex )
{
- SAL_WARN( "package", "Exception is thrown during stream wrapping!" << ex.Message);
+ SAL_WARN( "package", "Exception is thrown during stream wrapping!" << ex);
return uno::Reference < io::XInputStream > ();
}
}
diff --git a/reportdesign/source/filter/xml/xmlfilter.cxx b/reportdesign/source/filter/xml/xmlfilter.cxx
index 219593595726..e5fb7227aa0a 100644
--- a/reportdesign/source/filter/xml/xmlfilter.cxx
+++ b/reportdesign/source/filter/xml/xmlfilter.cxx
@@ -149,7 +149,7 @@ ErrCode ReadThroughComponent(
catch (const SAXParseException& r)
{
SAL_WARN( "reportdesign", "SAX parse exception caught while importing: "
- << r.Message << " "
+ << r << " "
<< r.LineNumber << ',' << r.ColumnNumber );
return ErrCode(1);
}
diff --git a/sax/source/fastparser/fastparser.cxx b/sax/source/fastparser/fastparser.cxx
index 5281ca14920e..40608010b53e 100644
--- a/sax/source/fastparser/fastparser.cxx
+++ b/sax/source/fastparser/fastparser.cxx
@@ -621,7 +621,7 @@ void Entity::saveException( const Any & e )
// unexpectedly some 'startElements' produce an UNO_QUERY_THROW
// for XComponent; and yet expect to continue parsing.
SAL_WARN("sax", "Unexpected exception from XML parser "
- << e.get<Exception>().Message);
+ << e.get<Exception>());
maSavedException = e;
}
diff --git a/sc/source/filter/excel/xlroot.cxx b/sc/source/filter/excel/xlroot.cxx
index 973902fdf42f..831c744f22fb 100644
--- a/sc/source/filter/excel/xlroot.cxx
+++ b/sc/source/filter/excel/xlroot.cxx
@@ -148,7 +148,7 @@ XclRootData::XclRootData( XclBiff eBiff, SfxMedium& rMedium,
}
catch( const Exception& e)
{
- SAL_WARN( "sc", "XclRootData::XclRootData - cannot get output device info: " << e.Message );
+ SAL_WARN( "sc", "XclRootData::XclRootData - cannot get output device info: " << e );
}
}
diff --git a/sc/source/filter/oox/excelfilter.cxx b/sc/source/filter/oox/excelfilter.cxx
index e624e34b426a..d10669c440d3 100644
--- a/sc/source/filter/oox/excelfilter.cxx
+++ b/sc/source/filter/oox/excelfilter.cxx
@@ -87,7 +87,7 @@ bool ExcelFilter::importDocument()
}
catch( const Exception& e )
{
- SAL_WARN("sc", "exception when importing document properties " << e.Message);
+ SAL_WARN("sc", "exception when importing document properties " << e);
}
catch( ... )
{
diff --git a/sc/source/filter/xml/xmlwrap.cxx b/sc/source/filter/xml/xmlwrap.cxx
index 6e87a29d4f57..2b4560480499 100644
--- a/sc/source/filter/xml/xmlwrap.cxx
+++ b/sc/source/filter/xml/xmlwrap.cxx
@@ -211,7 +211,7 @@ ErrCode ScXMLImportWrapper::ImportFromComponent(const uno::Reference<uno::XCompo
nReturn = ERRCODE_SFX_WRONGPASSWORD;
else
{
- SAL_WARN("sc.filter", "SAX parse exception caught while importing: " << r.Message);
+ SAL_WARN("sc.filter", "SAX parse exception caught while importing: " << r);
OUString sErr = OUString::number( r.LineNumber ) +
"," +
@@ -242,26 +242,26 @@ ErrCode ScXMLImportWrapper::ImportFromComponent(const uno::Reference<uno::XCompo
nReturn = ERRCODE_SFX_WRONGPASSWORD;
else
{
- SAL_WARN("sc.filter", "SAX exception caught while importing: " << r.Message);
+ SAL_WARN("sc.filter", "SAX exception caught while importing: " << r);
nReturn = SCERR_IMPORT_FORMAT;
}
}
catch( const packages::zip::ZipIOException& r )
{
- SAL_WARN("sc.filter", "Zip exception caught while importing: " << r.Message);
+ SAL_WARN("sc.filter", "Zip exception caught while importing: " << r);
nReturn = ERRCODE_IO_BROKENPACKAGE;
}
catch( const io::IOException& r )
{
- SAL_WARN("sc.filter", "IO exception caught while importing: " << r.Message);
+ SAL_WARN("sc.filter", "IO exception caught while importing: " << r);
nReturn = SCERR_IMPORT_OPEN;
}
catch( const uno::Exception& r )
{
- SAL_WARN("sc.filter", "uno exception caught while importing: " << r.Message);
+ SAL_WARN("sc.filter", "uno exception caught while importing: " << r);
nReturn = SCERR_IMPORT_UNKNOWN;
}
diff --git a/sc/source/ui/Accessibility/DrawModelBroadcaster.cxx b/sc/source/ui/Accessibility/DrawModelBroadcaster.cxx
index 933190dd4069..58ad10defe40 100644
--- a/sc/source/ui/Accessibility/DrawModelBroadcaster.cxx
+++ b/sc/source/ui/Accessibility/DrawModelBroadcaster.cxx
@@ -69,7 +69,7 @@ void ScDrawModelBroadcaster::Notify( SfxBroadcaster&,
}
catch( const uno::RuntimeException& r )
{
- SAL_WARN("sc.ui", "Runtime exception caught while notifying shape. : " << r.Message);
+ SAL_WARN("sc.ui", "Runtime exception caught while notifying shape. : " << r);
}
}
}
diff --git a/sc/source/ui/docshell/docsh8.cxx b/sc/source/ui/docshell/docsh8.cxx
index bdb2032c36ac..680addc70bfd 100644
--- a/sc/source/ui/docshell/docsh8.cxx
+++ b/sc/source/ui/docshell/docsh8.cxx
@@ -1009,7 +1009,7 @@ ErrCode ScDocShell::DBaseExport( const OUString& rFullFileName, rtl_TextEncoding
{
sal_Int32 nError = aException.ErrorCode;
SAL_WARN("sc", "ScDocShell::DBaseExport: SQLException ErrorCode: " << nError << ", SQLState: " << aException.SQLState <<
- ", Message: " << aException.Message << "\n");
+ ", Message: " << aException);
if (nError == 22018 || nError == 22001)
{
diff --git a/sc/source/ui/drawfunc/fuins2.cxx b/sc/source/ui/drawfunc/fuins2.cxx
index ded7e20ba678..b102851abe9a 100644
--- a/sc/source/ui/drawfunc/fuins2.cxx
+++ b/sc/source/ui/drawfunc/fuins2.cxx
@@ -210,7 +210,7 @@ void lcl_ChartInit(const uno::Reference <embed::XEmbeddedObject>& xObj, ScViewDa
// will be created nevertheless and the range string can be
// edited.
SAL_WARN("sc.ui",
- "lcl_ChartInit - caught IllegalArgumentException with message \"" << e.Message << "\","
+ "lcl_ChartInit - caught IllegalArgumentException with message \"" << e << "\","
" might be due to aRangeString: " << aRangeString);
}
diff --git a/sc/source/ui/miscdlgs/solverutil.cxx b/sc/source/ui/miscdlgs/solverutil.cxx
index 02c00aea63c8..45ef32b4945c 100644
--- a/sc/source/ui/miscdlgs/solverutil.cxx
+++ b/sc/source/ui/miscdlgs/solverutil.cxx
@@ -84,7 +84,7 @@ void ScSolverUtil::GetImplementations( uno::Sequence<OUString>& rImplNames,
}
catch (const css::uno::Exception& e)
{
- SAL_INFO("sc.ui", "ScSolverUtil::GetImplementations: cannot instantiate: " << sName << ", because: " << e.Message);
+ SAL_INFO("sc.ui", "ScSolverUtil::GetImplementations: cannot instantiate: " << sName << ", because: " << e);
}
}
}
diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx
index ba1508c5195a..bec07f0ccbbd 100644
--- a/sc/source/ui/unoobj/docuno.cxx
+++ b/sc/source/ui/unoobj/docuno.cxx
@@ -827,12 +827,12 @@ OString ScModelObj::getTextSelection(const char* pMimeType, OString& rUsedMimeTy
}
catch (const datatransfer::UnsupportedFlavorException& e)
{
- SAL_WARN("sc", "Caught UnsupportedFlavorException " << e.Message);
+ SAL_WARN("sc", "Caught " << e);
return OString();
}
catch (const css::uno::Exception& e)
{
- SAL_WARN("sc", "Caught UNO Exception " << e.Message);
+ SAL_WARN("sc", "Caught " << e);
return OString();
}
diff --git a/sc/source/ui/unoobj/exceldetect.cxx b/sc/source/ui/unoobj/exceldetect.cxx
index f42b80857267..43e288c4bd7f 100644
--- a/sc/source/ui/unoobj/exceldetect.cxx
+++ b/sc/source/ui/unoobj/exceldetect.cxx
@@ -73,7 +73,7 @@ bool hasStream(const uno::Reference<io::XInputStream>& xInStream, const OUString
}
catch (const css::ucb::ContentCreationException &e)
{
- SAL_WARN("sc", "hasStream caught " << e.Message);
+ SAL_WARN("sc", "hasStream caught " << e);
}
return false;
diff --git a/sc/source/ui/vba/vbachartobjects.cxx b/sc/source/ui/vba/vbachartobjects.cxx
index 970c9802442d..656deb64de33 100644
--- a/sc/source/ui/vba/vbachartobjects.cxx
+++ b/sc/source/ui/vba/vbachartobjects.cxx
@@ -146,7 +146,7 @@ ScVbaChartObjects::Add( double _nX, double _nY, double _nWidth, double _nHeight
}
catch (const uno::Exception& ex)
{
- SAL_WARN("sc", "AddItem caught exception " << ex.Message );
+ SAL_WARN("sc", "AddItem caught " << ex );
}
return aNULL();
}
diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx
index f0dd8bb376cc..b5c8573555f3 100644
--- a/sc/source/ui/vba/vbarange.cxx
+++ b/sc/source/ui/vba/vbarange.cxx
@@ -1556,7 +1556,7 @@ ScVbaRange::setValue( const uno::Any& aValue, ValueSetter& valueSetter )
}
catch ( const uno::Exception& e )
{
- SAL_WARN("sc", "Bahhh, caught exception " << e.Message );
+ SAL_WARN("sc", "Bahhh, caught " << e );
}
}
else
diff --git a/sc/source/ui/view/tabvwshb.cxx b/sc/source/ui/view/tabvwshb.cxx
index 5946da5c5ecd..d2c5e0207ad4 100644
--- a/sc/source/ui/view/tabvwshb.cxx
+++ b/sc/source/ui/view/tabvwshb.cxx
@@ -360,7 +360,7 @@ void ScTabViewShell::ExecDrawIns(SfxRequest& rReq)
}
catch (const uno::Exception& e)
{
- SAL_WARN( "sc", "Cannot Insert Chart: " << e.Message);
+ SAL_WARN( "sc", "Cannot Insert Chart: " << e);
}
break;
diff --git a/scripting/source/protocolhandler/scripthandler.cxx b/scripting/source/protocolhandler/scripthandler.cxx
index ebd942aecf6a..4dd2d8da5fa2 100644
--- a/scripting/source/protocolhandler/scripthandler.cxx
+++ b/scripting/source/protocolhandler/scripthandler.cxx
@@ -161,7 +161,7 @@ void SAL_CALL ScriptProtocolHandler::dispatchWithNotification(
SAL_WARN("scripting",
"ScriptProtocolHandler::dispatchWithNotification: caught RuntimeException"
"while dispatchFinished with failure of the execution "
- << e.Message );
+ << e );
}
}
return;
@@ -291,7 +291,7 @@ void SAL_CALL ScriptProtocolHandler::dispatchWithNotification(
{
SAL_WARN("scripting",
"ScriptProtocolHandler::dispatchWithNotification: caught RuntimeException"
- "while dispatchFinished " << e.Message );
+ "while dispatchFinished " << e );
}
}
}
diff --git a/scripting/source/provider/BrowseNodeFactoryImpl.cxx b/scripting/source/provider/BrowseNodeFactoryImpl.cxx
index e064556d61e9..aafa2f1d5e03 100644
--- a/scripting/source/provider/BrowseNodeFactoryImpl.cxx
+++ b/scripting/source/provider/BrowseNodeFactoryImpl.cxx
@@ -293,7 +293,7 @@ std::vector< Reference< browse::XBrowseNode > > getAllBrowseNodes( const Referen
// TODO proper exception handling, should throw
catch( const Exception& e )
{
- SAL_WARN("scripting", "Caught Exception " << e.Message );
+ SAL_WARN("scripting", "Caught " << e );
locnBNs.resize( mspIndex );
return locnBNs;
}
diff --git a/scripting/source/provider/MasterScriptProvider.cxx b/scripting/source/provider/MasterScriptProvider.cxx
index d9d829197e6c..12c336caf84f 100644
--- a/scripting/source/provider/MasterScriptProvider.cxx
+++ b/scripting/source/provider/MasterScriptProvider.cxx
@@ -209,7 +209,7 @@ void MasterScriptProvider::createPkgProvider()
catch ( const Exception& e )
{
SAL_WARN("scripting.provider", "Exception creating MasterScriptProvider for uno_packages in context "
- << m_sCtxString << ": " << e.Message );
+ << m_sCtxString << ": " << e );
}
}
@@ -504,8 +504,7 @@ MasterScriptProvider::insertByName( const OUString& aName, const Any& aElement )
}
catch ( Exception& e )
{
- SAL_INFO(
- "scripting.provider", "ignoring Exception " << e.Message);
+ SAL_INFO("scripting.provider", "ignoring " << e);
}
}
diff --git a/scripting/source/vbaevents/eventhelper.cxx b/scripting/source/vbaevents/eventhelper.cxx
index 837a8329f285..9690771027b1 100644
--- a/scripting/source/vbaevents/eventhelper.cxx
+++ b/scripting/source/vbaevents/eventhelper.cxx
@@ -927,7 +927,7 @@ EventListener::firing_Impl(const ScriptEvent& evt, Any* pRet )
}
catch ( uno::Exception& e )
{
- SAL_WARN("scripting", "event script raised " << e.Message );
+ SAL_WARN("scripting", "event script raised " << e );
}
}
}
diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx
index 14c36e4a845f..03cfc50aee50 100644
--- a/sd/source/core/stlsheet.cxx
+++ b/sd/source/core/stlsheet.cxx
@@ -678,7 +678,7 @@ void SAL_CALL SdStyleSheet::release( ) throw ()
}
catch (RuntimeException const& exc)
{ // don't break throw ()
- SAL_WARN( "sd", exc.Message );
+ SAL_WARN( "sd", exc );
}
OSL_ASSERT( mrBHelper.bDisposed );
SdStyleSheetBase::release();
diff --git a/sd/source/filter/xml/sdxmlwrp.cxx b/sd/source/filter/xml/sdxmlwrp.cxx
index b9222c679ffa..405ad7595ce6 100644
--- a/sd/source/filter/xml/sdxmlwrp.cxx
+++ b/sd/source/filter/xml/sdxmlwrp.cxx
@@ -244,7 +244,7 @@ ErrCode ReadThroughComponent(
if( bEncrypted )
return ERRCODE_SFX_WRONGPASSWORD;
- SAL_WARN( "sd.filter", "SAX parse exception caught while importing:" << r.Message);
+ SAL_WARN( "sd.filter", "SAX parse exception caught while importing:" << r);
OUString sErr( OUString::number( r.LineNumber ));
sErr += ",";
@@ -274,22 +274,22 @@ ErrCode ReadThroughComponent(
if( bEncrypted )
return ERRCODE_SFX_WRONGPASSWORD;
- SAL_WARN( "sd.filter", "SAX exception caught while importing:" << r.Message);
+ SAL_WARN( "sd.filter", "SAX exception caught while importing:" << r);
return SD_XML_READERROR;
}
catch (const packages::zip::ZipIOException& r)
{
- SAL_WARN( "sd.filter", "Zip exception caught while importing:" << r.Message);
+ SAL_WARN( "sd.filter", "Zip exception caught while importing:" << r);
return ERRCODE_IO_BROKENPACKAGE;
}
catch (const io::IOException& r)
{
- SAL_WARN( "sd.filter", "IO exception caught while importing:" << r.Message);
+ SAL_WARN( "sd.filter", "IO exception caught while importing:" << r);
return SD_XML_READERROR;
}
catch (const uno::Exception& r)
{
- SAL_WARN( "sd.filter", "uno exception caught while importing:" << r.Message);
+ SAL_WARN( "sd.filter", "uno exception caught while importing:" << r);
return SD_XML_READERROR;
}
@@ -990,7 +990,7 @@ bool SdXMLFilter::Export()
}
catch (const uno::Exception &e)
{
- SAL_WARN( "sd.filter", "uno Exception caught while exporting:" << e.Message);
+ SAL_WARN( "sd.filter", "uno Exception caught while exporting:" << e);
bDocRet = false;
}
if ( !bLocked )
diff --git a/sd/source/helper/simplereferencecomponent.cxx b/sd/source/helper/simplereferencecomponent.cxx
index 4d0234743e83..b2f55ad3832a 100644
--- a/sd/source/helper/simplereferencecomponent.cxx
+++ b/sd/source/helper/simplereferencecomponent.cxx
@@ -54,7 +54,7 @@ void SimpleReferenceComponent::release()
}
catch (RuntimeException & exc ) // don't break throw ()
{
- SAL_WARN( "sd", exc.Message );
+ SAL_WARN( "sd", exc );
}
}
diff --git a/sd/source/ui/tools/ConfigurationAccess.cxx b/sd/source/ui/tools/ConfigurationAccess.cxx
index 2b9285c6ebc2..d06dd5929f6a 100644
--- a/sd/source/ui/tools/ConfigurationAccess.cxx
+++ b/sd/source/ui/tools/ConfigurationAccess.cxx
@@ -106,7 +106,7 @@ Any ConfigurationAccess::GetConfigurationNode (
}
catch (const Exception& rException)
{
- SAL_WARN("sd", "caught exception while getting configuration node" << sPathToNode << ": " << rException.Message);
+ SAL_WARN("sd", "caught exception while getting configuration node" << sPathToNode << ": " << rException);
}
return Any();
diff --git a/sd/source/ui/unoidl/DrawController.cxx b/sd/source/ui/unoidl/DrawController.cxx
index ba6b31ebe8b5..c64647442829 100644
--- a/sd/source/ui/unoidl/DrawController.cxx
+++ b/sd/source/ui/unoidl/DrawController.cxx
@@ -424,7 +424,7 @@ void DrawController::FireSwitchCurrentPage (SdPage* pNewCurrentPage) throw()
}
catch (const uno::Exception& e)
{
- SAL_WARN("sd", "sd::SdUnoDrawView::FireSwitchCurrentPage(), exception caught: " << e.Message);
+ SAL_WARN("sd", "sd::SdUnoDrawView::FireSwitchCurrentPage(), exception caught: " << e);
}
}
}
diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index 90d75e5871f3..52ecca7729da 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -322,7 +322,7 @@ void SAL_CALL SdXImpressDocument::release() throw ( )
}
catch (const uno::RuntimeException& exc)
{ // don't break throw ()
- SAL_WARN( "sd", exc.Message );
+ SAL_WARN( "sd", exc );
}
}
SfxBaseModel::release();
diff --git a/sd/source/ui/view/drviewsa.cxx b/sd/source/ui/view/drviewsa.cxx
index 06ae7dae72b1..0fedb24f1b56 100644
--- a/sd/source/ui/view/drviewsa.cxx
+++ b/sd/source/ui/view/drviewsa.cxx
@@ -330,7 +330,7 @@ void DrawViewShell::Construct(DrawDocShell* pDocSh, PageKind eInitialPageKind)
{
// Eat the exception and log it
// We can still continue if scanner manager is not available.
- SAL_WARN("sd", "Scanner manager exception: " << exception.Message);
+ SAL_WARN("sd", "Scanner manager exception: " << exception);
}
mpAnnotationManager.reset( new AnnotationManager( GetViewShellBase() ) );
diff --git a/sdext/source/minimizer/configurationaccess.cxx b/sdext/source/minimizer/configurationaccess.cxx
index 4387e9bc0df5..3995637afebd 100644
--- a/sdext/source/minimizer/configurationaccess.cxx
+++ b/sdext/source/minimizer/configurationaccess.cxx
@@ -331,7 +331,7 @@ Reference< XInterface > ConfigurationAccess::GetConfigurationNode(
catch (const Exception& rException)
{
SAL_WARN("sdext.minimizer", "caught exception while getting configuration node "
- << sPathToNode << " : " << rException.Message);
+ << sPathToNode << " : " << rException);
}
return xNode;
}
diff --git a/sdext/source/pdfimport/filterdet.cxx b/sdext/source/pdfimport/filterdet.cxx
index 4b27527b9034..a1bb1946a939 100644
--- a/sdext/source/pdfimport/filterdet.cxx
+++ b/sdext/source/pdfimport/filterdet.cxx
@@ -290,7 +290,7 @@ OUString SAL_CALL PDFDetector::detect( uno::Sequence< beans::PropertyValue >& rF
osl_closeFile( aFile );
}
} catch (css::io::IOException & e) {
- SAL_WARN("sdext.pdfimport", "caught IOException " + e.Message);
+ SAL_WARN("sdext.pdfimport", "caught " << e);
return OUString();
}
OUString aEmbedMimetype;
diff --git a/sdext/source/pdfimport/pdfiadaptor.cxx b/sdext/source/pdfimport/pdfiadaptor.cxx
index 27e9ede9dd8e..7553aafc914f 100644
--- a/sdext/source/pdfimport/pdfiadaptor.cxx
+++ b/sdext/source/pdfimport/pdfiadaptor.cxx
@@ -155,7 +155,7 @@ sal_Bool SAL_CALL PDFIHybridAdaptor::filter( const uno::Sequence< beans::Propert
}
catch(const uno::Exception& e)
{
- SAL_INFO("sdext.pdfimport", "subfilter exception: " << e.Message);
+ SAL_INFO("sdext.pdfimport", "subfilter: " << e);
}
SAL_INFO("sdext.pdfimport", "subfilter: " << xSubFilter.get() );
diff --git a/sdext/source/pdfimport/test/pdf2xml.cxx b/sdext/source/pdfimport/test/pdf2xml.cxx
index f0caa1d8ae9a..6891c0f3db41 100644
--- a/sdext/source/pdfimport/test/pdf2xml.cxx
+++ b/sdext/source/pdfimport/test/pdf2xml.cxx
@@ -81,12 +81,12 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
}
catch (const uno::Exception& e)
{
- SAL_WARN("vcl.app", "Fatal exception: " << e.Message);
+ SAL_WARN("vcl.app", "Fatal: " << e);
return 1;
}
catch (const std::exception& e)
{
- SAL_WARN("vcl.app", "Fatal exception: " << e.what());
+ SAL_WARN("vcl.app", "Fatal: " << e.what());
return 1;
}
diff --git a/sdext/source/presenter/PresenterConfigurationAccess.cxx b/sdext/source/presenter/PresenterConfigurationAccess.cxx
index afde60c20a34..a000eb9279dc 100644
--- a/sdext/source/presenter/PresenterConfigurationAccess.cxx
+++ b/sdext/source/presenter/PresenterConfigurationAccess.cxx
@@ -67,7 +67,7 @@ PresenterConfigurationAccess::PresenterConfigurationAccess (
}
catch (const Exception& rException)
{
- SAL_WARN("sdext.presenter", "caught exception while opening configuration: " << rException.Message);
+ SAL_WARN("sdext.presenter", "caught exception while opening configuration: " << rException);
}
}
@@ -149,7 +149,7 @@ Any PresenterConfigurationAccess::GetConfigurationNode (
}
catch (const Exception& rException)
{
- SAL_WARN("sdext.presenter", "caught exception while getting configuration node " << sPathToNode << " : " << rException.Message);
+ SAL_WARN("sdext.presenter", "caught exception while getting configuration node " << sPathToNode << " : " << rException);
}
return Any();
diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index b0ad59f5e7c0..17b71fde7269 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -180,9 +180,7 @@ namespace
}
catch (Exception & e)
{
- SAL_INFO(
- "sfx.appl",
- "assuming Base to be missing; caught " << e.Message);
+ SAL_INFO("sfx.appl", "assuming Base to be missing; caught " << e);
return false;
}
}
@@ -207,7 +205,7 @@ namespace
{
SAL_INFO(
"sfx.appl",
- "trying to install LibreOffice Base, caught " << e.Message);
+ "trying to install LibreOffice Base, caught " << e);
}
return;
}
@@ -223,7 +221,7 @@ namespace
catch (const Exception & e)
{
SAL_INFO( "sfx.appl",
- "trying to load bibliography database, caught " << e.Message);
+ "trying to load bibliography database, caught " << e);
}
}
}
diff --git a/sfx2/source/bastyp/helper.cxx b/sfx2/source/bastyp/helper.cxx
index 62126dd0d6f8..51fa98d4af4e 100644
--- a/sfx2/source/bastyp/helper.cxx
+++ b/sfx2/source/bastyp/helper.cxx
@@ -116,7 +116,7 @@ std::vector<OUString> SfxContentHelper::GetResultSet( const OUString& rURL )
}
catch( const uno::Exception& e )
{
- SAL_WARN( "sfx.bastyp", "GetResultSet: Any other exception: " << e.Message );
+ SAL_WARN( "sfx.bastyp", "GetResultSet: " << e );
}
return aList;
diff --git a/sfx2/source/control/thumbnailview.cxx b/sfx2/source/control/thumbnailview.cxx
index badda16bd1a6..b79d3b02d947 100644
--- a/sfx2/source/control/thumbnailview.cxx
+++ b/sfx2/source/control/thumbnailview.cxx
@@ -1256,7 +1256,7 @@ BitmapEx ThumbnailView::readThumbnail(const OUString &msURL)
{
SAL_WARN("sfx",
"caught exception while trying to access Thumbnail/thumbnail.png of "
- << msURL << ": " << rException.Message);
+ << msURL << ": " << rException);
}
try
@@ -1283,14 +1283,14 @@ BitmapEx ThumbnailView::readThumbnail(const OUString &msURL)
{
SAL_WARN("sfx",
"caught exception while trying to access Thumbnails/thumbnail.png of "
- << msURL << ": " << rException.Message);
+ << msURL << ": " << rException);
}
}
catch (const uno::Exception& rException)
{
SAL_WARN("sfx",
"caught exception while trying to access thumbnail of "
- << msURL << ": " << rException.Message);
+ << msURL << ": " << rException);
}
// Extract the image from the stream.
diff --git a/sfx2/source/dialog/backingwindow.cxx b/sfx2/source/dialog/backingwindow.cxx
index 3ca873ed74e5..8966a27face4 100644
--- a/sfx2/source/dialog/backingwindow.cxx
+++ b/sfx2/source/dialog/backingwindow.cxx
@@ -131,7 +131,7 @@ BackingWindow::BackingWindow( vcl::Window* i_pParent ) :
}
catch (const Exception& e)
{
- SAL_WARN( "fwk", "BackingWindow - caught an exception! " << e.Message );
+ SAL_WARN( "fwk", "BackingWindow - caught an exception! " << e );
}
// fdo#34392: we do the layout dynamically, the layout depends on the font,
diff --git a/sfx2/source/doc/SfxDocumentMetaData.cxx b/sfx2/source/doc/SfxDocumentMetaData.cxx
index f3e6c5124024..93b93eb1b5a3 100644
--- a/sfx2/source/doc/SfxDocumentMetaData.cxx
+++ b/sfx2/source/doc/SfxDocumentMetaData.cxx
@@ -2039,7 +2039,7 @@ void SAL_CALL SfxDocumentMetaData::setModified( sal_Bool bModified )
throw;
} catch (const css::uno::Exception & e) {
// ignore
- SAL_WARN("sfx.doc", "setModified: exception: " << e.Message);
+ SAL_WARN("sfx.doc", "setModified: " << e);
}
} else {
if (xMB.is()) {
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index 7437c66ee8ed..a7dc38a6bd7c 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -2102,7 +2102,7 @@ void SfxMedium::Transfer_Impl()
}
catch ( css::uno::Exception & e )
{
- SAL_WARN( "sfx.doc", "LOCK not working while re-issuing it. Exception message: " << e.Message );
+ SAL_WARN( "sfx.doc", "LOCK not working while re-issuing it. Exception message: " << e );
}
}
catch ( const css::ucb::CommandAbortedException& )
@@ -3532,7 +3532,7 @@ bool SfxMedium::SignContents_Impl( bool bScriptingContent, const OUString& aODFV
catch (const io::IOException& rException)
{
if (bODF)
- SAL_WARN("sfx.doc", "ODF stream is not a zip storage: " << rException.Message);
+ SAL_WARN("sfx.doc", "ODF stream is not a zip storage: " << rException);
}
if ( !xWriteableZipStor.is() && bODF )
diff --git a/sfx2/source/doc/doctemplates.cxx b/sfx2/source/doc/doctemplates.cxx
index 7181a5db9fcb..4c6eed134cb1 100644
--- a/sfx2/source/doc/doctemplates.cxx
+++ b/sfx2/source/doc/doctemplates.cxx
@@ -431,7 +431,7 @@ void SfxDocTplService_Impl::init_Impl()
::comphelper::getProcessComponentContext()));
} catch (uno::RuntimeException const& e) {
SAL_WARN("sfx.doc", "SfxDocTplService_Impl::init_Impl: "
- "cannot create DocumentProperties service:" << e.Message);
+ "cannot create DocumentProperties service:" << e);
}
OUString const aService = SERVICENAME_TYPEDETECTION;
diff --git a/sfx2/source/doc/guisaveas.cxx b/sfx2/source/doc/guisaveas.cxx
index 86a02dc5dd8f..d733ac619fe4 100644
--- a/sfx2/source/doc/guisaveas.cxx
+++ b/sfx2/source/doc/guisaveas.cxx
@@ -649,7 +649,7 @@ bool ModelData_Impl::ExecuteFilterDialog_Impl( const OUString& aFilterName )
}
catch( const uno::Exception& e )
{
- SAL_WARN("sfx.doc", "ignoring UNO exception " << e.Message);
+ SAL_WARN("sfx.doc", "ignoring " << e);
}
return bDialogUsed;
@@ -1413,7 +1413,7 @@ bool SfxStoringHelper::GUIStoreModel( const uno::Reference< frame::XModel >& xMo
catch (const lang::IllegalArgumentException& e)
{
SAL_WARN("sfx.doc", "Ignoring parameters! "
- "ModelData considers this illegal: " << e.Message);
+ "ModelData considers this illegal: " << e);
aModelData.GetStorable()->store();
}
}
@@ -1783,7 +1783,7 @@ void SfxStoringHelper::SetDocInfoState(
}
catch (const uno::Exception& e)
{
- SAL_INFO("sfx.doc", "SetDocInfoState: caught exception: " << e.Message);
+ SAL_INFO("sfx.doc", "SetDocInfoState: caught " << e);
}
// set the modified flag back if required
diff --git a/sfx2/source/doc/objcont.cxx b/sfx2/source/doc/objcont.cxx
index ddbd8a9d90bc..e213dadcca68 100644
--- a/sfx2/source/doc/objcont.cxx
+++ b/sfx2/source/doc/objcont.cxx
@@ -444,7 +444,7 @@ void SfxObjectShell::UpdateFromTemplate_Impl( )
}
catch (const Exception& e)
{
- SAL_INFO("sfx.doc", "caught exception" << e.Message);
+ SAL_INFO("sfx.doc", e);
}
// if modify date was read successfully
diff --git a/sfx2/source/doc/objxtor.cxx b/sfx2/source/doc/objxtor.cxx
index a9da93c3187c..738ea5e10f71 100644
--- a/sfx2/source/doc/objxtor.cxx
+++ b/sfx2/source/doc/objxtor.cxx
@@ -662,7 +662,7 @@ BasicManager* SfxObjectShell::GetBasicManager() const
}
catch (const css::ucb::ContentCreationException& e)
{
- SAL_WARN("sfx.doc", "caught exception " << e.Message);
+ SAL_WARN("sfx.doc", "caught " << e);
}
#endif
return pBasMgr;
@@ -729,7 +729,7 @@ Reference< XLibraryContainer > SfxObjectShell::GetDialogContainer()
}
catch (const css::ucb::ContentCreationException& e)
{
- SAL_WARN("sfx.doc", "caught exception " << e.Message);
+ SAL_WARN("sfx.doc", "caught " << e);
}
SAL_WARN("sfx.doc", "SfxObjectShell::GetDialogContainer: falling back to the application - is this really expected here?");
@@ -753,7 +753,7 @@ Reference< XLibraryContainer > SfxObjectShell::GetBasicContainer()
}
catch (const css::ucb::ContentCreationException& e)
{
- SAL_WARN("sfx.doc", "caught exception " << e.Message);
+ SAL_WARN("sfx.doc", "caught " << e);
}
}
SAL_WARN("sfx.doc", "SfxObjectShell::GetBasicContainer: falling back to the application - is this really expected here?");
@@ -816,7 +816,7 @@ void SfxObjectShell::InitBasicManager_Impl()
}
catch (const css::ucb::ContentCreationException& e)
{
- SAL_WARN("sfx.doc", "caught exception " << e.Message);
+ SAL_WARN("sfx.doc", "caught " << e);
}
DBG_ASSERT( pImpl->aBasicManager.isValid(), "SfxObjectShell::InitBasicManager_Impl: did not get a BasicManager!" );
pImpl->bBasicInitialized = true;
diff --git a/sfx2/source/sidebar/PanelTitleBar.cxx b/sfx2/source/sidebar/PanelTitleBar.cxx
index 730c7617d107..59878135319f 100644
--- a/sfx2/source/sidebar/PanelTitleBar.cxx
+++ b/sfx2/source/sidebar/PanelTitleBar.cxx
@@ -148,7 +148,7 @@ void PanelTitleBar::HandleToolBoxItemClick (const sal_uInt16 nItemIndex)
}
catch(Exception& rException)
{
- SAL_WARN("sfx", "caught exception: " << rException.Message);
+ SAL_WARN("sfx", "caught " << rException);
}
}
}
diff --git a/sfx2/source/sidebar/SidebarController.cxx b/sfx2/source/sidebar/SidebarController.cxx
index a2b01d2635c3..caa2741ae324 100644
--- a/sfx2/source/sidebar/SidebarController.cxx
+++ b/sfx2/source/sidebar/SidebarController.cxx
@@ -857,7 +857,7 @@ Reference<ui::XUIElement> SidebarController::CreateUIElement (
}
catch(const Exception& rException)
{
- SAL_WARN("sfx.sidebar", "Cannot create panel " << rsImplementationURL << ": " << rException.Message);
+ SAL_WARN("sfx.sidebar", "Cannot create panel " << rsImplementationURL << ": " << rException);
return nullptr;
}
}
diff --git a/sfx2/source/sidebar/Theme.cxx b/sfx2/source/sidebar/Theme.cxx
index 6b130d984545..315bf057d21c 100644
--- a/sfx2/source/sidebar/Theme.cxx
+++ b/sfx2/source/sidebar/Theme.cxx
@@ -16,6 +16,7 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+
#include <sfx2/sidebar/Theme.hxx>
#include <sfx2/sidebar/Paint.hxx>
#include <sfx2/sidebar/Tools.hxx>
@@ -336,7 +337,7 @@ void Theme::UpdateTheme()
}
catch(beans::UnknownPropertyException& rException)
{
- SAL_WARN("sfx", "unknown property: " << rException.Message);
+ SAL_WARN("sfx", "unknown property: " << rException);
OSL_ASSERT(false);
}
}
diff --git a/sfx2/source/view/classificationhelper.cxx b/sfx2/source/view/classificationhelper.cxx
index 3cff7ae172db..aa61839c06e6 100644
--- a/sfx2/source/view/classificationhelper.cxx
+++ b/sfx2/source/view/classificationhelper.cxx
@@ -392,7 +392,7 @@ void SfxClassificationHelper::Impl::parsePolicy()
}
catch (const xml::sax::SAXParseException& rException)
{
- SAL_WARN("sfx.view", "parsePolicy() failed: " << rException.Message);
+ SAL_WARN("sfx.view", "parsePolicy() failed: " << rException);
}
m_aCategories = xClassificationParser->m_aCategories;
m_aMarkings = xClassificationParser->m_aMarkings;
@@ -450,7 +450,7 @@ void SfxClassificationHelper::Impl::pushToDocumentProperties()
}
catch (const uno::Exception& rException)
{
- SAL_WARN("sfx.view", "pushDocumentProperties() failed for property " << rLabel.first << ": " << rException.Message);
+ SAL_WARN("sfx.view", "pushDocumentProperties() failed for property " << rLabel.first << ": " << rException);
}
}
}
diff --git a/sfx2/source/view/ipclient.cxx b/sfx2/source/view/ipclient.cxx
index f0ec0e2e7f48..78756c693762 100644
--- a/sfx2/source/view/ipclient.cxx
+++ b/sfx2/source/view/ipclient.cxx
@@ -954,9 +954,7 @@ ErrCode SfxInPlaceClient::DoVerb( long nVerb )
}
catch (uno::Exception const& e)
{
- SAL_WARN("embeddedobj", "SfxInPlaceClient::DoVerb:"
- " -9 fallback path: exception caught: "
- << e.Message);
+ SAL_WARN("embeddedobj", "SfxInPlaceClient::DoVerb: -9 fallback path: " << e);
nError = ERRCODE_SO_GENERALERROR;
}
}
@@ -969,7 +967,7 @@ ErrCode SfxInPlaceClient::DoVerb( long nVerb )
catch (uno::Exception const& e)
{
SAL_WARN("embeddedobj", "SfxInPlaceClient::DoVerb:"
- " exception caught: " << e.Message);
+ " exception caught: " << e);
nError = ERRCODE_SO_GENERALERROR;
//TODO/LATER: better error handling
diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx
index 80c91ef25b7c..f39c71d02691 100644
--- a/sfx2/source/view/viewsh.cxx
+++ b/sfx2/source/view/viewsh.cxx
@@ -1635,7 +1635,7 @@ void SfxViewShell::CheckIPClient_Impl(
}
catch (const uno::Exception& e)
{
- SAL_WARN("sfx.view", "SfxViewShell::CheckIPClient_Impl exception: " << e.Message);
+ SAL_WARN("sfx.view", "SfxViewShell::CheckIPClient_Impl: " << e);
}
}
}
diff --git a/shell/source/backends/desktopbe/desktopbackend.cxx b/shell/source/backends/desktopbe/desktopbackend.cxx
index 775659000cb8..069ff2805e7c 100644
--- a/shell/source/backends/desktopbe/desktopbackend.cxx
+++ b/shell/source/backends/desktopbe/desktopbackend.cxx
@@ -282,7 +282,7 @@ css::uno::Reference< css::uno::XInterface > createBackend(
throw;
} catch (const css::uno::Exception & e) {
// Assuming these exceptions indicate that the service is not installed:
- SAL_WARN("shell", "createInstance(" << name << ") failed with " << e.Message);
+ SAL_WARN("shell", "createInstance(" << name << ") failed with " << e);
return css::uno::Reference< css::uno::XInterface >();
}
}
diff --git a/shell/source/cmdmail/cmdmailsuppl.cxx b/shell/source/cmdmail/cmdmailsuppl.cxx
index 6a31af2fe52a..77285609648f 100644
--- a/shell/source/cmdmail/cmdmailsuppl.cxx
+++ b/shell/source/cmdmail/cmdmailsuppl.cxx
@@ -200,7 +200,7 @@ void SAL_CALL CmdMailSuppl::sendSimpleMailMessage( const Reference< XSimpleMailM
catch(const RuntimeException &e )
{
m_xConfigurationProvider.clear();
- SAL_WARN("shell", "RuntimeException caught accessing configuration provider. " << e.Message );
+ SAL_WARN("shell", "RuntimeException caught accessing configuration provider. " << e );
throw;
}
diff --git a/slideshow/source/engine/activitiesqueue.cxx b/slideshow/source/engine/activitiesqueue.cxx
index 3f6c7d73bc33..7c5acf30d4d7 100644
--- a/slideshow/source/engine/activitiesqueue.cxx
+++ b/slideshow/source/engine/activitiesqueue.cxx
@@ -57,7 +57,7 @@ namespace slideshow
}
catch (const uno::Exception& e)
{
- SAL_WARN("slideshow", "" << e.Message);
+ SAL_WARN("slideshow", e);
}
}
diff --git a/slideshow/source/engine/eventqueue.cxx b/slideshow/source/engine/eventqueue.cxx
index 3ecad820b1a7..8fc545ee5b09 100644
--- a/slideshow/source/engine/eventqueue.cxx
+++ b/slideshow/source/engine/eventqueue.cxx
@@ -75,7 +75,7 @@ namespace slideshow
}
catch (const uno::Exception& e)
{
- SAL_WARN("slideshow", "" << e.Message);
+ SAL_WARN("slideshow", e);
}
maEvents.pop();
}
diff --git a/slideshow/source/engine/rehearsetimingsactivity.cxx b/slideshow/source/engine/rehearsetimingsactivity.cxx
index 25d4673879c1..19a6097d8983 100644
--- a/slideshow/source/engine/rehearsetimingsactivity.cxx
+++ b/slideshow/source/engine/rehearsetimingsactivity.cxx
@@ -181,7 +181,7 @@ RehearseTimingsActivity::~RehearseTimingsActivity()
}
catch (const uno::Exception& e)
{
- SAL_WARN("slideshow", "" << e.Message);
+ SAL_WARN("slideshow", e);
}
}
diff --git a/slideshow/source/engine/shapes/viewappletshape.cxx b/slideshow/source/engine/shapes/viewappletshape.cxx
index 58ef4c8cdff2..f319210e84f1 100644
--- a/slideshow/source/engine/shapes/viewappletshape.cxx
+++ b/slideshow/source/engine/shapes/viewappletshape.cxx
@@ -105,7 +105,7 @@ namespace slideshow
}
catch (const uno::Exception &e)
{
- SAL_WARN("slideshow", "" << e.Message);
+ SAL_WARN("slideshow", e);
}
}
diff --git a/slideshow/source/engine/shapes/viewmediashape.cxx b/slideshow/source/engine/shapes/viewmediashape.cxx
index 9059b218cdf4..5efe1906bac0 100644
--- a/slideshow/source/engine/shapes/viewmediashape.cxx
+++ b/slideshow/source/engine/shapes/viewmediashape.cxx
@@ -105,7 +105,7 @@ namespace slideshow
}
catch (const uno::Exception &e)
{
- SAL_WARN("slideshow", "" << e.Message);
+ SAL_WARN("slideshow", e);
}
}
diff --git a/slideshow/source/engine/shapesubset.cxx b/slideshow/source/engine/shapesubset.cxx
index 1155797d7ca7..59e97aa31f2f 100644
--- a/slideshow/source/engine/shapesubset.cxx
+++ b/slideshow/source/engine/shapesubset.cxx
@@ -81,7 +81,7 @@ namespace slideshow
}
catch (const uno::Exception& e)
{
- SAL_WARN("slideshow", "" << e.Message);
+ SAL_WARN("slideshow", e);
}
}
diff --git a/slideshow/source/engine/slide/userpaintoverlay.cxx b/slideshow/source/engine/slide/userpaintoverlay.cxx
index 27c4625839a0..aae113df63c3 100644
--- a/slideshow/source/engine/slide/userpaintoverlay.cxx
+++ b/slideshow/source/engine/slide/userpaintoverlay.cxx
@@ -489,7 +489,7 @@ namespace slideshow
}
catch (const uno::Exception& e)
{
- SAL_WARN("slideshow", "" << e.Message);
+ SAL_WARN("slideshow", e);
}
}
}
diff --git a/slideshow/source/engine/transitions/shapetransitionfactory.cxx b/slideshow/source/engine/transitions/shapetransitionfactory.cxx
index 9195c64f186b..9e98ab2a1561 100644
--- a/slideshow/source/engine/transitions/shapetransitionfactory.cxx
+++ b/slideshow/source/engine/transitions/shapetransitionfactory.cxx
@@ -112,7 +112,7 @@ ClippingAnimation::~ClippingAnimation()
}
catch (const uno::Exception& e)
{
- SAL_WARN("slideshow", "" << e.Message);
+ SAL_WARN("slideshow", e);
}
}
diff --git a/slideshow/source/engine/usereventqueue.cxx b/slideshow/source/engine/usereventqueue.cxx
index 8d7151036a80..e5bc35f39d32 100644
--- a/slideshow/source/engine/usereventqueue.cxx
+++ b/slideshow/source/engine/usereventqueue.cxx
@@ -556,7 +556,7 @@ UserEventQueue::~UserEventQueue()
}
catch (const uno::Exception& e)
{
- SAL_WARN("slideshow", "" << e.Message);
+ SAL_WARN("slideshow", e);
}
}
diff --git a/slideshow/test/demoshow.cxx b/slideshow/test/demoshow.cxx
index a5bd530a04af..cef4ab9b46b3 100644
--- a/slideshow/test/demoshow.cxx
+++ b/slideshow/test/demoshow.cxx
@@ -355,7 +355,7 @@ void ChildWindow::init()
}
catch (const uno::Exception &e)
{
- SAL_INFO("slideshow", "Exception " << e.Message );
+ SAL_INFO("slideshow", e );
}
}
@@ -368,7 +368,7 @@ void ChildWindow::Paint( const Rectangle& /*rRect*/ )
}
catch (const uno::Exception &e)
{
- SAL_INFO("slideshow", "Exception " << e.Message );
+ SAL_INFO("slideshow", e );
}
}
@@ -454,7 +454,7 @@ void DemoWindow::init()
}
catch (const uno::Exception &e)
{
- SAL_INFO("slideshow", "Exception " << e.Message );
+ SAL_INFO("slideshow", e );
}
}
diff --git a/sot/source/sdstor/ucbstorage.cxx b/sot/source/sdstor/ucbstorage.cxx
index ba6d7ad02d4c..d66102a89c4f 100644
--- a/sot/source/sdstor/ucbstorage.cxx
+++ b/sot/source/sdstor/ucbstorage.cxx
@@ -778,7 +778,7 @@ void UCBStorageStream_Impl::ReadSourceWriteTemporary()
}
catch (const Exception &e)
{
- SAL_WARN( "sot", e.Message );
+ SAL_WARN( "sot", e );
}
}
@@ -813,7 +813,7 @@ sal_uInt64 UCBStorageStream_Impl::ReadSourceWriteTemporary(sal_uInt64 aLength)
}
catch( const Exception & e )
{
- SAL_WARN( "sot", e.Message );
+ SAL_WARN( "sot", e );
}
}
@@ -861,7 +861,7 @@ std::size_t UCBStorageStream_Impl::GetData(void* pData, std::size_t const nSize)
}
catch (const Exception &e)
{
- SAL_WARN( "sot", e.Message );
+ SAL_WARN( "sot", e );
}
if( aResult < nSize )
diff --git a/starmath/source/mathmlexport.cxx b/starmath/source/mathmlexport.cxx
index 003d583c03c5..d7bc5898cad7 100644
--- a/starmath/source/mathmlexport.cxx
+++ b/starmath/source/mathmlexport.cxx
@@ -311,7 +311,7 @@ bool SmXMLExportWrapper::WriteThroughComponent(
}
catch ( const uno::Exception& rEx )
{
- SAL_WARN("starmath", "Can't create output stream in package: " << rEx.Message );
+ SAL_WARN("starmath", "Can't create output stream in package: " << rEx );
return false;
}
diff --git a/starmath/source/mathmlimport.cxx b/starmath/source/mathmlimport.cxx
index 230ad06bdd8d..120b0849000b 100644
--- a/starmath/source/mathmlimport.cxx
+++ b/starmath/source/mathmlimport.cxx
@@ -3093,7 +3093,7 @@ void SmXMLImport::SetConfigurationSettings(const Sequence<PropertyValue>& aConfP
}
catch (const Exception& rEx)
{
- SAL_WARN("starmath", "SmXMLImport::SetConfigurationSettings: Exception: " << rEx.Message );
+ SAL_WARN("starmath", "SmXMLImport::SetConfigurationSettings: Exception: " << rEx );
}
}
diff --git a/starmath/source/smdetect.cxx b/starmath/source/smdetect.cxx
index 6deea78d0c2f..107509f8caa1 100644
--- a/starmath/source/smdetect.cxx
+++ b/starmath/source/smdetect.cxx
@@ -81,7 +81,7 @@ OUString SAL_CALL SmFilterDetect::detect( Sequence< PropertyValue >& lDescriptor
}
catch (const css::ucb::ContentCreationException &e)
{
- SAL_WARN("starmath", "SmFilterDetect::detect caught " << e.Message);
+ SAL_WARN("starmath", "SmFilterDetect::detect caught " << e);
}
if (!bStorageOk)
diff --git a/starmath/source/unofilter.cxx b/starmath/source/unofilter.cxx
index cdb444207464..156ab7de077a 100644
--- a/starmath/source/unofilter.cxx
+++ b/starmath/source/unofilter.cxx
@@ -82,7 +82,7 @@ sal_Bool MathTypeFilter::filter(const uno::Sequence<beans::PropertyValue>& rDesc
}
catch (const uno::Exception& rException)
{
- SAL_WARN("starmath", "Exception caught: " << rException.Message);
+ SAL_WARN("starmath", "Exception caught: " << rException);
}
return bSuccess;
}
diff --git a/stoc/source/javaloader/javaloader.cxx b/stoc/source/javaloader/javaloader.cxx
index 2139815d357c..b634a3879895 100644
--- a/stoc/source/javaloader/javaloader.cxx
+++ b/stoc/source/javaloader/javaloader.cxx
@@ -356,7 +356,7 @@ css::uno::Reference<XInterface> SAL_CALL JavaComponentLoader_CreateInstance(cons
catch(const RuntimeException & runtimeException) {
SAL_INFO(
"stoc",
- "could not init javaloader due to " << runtimeException.Message);
+ "could not init javaloader due to " << runtimeException);
throw;
}
diff --git a/stoc/source/javavm/javavm.cxx b/stoc/source/javavm/javavm.cxx
index 60a0d3fc603e..5fdb0ea1cf79 100644
--- a/stoc/source/javavm/javavm.cxx
+++ b/stoc/source/javavm/javavm.cxx
@@ -538,14 +538,14 @@ void initVMConfiguration(
getINetPropsFromConfig(&jvm, xSMgr, xCtx);
}
catch(const css::uno::Exception & exception) {
- SAL_INFO("stoc", "can not get INETProps because of >" << exception.Message << "<");
+ SAL_INFO("stoc", "can not get INETProps because of " << exception);
}
try {
getDefaultLocaleFromConfig(&jvm, xSMgr,xCtx);
}
catch(const css::uno::Exception & exception) {
- SAL_INFO("stoc", "can not get locale because of >" << exception.Message << "<");
+ SAL_INFO("stoc", "can not get locale because of " << exception);
}
try
@@ -553,7 +553,7 @@ void initVMConfiguration(
getJavaPropsFromSafetySettings(&jvm, xSMgr, xCtx);
}
catch(const css::uno::Exception & exception) {
- SAL_INFO("stoc", "couldn't get safety settings because of >" << exception.Message << "<");
+ SAL_INFO("stoc", "couldn't get safety settings because of " << exception);
}
*pjvm= jvm;
@@ -1333,7 +1333,7 @@ void JavaVirtualMachine::registerConfigChangesListener()
}
}catch(const css::uno::Exception & e)
{
- SAL_INFO("stoc", "could not set up listener for Configuration because of >" << e.Message << "<");
+ SAL_INFO("stoc", "could not set up listener for Configuration because of >" << e << "<");
}
}
diff --git a/stoc/source/servicemanager/servicemanager.cxx b/stoc/source/servicemanager/servicemanager.cxx
index 6186ad209bf8..0c222301cb15 100644
--- a/stoc/source/servicemanager/servicemanager.cxx
+++ b/stoc/source/servicemanager/servicemanager.cxx
@@ -651,7 +651,7 @@ void OServiceManager::disposing()
}
catch (const RuntimeException & exc)
{
- SAL_INFO("stoc", "RuntimeException occurred upon disposing factory: " << exc.Message);
+ SAL_INFO("stoc", "RuntimeException occurred upon disposing factory: " << exc);
}
}
@@ -840,7 +840,7 @@ Reference< XInterface > OServiceManager::createInstanceWithContext(
}
catch (const lang::DisposedException & exc)
{
- SAL_INFO("stoc", "DisposedException occurred: " << exc.Message);
+ SAL_INFO("stoc", "DisposedException occurred: " << exc);
}
}
@@ -894,7 +894,7 @@ Reference< XInterface > OServiceManager::createInstanceWithArgumentsAndContext(
}
catch (const lang::DisposedException & exc)
{
- SAL_INFO("stoc", "DisposedException occurred: " << exc.Message);
+ SAL_INFO("stoc", "DisposedException occurred: " << exc);
}
}
diff --git a/stoc/test/javavm/testjavavm.cxx b/stoc/test/javavm/testjavavm.cxx
index e7d0c4d5a4cc..d7602359c660 100644
--- a/stoc/test/javavm/testjavavm.cxx
+++ b/stoc/test/javavm/testjavavm.cxx
@@ -138,7 +138,7 @@ SAL_IMPLEMENT_MAIN()
}
catch (const Exception & rExc)
{
- SAL_WARN("stoc", "### exception occurred: " << rExc.Message );
+ SAL_WARN("stoc", "### exception occurred: " << rExc );
}
Reference< XComponent > xCompContext( context, UNO_QUERY );
diff --git a/stoc/test/testconv.cxx b/stoc/test/testconv.cxx
index 1e9aae16ed42..2ed6fd712505 100644
--- a/stoc/test/testconv.cxx
+++ b/stoc/test/testconv.cxx
@@ -671,7 +671,7 @@ SAL_IMPLEMENT_MAIN()
}
catch (const Exception & rExc)
{
- SAL_WARN("stoc", "### exception occurred: " << rExc.Message );
+ SAL_WARN("stoc", "### exception occurred: " << rExc );
}
Reference< XComponent >( xMgr, UNO_QUERY )->dispose();
diff --git a/stoc/test/testcorefl.cxx b/stoc/test/testcorefl.cxx
index 3b2a02cccd8a..98aa7d768cda 100644
--- a/stoc/test/testcorefl.cxx
+++ b/stoc/test/testcorefl.cxx
@@ -367,7 +367,7 @@ SAL_IMPLEMENT_MAIN()
}
catch (const Exception & rExc)
{
- SAL_WARN("stoc", "### exception occurred: " << rExc.Message );
+ SAL_WARN("stoc", "### exception occurred: " << rExc );
}
printf( "testcorefl %s !\n", (bSucc ? "succeeded" : "failed") );
diff --git a/stoc/test/testintrosp.cxx b/stoc/test/testintrosp.cxx
index 3937f7e2bb60..c9c7aed33041 100644
--- a/stoc/test/testintrosp.cxx
+++ b/stoc/test/testintrosp.cxx
@@ -1190,7 +1190,7 @@ SAL_IMPLEMENT_MAIN()
}
catch (const Exception & rExc)
{
- SAL_WARN("stoc", "### exception occurred: " << rExc.Message );
+ SAL_WARN("stoc", "### exception occurred: " << rExc );
}
Reference< XComponent >( xMgr, UNO_QUERY )->dispose();
diff --git a/svgio/source/svguno/xsvgparser.cxx b/svgio/source/svguno/xsvgparser.cxx
index 15947a85f13c..0e666fc6d597 100644
--- a/svgio/source/svguno/xsvgparser.cxx
+++ b/svgio/source/svguno/xsvgparser.cxx
@@ -138,7 +138,7 @@ namespace svgio
}
catch(const uno::Exception& e)
{
- SAL_WARN( "svg", "Parse error! : " << e.Message);
+ SAL_WARN( "svg", "Parse error! : " << e);
}
// decompose to primitives
diff --git a/svl/source/config/itemholder2.cxx b/svl/source/config/itemholder2.cxx
index b809eba57b1d..3226f79e610f 100644
--- a/svl/source/config/itemholder2.cxx
+++ b/svl/source/config/itemholder2.cxx
@@ -50,8 +50,7 @@ ItemHolder2::ItemHolder2()
if(bMessage)
{
bMessage = false;
- SAL_WARN( "svl", "CreateInstance with arguments exception: "
- << rEx.Message);
+ SAL_WARN( "svl", "CreateInstance with arguments exception: " << rEx);
}
}
#else
diff --git a/svtools/langsupport/langsupport.cxx b/svtools/langsupport/langsupport.cxx
index 7ef274571f7e..4da9b4a98a1e 100644
--- a/svtools/langsupport/langsupport.cxx
+++ b/svtools/langsupport/langsupport.cxx
@@ -65,12 +65,12 @@ SAL_IMPLEMENT_MAIN()
}
catch (const uno::Exception& e)
{
- SAL_WARN("vcl.app", "Fatal exception: " << e.Message);
+ SAL_WARN("vcl.app", "Fatal: " << e);
return 1;
}
catch (const std::exception &e)
{
- SAL_WARN("vcl.app", "Fatal exception: " << e.what());
+ SAL_WARN("vcl.app", "Fatal: " << e.what());
return 1;
}
diff --git a/svtools/source/config/accessibilityoptions.cxx b/svtools/source/config/accessibilityoptions.cxx
index 9ec4c798572e..4f00f2b73a44 100644
--- a/svtools/source/config/accessibilityoptions.cxx
+++ b/svtools/source/config/accessibilityoptions.cxx
@@ -95,7 +95,7 @@ SvtAccessibilityOptions_Impl::SvtAccessibilityOptions_Impl()
catch(const css::uno::Exception& ex)
{
m_xCfg.clear();
- SAL_WARN("svtools.config", "Caught unexpected: " << ex.Message);
+ SAL_WARN("svtools.config", "Caught unexpected: " << ex);
}
}
@@ -111,7 +111,7 @@ bool SvtAccessibilityOptions_Impl::GetIsForPagePreviews() const
}
catch(const css::uno::Exception& ex)
{
- SAL_WARN("svtools.config", "Caught unexpected: " << ex.Message);
+ SAL_WARN("svtools.config", "Caught unexpected: " << ex);
}
return bRet;
}
@@ -128,7 +128,7 @@ bool SvtAccessibilityOptions_Impl::GetIsHelpTipsDisappear() const
}
catch(const css::uno::Exception& ex)
{
- SAL_WARN("svtools.config", "Caught unexpected: " << ex.Message);
+ SAL_WARN("svtools.config", "Caught unexpected: " << ex);
}
return bRet;
@@ -146,7 +146,7 @@ bool SvtAccessibilityOptions_Impl::GetIsAllowAnimatedGraphics() const
}
catch(const css::uno::Exception& ex)
{
- SAL_WARN("svtools.config", "Caught unexpected: " << ex.Message);
+ SAL_WARN("svtools.config", "Caught unexpected: " << ex);
}
return bRet;
@@ -164,7 +164,7 @@ bool SvtAccessibilityOptions_Impl::GetIsAllowAnimatedText() const
}
catch(const css::uno::Exception& ex)
{
- SAL_WARN("svtools.config", "Caught unexpected: " << ex.Message);
+ SAL_WARN("svtools.config", "Caught unexpected: " << ex);
}
return bRet;
@@ -182,7 +182,7 @@ bool SvtAccessibilityOptions_Impl::GetIsAutomaticFontColor() const
}
catch(const css::uno::Exception& ex)
{
- SAL_WARN("svtools.config", "Caught unexpected: " << ex.Message);
+ SAL_WARN("svtools.config", "Caught unexpected: " << ex);
}
return bRet;
@@ -200,7 +200,7 @@ sal_Int16 SvtAccessibilityOptions_Impl::GetHelpTipSeconds() const
}
catch(const css::uno::Exception& ex)
{
- SAL_WARN("svtools.config", "Caught unexpected: " << ex.Message);
+ SAL_WARN("svtools.config", "Caught unexpected: " << ex);
}
return nRet;
@@ -218,7 +218,7 @@ bool SvtAccessibilityOptions_Impl::IsSelectionInReadonly() const
}
catch(const css::uno::Exception& ex)
{
- SAL_WARN("svtools.config", "Caught unexpected: " << ex.Message);
+ SAL_WARN("svtools.config", "Caught unexpected: " << ex);
}
return bRet;
@@ -236,7 +236,7 @@ sal_Int16 SvtAccessibilityOptions_Impl::GetEdgeBlending() const
}
catch(const css::uno::Exception& ex)
{
- SAL_WARN("svtools.config", "Caught unexpected: " << ex.Message);
+ SAL_WARN("svtools.config", "Caught unexpected: " << ex);
}
return nRet;
@@ -254,7 +254,7 @@ sal_Int16 SvtAccessibilityOptions_Impl::GetListBoxMaximumLineCount() const
}
catch(const css::uno::Exception& ex)
{
- SAL_WARN("svtools.config", "Caught unexpected: " << ex.Message);
+ SAL_WARN("svtools.config", "Caught unexpected: " << ex);
}
return nRet;
@@ -272,7 +272,7 @@ sal_Int16 SvtAccessibilityOptions_Impl::GetColorValueSetColumnCount() const
}
catch(const css::uno::Exception& ex)
{
- SAL_WARN("svtools.config", "Caught unexpected: " << ex.Message);
+ SAL_WARN("svtools.config", "Caught unexpected: " << ex);
}
return nRet;
@@ -290,7 +290,7 @@ bool SvtAccessibilityOptions_Impl::GetPreviewUsesCheckeredBackground() const
}
catch(const css::uno::Exception& ex)
{
- SAL_WARN("svtools.config", "Caught unexpected: " << ex.Message);
+ SAL_WARN("svtools.config", "Caught unexpected: " << ex);
}
return bRet;
diff --git a/svtools/source/config/itemholder2.cxx b/svtools/source/config/itemholder2.cxx
index 2512715caab8..e9a18b21054a 100644
--- a/svtools/source/config/itemholder2.cxx
+++ b/svtools/source/config/itemholder2.cxx
@@ -59,7 +59,7 @@ ItemHolder2::ItemHolder2()
if(bMessage)
{
bMessage = false;
- SAL_WARN( "svtools", "CreateInstance with arguments exception: " << rEx.Message );
+ SAL_WARN( "svtools", "CreateInstance with arguments: " << rEx );
}
}
#else
diff --git a/svtools/source/config/printoptions.cxx b/svtools/source/config/printoptions.cxx
index 2e3cc7d7642a..81d7c7a275d3 100644
--- a/svtools/source/config/printoptions.cxx
+++ b/svtools/source/config/printoptions.cxx
@@ -138,7 +138,7 @@ SvtPrintOptions_Impl::SvtPrintOptions_Impl(const OUString& rConfigRoot)
{
m_xNode.clear();
m_xCfg.clear();
- SAL_WARN("svtools.config", "Caught unexpected: " << ex.Message);
+ SAL_WARN("svtools.config", "Caught unexpected: " << ex);
}
}
@@ -156,7 +156,7 @@ bool SvtPrintOptions_Impl::IsReduceTransparency() const
}
catch (const css::uno::Exception& ex)
{
- SAL_WARN("svtools.config", "Caught unexpected: " << ex.Message);
+ SAL_WARN("svtools.config", "Caught unexpected: " << ex);
}
return bRet;
@@ -176,7 +176,7 @@ sal_Int16 SvtPrintOptions_Impl::GetReducedTransparencyMode() const
}
catch (const css::uno::Exception& ex)
{
- SAL_WARN("svtools.config", "Caught unexpected: " << ex.Message);
+ SAL_WARN("svtools.config", "Caught unexpected: " << ex);
}
return nRet;
@@ -198,7 +198,7 @@ bool SvtPrintOptions_Impl::IsReduceGradients() const
}
catch (const css::uno::Exception& ex)
{
- SAL_WARN("svtools.config", "Caught unexpected: " << ex.Message);
+ SAL_WARN("svtools.config", "Caught unexpected: " << ex);
}
return bRet;
@@ -220,7 +220,7 @@ sal_Int16 SvtPrintOptions_Impl::GetReducedGradientMode() const
}
catch (const css::uno::Exception& ex)
{
- SAL_WARN("svtools.config", "Caught unexpected: " << ex.Message);
+ SAL_WARN("svtools.config", "Caught unexpected: " << ex);
}
return nRet;
@@ -242,7 +242,7 @@ sal_Int16 SvtPrintOptions_Impl::GetReducedGradientStepCount() const
}
catch (const css::uno::Exception& ex)
{
- SAL_WARN("svtools.config", "Caught unexpected: " << ex.Message);
+ SAL_WARN("svtools.config", "Caught unexpected: " << ex);
}
return nRet;
@@ -264,7 +264,7 @@ bool SvtPrintOptions_Impl::IsReduceBitmaps() const
}
catch (const css::uno::Exception& ex)
{
- SAL_WARN("svtools.config", "Caught unexpected: " << ex.Message);
+ SAL_WARN("svtools.config", "Caught unexpected: " << ex);
}
return bRet;
@@ -286,7 +286,7 @@ sal_Int16 SvtPrintOptions_Impl::GetReducedBitmapMode() const
}
catch (const css::uno::Exception& ex)
{
- SAL_WARN("svtools.config", "Caught unexpected: " << ex.Message);
+ SAL_WARN("svtools.config", "Caught unexpected: " << ex);
}
return nRet;
@@ -308,7 +308,7 @@ sal_Int16 SvtPrintOptions_Impl::GetReducedBitmapResolution() const
}
catch (const css::uno::Exception& ex)
{
- SAL_WARN("svtools.config", "Caught unexpected: " << ex.Message);
+ SAL_WARN("svtools.config", "Caught unexpected: " << ex);
}
return nRet;
@@ -330,7 +330,7 @@ bool SvtPrintOptions_Impl::IsReducedBitmapIncludesTransparency() const
}
catch (const css::uno::Exception& ex)
{
- SAL_WARN("svtools.config", "Caught unexpected: " << ex.Message);
+ SAL_WARN("svtools.config", "Caught unexpected: " << ex);
}
return bRet;
@@ -352,7 +352,7 @@ bool SvtPrintOptions_Impl::IsConvertToGreyscales() const
}
catch (const css::uno::Exception& ex)
{
- SAL_WARN("svtools.config", "Caught unexpected: " << ex.Message);
+ SAL_WARN("svtools.config", "Caught unexpected: " << ex);
}
return bRet;
@@ -375,7 +375,7 @@ bool SvtPrintOptions_Impl::IsPDFAsStandardPrintJobFormat() const
}
catch (const css::uno::Exception& ex)
{
- SAL_WARN("svtools.config", "Caught unexpected: " << ex.Message);
+ SAL_WARN("svtools.config", "Caught unexpected: " << ex);
}
return bRet;
@@ -465,7 +465,7 @@ void SvtPrintOptions_Impl::impl_setValue (const OUString& sProp, bool bNew )
}
catch(const css::uno::Exception& ex)
{
- SAL_WARN("svtools.config", "Caught unexpected: " << ex.Message);
+ SAL_WARN("svtools.config", "Caught unexpected: " << ex);
}
}
@@ -493,7 +493,7 @@ void SvtPrintOptions_Impl::impl_setValue (const OUString& sProp,
}
catch(const css::uno::Exception& ex)
{
- SAL_WARN("svtools.config", "Caught unexpected: " << ex.Message);
+ SAL_WARN("svtools.config", "Caught unexpected: " << ex);
}
}
diff --git a/svtools/source/contnr/DocumentInfoPreview.cxx b/svtools/source/contnr/DocumentInfoPreview.cxx
index 7a5df2ad4614..7338412e01f7 100644
--- a/svtools/source/contnr/DocumentInfoPreview.cxx
+++ b/svtools/source/contnr/DocumentInfoPreview.cxx
@@ -112,7 +112,7 @@ void ODocumentInfoPreview::fill(
value = conv->convertToSimpleType(aAny, css::uno::TypeClass_STRING).
get< OUString >();
} catch (css::script::CannotConvertException & e) {
- SAL_INFO("svtools.contnr", "ignored CannotConvertException " << e.Message);
+ SAL_INFO("svtools.contnr", "ignored " << e);
}
if (!value.isEmpty()) {
insertEntry(name, value);
diff --git a/svtools/source/control/inettbc.cxx b/svtools/source/control/inettbc.cxx
index 0db56b44794b..725ff7136a82 100644
--- a/svtools/source/control/inettbc.cxx
+++ b/svtools/source/control/inettbc.cxx
@@ -634,10 +634,7 @@ void SvtMatchContext_Impl::doExecute()
try {
proc2->releaseCommandIdentifier(id);
} catch (css::uno::RuntimeException & e) {
- SAL_WARN(
- "svtools.control",
- "ignoring UNO RuntimeException "
- << e.Message);
+ SAL_WARN("svtools.control", "ignoring " << e);
}
}
throw;
@@ -661,10 +658,7 @@ void SvtMatchContext_Impl::doExecute()
res, css::uno::UNO_QUERY_THROW);
folder = row->getBoolean(1) && !row->wasNull();
} catch (css::uno::Exception & e) {
- SAL_WARN(
- "svtools.control",
- "ignoring UNO Exception " << typeid(*&e).name()
- << ": " << e.Message);
+ SAL_WARN("svtools.control", "ignoring " << e);
return;
}
}
diff --git a/svtools/source/misc/embedhlp.cxx b/svtools/source/misc/embedhlp.cxx
index 68691df709d7..636e5458500c 100644
--- a/svtools/source/misc/embedhlp.cxx
+++ b/svtools/source/misc/embedhlp.cxx
@@ -342,7 +342,7 @@ void EmbeddedObjectRef::Clear()
}
catch (const uno::Exception& e)
{
- SAL_WARN("svtools.misc", "Error on switching of the object to loaded state and closing: \"" << e.Message << "\"");
+ SAL_WARN("svtools.misc", "Error on switching of the object to loaded state and closing: \"" << e << "\"");
}
}
}
@@ -442,7 +442,7 @@ const Graphic* EmbeddedObjectRef::GetGraphic() const
}
catch( const uno::Exception& ex )
{
- SAL_WARN("svtools.misc", "Something went wrong on getting the graphic: " << ex.Message);
+ SAL_WARN("svtools.misc", "Something went wrong on getting the graphic: " << ex);
}
return mpImpl->pGraphic.get();
@@ -479,7 +479,7 @@ Size EmbeddedObjectRef::GetSize( MapMode const * pTargetMapMode ) const
}
catch (const uno::Exception& e)
{
- SAL_WARN("svtools.misc", "Something went wrong on getting of the size of the object: \"" << e.Message << "\"");
+ SAL_WARN("svtools.misc", "Something went wrong on getting of the size of the object: \"" << e << "\"");
}
try
@@ -488,7 +488,7 @@ Size EmbeddedObjectRef::GetSize( MapMode const * pTargetMapMode ) const
}
catch (const uno::Exception& e)
{
- SAL_WARN("svtools.misc", "Can not get the map mode: \"" << e.Message << "\"");
+ SAL_WARN("svtools.misc", "Can not get the map mode: \"" << e << "\"");
}
}
@@ -575,7 +575,7 @@ SvStream* EmbeddedObjectRef::GetGraphicStream( bool bUpdate ) const
}
catch (const uno::Exception& ex)
{
- SAL_WARN("svtools.misc", "discarding broken embedded object preview: " << ex.Message);
+ SAL_WARN("svtools.misc", "discarding broken embedded object preview: " << ex);
delete pStream;
xStream.clear();
}
diff --git a/svtools/source/misc/imagemgr.cxx b/svtools/source/misc/imagemgr.cxx
index 26af30e533b5..d3bffc243761 100644
--- a/svtools/source/misc/imagemgr.cxx
+++ b/svtools/source/misc/imagemgr.cxx
@@ -394,7 +394,7 @@ static SvImageId GetImageId_Impl( const INetURLObject& rObject, bool bDetectFold
}
catch (const css::ucb::ContentCreationException& e)
{
- SAL_WARN("svtools.misc", "GetImageId_Impl: Caught exception: " << e.Message);
+ SAL_WARN("svtools.misc", "GetImageId_Impl: Caught " << e);
}
return nId;
diff --git a/svx/source/core/extedit.cxx b/svx/source/core/extedit.cxx
index 0568defa3ff1..a0a96bf08aac 100644
--- a/svx/source/core/extedit.cxx
+++ b/svx/source/core/extedit.cxx
@@ -96,7 +96,7 @@ void ExternalToolEditThread::execute()
}
catch (Exception const& e)
{
- SAL_WARN("svx", "ExternalToolEditThread: exception: " << e.Message);
+ SAL_WARN("svx", "ExternalToolEditThread: " << e);
}
}
diff --git a/svx/source/core/graphichelper.cxx b/svx/source/core/graphichelper.cxx
index cc1e725c0eb9..9e8f3dfceab8 100644
--- a/svx/source/core/graphichelper.cxx
+++ b/svx/source/core/graphichelper.cxx
@@ -172,7 +172,7 @@ bool lcl_ExecuteFilterDialog( const Sequence< PropertyValue >& rPropsForDialog,
}
catch( const Exception& e )
{
- SAL_WARN("sfx.doc", "ignoring UNO exception " << e.Message);
+ SAL_WARN("sfx.doc", "ignoring " << e);
}
return bStatus;
diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx
index 552e116fa655..252cdf95c30b 100644
--- a/svx/source/fmcomp/fmgridcl.cxx
+++ b/svx/source/fmcomp/fmgridcl.cxx
@@ -1900,8 +1900,7 @@ namespace
try {
xProp->getPropertyValue( _sPropName ) >>= sRetText;
} catch (UnknownPropertyException const& e) {
- SAL_WARN("svx.fmcomp",
- "exception caught: " << e.Message);
+ SAL_WARN("svx.fmcomp", e);
}
}
}
diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx
index 3977228feb65..f3045b1a94d1 100644
--- a/svx/source/fmcomp/gridcell.cxx
+++ b/svx/source/fmcomp/gridcell.cxx
@@ -3539,7 +3539,7 @@ void FmXTextCell::PaintFieldToCell(OutputDevice& rDev,
}
catch (const Exception& e)
{
- SAL_WARN("svx.fmcomp", "PaintFieldToCell: caught an exception: " << e.Message);
+ SAL_WARN("svx.fmcomp", "PaintFieldToCell: caught " << e);
}
}
diff --git a/svx/source/form/fmsrcimp.cxx b/svx/source/form/fmsrcimp.cxx
index 75b04fabd1cd..ed18ac1fe9b8 100644
--- a/svx/source/form/fmsrcimp.cxx
+++ b/svx/source/form/fmsrcimp.cxx
@@ -210,12 +210,12 @@ bool FmSearchEngine::MoveCursor()
}
catch(css::sdbc::SQLException const& e)
{
- SAL_WARN( "svx", "FmSearchEngine::MoveCursor: caught a DatabaseException: " << e.SQLState );
+ SAL_WARN( "svx", "FmSearchEngine::MoveCursor: caught " << e << " sqlstate=" << e.SQLState );
bSuccess = false;
}
catch(Exception const& e)
{
- SAL_WARN( "svx", "FmSearchEngine::MoveCursor: caught an Exception: " << e.Message);
+ SAL_WARN( "svx", "FmSearchEngine::MoveCursor: caught " << e);
bSuccess = false;
}
catch(...)
diff --git a/svx/source/gallery2/galtheme.cxx b/svx/source/gallery2/galtheme.cxx
index 961ebed99d76..fa7d6971207f 100644
--- a/svx/source/gallery2/galtheme.cxx
+++ b/svx/source/gallery2/galtheme.cxx
@@ -101,7 +101,7 @@ void GalleryTheme::ImplCreateSvDrawStorage()
{
SAL_WARN("svx", "failed to open: "
<< GetSdvURL().GetMainURL(INetURLObject::DecodeMechanism::NONE)
- << "due to : " << e.Message);
+ << "due to : " << e);
}
}
@@ -665,7 +665,7 @@ void GalleryTheme::Actualize( const Link<const INetURLObject&, void>& rActualize
{
SAL_WARN("svx", "failed to open: "
<< aTmpURL.GetMainURL(INetURLObject::DecodeMechanism::NONE)
- << "due to : " << e.Message);
+ << "due to : " << e);
nStorErr = ERRCODE_IO_GENERAL;
}
diff --git a/svx/source/gengal/gengal.cxx b/svx/source/gengal/gengal.cxx
index e3fe915b9e3d..fb338de91096 100644
--- a/svx/source/gengal/gengal.cxx
+++ b/svx/source/gengal/gengal.cxx
@@ -319,12 +319,12 @@ int GalApp::Main()
}
catch (const uno::Exception& e)
{
- SAL_WARN("svx", "Fatal exception: " << e.Message);
+ SAL_WARN("svx", "Fatal: " << e);
return EXIT_FAILURE;
}
catch (const std::exception &e)
{
- SAL_WARN("svx", "Fatal exception: " << e.what());
+ SAL_WARN("svx", "Fatal: " << e.what());
return 1;
}
diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx
index ad2d751abbd9..124fd1741b29 100644
--- a/svx/source/svdraw/svdmodel.cxx
+++ b/svx/source/svdraw/svdmodel.cxx
@@ -864,7 +864,7 @@ SdrModel::GetDocumentStream( OUString const& rURL,
}
catch (uno::Exception const& e)
{
- SAL_WARN("svx", "exception: '" << e.Message << "'");
+ SAL_WARN("svx", "exception: '" << e << "'");
}
return nullptr;
}
diff --git a/svx/source/svdraw/svdomedia.cxx b/svx/source/svdraw/svdomedia.cxx
index 1594c5d43396..7dd17c5e7665 100644
--- a/svx/source/svdraw/svdomedia.cxx
+++ b/svx/source/svdraw/svdomedia.cxx
@@ -320,7 +320,7 @@ static bool lcl_HandleJsonPackageURL(
}
catch (uno::Exception const& e)
{
- SAL_INFO("svx", "exception while copying glTF related files to temp directory '" << e.Message << "'");
+ SAL_INFO("svx", "exception while copying glTF related files to temp directory '" << e << "'");
}
return true;
}
@@ -348,7 +348,7 @@ static bool lcl_CopyToTempFile(
}
catch (uno::Exception const& e)
{
- SAL_WARN("svx", "exception: '" << e.Message << "'");
+ SAL_WARN("svx", "exception: '" << e << "'");
return false;
}
o_rTempFileURL = tempFileURL;
@@ -396,7 +396,7 @@ static bool lcl_HandlePackageURL(
}
catch (uno::Exception const& e)
{
- SAL_WARN("svx", "exception: '" << e.Message << "'");
+ SAL_WARN("svx", "exception: '" << e << "'");
return false;
}
if (!xInStream.is())
diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx
index 625f9ea1fd9a..02a41ca31e0a 100644
--- a/svx/source/svdraw/svdoole2.cxx
+++ b/svx/source/svdraw/svdoole2.cxx
@@ -911,8 +911,7 @@ void SdrOle2Obj::CheckFileLink_Impl()
}
catch (const css::uno::Exception& e)
{
- SAL_WARN("svx", "SdrOle2Obj::CheckFileLink_Impl(),"
- "exception caught: " << e.Message);
+ SAL_WARN("svx", "SdrOle2Obj::CheckFileLink_Impl(), " << e);
}
}
}
diff --git a/svx/workben/pixelctl.cxx b/svx/workben/pixelctl.cxx
index 1a751bec30e1..d4dce050dcd3 100644
--- a/svx/workben/pixelctl.cxx
+++ b/svx/workben/pixelctl.cxx
@@ -65,12 +65,12 @@ SAL_IMPLEMENT_MAIN()
}
catch (const Exception& e)
{
- SAL_WARN("vcl.app", "Fatal exception: " << e.Message);
+ SAL_WARN("vcl.app", "Fatal: " << e);
return 1;
}
catch (const std::exception& e)
{
- SAL_WARN("vcl.app", "Fatal exception: " << e.what());
+ SAL_WARN("vcl.app", "Fatal: " << e.what());
return 1;
}
diff --git a/sw/source/core/access/accmap.cxx b/sw/source/core/access/accmap.cxx
index 3d0dd877409e..9e69ee7cf077 100644
--- a/sw/source/core/access/accmap.cxx
+++ b/sw/source/core/access/accmap.cxx
@@ -193,7 +193,7 @@ void SwDrawModellListener_Impl::Notify( SfxBroadcaster& /*rBC*/,
}
catch( uno::RuntimeException const & r )
{
- SAL_WARN("sw.a11y", "Runtime exception caught while notifying shape: " << r.Message);
+ SAL_WARN("sw.a11y", "Runtime exception caught while notifying shape: " << r);
}
}
}
diff --git a/sw/source/core/edit/edundo.cxx b/sw/source/core/edit/edundo.cxx
index 58b8af364f45..4591c535d6a5 100644
--- a/sw/source/core/edit/edundo.cxx
+++ b/sw/source/core/edit/edundo.cxx
@@ -132,8 +132,7 @@ bool SwEditShell::Undo(sal_uInt16 const nCount)
|| bRet;
}
} catch (const css::uno::Exception & e) {
- SAL_WARN("sw.core",
- "SwEditShell::Undo(): exception caught: " << e.Message);
+ SAL_WARN("sw.core", "SwEditShell::Undo(): exception caught: " << e);
}
if (bRestoreCursor)
@@ -188,8 +187,7 @@ bool SwEditShell::Redo(sal_uInt16 const nCount)
|| bRet;
}
} catch (const css::uno::Exception & e) {
- SAL_WARN("sw.core",
- "SwEditShell::Redo(): exception caught: " << e.Message);
+ SAL_WARN("sw.core", "SwEditShell::Redo(): exception caught: " << e);
}
Pop((bRestoreCursor) ? PopMode::DeleteCurrent : PopMode::DeleteStack);
@@ -218,8 +216,7 @@ bool SwEditShell::Repeat(sal_uInt16 const nCount)
bRet = GetDoc()->GetIDocumentUndoRedo().Repeat( context, nCount )
|| bRet;
} catch (const css::uno::Exception & e) {
- SAL_WARN("sw.core",
- "SwEditShell::Repeat(): exception caught: " << e.Message);
+ SAL_WARN("sw.core", "SwEditShell::Repeat(): exception caught: " << e);
}
EndAllAction();
diff --git a/sw/source/core/layout/layact.cxx b/sw/source/core/layout/layact.cxx
index e0ebc69ca6d3..70047724f494 100644
--- a/sw/source/core/layout/layact.cxx
+++ b/sw/source/core/layout/layact.cxx
@@ -1923,7 +1923,7 @@ bool SwLayIdle::DoIdleJob_( const SwContentFrame *pCnt, IdleJobType eJob )
pImp->GetShell()->InvalidateWindows( aRepaint );
} catch( const css::uno::RuntimeException& e) {
// handle smarttag problems gracefully and provide diagnostics
- SAL_WARN( "sw.core", "SMART_TAGS Exception:" << e.Message);
+ SAL_WARN( "sw.core", "SMART_TAGS: " << e);
}
if (Application::AnyInput(VCL_INPUT_ANY & VclInputFlags(~VclInputFlags::TIMER)))
return true;
diff --git a/sw/source/core/tox/toxhlp.cxx b/sw/source/core/tox/toxhlp.cxx
index 9ad441bb4abf..7bdd2d3d0130 100644
--- a/sw/source/core/tox/toxhlp.cxx
+++ b/sw/source/core/tox/toxhlp.cxx
@@ -33,7 +33,7 @@ IndexEntrySupplierWrapper::IndexEntrySupplierWrapper()
}
catch (const uno::Exception& e)
{
- SAL_WARN( "sw.core", "IndexEntrySupplierWrapper: Caught exception: " << e.Message );
+ SAL_WARN( "sw.core", "IndexEntrySupplierWrapper: Caught " << e );
}
}
@@ -51,7 +51,7 @@ OUString IndexEntrySupplierWrapper::GetIndexKey( const OUString& rText,
}
catch (const uno::Exception& e)
{
- SAL_WARN( "sw.core", "getIndexKey: Caught exception: " << e.Message );
+ SAL_WARN( "sw.core", "getIndexKey: Caught " << e );
}
return sRet;
}
@@ -64,7 +64,7 @@ OUString IndexEntrySupplierWrapper::GetFollowingText( bool bMorePages ) const
}
catch (const uno::Exception& e)
{
- SAL_WARN( "sw.core", "getIndexFollowPageWord: Caught exception: " << e.Message );
+ SAL_WARN( "sw.core", "getIndexFollowPageWord: Caught " << e );
}
return sRet;
}
@@ -78,7 +78,7 @@ css::uno::Sequence< OUString > IndexEntrySupplierWrapper::GetAlgorithmList( cons
}
catch (const uno::Exception& e)
{
- SAL_WARN( "sw.core", "getAlgorithmList: Caught exception: " << e.Message );
+ SAL_WARN( "sw.core", "getAlgorithmList: Caught " << e );
}
return sRet;
}
@@ -93,7 +93,7 @@ bool IndexEntrySupplierWrapper::LoadAlgorithm(
}
catch (const uno::Exception& e)
{
- SAL_WARN( "sw.core", "loadAlgorithm: Caught exception: " << e.Message );
+ SAL_WARN( "sw.core", "loadAlgorithm: Caught " << e );
}
return bRet;
}
@@ -111,7 +111,7 @@ sal_Int16 IndexEntrySupplierWrapper::CompareIndexEntry(
}
catch (const uno::Exception& e)
{
- SAL_WARN( "sw.core", "compareIndexEntry: Caught exception: " << e.Message );
+ SAL_WARN( "sw.core", "compareIndexEntry: Caught " << e );
}
return nRet;
}
diff --git a/sw/source/core/view/viewimp.cxx b/sw/source/core/view/viewimp.cxx
index 22ea4ad88244..7a79eabc2600 100644
--- a/sw/source/core/view/viewimp.cxx
+++ b/sw/source/core/view/viewimp.cxx
@@ -304,7 +304,7 @@ void SwViewShellImp::UpdateAccessible()
}
catch (uno::Exception const& e)
{
- SAL_WARN("sw.a11y", "exception: " << e.Message);
+ SAL_WARN("sw.a11y", e);
assert(!"SwViewShellImp::UpdateAccessible: unhandled exception");
}
}
diff --git a/sw/source/filter/docx/swdocxreader.cxx b/sw/source/filter/docx/swdocxreader.cxx
index 5dcbb557c63d..60b028b8e608 100644
--- a/sw/source/filter/docx/swdocxreader.cxx
+++ b/sw/source/filter/docx/swdocxreader.cxx
@@ -84,7 +84,7 @@ ErrCode SwDOCXReader::Read(SwDoc& rDoc, const OUString& /* rBaseURL */, SwPaM& r
}
catch (uno::Exception const& e)
{
- SAL_WARN("sw.docx", "SwDOCXReader::Read(): exception: " << e.Message);
+ SAL_WARN("sw.docx", "SwDOCXReader::Read(): " << e);
ret = ERR_SWG_READ_ERROR;
}
return ret;
diff --git a/sw/source/filter/rtf/swparrtf.cxx b/sw/source/filter/rtf/swparrtf.cxx
index 2b8632fad14c..99fd13ab0a33 100644
--- a/sw/source/filter/rtf/swparrtf.cxx
+++ b/sw/source/filter/rtf/swparrtf.cxx
@@ -93,7 +93,7 @@ ErrCode SwRTFReader::Read(SwDoc& rDoc, const OUString& /*rBaseURL*/, SwPaM& rPam
}
catch (uno::Exception const& e)
{
- SAL_WARN("sw.rtf", "SwRTFReader::Read(): exception: " << e.Message);
+ SAL_WARN("sw.rtf", "SwRTFReader::Read(): " << e);
ret = ERR_SWG_READ_ERROR;
}
diff --git a/sw/source/filter/writer/writer.cxx b/sw/source/filter/writer/writer.cxx
index 50cd3a3812c4..bcd03f2b8db0 100644
--- a/sw/source/filter/writer/writer.cxx
+++ b/sw/source/filter/writer/writer.cxx
@@ -254,7 +254,7 @@ ErrCode Writer::Write( SwPaM& rPaM, SvStream& rStrm, const OUString* pFName )
}
catch (const css::ucb::ContentCreationException &e)
{
- SAL_WARN("sw", "Writer::Write caught " << e.Message);
+ SAL_WARN("sw", "Writer::Write caught " << e);
}
return nResult;
}
diff --git a/sw/source/filter/ww8/docxexport.cxx b/sw/source/filter/ww8/docxexport.cxx
index c3df2b0cf18f..166c7c78c268 100644
--- a/sw/source/filter/ww8/docxexport.cxx
+++ b/sw/source/filter/ww8/docxexport.cxx
@@ -409,7 +409,7 @@ OString DocxExport::WriteOLEObject(SwOLEObj& rObject, OUString & io_rProgID)
}
catch (uno::Exception const& e)
{
- SAL_WARN("sw.ww8", "DocxExport::WriteOLEObject: exception: " << e.Message);
+ SAL_WARN("sw.ww8", "DocxExport::WriteOLEObject: " << e);
return OString();
}
diff --git a/sw/source/filter/ww8/docxsdrexport.cxx b/sw/source/filter/ww8/docxsdrexport.cxx
index 383d598aa7a7..720a923f5861 100644
--- a/sw/source/filter/ww8/docxsdrexport.cxx
+++ b/sw/source/filter/ww8/docxsdrexport.cxx
@@ -1099,7 +1099,7 @@ void DocxSdrExport::writeDiagramRels(const uno::Sequence< uno::Sequence< uno::An
}
catch (const uno::Exception& rException)
{
- SAL_WARN("sw.ww8", "DocxSdrExport::writeDiagramRels Failed to copy grabbaged Image: " << rException.Message);
+ SAL_WARN("sw.ww8", "DocxSdrExport::writeDiagramRels Failed to copy grabbaged Image: " << rException);
}
dataImagebin->closeInput();
}
diff --git a/sw/source/filter/ww8/rtfsdrexport.cxx b/sw/source/filter/ww8/rtfsdrexport.cxx
index 9241b6fe529d..b8ca0b47bcb7 100644
--- a/sw/source/filter/ww8/rtfsdrexport.cxx
+++ b/sw/source/filter/ww8/rtfsdrexport.cxx
@@ -454,7 +454,7 @@ void RtfSdrExport::impl_writeGraphic()
catch (beans::UnknownPropertyException& rException)
{
// ATM groupshapes are not supported, just make sure we don't crash on them.
- SAL_WARN("sw.rtf", "failed. Message: " << rException.Message);
+ SAL_WARN("sw.rtf", "failed. Message: " << rException);
return;
}
OString aURLBS(OUStringToOString(sGraphicURL, RTL_TEXTENCODING_UTF8));
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index c63cb2502269..395a6cd57330 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -4930,7 +4930,7 @@ ErrCode SwWW8ImplReader::CoreLoad(WW8Glossary const *pGloss)
}
catch (const uno::Exception& rException)
{
- SAL_WARN("sw.ww8", "SwWW8ImplReader::CoreLoad: failed to initialize RDF metadata: " << rException.Message);
+ SAL_WARN("sw.ww8", "SwWW8ImplReader::CoreLoad: failed to initialize RDF metadata: " << rException);
}
ReadDocInfo();
}
diff --git a/sw/source/filter/ww8/ww8toolbar.cxx b/sw/source/filter/ww8/ww8toolbar.cxx
index 33a4547ae6ba..ecc5e6b66bc8 100644
--- a/sw/source/filter/ww8/ww8toolbar.cxx
+++ b/sw/source/filter/ww8/ww8toolbar.cxx
@@ -589,7 +589,7 @@ bool SwCTB::ImportCustomToolBar( SwCTBWrapper& rWrapper, CustomToolBarImportHelp
}
catch( const uno::Exception& e )
{
- SAL_INFO("sw.ww8","***** For some reason we have an exception " << e.Message );
+ SAL_INFO("sw.ww8","***** For some reason we have an " << e );
bRes = false;
}
return bRes;
diff --git a/sw/source/filter/xml/swxml.cxx b/sw/source/filter/xml/swxml.cxx
index 515d3a6b2dfa..bd37e18b2634 100644
--- a/sw/source/filter/xml/swxml.cxx
+++ b/sw/source/filter/xml/swxml.cxx
@@ -196,7 +196,7 @@ ErrCode ReadThroughComponent(
if( bEncrypted )
return ERRCODE_SFX_WRONGPASSWORD;
- SAL_WARN( "sw", "SAX parse exception caught while importing: " << r.Message );
+ SAL_WARN( "sw", "SAX parse exception caught while importing: " << r );
const OUString sErr( OUString::number( r.LineNumber )
+ ","
@@ -226,22 +226,22 @@ ErrCode ReadThroughComponent(
if( bEncrypted )
return ERRCODE_SFX_WRONGPASSWORD;
- SAL_WARN( "sw", "SAX exception caught while importing: " << r.Message);
+ SAL_WARN( "sw", "SAX exception caught while importing: " << r);
return ERR_SWG_READ_ERROR;
}
catch(const packages::zip::ZipIOException& r)
{
- SAL_WARN( "sw", "Zip exception caught while importing: " << r.Message);
+ SAL_WARN( "sw", "Zip exception caught while importing: " << r);
return ERRCODE_IO_BROKENPACKAGE;
}
catch(const io::IOException& r)
{
- SAL_WARN( "sw", "IO exception caught while importing: " << r.Message);
+ SAL_WARN( "sw", "IO exception caught while importing: " << r);
return ERR_SWG_READ_ERROR;
}
catch(const uno::Exception& r)
{
- SAL_WARN( "sw", "uno exception caught while importing: " << r.Message );
+ SAL_WARN( "sw", "uno exception caught while importing: " << r );
return ERR_SWG_READ_ERROR;
}
diff --git a/sw/source/filter/xml/xmlfmt.cxx b/sw/source/filter/xml/xmlfmt.cxx
index 4b0af71ddf6b..7c129e072d52 100644
--- a/sw/source/filter/xml/xmlfmt.cxx
+++ b/sw/source/filter/xml/xmlfmt.cxx
@@ -343,7 +343,7 @@ SwXMLTextStyleContext_Impl::Finish( bool bOverwrite )
}
catch (uno::Exception const& e)
{
- SAL_WARN("sw.xml", "exception when setting ParaStyleConditions: " << e.Message);
+ SAL_WARN("sw.xml", "exception when setting ParaStyleConditions: " << e);
}
}
XMLTextStyleContext::Finish( bOverwrite );
diff --git a/sw/source/ui/dbui/dbinsdlg.cxx b/sw/source/ui/dbui/dbinsdlg.cxx
index fc4ad77224b0..aa655be4af6c 100644
--- a/sw/source/ui/dbui/dbinsdlg.cxx
+++ b/sw/source/ui/dbui/dbinsdlg.cxx
@@ -1173,7 +1173,7 @@ void SwInsertDBColAutoPilot::DataToDoc( const Sequence<Any>& rSelection,
}
catch (const Exception& rExcept)
{
- SAL_WARN("sw", rExcept.Message);
+ SAL_WARN("sw", rExcept);
}
}
diff --git a/sw/source/ui/dbui/mmaddressblockpage.cxx b/sw/source/ui/dbui/mmaddressblockpage.cxx
index 17ee1512e736..d966be4d7981 100644
--- a/sw/source/ui/dbui/mmaddressblockpage.cxx
+++ b/sw/source/ui/dbui/mmaddressblockpage.cxx
@@ -182,7 +182,7 @@ IMPL_LINK_NOARG(SwMailMergeAddressBlockPage, AddressListHdl_Impl, Button*, void)
}
catch (const uno::Exception& e)
{
- SAL_WARN("sw", e.Message);
+ SAL_WARN("sw", e);
ScopedVclPtrInstance<MessageDialog>(this, e.Message)->Execute();
}
}
diff --git a/sw/source/uibase/app/apphdl.cxx b/sw/source/uibase/app/apphdl.cxx
index 9839eddc2d6c..11ab8fcdc312 100644
--- a/sw/source/uibase/app/apphdl.cxx
+++ b/sw/source/uibase/app/apphdl.cxx
@@ -405,7 +405,7 @@ bool lcl_hasAllComponentsAvailable()
{
SAL_INFO(
"sw.core",
- "assuming Base to be missing; caught " << e.Message);
+ "assuming Base to be missing; caught " << e);
return false;
}
}
@@ -428,7 +428,7 @@ void SwMailMergeWizardExecutor::ExecuteMailMergeWizard( const SfxItemSet * pArgs
{
SAL_INFO(
"sw.core",
- "trying to install LibreOffice Base, caught " << e.Message);
+ "trying to install LibreOffice Base, caught " << e);
}
return;
}
diff --git a/sw/source/uibase/config/StoredChapterNumbering.cxx b/sw/source/uibase/config/StoredChapterNumbering.cxx
index e0bc40a9ed02..271602493317 100644
--- a/sw/source/uibase/config/StoredChapterNumbering.cxx
+++ b/sw/source/uibase/config/StoredChapterNumbering.cxx
@@ -444,8 +444,7 @@ void ExportStoredChapterNumberingRules(SwChapterNumRules & rRules,
}
catch (uno::Exception const& e)
{
- SAL_WARN("sw.ui",
- "ExportStoredChapterNumberingRules: exception: " << e.Message);
+ SAL_WARN("sw.ui", "ExportStoredChapterNumberingRules: " << e);
}
}
@@ -474,8 +473,7 @@ void ImportStoredChapterNumberingRules(SwChapterNumRules & rRules,
}
catch (uno::Exception const& e)
{
- SAL_WARN("sw.ui",
- "ImportStoredChapterNumberingRules: exception: " << e.Message);
+ SAL_WARN("sw.ui", "ImportStoredChapterNumberingRules: " << e);
}
}
diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx
index 2811c217580c..241cfaa52730 100644
--- a/sw/source/uibase/dbui/dbmgr.cxx
+++ b/sw/source/uibase/dbui/dbmgr.cxx
@@ -1737,7 +1737,7 @@ sal_uLong SwDBManager::GetColumnFormat( const OUString& rDBName,
}
catch (const uno::Exception& e)
{
- SAL_WARN("sw.mailmerge", "Exception in getColumns(): " << e.Message);
+ SAL_WARN("sw.mailmerge", "Exception in getColumns(): " << e);
}
if(!xCols.is() || !xCols->hasByName(rColNm))
return nRet;
@@ -1829,7 +1829,7 @@ sal_uLong SwDBManager::GetColumnFormat( uno::Reference< sdbc::XDataSource> const
}
catch (const uno::Exception& e)
{
- SAL_WARN("sw.mailmerge", "illegal number format key: " << e.Message);
+ SAL_WARN("sw.mailmerge", "illegal number format key: " << e);
}
}
}
@@ -1952,7 +1952,7 @@ uno::Reference< sdbcx::XColumnsSupplier> SwDBManager::GetColumnSupplier(uno::Ref
}
catch (const uno::Exception& e)
{
- SAL_WARN("sw.mailmerge", "Exception in SwDBManager::GetColumnSupplier: " << e.Message);
+ SAL_WARN("sw.mailmerge", "Exception in SwDBManager::GetColumnSupplier: " << e);
}
return xRet;
@@ -2019,7 +2019,7 @@ OUString SwDBManager::GetDBField(uno::Reference<beans::XPropertySet> const & xCo
}
catch (const uno::Exception& e)
{
- SAL_WARN("sw.mailmerge", "exception caught: " << e.Message);
+ SAL_WARN("sw.mailmerge", "exception caught: " << e);
}
}
@@ -2277,7 +2277,7 @@ static bool lcl_ToNextRecord( SwDSParam* pParam, const SwDBNextRecord action )
bRet = false;
// we allow merging with empty databases, so don't warn on init
SAL_WARN_IF(action == SwDBNextRecord::NEXT,
- "sw.mailmerge", "exception in ToNextRecord(): " << e.Message);
+ "sw.mailmerge", "exception in ToNextRecord(): " << e);
}
return bRet;
}
@@ -3037,7 +3037,7 @@ void SwDBManager::InsertText(SwWrtShell& rSh,
}
catch (const uno::Exception& e)
{
- SAL_WARN("sw.mailmerge", "exception caught: " << e.Message);
+ SAL_WARN("sw.mailmerge", "exception caught: " << e);
}
}
}
@@ -3055,7 +3055,7 @@ uno::Reference<sdbc::XDataSource> SwDBManager::getDataSourceAsParent(const uno::
}
catch (const uno::Exception& e)
{
- SAL_WARN("sw.mailmerge", "exception caught in getDataSourceAsParent(): " << e.Message);
+ SAL_WARN("sw.mailmerge", "exception caught in getDataSourceAsParent(): " << e);
}
return xSource;
}
@@ -3094,7 +3094,7 @@ uno::Reference<sdbc::XResultSet> SwDBManager::createCursor(const OUString& _sDat
}
catch (const uno::Exception& e)
{
- SAL_WARN("sw.mailmerge", "Caught exception while creating a new RowSet: " << e.Message);
+ SAL_WARN("sw.mailmerge", "Caught exception while creating a new RowSet: " << e);
}
return xResultSet;
}
diff --git a/sw/source/uibase/dbui/mmconfigitem.cxx b/sw/source/uibase/dbui/mmconfigitem.cxx
index 0dbc3a088543..9c97e831ee25 100644
--- a/sw/source/uibase/dbui/mmconfigitem.cxx
+++ b/sw/source/uibase/dbui/mmconfigitem.cxx
@@ -891,7 +891,7 @@ Reference< XResultSet> SwMailMergeConfigItem::GetResultSet() const
}
catch (const Exception& e)
{
- SAL_WARN("sw.ui", "exception caught: " << e.Message);
+ SAL_WARN("sw.ui", "exception caught: " << e);
}
xRowSet->execute();
m_pImpl->m_xResultSet = xRowSet.get();
@@ -900,7 +900,7 @@ Reference< XResultSet> SwMailMergeConfigItem::GetResultSet() const
}
catch (const Exception& e)
{
- SAL_WARN("sw.ui", "exception caught in: SwMailMergeConfigItem::GetResultSet() " << e.Message);
+ SAL_WARN("sw.ui", "exception caught in: SwMailMergeConfigItem::GetResultSet() " << e);
}
}
return m_pImpl->m_xResultSet;
@@ -938,7 +938,7 @@ void SwMailMergeConfigItem::SetFilter(OUString const & rFilter)
}
catch (const Exception& e)
{
- SAL_WARN("sw.ui", "exception caught in SwMailMergeConfigItem::SetFilter(): " << e.Message);
+ SAL_WARN("sw.ui", "exception caught in SwMailMergeConfigItem::SetFilter(): " << e);
}
}
}
diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx
index 5465cd7d89b0..62fc854b0821 100644
--- a/toolkit/source/awt/vclxtoolkit.cxx
+++ b/toolkit/source/awt/vclxtoolkit.cxx
@@ -1391,7 +1391,7 @@ css::uno::Reference< css::awt::XWindowPeer > VCLXToolkit::createSystemChild( con
catch ( const css::uno::RuntimeException & rEx )
{
// system child window could not be created
- SAL_WARN("toolkit", "caught " << rEx.Message);
+ SAL_WARN("toolkit", "caught " << rEx);
pChildWindow.clear();
}
}
@@ -1786,7 +1786,7 @@ void VCLXToolkit::callTopWindowListeners(
}
catch (const css::uno::RuntimeException & rEx)
{
- SAL_WARN("toolkit", "caught " << rEx.Message);
+ SAL_WARN("toolkit", "caught " << rEx);
}
}
}
@@ -1831,7 +1831,7 @@ bool VCLXToolkit::callKeyHandlers(::VclSimpleEvent const * pEvent,
}
catch (const css::uno::RuntimeException & rEx)
{
- SAL_WARN("toolkit", "caught " << rEx.Message);
+ SAL_WARN("toolkit", "caught " << rEx);
}
}
}
@@ -1877,7 +1877,7 @@ void VCLXToolkit::callFocusListeners(::VclSimpleEvent const * pEvent,
}
catch (const css::uno::RuntimeException & rEx)
{
- SAL_WARN("toolkit", "caught " << rEx.Message);
+ SAL_WARN("toolkit", "caught " << rEx);
}
}
}
diff --git a/toolkit/source/controls/unocontrols.cxx b/toolkit/source/controls/unocontrols.cxx
index b7f5466ab9ef..80d4def816fd 100644
--- a/toolkit/source/controls/unocontrols.cxx
+++ b/toolkit/source/controls/unocontrols.cxx
@@ -2930,7 +2930,7 @@ void UnoListBoxControl::itemStateChanged( const awt::ItemEvent& rEvent )
}
catch( const Exception& e )
{
- SAL_WARN( "toolkit", "UnoListBoxControl::itemStateChanged: caught an exception: " << e.Message);
+ SAL_WARN( "toolkit", "UnoListBoxControl::itemStateChanged: caught " << e);
}
}
}
@@ -3266,7 +3266,7 @@ void UnoComboBoxControl::itemStateChanged( const awt::ItemEvent& rEvent )
}
catch( const Exception& e )
{
- SAL_WARN( "toolkit", "UnoComboBoxControl::itemStateChanged: caught an exception: " << e.Message);
+ SAL_WARN( "toolkit", "UnoComboBoxControl::itemStateChanged: caught " << e);
}
}
}
diff --git a/ucb/source/core/provprox.cxx b/ucb/source/core/provprox.cxx
index 271269a35feb..73a81c5f51c4 100644
--- a/ucb/source/core/provprox.cxx
+++ b/ucb/source/core/provprox.cxx
@@ -313,7 +313,7 @@ UcbContentProviderProxy::getContentProvider()
}
catch ( Exception const & e)
{
- SAL_INFO( "ucb.core", "Exception when getting content provider: " << e.Message );
+ SAL_INFO( "ucb.core", "Exception when getting content provider: " << e );
}
// registerInstance called at proxy, but not yet at original?
diff --git a/ucb/source/ucp/expand/ucpexpand.cxx b/ucb/source/ucp/expand/ucpexpand.cxx
index 0cc5f145ee5a..6be7fd136e37 100644
--- a/ucb/source/ucp/expand/ucpexpand.cxx
+++ b/ucb/source/ucp/expand/ucpexpand.cxx
@@ -200,7 +200,7 @@ sal_Int32 ExpandContentProviderImpl::compareContentIds(
}
catch (const ucb::IllegalIdentifierException & exc)
{
- SAL_WARN( "ucb", exc.Message );
+ SAL_WARN( "ucb", exc );
return -1;
}
}
diff --git a/ucbhelper/source/client/content.cxx b/ucbhelper/source/client/content.cxx
index 7484f5c899ad..388c790e8de3 100644
--- a/ucbhelper/source/client/content.cxx
+++ b/ucbhelper/source/client/content.cxx
@@ -278,7 +278,7 @@ static Reference< XContent > getContentNoThrow(
}
catch ( IllegalIdentifierException const & e )
{
- SAL_WARN("ucbhelper", "getContentNoThrow: exception: " << e.Message);
+ SAL_WARN("ucbhelper", "getContentNoThrow: " << e);
}
return xContent;
diff --git a/unotools/source/config/configitem.cxx b/unotools/source/config/configitem.cxx
index d0d17510ebe4..80d18841299e 100644
--- a/unotools/source/config/configitem.cxx
+++ b/unotools/source/config/configitem.cxx
@@ -423,7 +423,7 @@ Sequence< Any > ConfigItem::GetProperties(const Sequence< OUString >& rNames)
"unotools.config",
"ignoring XHierarchicalNameAccess to /org.openoffice."
<< sSubTree << "/" << pNames[i] << " Exception: "
- << rEx.Message);
+ << rEx);
}
}
@@ -503,7 +503,7 @@ bool ConfigItem::PutProperties( const Sequence< OUString >& rNames,
{
SAL_WARN(
"unotools.config",
- "Exception from PutProperties: " << e.Message);
+ "Exception from PutProperties: " << e);
}
}
try
@@ -515,7 +515,7 @@ bool ConfigItem::PutProperties( const Sequence< OUString >& rNames,
{
SAL_WARN(
"unotools.config",
- "Exception from commitChanges(): " << e.Message);
+ "Exception from commitChanges(): " << e);
}
}
@@ -645,7 +645,7 @@ Sequence< OUString > ConfigItem::GetNodeNames(const OUString& rNode, ConfigNameF
{
SAL_WARN(
"unotools.config",
- "Exception from GetNodeNames: " << e.Message);
+ "Exception from GetNodeNames: " << e);
}
}
return aRet;
@@ -683,7 +683,7 @@ bool ConfigItem::ClearNodeSet(const OUString& rNode)
{
SAL_WARN(
"unotools.config",
- "Exception from removeByName(): " << e.Message);
+ "Exception from removeByName(): " << e);
}
}
xBatch->commitChanges();
@@ -691,8 +691,7 @@ bool ConfigItem::ClearNodeSet(const OUString& rNode)
}
catch (css::uno::Exception & e)
{
- SAL_WARN(
- "unotools.config", "Exception from ClearNodeSet" << e.Message);
+ SAL_WARN("unotools.config", "Exception from ClearNodeSet" << e);
}
}
return bRet;
@@ -731,7 +730,7 @@ bool ConfigItem::ClearNodeElements(const OUString& rNode, Sequence< OUString > c
{
SAL_WARN(
"unotools.config",
- "Exception from commitChanges(): " << e.Message);
+ "Exception from commitChanges(): " << e);
}
bRet = true;
}
@@ -739,7 +738,7 @@ bool ConfigItem::ClearNodeElements(const OUString& rNode, Sequence< OUString > c
{
SAL_WARN(
"unotools.config",
- "Exception from GetNodeNames: " << e.Message);
+ "Exception from GetNodeNames: " << e);
}
}
return bRet;
@@ -829,7 +828,7 @@ bool ConfigItem::SetSetProperties(
{
SAL_WARN(
"unotools.config",
- "Exception from commitChanges(): " << e.Message);
+ "Exception from commitChanges(): " << e);
}
const PropertyValue* pProperties = rValues.getConstArray();
@@ -870,8 +869,7 @@ bool ConfigItem::SetSetProperties(
{
SAL_WARN(
"unotools.config",
- "Exception form insert/replaceByName(): "
- << e.Message);
+ "Exception form insert/replaceByName(): " << e);
}
}
xBatch->commitChanges();
@@ -881,7 +879,7 @@ bool ConfigItem::SetSetProperties(
{
SAL_WARN(
"unotools.config",
- "Exception from SetSetProperties: " << rEx.Message);
+ "Exception from SetSetProperties: " << rEx);
bRet = false;
}
}
@@ -961,7 +959,7 @@ bool ConfigItem::ReplaceSetProperties(
{
SAL_WARN(
"unotools.config",
- "Exception from commitChanges(): " << e.Message);
+ "Exception from commitChanges(): " << e);
}
}
@@ -982,7 +980,7 @@ bool ConfigItem::ReplaceSetProperties(
{
SAL_WARN(
"unotools.config",
- "Exception from commitChanges(): " << e.Message);
+ "Exception from commitChanges(): " << e);
}
const PropertyValue* pProperties = rValues.getConstArray();
@@ -1021,8 +1019,7 @@ bool ConfigItem::ReplaceSetProperties(
{
SAL_WARN(
"unotools.config",
- "Exception from insert/replaceByName(): "
- << e.Message);
+ "Exception from insert/replaceByName(): " << e);
}
}
xBatch->commitChanges();
@@ -1031,8 +1028,7 @@ bool ConfigItem::ReplaceSetProperties(
catch (const Exception& rEx)
{
SAL_WARN(
- "unotools.config",
- "Exception from ReplaceSetProperties: " << rEx.Message);
+ "unotools.config", "Exception from ReplaceSetProperties: " << rEx);
bRet = false;
}
}
@@ -1076,9 +1072,7 @@ bool ConfigItem::AddNode(const OUString& rNode, const OUString& rNewNode)
}
catch (css::uno::Exception & e)
{
- SAL_WARN(
- "unotools.config",
- "Exception from commitChanges(): " << e.Message);
+ SAL_WARN("unotools.config", "Exception from commitChanges(): " << e);
}
}
else
@@ -1091,17 +1085,14 @@ bool ConfigItem::AddNode(const OUString& rNode, const OUString& rNewNode)
}
catch (css::uno::Exception & e)
{
- SAL_WARN(
- "unotools.config",
- "Exception from AddNode(): " << e.Message);
+ SAL_WARN("unotools.config", "Exception from AddNode(): " << e);
}
}
xBatch->commitChanges();
}
catch (const Exception& rEx)
{
- SAL_WARN(
- "unotools.config", "Exception from AddNode(): " << rEx.Message);
+ SAL_WARN("unotools.config", "Exception from AddNode(): " << rEx);
bRet = false;
}
}
diff --git a/unotools/source/config/historyoptions.cxx b/unotools/source/config/historyoptions.cxx
index b4213295c142..e12403f77784 100644
--- a/unotools/source/config/historyoptions.cxx
+++ b/unotools/source/config/historyoptions.cxx
@@ -117,7 +117,7 @@ SvtHistoryOptions_Impl::SvtHistoryOptions_Impl()
m_xCfg.clear();
m_xCommonXCU.clear();
- SAL_WARN("unotools.config", "Caught unexpected: " << ex.Message);
+ SAL_WARN("unotools.config", "Caught unexpected: " << ex);
}
}
@@ -148,7 +148,7 @@ sal_uInt32 SvtHistoryOptions_Impl::GetCapacity(EHistoryType eHistory)
}
catch (const uno::Exception& ex)
{
- SAL_WARN("unotools.config", "Caught unexpected: " << ex.Message);
+ SAL_WARN("unotools.config", "Caught unexpected: " << ex);
}
return nSize;
@@ -176,7 +176,7 @@ uno::Reference<container::XNameAccess> SvtHistoryOptions_Impl::GetListAccess(EHi
}
catch (const uno::Exception& ex)
{
- SAL_WARN("unotools.config", "Caught unexpected: " << ex.Message);
+ SAL_WARN("unotools.config", "Caught unexpected: " << ex);
}
return xListAccess;
@@ -215,7 +215,7 @@ void SvtHistoryOptions_Impl::impl_truncateList(EHistoryType eHistory, sal_uInt32
}
catch(const uno::Exception& ex)
{
- SAL_WARN("unotools.config", "Caught unexpected: " << ex.Message);
+ SAL_WARN("unotools.config", "Caught unexpected: " << ex);
}
}
@@ -248,7 +248,7 @@ void SvtHistoryOptions_Impl::Clear( EHistoryType eHistory )
}
catch(const uno::Exception& ex)
{
- SAL_WARN("unotools.config", "Caught unexpected: " << ex.Message);
+ SAL_WARN("unotools.config", "Caught unexpected: " << ex);
}
}
@@ -276,7 +276,7 @@ Sequence< Sequence<PropertyValue> > SvtHistoryOptions_Impl::GetList(EHistoryType
}
catch(const uno::Exception& ex)
{
- SAL_WARN("unotools.config", "Caught unexpected: " << ex.Message);
+ SAL_WARN("unotools.config", "Caught unexpected: " << ex);
}
const sal_Int32 nLength = xOrderList->getElementNames().getLength();
@@ -310,7 +310,7 @@ Sequence< Sequence<PropertyValue> > SvtHistoryOptions_Impl::GetList(EHistoryType
// ignore such corrupted individual items here, so that at
// least newly added items are successfully reported back
// from this function:
- SAL_WARN("unotools.config", "Caught unexpected: " << ex.Message);
+ SAL_WARN("unotools.config", "Caught unexpected: " << ex);
}
}
assert(nCount <= nLength);
@@ -444,7 +444,7 @@ void SvtHistoryOptions_Impl::AppendItem(EHistoryType eHistory,
}
catch(const uno::Exception& ex)
{
- SAL_WARN("unotools.config", "Caught unexpected: " << ex.Message);
+ SAL_WARN("unotools.config", "Caught unexpected: " << ex);
}
}
@@ -508,7 +508,7 @@ void SvtHistoryOptions_Impl::DeleteItem(EHistoryType eHistory, const OUString& s
}
catch (const uno::Exception& ex)
{
- SAL_WARN("unotools.config", "Caught unexpected: " << ex.Message);
+ SAL_WARN("unotools.config", "Caught unexpected: " << ex);
}
}
diff --git a/unotools/source/config/itemholder1.cxx b/unotools/source/config/itemholder1.cxx
index a11fd059fead..f3dfcc98af5e 100644
--- a/unotools/source/config/itemholder1.cxx
+++ b/unotools/source/config/itemholder1.cxx
@@ -64,7 +64,7 @@ ItemHolder1::ItemHolder1()
if(bMessage)
{
bMessage = false;
- SAL_WARN( "unotools", "CreateInstance with arguments exception: " << rEx.Message);
+ SAL_WARN( "unotools", "CreateInstance with arguments exception: " << rEx);
}
}
#else
diff --git a/unotools/source/config/pathoptions.cxx b/unotools/source/config/pathoptions.cxx
index 6bdc59f93c4d..998ff53d0072 100644
--- a/unotools/source/config/pathoptions.cxx
+++ b/unotools/source/config/pathoptions.cxx
@@ -298,7 +298,7 @@ void SvtPathOptions_Impl::SetPath( SvtPathOptions::Paths ePath, const OUString&
}
catch (const Exception& e)
{
- SAL_WARN("unotools.config", "SetPath: exception: " << e.Message);
+ SAL_WARN("unotools.config", "SetPath: " << e);
}
}
}
diff --git a/unotools/source/config/useroptions.cxx b/unotools/source/config/useroptions.cxx
index 625a925b4095..31ce8c9893d0 100644
--- a/unotools/source/config/useroptions.cxx
+++ b/unotools/source/config/useroptions.cxx
@@ -147,7 +147,7 @@ SvtUserOptions::Impl::Impl() :
catch (uno::Exception const& ex)
{
m_xCfg.clear();
- SAL_WARN("unotools.config", "Caught unexpected: " << ex.Message);
+ SAL_WARN("unotools.config", "Caught unexpected: " << ex);
}
}
@@ -161,7 +161,7 @@ OUString SvtUserOptions::Impl::GetToken (UserOptToken nToken) const
}
catch (uno::Exception const& ex)
{
- SAL_WARN("unotools.config", "Caught unexpected: " << ex.Message);
+ SAL_WARN("unotools.config", "Caught unexpected: " << ex);
}
return sToken;
}
@@ -176,7 +176,7 @@ void SvtUserOptions::Impl::SetToken (UserOptToken nToken, OUString const& sToken
}
catch (uno::Exception const& ex)
{
- SAL_WARN("unotools.config", "Caught unexpected: " << ex.Message);
+ SAL_WARN("unotools.config", "Caught unexpected: " << ex);
}
}
diff --git a/unotools/source/i18n/calendarwrapper.cxx b/unotools/source/i18n/calendarwrapper.cxx
index 086ae57a661c..98e765104a3a 100644
--- a/unotools/source/i18n/calendarwrapper.cxx
+++ b/unotools/source/i18n/calendarwrapper.cxx
@@ -49,7 +49,7 @@ void CalendarWrapper::loadDefaultCalendar( const css::lang::Locale& rLocale )
}
catch (const Exception& e)
{
- SAL_WARN( "unotools.i18n", "loadDefaultCalendar: Exception caught " << e.Message );
+ SAL_WARN( "unotools.i18n", "loadDefaultCalendar: Exception caught " << e );
}
}
@@ -63,7 +63,7 @@ void CalendarWrapper::loadCalendar( const OUString& rUniqueID, const css::lang::
catch (const Exception& e)
{
SAL_WARN( "unotools.i18n", "loadCalendar: Exception caught requested: "
- << rUniqueID << " Locale: " << rLocale.Language << "_" << rLocale.Country << " " << e.Message );
+ << rUniqueID << " Locale: " << rLocale.Language << "_" << rLocale.Country << " " << e );
}
}
@@ -76,7 +76,7 @@ css::uno::Sequence< OUString > CalendarWrapper::getAllCalendars( const css::lang
}
catch (const Exception& e)
{
- SAL_WARN( "unotools.i18n", "getAllCalendars: Exception caught " << e.Message );
+ SAL_WARN( "unotools.i18n", "getAllCalendars: Exception caught " << e );
}
return css::uno::Sequence< OUString > (0);
@@ -91,7 +91,7 @@ OUString CalendarWrapper::getUniqueID() const
}
catch (const Exception& e)
{
- SAL_WARN( "unotools.i18n", "getUniqueID: Exception caught " << e.Message );
+ SAL_WARN( "unotools.i18n", "getUniqueID: Exception caught " << e );
}
return OUString();
}
@@ -105,7 +105,7 @@ void CalendarWrapper::setDateTime( double fTimeInDays )
}
catch (const Exception& e)
{
- SAL_WARN( "unotools.i18n", "setDateTime: Exception caught " << e.Message );
+ SAL_WARN( "unotools.i18n", "setDateTime: Exception caught " << e );
}
}
@@ -118,7 +118,7 @@ double CalendarWrapper::getDateTime() const
}
catch (const Exception& e)
{
- SAL_WARN( "unotools.i18n", "getDateTime: Exception caught " << e.Message );
+ SAL_WARN( "unotools.i18n", "getDateTime: Exception caught " << e );
}
return 0.0;
}
@@ -134,7 +134,7 @@ void CalendarWrapper::setLocalDateTime( double fTimeInDays )
}
catch (const Exception& e)
{
- SAL_WARN( "unotools.i18n", "setLocalDateTime: Exception caught " << e.Message );
+ SAL_WARN( "unotools.i18n", "setLocalDateTime: Exception caught " << e );
}
}
@@ -149,7 +149,7 @@ double CalendarWrapper::getLocalDateTime() const
}
catch (const Exception& e)
{
- SAL_WARN( "unotools.i18n", "getLocalDateTime: Exception caught " << e.Message );
+ SAL_WARN( "unotools.i18n", "getLocalDateTime: Exception caught " << e );
}
return 0.0;
}
@@ -163,7 +163,7 @@ void CalendarWrapper::setValue( sal_Int16 nFieldIndex, sal_Int16 nValue )
}
catch (const Exception& e)
{
- SAL_WARN( "unotools.i18n", "setValue: Exception caught " << e.Message );
+ SAL_WARN( "unotools.i18n", "setValue: Exception caught " << e );
}
}
@@ -176,7 +176,7 @@ bool CalendarWrapper::isValid() const
}
catch (const Exception& e)
{
- SAL_WARN( "unotools.i18n", "isValid: Exception caught " << e.Message );
+ SAL_WARN( "unotools.i18n", "isValid: Exception caught " << e );
}
return false;
}
@@ -190,7 +190,7 @@ sal_Int16 CalendarWrapper::getValue( sal_Int16 nFieldIndex ) const
}
catch (const Exception& e)
{
- SAL_WARN( "unotools.i18n", "getValue: Exception caught " << e.Message );
+ SAL_WARN( "unotools.i18n", "getValue: Exception caught " << e );
}
return 0;
}
@@ -204,7 +204,7 @@ sal_Int16 CalendarWrapper::getFirstDayOfWeek() const
}
catch (const Exception& e)
{
- SAL_WARN( "unotools.i18n", "getFirstDayOfWeek: Exception caught " << e.Message );
+ SAL_WARN( "unotools.i18n", "getFirstDayOfWeek: Exception caught " << e );
}
return 0;
}
@@ -218,7 +218,7 @@ sal_Int16 CalendarWrapper::getNumberOfMonthsInYear() const
}
catch (const Exception& e)
{
- SAL_WARN( "unotools.i18n", "getNumberOfMonthsInYear: Exception caught " << e.Message );
+ SAL_WARN( "unotools.i18n", "getNumberOfMonthsInYear: Exception caught " << e );
}
return 0;
}
@@ -232,7 +232,7 @@ sal_Int16 CalendarWrapper::getNumberOfDaysInWeek() const
}
catch (const Exception& e)
{
- SAL_WARN( "unotools.i18n", "getNumberOfDaysInWeek: Exception caught " << e.Message );
+ SAL_WARN( "unotools.i18n", "getNumberOfDaysInWeek: Exception caught " << e );
}
return 0;
}
@@ -246,7 +246,7 @@ css::uno::Sequence< css::i18n::CalendarItem2 > CalendarWrapper::getMonths() cons
}
catch (const Exception& e)
{
- SAL_WARN( "unotools.i18n", "getMonths: Exception caught " << e.Message );
+ SAL_WARN( "unotools.i18n", "getMonths: Exception caught " << e );
}
return css::uno::Sequence< css::i18n::CalendarItem2 > (0);
}
@@ -260,7 +260,7 @@ css::uno::Sequence< css::i18n::CalendarItem2 > CalendarWrapper::getDays() const
}
catch (const Exception& e)
{
- SAL_WARN( "unotools.i18n", "getDays: Exception caught " << e.Message );
+ SAL_WARN( "unotools.i18n", "getDays: Exception caught " << e );
}
return css::uno::Sequence< css::i18n::CalendarItem2 > (0);
}
@@ -274,7 +274,7 @@ OUString CalendarWrapper::getDisplayName( sal_Int16 nCalendarDisplayIndex, sal_I
}
catch (const Exception& e)
{
- SAL_WARN( "unotools.i18n", "getDisplayName: Exception caught " << e.Message );
+ SAL_WARN( "unotools.i18n", "getDisplayName: Exception caught " << e );
}
return OUString();
}
@@ -290,7 +290,7 @@ OUString CalendarWrapper::getDisplayString( sal_Int32 nCalendarDisplayCode, sal_
}
catch (const Exception& e)
{
- SAL_WARN( "unotools.i18n", "getDisplayString: Exception caught " << e.Message );
+ SAL_WARN( "unotools.i18n", "getDisplayString: Exception caught " << e );
}
return OUString();
}
@@ -306,7 +306,7 @@ css::i18n::Calendar2 CalendarWrapper::getLoadedCalendar() const
}
catch (const Exception& e)
{
- SAL_WARN( "unotools.i18n", "getLoadedCalendar2: Exception caught " << e.Message );
+ SAL_WARN( "unotools.i18n", "getLoadedCalendar2: Exception caught " << e );
}
return css::i18n::Calendar2();
}
@@ -320,7 +320,7 @@ css::uno::Sequence< css::i18n::CalendarItem2 > CalendarWrapper::getGenitiveMonth
}
catch (const Exception& e)
{
- SAL_WARN( "unotools.i18n", "getGenitiveMonths: Exception caught " << e.Message );
+ SAL_WARN( "unotools.i18n", "getGenitiveMonths: Exception caught " << e );
}
return css::uno::Sequence< css::i18n::CalendarItem2 > (0);
}
@@ -334,7 +334,7 @@ css::uno::Sequence< css::i18n::CalendarItem2 > CalendarWrapper::getPartitiveMont
}
catch (const Exception& e)
{
- SAL_WARN( "unotools.i18n", "getPartitiveMonths: Exception caught " << e.Message );
+ SAL_WARN( "unotools.i18n", "getPartitiveMonths: Exception caught " << e );
}
return css::uno::Sequence< css::i18n::CalendarItem2 > (0);
}
diff --git a/unotools/source/i18n/charclass.cxx b/unotools/source/i18n/charclass.cxx
index 60e5227070a9..8cdabfcd0f9d 100644
--- a/unotools/source/i18n/charclass.cxx
+++ b/unotools/source/i18n/charclass.cxx
@@ -404,7 +404,7 @@ css::i18n::ParseResult CharClass::parseAnyToken(
}
catch ( const Exception& e )
{
- SAL_WARN( "unotools.i18n", "parseAnyToken: Exception caught " << e.Message );
+ SAL_WARN( "unotools.i18n", "parseAnyToken: Exception caught " << e );
return ParseResult();
}
}
@@ -429,7 +429,7 @@ css::i18n::ParseResult CharClass::parsePredefinedToken(
}
catch ( const Exception& e )
{
- SAL_WARN( "unotools.i18n", "parsePredefinedToken: Exception caught " << e.Message );
+ SAL_WARN( "unotools.i18n", "parsePredefinedToken: Exception caught " << e );
return ParseResult();
}
}
diff --git a/unotools/source/i18n/localedatawrapper.cxx b/unotools/source/i18n/localedatawrapper.cxx
index 1750a9b23bc5..09e5c186f517 100644
--- a/unotools/source/i18n/localedatawrapper.cxx
+++ b/unotools/source/i18n/localedatawrapper.cxx
@@ -168,7 +168,7 @@ css::i18n::LanguageCountryInfo LocaleDataWrapper::getLanguageCountryInfo() const
}
catch (const Exception& e)
{
- SAL_WARN( "unotools.i18n", "getLanguageCountryInfo: Exception caught " << e.Message );
+ SAL_WARN( "unotools.i18n", "getLanguageCountryInfo: Exception caught " << e );
}
return css::i18n::LanguageCountryInfo();
}
@@ -195,7 +195,7 @@ const css::i18n::LocaleDataItem& LocaleDataWrapper::getLocaleItem() const
}
catch (const Exception& e)
{
- SAL_WARN( "unotools.i18n", "getLocaleItem: Exception caught " << e.Message );
+ SAL_WARN( "unotools.i18n", "getLocaleItem: Exception caught " << e );
}
static css::i18n::LocaleDataItem aEmptyItem;
return aEmptyItem;
@@ -209,7 +209,7 @@ css::uno::Sequence< css::i18n::Currency2 > LocaleDataWrapper::getAllCurrencies()
}
catch (const Exception& e)
{
- SAL_WARN( "unotools.i18n", "getAllCurrencies: Exception caught " << e.Message );
+ SAL_WARN( "unotools.i18n", "getAllCurrencies: Exception caught " << e );
}
return css::uno::Sequence< css::i18n::Currency2 >(0);
}
@@ -222,7 +222,7 @@ css::uno::Sequence< css::i18n::FormatElement > LocaleDataWrapper::getAllFormats(
}
catch (const Exception& e)
{
- SAL_WARN( "unotools.i18n", "getAllFormats: Exception caught " << e.Message );
+ SAL_WARN( "unotools.i18n", "getAllFormats: Exception caught " << e );
}
return css::uno::Sequence< css::i18n::FormatElement >(0);
}
@@ -235,7 +235,7 @@ css::i18n::ForbiddenCharacters LocaleDataWrapper::getForbiddenCharacters() const
}
catch (const Exception& e)
{
- SAL_WARN( "unotools.i18n", "getForbiddenCharacters: Exception caught " << e.Message );
+ SAL_WARN( "unotools.i18n", "getForbiddenCharacters: Exception caught " << e );
}
return css::i18n::ForbiddenCharacters();
}
@@ -248,7 +248,7 @@ css::uno::Sequence< OUString > LocaleDataWrapper::getReservedWord() const
}
catch ( const Exception& e )
{
- SAL_WARN( "unotools.i18n", "getReservedWord: Exception caught " << e.Message );
+ SAL_WARN( "unotools.i18n", "getReservedWord: Exception caught " << e );
}
return css::uno::Sequence< OUString >(0);
}
@@ -266,7 +266,7 @@ css::uno::Sequence< css::lang::Locale > LocaleDataWrapper::getAllInstalledLocale
}
catch ( const Exception& e )
{
- SAL_WARN( "unotools.i18n", "getAllInstalledLocaleNames: Exception caught " << e.Message );
+ SAL_WARN( "unotools.i18n", "getAllInstalledLocaleNames: Exception caught " << e );
}
return rInstalledLocales;
}
@@ -1821,7 +1821,7 @@ css::uno::Sequence< css::i18n::Calendar2 > LocaleDataWrapper::getAllCalendars()
}
catch (const Exception& e)
{
- SAL_WARN( "unotools.i18n", "getAllCalendars: Exception caught " << e.Message );
+ SAL_WARN( "unotools.i18n", "getAllCalendars: Exception caught " << e );
}
return css::uno::Sequence< css::i18n::Calendar2 >(0);
}
@@ -1845,7 +1845,7 @@ css::uno::Sequence< OUString > LocaleDataWrapper::getDateAcceptancePatterns() co
}
catch (const Exception& e)
{
- SAL_WARN( "unotools.i18n", "getDateAcceptancePatterns: Exception caught " << e.Message );
+ SAL_WARN( "unotools.i18n", "getDateAcceptancePatterns: Exception caught " << e );
}
return css::uno::Sequence< OUString >(0);
}
@@ -1865,7 +1865,7 @@ void LocaleDataWrapper::setDateAcceptancePatterns(
}
catch (const Exception& e)
{
- SAL_WARN( "unotools.i18n", "setDateAcceptancePatterns: Exception caught " << e.Message );
+ SAL_WARN( "unotools.i18n", "setDateAcceptancePatterns: Exception caught " << e );
}
if (!rPatterns.getLength())
return; // just a reset
diff --git a/unotools/source/i18n/transliterationwrapper.cxx b/unotools/source/i18n/transliterationwrapper.cxx
index d2d037a482f2..4a65f801cfba 100644
--- a/unotools/source/i18n/transliterationwrapper.cxx
+++ b/unotools/source/i18n/transliterationwrapper.cxx
@@ -148,7 +148,7 @@ void TransliterationWrapper::loadModuleImpl() const
}
catch ( const Exception& e )
{
- SAL_WARN( "unotools.i18n", "loadModuleImpl: Exception caught " << e.Message );
+ SAL_WARN( "unotools.i18n", "loadModuleImpl: Exception caught " << e );
}
bFirstCall = false;
@@ -169,7 +169,7 @@ void TransliterationWrapper::loadModuleByImplName(const OUString& rModuleName,
}
catch ( const Exception& e )
{
- SAL_WARN( "unotools.i18n", "loadModuleByImplName: Exception caught " << e.Message );
+ SAL_WARN( "unotools.i18n", "loadModuleByImplName: Exception caught " << e );
}
bFirstCall = false;
@@ -188,7 +188,7 @@ bool TransliterationWrapper::equals(
}
catch ( const Exception& e )
{
- SAL_WARN( "unotools.i18n", "equals: Exception caught " << e.Message );
+ SAL_WARN( "unotools.i18n", "equals: Exception caught " << e );
}
return false;
}
@@ -204,7 +204,7 @@ sal_Int32 TransliterationWrapper::compareString( const OUString& rStr1, const OU
}
catch (const Exception& e)
{
- SAL_WARN( "unotools.i18n", "compareString: Exception caught " << e.Message );
+ SAL_WARN( "unotools.i18n", "compareString: Exception caught " << e );
}
return 0;
}
diff --git a/unotools/source/misc/mediadescriptor.cxx b/unotools/source/misc/mediadescriptor.cxx
index 1e37fe199cad..b9b4610012c3 100644
--- a/unotools/source/misc/mediadescriptor.cxx
+++ b/unotools/source/misc/mediadescriptor.cxx
@@ -521,9 +521,7 @@ bool MediaDescriptor::impl_addInputStream( bool bLockFile )
}
catch(const css::uno::Exception& ex)
{
- SAL_WARN(
- "unotools.misc",
- "invalid MediaDescriptor detected: " << ex.Message);
+ SAL_WARN("unotools.misc", "invalid MediaDescriptor detected: " << ex);
return false;
}
}
@@ -632,17 +630,13 @@ bool MediaDescriptor::impl_openStreamWithURL( const OUString& sURL, bool bLockFi
{ throw; }
catch(const css::ucb::ContentCreationException& e)
{
- SAL_WARN(
- "unotools.misc",
- "caught ContentCreationException \"" << e.Message
+ SAL_WARN("unotools.misc", "caught \"" << e
<< "\" while opening <" << sURL << ">");
return false; // TODO error handling
}
catch(const css::uno::Exception& e)
{
- SAL_WARN(
- "unotools.misc",
- "caught Exception \"" << e.Message << "\" while opening <"
+ SAL_WARN("unotools.misc", "caught \"" << e << "\" while opening <"
<< sURL << ">");
return false; // TODO error handling
}
@@ -683,9 +677,7 @@ bool MediaDescriptor::impl_openStreamWithURL( const OUString& sURL, bool bLockFi
// break this method.
if (!pInteraction->wasWriteError() || bModeRequestedExplicitly)
{
- SAL_WARN(
- "unotools.misc",
- "caught Exception \"" << e.Message
+ SAL_WARN("unotools.misc", "caught \"" << e
<< "\" while opening <" << sURL << ">");
// If the protocol is webdav, then we need to treat the stream as readonly, even if the
// operation was requested as read/write explicitly (the WebDAV UCB implementation is monodirectional
@@ -751,8 +743,7 @@ bool MediaDescriptor::impl_openStreamWithURL( const OUString& sURL, bool bLockFi
{
SAL_INFO(
"unotools.misc",
- "caught Exception \"" << e.Message << "\" while opening <"
- << sURL << ">");
+ "caught " << e << " while opening <" << sURL << ">");
return false;
}
}
diff --git a/unotools/source/ucbhelper/ucbhelper.cxx b/unotools/source/ucbhelper/ucbhelper.cxx
index 417a70bba7d6..0cded08d91b9 100644
--- a/unotools/source/ucbhelper/ucbhelper.cxx
+++ b/unotools/source/ucbhelper/ucbhelper.cxx
@@ -103,7 +103,7 @@ std::vector<OUString> getContents(OUString const & url) {
SAL_INFO(
"unotools.ucbhelper",
"getContents(" << url << ") " << e.getValueType().getTypeName()
- << " \"" << e.get<css::uno::Exception>().Message << '"');
+ << " \"" << e.get<css::uno::Exception>() << '"');
return std::vector<OUString>();
}
}
@@ -152,7 +152,7 @@ bool utl::UCBContentHelper::IsDocument(OUString const & url) {
"unotools.ucbhelper",
"UCBContentHelper::IsDocument(" << url << ") "
<< e.getValueType().getTypeName() << " \""
- << e.get<css::uno::Exception>().Message << '"');
+ << e.get<css::uno::Exception>() << '"');
return false;
}
}
@@ -173,7 +173,7 @@ css::uno::Any utl::UCBContentHelper::GetProperty(
"unotools.ucbhelper",
"UCBContentHelper::GetProperty(" << url << ", " << property << ") "
<< e.getValueType().getTypeName() << " \""
- << e.get<css::uno::Exception>().Message << '"');
+ << e.get<css::uno::Exception>() << '"');
return css::uno::Any();
}
}
@@ -192,7 +192,7 @@ bool utl::UCBContentHelper::IsFolder(OUString const & url) {
"unotools.ucbhelper",
"UCBContentHelper::IsFolder(" << url << ") "
<< e.getValueType().getTypeName() << " \""
- << e.get<css::uno::Exception>().Message << '"');
+ << e.get<css::uno::Exception>() << '"');
return false;
}
}
@@ -214,7 +214,7 @@ bool utl::UCBContentHelper::GetTitle(
"unotools.ucbhelper",
"UCBContentHelper::GetTitle(" << url << ") "
<< e.getValueType().getTypeName() << " \""
- << e.get<css::uno::Exception>().Message << '"');
+ << e.get<css::uno::Exception>() << '"');
return false;
}
}
@@ -236,7 +236,7 @@ bool utl::UCBContentHelper::Kill(OUString const & url) {
"unotools.ucbhelper",
"UCBContentHelper::Kill(" << url << ") "
<< e.getValueType().getTypeName() << " \""
- << e.get<css::uno::Exception>().Message << '"');
+ << e.get<css::uno::Exception>() << '"');
return false;
}
}
@@ -276,7 +276,7 @@ bool utl::UCBContentHelper::MakeFolder(
SAL_INFO(
"unotools.ucbhelper",
"UCBContentHelper::MakeFolder(" << title
- << ") InteractiveIOException \"" << e.Message
+ << ") InteractiveIOException \"" << e
<< "\", code " << + (sal_Int32)e.Code);
}
} catch (css::ucb::NameClashException const &) {
@@ -292,7 +292,7 @@ bool utl::UCBContentHelper::MakeFolder(
"unotools.ucbhelper",
"UCBContentHelper::MakeFolder(" << title << ") "
<< e.getValueType().getTypeName() << " \""
- << e.get<css::uno::Exception>().Message << '"');
+ << e.get<css::uno::Exception>() << '"');
}
if (exists) {
INetURLObject o(parent.getURL());
@@ -328,7 +328,7 @@ bool utl::UCBContentHelper::IsYounger(
"unotools.ucbhelper",
"UCBContentHelper::IsYounger(" << younger << ", " << older << ") "
<< e.getValueType().getTypeName() << " \""
- << e.get<css::uno::Exception>().Message << '"');
+ << e.get<css::uno::Exception>() << '"');
return false;
}
}
@@ -420,7 +420,7 @@ bool utl::UCBContentHelper::IsSubPath(
"unotools.ucbhelper",
"UCBContentHelper::IsSubPath(" << parent << ", " << child << ") "
<< e.getValueType().getTypeName() << " \""
- << e.get<css::uno::Exception>().Message << '"');
+ << e.get<css::uno::Exception>() << '"');
}
return false;
}
diff --git a/unoxml/source/dom/documentbuilder.cxx b/unoxml/source/dom/documentbuilder.cxx
index 0b5aa5d583d7..d0e7ad0121e3 100644
--- a/unoxml/source/dom/documentbuilder.cxx
+++ b/unoxml/source/dom/documentbuilder.cxx
@@ -200,7 +200,7 @@ namespace DOM
memcpy(buffer, chunk.getConstArray(), nread);
return nread;
} catch (const css::uno::Exception& ex) {
- SAL_WARN( "unoxml", ex.Message);
+ SAL_WARN( "unoxml", ex);
return -1;
}
}
@@ -219,7 +219,7 @@ namespace DOM
delete pctx;
return 0;
} catch (const css::uno::Exception& ex) {
- SAL_WARN( "unoxml", ex.Message);
+ SAL_WARN( "unoxml", ex);
return -1;
}
}
@@ -295,9 +295,7 @@ namespace DOM
catch (const css::uno::Exception &e)
{
// Protect lib2xml from UNO Exception
- SAL_WARN("unoxml",
- "DOM::warning_func: caught RuntimeException"
- << e.Message);
+ SAL_WARN("unoxml", "DOM::warning_func: caught " << e);
}
}
@@ -329,9 +327,7 @@ namespace DOM
catch (const css::uno::Exception &e)
{
// Protect lib2xml from UNO Exception
- SAL_WARN("unoxml",
- "DOM::error_func: caught RuntimeException"
- << e.Message);
+ SAL_WARN("unoxml", "DOM::error_func: caught " << e);
}
}
} // extern "C"
diff --git a/unoxml/source/dom/elementlist.cxx b/unoxml/source/dom/elementlist.cxx
index f4dcfba1136c..3d6057f0d056 100644
--- a/unoxml/source/dom/elementlist.cxx
+++ b/unoxml/source/dom/elementlist.cxx
@@ -107,8 +107,7 @@ namespace DOM
m_xEventListener = new WeakEventListener(this);
xTarget->addEventListener("DOMSubtreeModified", m_xEventListener, false/*capture*/);
} catch (const Exception &e){
- SAL_WARN( "unoxml", "Exception caught while registering NodeList as listener: "
- << e.Message);
+ SAL_WARN( "unoxml", "Exception caught while registering NodeList as listener: " << e);
}
}
diff --git a/uui/source/logindlg.cxx b/uui/source/logindlg.cxx
index 659f3bd6b090..55e3e642f183 100644
--- a/uui/source/logindlg.cxx
+++ b/uui/source/logindlg.cxx
@@ -176,7 +176,7 @@ IMPL_LINK_NOARG(LoginDialog, PathHdl_Impl, Button*, void)
}
catch (uno::Exception & e)
{
- SAL_WARN("uui", "LoginDialog::PathHdl_Impl: caught UNO exception: " << e.Message);
+ SAL_WARN("uui", "LoginDialog::PathHdl_Impl: caught " << e);
}
}
diff --git a/vcl/backendtest/VisualBackendTest.cxx b/vcl/backendtest/VisualBackendTest.cxx
index fb75618c5a88..e9651a7e4c8f 100644
--- a/vcl/backendtest/VisualBackendTest.cxx
+++ b/vcl/backendtest/VisualBackendTest.cxx
@@ -526,7 +526,7 @@ public:
}
catch (const css::uno::Exception& rException)
{
- SAL_WARN("vcl.app", "Fatal exception: " << rException.Message);
+ SAL_WARN("vcl.app", "Fatal exception: " << rException);
return 1;
}
catch (const std::exception& rException)
diff --git a/vcl/source/app/session.cxx b/vcl/source/app/session.cxx
index 23c60d7f8bb9..834ed57b2902 100644
--- a/vcl/source/app/session.cxx
+++ b/vcl/source/app/session.cxx
@@ -23,7 +23,6 @@
#include <cppuhelper/basemutex.hxx>
#include <cppuhelper/compbase.hxx>
-
#include <vcl/svapp.hxx>
#include <factory.hxx>
@@ -377,7 +376,7 @@ void VCLSession::disposing() {
listener.m_xListener->disposing(src);
SAL_INFO("vcl.se.debug", " call Listener disposing");
} catch (css::uno::RuntimeException & e) {
- SAL_WARN("vcl.se", "ignoring RuntimeException " << e.Message);
+ SAL_WARN("vcl.se", "ignoring " << e);
}
}
}
diff --git a/vcl/source/app/svdata.cxx b/vcl/source/app/svdata.cxx
index d5cc3fbac380..fb6d6726c419 100644
--- a/vcl/source/app/svdata.cxx
+++ b/vcl/source/app/svdata.cxx
@@ -154,7 +154,7 @@ vcl::Window *ImplGetDefaultContextWindow()
}
catch (const css::uno::Exception& e)
{
- SAL_WARN("vcl", "unable to create Default Window: " << e.Message);
+ SAL_WARN("vcl", "unable to create Default Window: " << e);
}
}
}
@@ -260,7 +260,7 @@ bool ImplInitAccessBridge()
} catch (css::uno::DeploymentException & e) {
SAL_WARN(
"vcl",
- "got no IAccessible2 bridge" << e.Message);
+ "got no IAccessible2 bridge" << e);
return false;
}
}
diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx
index 581fb820c96c..d35f32ba646f 100644
--- a/vcl/source/app/svmain.cxx
+++ b/vcl/source/app/svmain.cxx
@@ -337,7 +337,7 @@ bool InitVCL()
}
catch (const uno::Exception &e)
{
- SAL_INFO("vcl.app", "Unable to get ui language: '" << e.Message);
+ SAL_INFO("vcl.app", "Unable to get ui language: '" << e);
}
pSVData->mpDefInst->AfterAppInit();
diff --git a/vcl/source/gdi/gdimtf.cxx b/vcl/source/gdi/gdimtf.cxx
index f0b9ce1fbbbb..0490b4ae63e2 100644
--- a/vcl/source/gdi/gdimtf.cxx
+++ b/vcl/source/gdi/gdimtf.cxx
@@ -436,8 +436,7 @@ bool GDIMetaFile::ImplPlayWithRenderer( OutputDevice* pOut, const Point& rPos, S
catch (const uno::Exception& e)
{
// ignore errors, no way of reporting them here
- SAL_WARN("vcl.gdi",
- "GDIMetaFile::ImplPlayWithRenderer: exception: " << e.Message);
+ SAL_WARN("vcl.gdi", "GDIMetaFile::ImplPlayWithRenderer: " << e);
}
return false;
diff --git a/vcl/source/gdi/vectorgraphicdata.cxx b/vcl/source/gdi/vectorgraphicdata.cxx
index 3bcb8fb7351a..d5d66f80c440 100644
--- a/vcl/source/gdi/vectorgraphicdata.cxx
+++ b/vcl/source/gdi/vectorgraphicdata.cxx
@@ -82,7 +82,7 @@ BitmapEx convertPrimitive2DSequenceToBitmapEx(
}
catch (const uno::Exception& e)
{
- SAL_WARN("vcl", "Got no graphic::XPrimitive2DRenderer! : " << e.Message);
+ SAL_WARN("vcl", "Got no graphic::XPrimitive2DRenderer! : " << e);
}
catch (const std::exception& e)
{
diff --git a/vcl/source/image/ImplImageTree.cxx b/vcl/source/image/ImplImageTree.cxx
index dd3d91855c0d..8b874868a32e 100644
--- a/vcl/source/image/ImplImageTree.cxx
+++ b/vcl/source/image/ImplImageTree.cxx
@@ -246,7 +246,7 @@ OUString ImplImageTree::getImageUrl(OUString const & rName, OUString const & rSt
}
catch (const css::uno::Exception & e)
{
- SAL_INFO("vcl", "exception " << e.Message);
+ SAL_INFO("vcl", e);
}
aStyle = fallbackStyle(aStyle);
@@ -362,7 +362,7 @@ bool ImplImageTree::doLoadImage(ImageRequestParameters& rParameters)
}
catch (const css::uno::Exception& e)
{
- SAL_INFO("vcl", "ImplImageTree::doLoadImage exception " << e.Message);
+ SAL_INFO("vcl", "ImplImageTree::doLoadImage " << e);
}
if (bFound)
@@ -538,7 +538,7 @@ bool ImplImageTree::checkPathAccess()
throw;
}
catch (const css::uno::Exception & e) {
- SAL_INFO("vcl", "ImplImageTree::zip file location exception " << e.Message << " for " << rIconSet.maURL);
+ SAL_INFO("vcl", "ImplImageTree::zip file location " << e << " for " << rIconSet.maURL);
return false;
}
return rNameAccess.is();
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index d2bdc7f94146..abfce54a64dd 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -147,7 +147,7 @@ VclBuilder::VclBuilder(vcl::Window *pParent, const OUString& sUIDir, const OUStr
}
catch (const css::uno::Exception &rExcept)
{
- SAL_WARN("vcl.layout", "Unable to read .ui file: " << rExcept.Message);
+ SAL_WARN("vcl.layout", "Unable to read .ui file: " << rExcept);
CrashReporter::AddKeyValue("VclBuilderException", "Unable to read .ui file: " + rExcept.Message);
throw;
}
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 47153bce8a4b..0baa83b10176 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -3222,9 +3222,7 @@ Reference< XClipboard > Window::GetClipboard()
}
catch (DeploymentException & e)
{
- SAL_WARN(
- "vcl.window",
- "ignoring DeploymentException \"" << e.Message << "\"");
+ SAL_WARN("vcl.window", "ignoring " << e);
}
}
@@ -3265,9 +3263,7 @@ Reference< XClipboard > Window::GetPrimarySelection()
}
catch (RuntimeException & e)
{
- SAL_WARN(
- "vcl.window",
- "ignoring RuntimeException \"" << e.Message << "\"");
+ SAL_WARN("vcl.window", "ignoring " << e);
}
}
diff --git a/vcl/unx/gtk/gtksalframe.cxx b/vcl/unx/gtk/gtksalframe.cxx
index 0077a056bb53..27b8f3158c62 100644
--- a/vcl/unx/gtk/gtksalframe.cxx
+++ b/vcl/unx/gtk/gtksalframe.cxx
@@ -3778,7 +3778,7 @@ static uno::Reference<accessibility::XAccessibleEditableText> lcl_GetxText(vcl::
}
catch(const uno::Exception& e)
{
- SAL_WARN( "vcl.gtk", "Exception in getting input method surrounding text: " << e.Message);
+ SAL_WARN( "vcl.gtk", "Exception in getting input method surrounding text: " << e);
}
return xText;
}
diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx
index bc0b41df5998..eacd1d716ef3 100644
--- a/vcl/unx/gtk3/gtk3gtkframe.cxx
+++ b/vcl/unx/gtk3/gtk3gtkframe.cxx
@@ -4086,7 +4086,7 @@ static uno::Reference<accessibility::XAccessibleEditableText> lcl_GetxText(vcl::
}
catch(const uno::Exception& e)
{
- SAL_WARN( "vcl.gtk3", "Exception in getting input method surrounding text: " << e.Message);
+ SAL_WARN( "vcl.gtk3", "Exception in getting input method surrounding text: " << e);
}
return xText;
}
diff --git a/vcl/workben/mtfdemo.cxx b/vcl/workben/mtfdemo.cxx
index e450309a659e..6effbadcc473 100644
--- a/vcl/workben/mtfdemo.cxx
+++ b/vcl/workben/mtfdemo.cxx
@@ -93,12 +93,12 @@ public:
}
catch (const css::uno::Exception& e)
{
- SAL_WARN("vcl.app", "Fatal exception: " << e.Message);
+ SAL_WARN("vcl.app", "Fatal: " << e);
return 1;
}
catch (const std::exception& e)
{
- SAL_WARN("vcl.app", "Fatal exception: " << e.what());
+ SAL_WARN("vcl.app", "Fatal: " << e.what());
return 1;
}
return 0;
diff --git a/vcl/workben/outdevgrind.cxx b/vcl/workben/outdevgrind.cxx
index 3e92d6cb5784..60d5c61db837 100644
--- a/vcl/workben/outdevgrind.cxx
+++ b/vcl/workben/outdevgrind.cxx
@@ -731,12 +731,12 @@ SAL_IMPLEMENT_MAIN()
}
catch (const css::uno::Exception& e)
{
- SAL_WARN("vcl.app", "Fatal exception: " << e.Message);
+ SAL_WARN("vcl.app", "Fatal: " << e);
return EXIT_FAILURE;
}
catch (const std::exception& e)
{
- SAL_WARN("vcl.app", "Fatal exception: " << e.what());
+ SAL_WARN("vcl.app", "Fatal: " << e.what());
return EXIT_FAILURE;
}
diff --git a/vcl/workben/svdem.cxx b/vcl/workben/svdem.cxx
index 64960323596e..c406fba46c57 100644
--- a/vcl/workben/svdem.cxx
+++ b/vcl/workben/svdem.cxx
@@ -58,7 +58,7 @@ SAL_IMPLEMENT_MAIN()
}
catch (const Exception& e)
{
- SAL_WARN("vcl.app", "Fatal exception: " << e.Message);
+ SAL_WARN("vcl.app", "Fatal: " << e);
return 1;
}
catch (const std::exception &e)
diff --git a/vcl/workben/svpclient.cxx b/vcl/workben/svpclient.cxx
index 81c8be25be4d..253ba304fb77 100644
--- a/vcl/workben/svpclient.cxx
+++ b/vcl/workben/svpclient.cxx
@@ -78,12 +78,12 @@ SAL_IMPLEMENT_MAIN()
}
catch (const Exception& e)
{
- SAL_WARN("vcl", "Fatal exception: " << e.Message);
+ SAL_WARN("vcl", "Fatal: " << e);
return 1;
}
catch (const std::exception& e)
{
- SAL_WARN("vcl", "Fatal exception: " << e.what());
+ SAL_WARN("vcl", "Fatal: " << e.what());
return 1;
}
diff --git a/vcl/workben/svptest.cxx b/vcl/workben/svptest.cxx
index 6b66e122e703..b107ccdca990 100644
--- a/vcl/workben/svptest.cxx
+++ b/vcl/workben/svptest.cxx
@@ -67,7 +67,7 @@ SAL_IMPLEMENT_MAIN()
}
catch (const Exception& e)
{
- SAL_WARN("vcl.app", "Fatal exception: " << e.Message);
+ SAL_WARN("vcl.app", "Fatal: " << e);
return 1;
}
catch (const std::exception &e)
diff --git a/vcl/workben/vcldemo.cxx b/vcl/workben/vcldemo.cxx
index 1825bbd22c55..c755b33265c9 100644
--- a/vcl/workben/vcldemo.cxx
+++ b/vcl/workben/vcldemo.cxx
@@ -2256,12 +2256,12 @@ public:
}
catch (const css::uno::Exception& e)
{
- SAL_WARN("vcl.app", "Fatal exception: " << e.Message);
+ SAL_WARN("vcl.app", "Fatal: " << e);
return 1;
}
catch (const std::exception& e)
{
- SAL_WARN("vcl.app", "Fatal exception: " << e.what());
+ SAL_WARN("vcl.app", "Fatal: " << e.what());
return 1;
}
return 0;
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx
index ab3e53c9d93d..1423263274ab 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -129,7 +129,7 @@ DomainMapper::DomainMapper( const uno::Reference< uno::XComponentContext >& xCon
}
catch (const uno::Exception& rException)
{
- SAL_WARN("writerfilter", "DomainMapper::DomainMapper: failed to initialize RDF metadata: " << rException.Message);
+ SAL_WARN("writerfilter", "DomainMapper::DomainMapper: failed to initialize RDF metadata: " << rException);
}
if (eDocumentType == SourceDocumentType::OOXML) {
@@ -146,7 +146,7 @@ DomainMapper::DomainMapper( const uno::Reference< uno::XComponentContext >& xCon
}
catch (const uno::Exception& rException)
{
- SAL_WARN("writerfilter", "DomainMapper::DomainMapper: failed to initialize default font: " << rException.Message);
+ SAL_WARN("writerfilter", "DomainMapper::DomainMapper: failed to initialize default font: " << rException);
}
}
@@ -3187,7 +3187,7 @@ void DomainMapper::lcl_text(const sal_uInt8 * data_, size_t len)
}
catch( const uno::RuntimeException& e )
{
- SAL_WARN("writerfilter", "failed. Message :" << e.Message);
+ SAL_WARN("writerfilter", "failed. Message :" << e);
}
}
diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
index 98faa97b635d..22ba665a8e02 100644
--- a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
@@ -938,7 +938,7 @@ bool lcl_emptyRow(std::vector<RowSequence_t>& rTableRanges, sal_Int32 nRow)
}
catch (const lang::IllegalArgumentException& e)
{
- SAL_WARN( "writerfilter.dmapper", "compareRegionStarts() failed: " << e.Message);
+ SAL_WARN( "writerfilter.dmapper", "compareRegionStarts() failed: " << e);
return false;
}
return true;
@@ -1101,7 +1101,7 @@ void DomainMapperTableHandler::endTable(unsigned int nestedTableLevel, bool bTab
catch ( const lang::IllegalArgumentException &e )
{
SAL_INFO("writerfilter.dmapper",
- "Conversion to table error: " << e.Message);
+ "Conversion to table error: " << e);
#ifdef DEBUG_WRITERFILTER
TagLogger::getInstance().chars(std::string("failed to import table!"));
#endif
@@ -1109,7 +1109,7 @@ void DomainMapperTableHandler::endTable(unsigned int nestedTableLevel, bool bTab
catch ( const uno::Exception &e )
{
SAL_INFO("writerfilter.dmapper",
- "Exception during table creation: " << e.Message);
+ "Exception during table creation: " << e);
}
// If we have a table with a start and an end position, we should make it a floating one.
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index a6223b741061..b5572dc484aa 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -1281,7 +1281,7 @@ void DomainMapper_Impl::finishParagraph( const PropertyMapPtr& pPropertyMap )
}
catch(const uno::Exception& e)
{
- SAL_WARN( "writerfilter.dmapper", "finishParagraph() exception: " << e.Message );
+ SAL_WARN( "writerfilter.dmapper", "finishParagraph() " << e );
}
}
@@ -1741,7 +1741,7 @@ void DomainMapper_Impl::PushFootOrEndnote( bool bIsFootnote )
}
catch( const uno::Exception& e )
{
- SAL_WARN("writerfilter.dmapper", "exception in PushFootOrEndnote: " << e.Message);
+ SAL_WARN("writerfilter.dmapper", "exception in PushFootOrEndnote: " << e);
}
}
@@ -1859,7 +1859,7 @@ void DomainMapper_Impl::PushAnnotation()
}
catch( const uno::Exception& rException)
{
- SAL_WARN("writerfilter.dmapper", "exception in PushAnnotation: " << rException.Message);
+ SAL_WARN("writerfilter.dmapper", "exception in PushAnnotation: " << rException);
}
}
@@ -1927,7 +1927,7 @@ void DomainMapper_Impl::PopAnnotation()
catch (uno::Exception const& e)
{
SAL_WARN("writerfilter.dmapper",
- "Cannot insert annotation field: exception: " << e.Message);
+ "Cannot insert annotation field: " << e);
}
m_xAnnotationField.clear();
@@ -2120,7 +2120,7 @@ void DomainMapper_Impl::PushShapeContext( const uno::Reference< drawing::XShape
}
catch ( const uno::Exception& e )
{
- SAL_WARN("writerfilter.dmapper", "Exception when adding shape: " << e.Message);
+ SAL_WARN("writerfilter.dmapper", "Exception when adding shape: " << e);
}
}
/*
@@ -2738,7 +2738,7 @@ void DomainMapper_Impl::ChainTextFrames()
}
catch (const uno::Exception& rException)
{
- SAL_WARN("writerfilter.dmapper", "failed. message: " << rException.Message);
+ SAL_WARN("writerfilter.dmapper", "failed. message: " << rException);
}
}
@@ -4432,7 +4432,7 @@ void DomainMapper_Impl::CloseFieldCommand()
}
catch( const uno::Exception& e )
{
- SAL_WARN( "writerfilter.dmapper", "Exception in CloseFieldCommand(): " << e.Message );
+ SAL_WARN( "writerfilter.dmapper", "Exception in CloseFieldCommand(): " << e );
}
pContext->SetCommandCompleted();
}
@@ -4604,7 +4604,7 @@ void DomainMapper_Impl::SetFieldResult(OUString const& rResult)
catch (const uno::Exception& e)
{
SAL_WARN("writerfilter.dmapper",
- "DomainMapper_Impl::SetFieldResult: exception: " << e.Message);
+ "DomainMapper_Impl::SetFieldResult: " << e);
}
}
}
@@ -5084,7 +5084,7 @@ void DomainMapper_Impl::ExecuteFrameConversion()
}
catch( const uno::Exception& rEx)
{
- SAL_WARN( "writerfilter.dmapper", "Exception caught when converting to frame: " + rEx.Message );
+ SAL_WARN( "writerfilter.dmapper", "Exception caught when converting to frame: " << rEx );
}
}
m_xFrameStartRange = nullptr;
@@ -5288,7 +5288,7 @@ uno::Reference<container::XIndexAccess> DomainMapper_Impl::GetCurrentNumberingRu
catch (const uno::Exception& e)
{
SAL_WARN("writerfilter.dmapper",
- "GetCurrentNumberingRules: exception caught: " << e.Message);
+ "GetCurrentNumberingRules: exception caught: " << e);
}
return xRet;
}
diff --git a/writerfilter/source/dmapper/GraphicImport.cxx b/writerfilter/source/dmapper/GraphicImport.cxx
index 553a4e86a8f5..2173a015b173 100644
--- a/writerfilter/source/dmapper/GraphicImport.cxx
+++ b/writerfilter/source/dmapper/GraphicImport.cxx
@@ -381,7 +381,7 @@ public:
}
catch( const uno::Exception& e )
{
- SAL_WARN("writerfilter", "failed. Message :" << e.Message);
+ SAL_WARN("writerfilter", "failed. Message :" << e);
}
}
@@ -1338,7 +1338,7 @@ uno::Reference< text::XTextContent > GraphicImport::createGraphicObject( const b
}
catch( const uno::Exception& e )
{
- SAL_WARN("writerfilter", "failed. Message :" << e.Message);
+ SAL_WARN("writerfilter", "failed. Message :" << e);
}
return xGraphicObject;
}
diff --git a/writerfilter/source/dmapper/ModelEventListener.cxx b/writerfilter/source/dmapper/ModelEventListener.cxx
index 851825e27699..4c59ba3b38ba 100644
--- a/writerfilter/source/dmapper/ModelEventListener.cxx
+++ b/writerfilter/source/dmapper/ModelEventListener.cxx
@@ -87,7 +87,7 @@ void ModelEventListener::notifyEvent( const document::EventObject& rEvent )
}
catch( const uno::Exception& rEx )
{
- SAL_WARN("writerfilter", "exception while updating indexes: " << rEx.Message);
+ SAL_WARN("writerfilter", "exception while updating indexes: " << rEx);
}
}
diff --git a/writerfilter/source/dmapper/NumberingManager.cxx b/writerfilter/source/dmapper/NumberingManager.cxx
index 2fe06c4d9508..d1406421140a 100644
--- a/writerfilter/source/dmapper/NumberingManager.cxx
+++ b/writerfilter/source/dmapper/NumberingManager.cxx
@@ -633,17 +633,17 @@ void ListDef::CreateNumberingRules( DomainMapper& rDMapper,
}
catch( const lang::IllegalArgumentException& e )
{
- SAL_WARN( "writerfilter", "Exception: " << e.Message );
+ SAL_WARN( "writerfilter", e );
assert( !"Incorrect argument to UNO call" );
}
catch( const uno::RuntimeException& e )
{
- SAL_WARN( "writerfilter", "Exception: " << e.Message );
+ SAL_WARN( "writerfilter", e );
assert( !"Incorrect argument to UNO call" );
}
catch( const uno::Exception& e )
{
- SAL_WARN( "writerfilter", "Exception: " << e.Message );
+ SAL_WARN( "writerfilter", e );
}
}
diff --git a/writerfilter/source/dmapper/OLEHandler.cxx b/writerfilter/source/dmapper/OLEHandler.cxx
index ae1e13a0041b..3bf20e91c9cd 100644
--- a/writerfilter/source/dmapper/OLEHandler.cxx
+++ b/writerfilter/source/dmapper/OLEHandler.cxx
@@ -125,7 +125,7 @@ void OLEHandler::lcl_attribute(Id rName, Value & rVal)
}
catch( const uno::Exception& e )
{
- SAL_WARN("writerfilter", "Exception in OLE Handler: " << e.Message);
+ SAL_WARN("writerfilter", "Exception in OLE Handler: " << e);
}
// No need to set the wrapping here as it's either set in oox or will be set later
}
@@ -176,7 +176,7 @@ void OLEHandler::lcl_sprm(Sprm & rSprm)
}
catch( const uno::Exception& e )
{
- SAL_WARN("writerfilter", "Exception in OLE Handler: " << e.Message);
+ SAL_WARN("writerfilter", "Exception in OLE Handler: " << e);
}
}
}
diff --git a/writerfilter/source/dmapper/PropertyMap.cxx b/writerfilter/source/dmapper/PropertyMap.cxx
index 9ff1da5d0cd2..be506993b9df 100644
--- a/writerfilter/source/dmapper/PropertyMap.cxx
+++ b/writerfilter/source/dmapper/PropertyMap.cxx
@@ -510,7 +510,7 @@ uno::Reference< beans::XPropertySet > SectionPropertyMap::GetPageStyle( const un
}
catch ( const uno::Exception& rException )
{
- SAL_WARN( "writerfilter", "SectionPropertyMap::GetPageStyle() failed: " << rException.Message );
+ SAL_WARN( "writerfilter", "SectionPropertyMap::GetPageStyle() failed: " << rException );
}
return xRet;
@@ -796,7 +796,7 @@ void SectionPropertyMap::CopyHeaderFooterTextProperty( const uno::Reference< bea
}
catch ( const uno::Exception& e )
{
- SAL_INFO( "writerfilter", "An exception occurred in SectionPropertyMap::CopyHeaderFooterTextProperty( ) - " << e.Message );
+ SAL_INFO( "writerfilter", "An exception occurred in SectionPropertyMap::CopyHeaderFooterTextProperty( ) - " << e );
}
}
diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx b/writerfilter/source/dmapper/StyleSheetTable.cxx
index 9e5d80735c47..8335ecd61d9d 100644
--- a/writerfilter/source/dmapper/StyleSheetTable.cxx
+++ b/writerfilter/source/dmapper/StyleSheetTable.cxx
@@ -375,7 +375,7 @@ void StyleSheetTable_Impl::SetPropertiesToDefault(const uno::Reference<style::XS
}
catch(const uno::Exception& rException)
{
- SAL_INFO("writerfilter", "setPropertyToDefault(" << aPropertyNames[i] << ") failed: " << rException.Message);
+ SAL_INFO("writerfilter", "setPropertyToDefault(" << aPropertyNames[i] << ") failed: " << rException);
}
}
}
@@ -1209,7 +1209,7 @@ void StyleSheetTable::ApplyStyleSheets( const FontTablePtr& rFontTable )
}
catch( const uno::Exception& rException )
{
- SAL_WARN("writerfilter", "Styles could not be imported completely: " << rException.Message);
+ SAL_WARN("writerfilter", "Styles could not be imported completely: " << rException);
}
}
diff --git a/writerfilter/source/dmapper/TableManager.cxx b/writerfilter/source/dmapper/TableManager.cxx
index 87ca79b5e118..707b8223f565 100644
--- a/writerfilter/source/dmapper/TableManager.cxx
+++ b/writerfilter/source/dmapper/TableManager.cxx
@@ -320,7 +320,7 @@ void TableManager::resolveCurrentTable()
}
catch (css::uno::Exception const& e)
{
- SAL_WARN("writerfilter", "resolving of current table failed with: " << e.Message);
+ SAL_WARN("writerfilter", "resolving of current table failed with: " << e);
}
}
mState.resetTableProps();
diff --git a/writerfilter/source/filter/RtfFilter.cxx b/writerfilter/source/filter/RtfFilter.cxx
index 6487b015c6bf..711d0e5d3116 100644
--- a/writerfilter/source/filter/RtfFilter.cxx
+++ b/writerfilter/source/filter/RtfFilter.cxx
@@ -156,7 +156,7 @@ sal_Bool RtfFilter::filter(const uno::Sequence< beans::PropertyValue >& rDescrip
}
catch (const uno::Exception& e)
{
- SAL_INFO("writerfilter", "Exception caught: " << e.Message);
+ SAL_INFO("writerfilter", "Exception caught: " << e);
}
if (xStatusIndicator.is())
diff --git a/writerfilter/source/filter/WriterFilter.cxx b/writerfilter/source/filter/WriterFilter.cxx
index 44dec903a42e..01d0f66a652f 100644
--- a/writerfilter/source/filter/WriterFilter.cxx
+++ b/writerfilter/source/filter/WriterFilter.cxx
@@ -209,8 +209,7 @@ sal_Bool WriterFilter::filter(const uno::Sequence< beans::PropertyValue >& rDesc
}
catch (uno::Exception const& e)
{
- SAL_WARN("writerfilter", "WriterFilter::filter(): "
- "failed with exception " << e.Message);
+ SAL_WARN("writerfilter", "WriterFilter::filter(): failed with " << e);
throw lang::WrappedTargetRuntimeException("",
static_cast<OWeakObject*>(this), uno::makeAny(e));
}
diff --git a/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx b/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
index d750dc9973a4..63277cf72065 100644
--- a/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
+++ b/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
@@ -84,7 +84,7 @@ void OOXMLDocumentImpl::resolveFastSubStream(Stream & rStreamHandler,
catch (uno::Exception const& e)
{
SAL_INFO("writerfilter.ooxml", "resolveFastSubStream: exception while "
- "resolving stream " << nType << " : " << e.Message);
+ "resolving stream " << nType << " : " << e);
return;
}
OOXMLStream::Pointer_t savedStream = mpStream;
@@ -142,7 +142,7 @@ uno::Reference<xml::dom::XDocument> OOXMLDocumentImpl::importSubStream(OOXMLStre
catch (uno::Exception const& e)
{
SAL_INFO("writerfilter.ooxml", "importSubStream: exception while "
- "importing stream " << nType << " : " << e.Message);
+ "importing stream " << nType << " : " << e);
return xRet;
}
@@ -160,7 +160,7 @@ uno::Reference<xml::dom::XDocument> OOXMLDocumentImpl::importSubStream(OOXMLStre
catch (uno::Exception const& e)
{
SAL_INFO("writerfilter.ooxml", "importSubStream: exception while "
- "parsing stream " << nType << " : " << e.Message);
+ "parsing stream " << nType << " : " << e);
return xRet;
}
}
@@ -189,7 +189,7 @@ void OOXMLDocumentImpl::importSubStreamRelations(const OOXMLStream::Pointer_t& p
catch (uno::Exception const& e)
{
SAL_WARN("writerfilter.ooxml", "importSubStreamRelations: exception while "
- "importing stream " << nType << " : " << e.Message);
+ "importing stream " << nType << " : " << e);
return;
}
@@ -210,7 +210,7 @@ void OOXMLDocumentImpl::importSubStreamRelations(const OOXMLStream::Pointer_t& p
catch (uno::Exception const& e)
{
SAL_WARN("writerfilter.ooxml", "importSubStream: exception while "
- "parsing stream " << nType << " : " << e.Message);
+ "parsing stream " << nType << " : " << e);
mxCustomXmlProsDom = xRelation;
}
@@ -505,8 +505,7 @@ void OOXMLDocumentImpl::resolve(Stream & rStream)
// note: cannot throw anything other than SAXException out of here?
catch (uno::Exception const& e)
{
- SAL_WARN("writerfilter.ooxml",
- "OOXMLDocumentImpl::resolve(): exception: " << e.Message);
+ SAL_WARN("writerfilter.ooxml", "OOXMLDocumentImpl::resolve(): " << e);
throw lang::WrappedTargetRuntimeException("", nullptr,
uno::makeAny(e));
}
@@ -606,7 +605,7 @@ void OOXMLDocumentImpl::resolveGlossaryStream(Stream & /*rStream*/)
catch (uno::Exception const& e)
{
SAL_INFO("writerfilter.ooxml", "resolveGlossaryStream: exception while "
- "createStream for glossary" << OOXMLStream::GLOSSARY << " : " << e.Message);
+ "createStream for glossary" << OOXMLStream::GLOSSARY << " : " << e);
return;
}
uno::Reference<embed::XRelationshipAccess> xRelationshipAccess;
@@ -673,7 +672,7 @@ void OOXMLDocumentImpl::resolveGlossaryStream(Stream & /*rStream*/)
catch (uno::Exception const& e)
{
SAL_INFO("writerfilter.ooxml", "importSubStream: exception while "
- "parsing stream of Type" << nType << " : " << e.Message);
+ "parsing stream of Type" << nType << " : " << e);
return;
}
@@ -758,7 +757,7 @@ void OOXMLDocumentImpl::resolveEmbeddingsStream(const OOXMLStream::Pointer_t& pS
catch (uno::Exception const& e)
{
SAL_INFO("writerfilter.ooxml", "resolveEmbeddingsStream: can't find header/footer whilst "
- "resolving stream " << streamType << " : " << e.Message);
+ "resolving stream " << streamType << " : " << e);
return;
}
}
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 4c6f03ad06c8..398ca2e82c0d 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -2790,7 +2790,7 @@ RTFError RTFDocumentImpl::popState()
}
catch (const uno::Exception& rException)
{
- SAL_WARN("writerfilter.rtf", "failed to set property " << rKey << ": " << rException.Message);
+ SAL_WARN("writerfilter.rtf", "failed to set property " << rKey << ": " << rException);
}
}
}
diff --git a/writerperfect/source/writer/MSWorksImportFilter.cxx b/writerperfect/source/writer/MSWorksImportFilter.cxx
index 723ebf73f892..fa1fe401816d 100644
--- a/writerperfect/source/writer/MSWorksImportFilter.cxx
+++ b/writerperfect/source/writer/MSWorksImportFilter.cxx
@@ -78,7 +78,7 @@ bool MSWorksImportFilter::doImportDocument(librevenge::RVNGInputStream &rInput,
}
catch (css::uno::Exception &e)
{
- SAL_WARN("writerperfect", "ignoring Exception " << e.Message);
+ SAL_WARN("writerperfect", "ignoring " << e);
}
return libwps::WPS_OK == libwps::WPSDocument::parse(&rInput, &rGenerator, "", fileEncoding.c_str());
}
diff --git a/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx b/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx
index 993666682aca..5ccbb5137197 100644
--- a/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx
+++ b/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx
@@ -251,7 +251,7 @@ ResultSetForQuery::ResultSetForQuery( const uno::Reference< uno::XComponentConte
}
catch (const Exception &e)
{
- SAL_WARN("xmlhelp", "Exception: " << e.Message);
+ SAL_WARN("xmlhelp", e);
}
++iDir;
diff --git a/xmloff/source/chart/SchXMLChartContext.cxx b/xmloff/source/chart/SchXMLChartContext.cxx
index 596f9e580b50..f7fb5d06ba97 100644
--- a/xmloff/source/chart/SchXMLChartContext.cxx
+++ b/xmloff/source/chart/SchXMLChartContext.cxx
@@ -166,8 +166,7 @@ void lcl_removeEmptyChartTypeGroups( const uno::Reference< chart2::XChartDocumen
}
catch(const uno::Exception& ex)
{
- OString aBStr(OUStringToOString(ex.Message, RTL_TEXTENCODING_ASCII_US));
- SAL_INFO("xmloff.chart", "Exception caught while removing empty chart types: " << aBStr);
+ SAL_INFO("xmloff.chart", "Exception caught while removing empty chart types: " << ex);
}
}
@@ -303,8 +302,7 @@ void lcl_setDataProvider(uno::Reference<chart2::XChartDocument> const & xChartDo
}
catch (const uno::Exception & rEx)
{
- OString aBStr(OUStringToOString(rEx.Message, RTL_TEXTENCODING_ASCII_US));
- SAL_INFO("xmloff.chart", "SchXMLChartContext::StartElement(): Exception caught: " << aBStr);
+ SAL_INFO("xmloff.chart", "SchXMLChartContext::StartElement(): Exception caught: " << rEx);
}
}
diff --git a/xmloff/source/chart/SchXMLExport.cxx b/xmloff/source/chart/SchXMLExport.cxx
index 41d0716f6b4d..e0975a8d801c 100644
--- a/xmloff/source/chart/SchXMLExport.cxx
+++ b/xmloff/source/chart/SchXMLExport.cxx
@@ -346,7 +346,7 @@ Reference< chart2::data::XLabeledDataSequence > lcl_getCategories( const Referen
}
catch( const uno::Exception & ex )
{
- SAL_WARN("xmloff.chart", "Exception caught. Type: " << OUString::createFromAscii( typeid( ex ).name()) << ", Message: " << ex.Message);
+ SAL_WARN("xmloff.chart", "Exception caught. " << ex);
}
return xResult;
@@ -453,7 +453,7 @@ bool lcl_isSeriesAttachedToFirstAxis(
}
catch( const uno::Exception & ex )
{
- SAL_WARN("xmloff.chart", "Exception caught. Type: " << OUString::createFromAscii( typeid( ex ).name()) << ", Message: " << ex.Message);
+ SAL_WARN("xmloff.chart", "Exception caught. Type: " << OUString::createFromAscii( typeid( ex ).name()) << ", Message: " << ex);
}
return bResult;
@@ -876,7 +876,7 @@ lcl_TableData lcl_getDataForLocalTable(
}
catch( const uno::Exception & rEx )
{
- SAL_INFO("xmloff.chart", "something went wrong during table data collection: " << rEx.Message);
+ SAL_INFO("xmloff.chart", "something went wrong during table data collection: " << rEx);
}
return aResult;
@@ -922,8 +922,7 @@ void lcl_exportNumberFormat( const OUString& rPropertyName, const Reference< bea
}
catch( const uno::Exception & rEx )
{
- OString aBStr(OUStringToOString(rEx.Message, RTL_TEXTENCODING_ASCII_US));
- SAL_INFO("xmloff.chart", "chart:exporting error bar ranges: " << aBStr );
+ SAL_INFO("xmloff.chart", "chart:exporting error bar ranges: " << rEx );
}
}
@@ -1465,7 +1464,7 @@ void SchXMLExportHelper_Impl::parseDocument( Reference< chart::XChartDocument >
}
catch( const uno::Exception & rEx )
{
- SAL_INFO("xmloff.chart", "AdditionalShapes not found: " << rEx.Message );
+ SAL_INFO("xmloff.chart", "AdditionalShapes not found: " << rEx );
}
if( mxAdditionalShapes.is())
@@ -1914,8 +1913,7 @@ void SchXMLExportHelper_Impl::exportPlotArea(
}
catch( const uno::Exception & rEx )
{
- OString aBStr(OUStringToOString(rEx.Message, RTL_TEXTENCODING_ASCII_US));
- SAL_INFO("xmloff.chart", "chart:exportPlotAreaException caught: " << aBStr);
+ SAL_INFO("xmloff.chart", "chart:exportPlotAreaException caught: " << rEx);
}
}
@@ -2624,7 +2622,7 @@ void SchXMLExportHelper_Impl::exportSeries(
}
catch( const uno::Exception & rEx )
{
- SAL_INFO("xmloff.chart", "Series not found or no XPropertySet: " << rEx.Message );
+ SAL_INFO("xmloff.chart", "Series not found or no XPropertySet: " << rEx );
continue;
}
if( xPropSet.is())
@@ -2640,7 +2638,7 @@ void SchXMLExportHelper_Impl::exportSeries(
}
catch( const beans::UnknownPropertyException & rEx )
{
- SAL_INFO("xmloff.chart", "Required property not found in DataRowProperties: " << rEx.Message );
+ SAL_INFO("xmloff.chart", "Required property not found in DataRowProperties: " << rEx );
}
const SvtSaveOptions::ODFDefaultVersion nCurrentODFVersion( SvtSaveOptions().GetODFDefaultVersion() );
@@ -2796,7 +2794,7 @@ void SchXMLExportHelper_Impl::exportSeries(
}
catch( const uno::Exception & rEx )
{
- SAL_INFO("xmloff.chart", "Exception caught during Export of series - optional DataMeanValueProperties not available: " << rEx.Message );
+ SAL_INFO("xmloff.chart", "Exception caught during Export of series - optional DataMeanValueProperties not available: " << rEx );
}
if( xStatProp.is() )
@@ -3044,7 +3042,7 @@ void SchXMLExportHelper_Impl::exportErrorBar( const Reference<beans::XPropertySe
}
catch( const beans::UnknownPropertyException & rEx )
{
- SAL_INFO("xmloff.chart", "Required property not found in DataRowProperties: " << rEx.Message );
+ SAL_INFO("xmloff.chart", "Required property not found in DataRowProperties: " << rEx );
}
if( nErrorBarStyle != chart::ErrorBarStyle::NONE && (bNegative || bPositive))
@@ -3266,7 +3264,7 @@ void SchXMLExportHelper_Impl::exportDataPoints(
}
catch( const uno::Exception & rEx )
{
- SAL_INFO("xmloff.chart", "Exception caught during Export of data point: " << rEx.Message );
+ SAL_INFO("xmloff.chart", "Exception caught during Export of data point: " << rEx );
}
}
else
@@ -3335,7 +3333,7 @@ void SchXMLExportHelper_Impl::exportDataPoints(
}
catch( const uno::Exception & rEx )
{
- SAL_INFO("xmloff.chart", "Exception caught during Export of data point: " << rEx.Message );
+ SAL_INFO("xmloff.chart", "Exception caught during Export of data point: " << rEx );
}
if( xPropSet.is())
{
@@ -3669,7 +3667,7 @@ void SchXMLExportHelper_Impl::InitRangeSegmentationProperties( const Reference<
}
catch( const uno::Exception & ex )
{
- SAL_WARN("xmloff.chart", "Exception caught. Type: " << OUString::createFromAscii( typeid( ex ).name()) << ", Message: " << ex.Message);
+ SAL_WARN("xmloff.chart", "Exception caught. Type: " << OUString::createFromAscii( typeid( ex ).name()) << ", Message: " << ex);
}
}
diff --git a/xmloff/source/chart/SchXMLImport.cxx b/xmloff/source/chart/SchXMLImport.cxx
index 30d1b6506f28..6212112af875 100644
--- a/xmloff/source/chart/SchXMLImport.cxx
+++ b/xmloff/source/chart/SchXMLImport.cxx
@@ -406,7 +406,7 @@ void SchXMLImportHelper::DeleteDataSeries(
}
catch( const uno::Exception & ex )
{
- SAL_WARN("xmloff.chart", "Exception caught. Type: " << OUString::createFromAscii( typeid( ex ).name()) << ", Message: " << ex.Message);
+ SAL_WARN("xmloff.chart", "Exception caught. " << ex);
}
}
@@ -484,7 +484,7 @@ Reference< chart2::XDataSeries > SchXMLImportHelper::GetNewDataSeries(
}
catch( const uno::Exception & ex )
{
- SAL_WARN("xmloff.chart", "Exception caught. Type: " << OUString::createFromAscii( typeid( ex ).name()) << ", Message: " << ex.Message);
+ SAL_WARN("xmloff.chart", "Exception caught. Type: " << OUString::createFromAscii( typeid( ex ).name()) << ", Message: " << ex);
}
return xResult;
}
@@ -600,8 +600,7 @@ void SAL_CALL SchXMLImport::setTargetDocument(const uno::Reference<lang::XCompon
}
catch (const uno::Exception & rEx)
{
- OString aBStr(OUStringToOString(rEx.Message, RTL_TEXTENCODING_ASCII_US));
- SAL_INFO("xmloff.chart", "SchXMLChartContext::StartElement(): Exception caught: " << aBStr);
+ SAL_INFO("xmloff.chart", "SchXMLChartContext::StartElement(): Exception caught: " << rEx);
}
}
diff --git a/xmloff/source/chart/SchXMLPlotAreaContext.cxx b/xmloff/source/chart/SchXMLPlotAreaContext.cxx
index b724655f7066..b625331c6db5 100644
--- a/xmloff/source/chart/SchXMLPlotAreaContext.cxx
+++ b/xmloff/source/chart/SchXMLPlotAreaContext.cxx
@@ -117,8 +117,7 @@ void SchXML3DSceneAttributesHelper::getCameraDefaultFromDiagram( const uno::Refe
}
catch( const uno::Exception & rEx )
{
- OString aBStr(OUStringToOString(rEx.Message, RTL_TEXTENCODING_ASCII_US));
- SAL_INFO("xmloff.chart", "Exception caught for property NumberOfLines: " << aBStr);
+ SAL_INFO("xmloff.chart", "Exception caught for property NumberOfLines: " << rEx);
}
}
@@ -384,8 +383,7 @@ void SchXMLPlotAreaContext::StartElement( const uno::Reference< xml::sax::XAttri
}
catch( const uno::Exception & rEx )
{
- OString aBStr(OUStringToOString(rEx.Message, RTL_TEXTENCODING_ASCII_US));
- SAL_INFO("xmloff.chart", "PlotAreaContext:EndElement(): Exception caught: " << aBStr);
+ SAL_INFO("xmloff.chart", "PlotAreaContext:EndElement(): Exception caught: " << rEx);
}
} // if
@@ -555,8 +553,7 @@ void SchXMLPlotAreaContext::EndElement()
}
catch( const uno::Exception & rEx )
{
- OString aBStr(OUStringToOString(rEx.Message, RTL_TEXTENCODING_ASCII_US));
- SAL_INFO("xmloff.chart", "Exception caught for property NumberOfLines: " << aBStr);
+ SAL_INFO("xmloff.chart", "Exception caught for property NumberOfLines: " << rEx);
}
}
@@ -571,8 +568,7 @@ void SchXMLPlotAreaContext::EndElement()
}
catch( const uno::Exception & rEx )
{
- OString aBStr(OUStringToOString(rEx.Message, RTL_TEXTENCODING_ASCII_US));
- SAL_INFO("xmloff.chart", "Exception caught for property Volume: " << aBStr);
+ SAL_INFO("xmloff.chart", "Exception caught for property Volume: " << rEx);
}
}
}
diff --git a/xmloff/source/chart/SchXMLSeries2Context.cxx b/xmloff/source/chart/SchXMLSeries2Context.cxx
index 5aa8eec6e80a..e5552cbe301d 100644
--- a/xmloff/source/chart/SchXMLSeries2Context.cxx
+++ b/xmloff/source/chart/SchXMLSeries2Context.cxx
@@ -469,7 +469,7 @@ void SchXMLSeries2Context::StartElement( const uno::Reference< xml::sax::XAttrib
}
catch( const uno::Exception & ex )
{
- SAL_WARN("xmloff.chart", "Exception caught. Type: " << OUString::createFromAscii( typeid( ex ).name()) << ", Message: " << ex.Message);
+ SAL_WARN("xmloff.chart", "Exception caught. " << ex);
}
//init mbSymbolSizeIsMissingInFile:
@@ -859,7 +859,7 @@ void SchXMLSeries2Context::setStylesToSeries( SeriesDefaultsAndStyles& rSeriesDe
}
catch( const uno::Exception & rEx )
{
- SAL_INFO("xmloff.chart", "Exception caught during setting styles to series: " << rEx.Message );
+ SAL_INFO("xmloff.chart", "Exception caught during setting styles to series: " << rEx );
}
}
}
@@ -930,7 +930,7 @@ void SchXMLSeries2Context::setStylesToRegressionCurves(
}
catch( const uno::Exception& rEx )
{
- SAL_INFO("xmloff.chart", "Exception caught during setting styles to series: " << rEx.Message );
+ SAL_INFO("xmloff.chart", "Exception caught during setting styles to series: " << rEx );
}
}
@@ -1001,7 +1001,7 @@ void SchXMLSeries2Context::setStylesToStatisticsObjects( SeriesDefaultsAndStyles
}
catch( const uno::Exception & rEx )
{
- SAL_INFO("xmloff.chart", "Exception caught during setting styles to series: " << rEx.Message );
+ SAL_INFO("xmloff.chart", "Exception caught during setting styles to series: " << rEx );
}
}
}
@@ -1097,7 +1097,7 @@ void SchXMLSeries2Context::setStylesToDataPoints( SeriesDefaultsAndStyles& rSeri
}
catch( const uno::Exception & rEx )
{
- SAL_INFO("xmloff.chart", "Exception caught during setting styles to data points: " << rEx.Message );
+ SAL_INFO("xmloff.chart", "Exception caught during setting styles to data points: " << rEx );
}
}
} // styles iterator
diff --git a/xmloff/source/chart/SchXMLSeriesHelper.cxx b/xmloff/source/chart/SchXMLSeriesHelper.cxx
index 3f5173d308c5..7ead41dfb260 100644
--- a/xmloff/source/chart/SchXMLSeriesHelper.cxx
+++ b/xmloff/source/chart/SchXMLSeriesHelper.cxx
@@ -61,7 +61,7 @@ using ::com::sun::star::uno::Sequence;
}
catch( const uno::Exception & ex )
{
- SAL_WARN("xmloff.chart", "Exception caught. Type: " << OUString::createFromAscii( typeid( ex ).name() ) << ", Message: " << ex.Message );
+ SAL_WARN("xmloff.chart", "Exception caught. Type: " << OUString::createFromAscii( typeid( ex ).name() ) << ", Message: " << ex );
}
return aResult;
@@ -192,7 +192,7 @@ uno::Reference< beans::XPropertySet > SchXMLSeriesHelper::createOldAPISeriesProp
}
catch( const uno::Exception & rEx )
{
- SAL_INFO("xmloff.chart", "Exception caught SchXMLSeriesHelper::createOldAPISeriesPropertySet: " << rEx.Message );
+ SAL_INFO("xmloff.chart", "Exception caught SchXMLSeriesHelper::createOldAPISeriesPropertySet: " << rEx );
}
}
@@ -227,7 +227,7 @@ uno::Reference< beans::XPropertySet > SchXMLSeriesHelper::createOldAPIDataPointP
}
catch( const uno::Exception & rEx )
{
- SAL_INFO("xmloff.chart", "Exception caught SchXMLSeriesHelper::createOldAPIDataPointPropertySet: " << rEx.Message );
+ SAL_INFO("xmloff.chart", "Exception caught SchXMLSeriesHelper::createOldAPIDataPointPropertySet: " << rEx );
}
}
diff --git a/xmloff/source/chart/SchXMLTools.cxx b/xmloff/source/chart/SchXMLTools.cxx
index 6d3dc3e99081..003a6f6f3fb7 100644
--- a/xmloff/source/chart/SchXMLTools.cxx
+++ b/xmloff/source/chart/SchXMLTools.cxx
@@ -507,7 +507,7 @@ void CreateCategories(
}
catch( const lang::IllegalArgumentException & ex )
{
- SAL_WARN("xmloff.chart", "IllegalArgumentException caught, Message: " << ex.Message );
+ SAL_WARN("xmloff.chart", "IllegalArgumentException caught, Message: " << ex );
}
aData.Categories.set( xLabeledSeq );
if( pLSequencesPerIndex )
@@ -646,7 +646,7 @@ void setXMLRangePropertyAtDataSequence(
}
catch( const uno::Exception & ex )
{
- SAL_WARN("xmloff.chart", "Exception caught, Message: " << ex.Message );
+ SAL_WARN("xmloff.chart", "Exception caught, Message: " << ex );
}
}
@@ -673,7 +673,7 @@ bool getXMLRangePropertyFromDataSequence(
}
catch( const uno::Exception & ex )
{
- SAL_WARN("xmloff.chart", "Exception caught, Message: " << ex.Message );
+ SAL_WARN("xmloff.chart", "Exception caught, Message: " << ex );
}
}
return bResult;
diff --git a/xmloff/source/core/DocumentSettingsContext.cxx b/xmloff/source/core/DocumentSettingsContext.cxx
index dd875a91db82..8c2f56569149 100644
--- a/xmloff/source/core/DocumentSettingsContext.cxx
+++ b/xmloff/source/core/DocumentSettingsContext.cxx
@@ -762,7 +762,7 @@ void XMLConfigItemMapIndexedContext::EndElement()
catch (uno::Exception const& e)
{
SAL_WARN("xmloff.core",
- "Exception while importing forbidden characters: " << e.Message);
+ "Exception while importing forbidden characters: " << e);
}
}
}
diff --git a/xmloff/source/draw/animationexport.cxx b/xmloff/source/draw/animationexport.cxx
index f3014ce41224..5af1d934fe1a 100644
--- a/xmloff/source/draw/animationexport.cxx
+++ b/xmloff/source/draw/animationexport.cxx
@@ -547,7 +547,7 @@ static OUString lcl_StoreMediaAndGetURL(SvXMLExport & rExport, OUString const& r
}
catch (uno::Exception const& e)
{
- SAL_INFO("xmloff", "exception while storing embedded media: '" << e.Message << "'");
+ SAL_INFO("xmloff", "exception while storing embedded media: '" << e << "'");
}
return OUString();
}
diff --git a/xmloff/source/draw/shapeexport.cxx b/xmloff/source/draw/shapeexport.cxx
index 96f38e27c788..16084b9e27aa 100644
--- a/xmloff/source/draw/shapeexport.cxx
+++ b/xmloff/source/draw/shapeexport.cxx
@@ -3174,8 +3174,7 @@ lcl_StoreMediaAndGetURL(SvXMLExport & rExport,
}
catch (uno::Exception const& e)
{
- SAL_INFO("xmloff", "exception while storing embedded media: '"
- << e.Message << "'");
+ SAL_INFO("xmloff", "exception while storing embedded media: " << e);
}
return OUString();
}
@@ -3231,7 +3230,7 @@ static void lcl_StoreGltfExternals(
}
catch (uno::Exception const& e)
{
- SAL_INFO("xmloff", "exception while saving embedded model: '" << e.Message << "'");
+ SAL_INFO("xmloff", "exception while saving embedded model: '" << e << "'");
}
}
}
@@ -3310,7 +3309,7 @@ static void lcl_StoreGltfFallback(
}
catch (uno::Exception const& e)
{
- SAL_INFO("xmloff", "exception while saving fallback image of glTF model: '" << e.Message << "'");
+ SAL_INFO("xmloff", "exception while saving fallback image of glTF model: '" << e << "'");
}
}
}
diff --git a/xmloff/source/draw/shapeimport.cxx b/xmloff/source/draw/shapeimport.cxx
index cc541900fcb9..37215f14910d 100644
--- a/xmloff/source/draw/shapeimport.cxx
+++ b/xmloff/source/draw/shapeimport.cxx
@@ -836,7 +836,7 @@ void XMLShapeImportHelper::popGroupAndSort()
}
catch( const uno::Exception& rException )
{
- SAL_WARN("xmloff", "exception while sorting shapes, sorting failed: " << rException.Message);
+ SAL_WARN("xmloff", "exception while sorting shapes, sorting failed: " << rException);
}
// put parent on top and drop current context, we are done
diff --git a/xmloff/source/forms/officeforms.cxx b/xmloff/source/forms/officeforms.cxx
index 34b26f8090b0..def7655747b1 100644
--- a/xmloff/source/forms/officeforms.cxx
+++ b/xmloff/source/forms/officeforms.cxx
@@ -57,7 +57,7 @@ namespace xmloff
pRet = GetImport().GetFormImport()->createContext( _nPrefix, _rLocalName, xAttrList );
} catch (const Exception& rException)
{
- SAL_WARN("xmloff.forms", "OFormsRootImport::CreateChildContext: " << rException.Message);
+ SAL_WARN("xmloff.forms", "OFormsRootImport::CreateChildContext: " << rException);
}
return pRet;
}
diff --git a/xmloff/source/style/XMLFontAutoStylePool.cxx b/xmloff/source/style/XMLFontAutoStylePool.cxx
index 0d2f70fb47c6..7a1661c9ad1d 100644
--- a/xmloff/source/style/XMLFontAutoStylePool.cxx
+++ b/xmloff/source/style/XMLFontAutoStylePool.cxx
@@ -424,7 +424,7 @@ OUString XMLFontAutoStylePool::embedFontFile( const OUString& fileUrl )
}
} catch( const Exception& e )
{
- SAL_WARN( "xmloff", "Exception when embedding a font file:" << e.Message );
+ SAL_WARN( "xmloff", "Exception when embedding a font file:" << e );
}
return OUString();
}
diff --git a/xmloff/source/text/XMLTextFrameContext.cxx b/xmloff/source/text/XMLTextFrameContext.cxx
index 7e3131ba634b..e6ca2f29864b 100644
--- a/xmloff/source/text/XMLTextFrameContext.cxx
+++ b/xmloff/source/text/XMLTextFrameContext.cxx
@@ -700,7 +700,7 @@ void XMLTextFrameContext_Impl::Create()
}
catch (lang::IllegalArgumentException const& e)
{
- SAL_WARN("xmloff.text", "Cannot import part of the text - probably an image in the text frame? " << e.Message);
+ SAL_WARN("xmloff.text", "Cannot import part of the text - probably an image in the text frame? " << e);
return;
}
}
@@ -1234,7 +1234,7 @@ void XMLTextFrameContext_Impl::SetName()
catch (uno::Exception const& e)
{ // fdo#71698 document contains 2 frames with same draw:name
SAL_INFO("xmloff.text", "SetName(): exception setting \""
- << m_sOrigName << "\": " << e.Message);
+ << m_sOrigName << "\": " << e);
}
}
}
diff --git a/xmloff/source/text/txtparai.cxx b/xmloff/source/text/txtparai.cxx
index 3115788f66cd..fe66065a928d 100644
--- a/xmloff/source/text/txtparai.cxx
+++ b/xmloff/source/text/txtparai.cxx
@@ -2072,7 +2072,7 @@ void XMLParaContext::EndElement()
}
catch (uno::RuntimeException const& e)
{
- SAL_INFO("xmloff.text", "could not insert index mark, presumably in editengine text " << e.Message);
+ SAL_INFO("xmloff.text", "could not insert index mark, presumably in editengine text " << e);
}
}
break;
diff --git a/xmlscript/source/xmlflat_imexp/xmlbas_export.cxx b/xmlscript/source/xmlflat_imexp/xmlbas_export.cxx
index a0793905a54c..ccb58d310728 100644
--- a/xmlscript/source/xmlflat_imexp/xmlbas_export.cxx
+++ b/xmlscript/source/xmlflat_imexp/xmlbas_export.cxx
@@ -303,22 +303,22 @@ sal_Bool XMLBasicExporterBase::filter( const Sequence< beans::PropertyValue >& /
}
catch ( const container::NoSuchElementException& e )
{
- SAL_INFO("xmlscript.xmlflat", "XMLBasicExporterBase::filter: caught NoSuchElementException reason " << e.Message );
+ SAL_INFO("xmlscript.xmlflat", "XMLBasicExporterBase::filter: caught NoSuchElementException reason " << e );
bReturn = false;
}
catch ( const lang::IllegalArgumentException& e )
{
- SAL_INFO("xmlscript.xmlflat", "XMLBasicExporterBase::filter: caught IllegalArgumentException reason " << e.Message );
+ SAL_INFO("xmlscript.xmlflat", "XMLBasicExporterBase::filter: caught IllegalArgumentException reason " << e );
bReturn = false;
}
catch ( const lang::WrappedTargetException& e )
{
- SAL_INFO("xmlscript.xmlflat", "XMLBasicExporterBase::filter: caught WrappedTargetException reason " << e.Message );
+ SAL_INFO("xmlscript.xmlflat", "XMLBasicExporterBase::filter: caught WrappedTargetException reason " << e );
bReturn = false;
}
catch ( const xml::sax::SAXException& e )
{
- SAL_INFO("xmlscript.xmlflat", "XMLBasicExporterBase::filter: caught SAXException reason " << e.Message );
+ SAL_INFO("xmlscript.xmlflat", "XMLBasicExporterBase::filter: caught SAXException reason " << e );
bReturn = false;
}
diff --git a/xmlscript/source/xmlflat_imexp/xmlbas_import.cxx b/xmlscript/source/xmlflat_imexp/xmlbas_import.cxx
index 4cf57195c8d1..33692d937f77 100644
--- a/xmlscript/source/xmlflat_imexp/xmlbas_import.cxx
+++ b/xmlscript/source/xmlflat_imexp/xmlbas_import.cxx
@@ -176,11 +176,11 @@ void BasicElementBase::processingInstruction( const OUString& /*rTarget*/, const
}
catch ( const container::ElementExistException& e )
{
- SAL_INFO("xmlscript.xmlflat", "BasicLibrariesElement::startChildElement: caught ElementExceptionExist reason " << e.Message );
+ SAL_INFO("xmlscript.xmlflat", "BasicLibrariesElement::startChildElement: caught ElementExceptionExist reason " << e );
}
catch ( const lang::IllegalArgumentException& e )
{
- SAL_INFO("xmlscript.xmlflat", "BasicLibrariesElement::startChildElement: caught IllegalArgumentException reason " << e.Message );
+ SAL_INFO("xmlscript.xmlflat", "BasicLibrariesElement::startChildElement: caught IllegalArgumentException reason " << e );
}
}
}
@@ -216,7 +216,7 @@ void BasicElementBase::processingInstruction( const OUString& /*rTarget*/, const
}
catch ( const lang::IllegalArgumentException& e )
{
- SAL_INFO("xmlscript.xmlflat", "BasicLibrariesElement::startChildElement: caught IllegalArgumentException reason " << e.Message );
+ SAL_INFO("xmlscript.xmlflat", "BasicLibrariesElement::startChildElement: caught IllegalArgumentException reason " << e );
}
}
}
@@ -252,7 +252,7 @@ void BasicElementBase::processingInstruction( const OUString& /*rTarget*/, const
}
catch ( const lang::WrappedTargetException& e )
{
- SAL_INFO("xmlscript.xmlflat", "BasicEmbeddedLibraryElement CTOR: caught WrappedTargetException reason " << e.Message );
+ SAL_INFO("xmlscript.xmlflat", "BasicEmbeddedLibraryElement CTOR: caught WrappedTargetException reason " << e );
}
}
@@ -372,15 +372,15 @@ void BasicElementBase::processingInstruction( const OUString& /*rTarget*/, const
}
catch ( const container::ElementExistException& e )
{
- SAL_INFO("xmlscript.xmlflat", "BasicSourceCodeElement::endElement: caught ElementExceptionExist reason " << e.Message );
+ SAL_INFO("xmlscript.xmlflat", "BasicSourceCodeElement::endElement: caught ElementExceptionExist reason " << e );
}
catch ( const lang::IllegalArgumentException& e )
{
- SAL_INFO("xmlscript.xmlflat", "BasicSourceCodeElement::endElement: caught IllegalArgumentException reason " << e.Message );
+ SAL_INFO("xmlscript.xmlflat", "BasicSourceCodeElement::endElement: caught IllegalArgumentException reason " << e );
}
catch ( const lang::WrappedTargetException& e )
{
- SAL_INFO("xmlscript.xmlflat", "BasicSourceCodeElement::endElement: caught WrappedTargetException reason " << e.Message );
+ SAL_INFO("xmlscript.xmlflat", "BasicSourceCodeElement::endElement: caught WrappedTargetException reason " << e );
}
}
diff --git a/xmlscript/test/imexp.cxx b/xmlscript/test/imexp.cxx
index 0159e734bba2..e275179beef1 100644
--- a/xmlscript/test/imexp.cxx
+++ b/xmlscript/test/imexp.cxx
@@ -72,7 +72,7 @@ Reference< XComponentContext > createInitialComponentContext(
catch( const Exception& rExc )
{
- SAL_WARN( "xmlscript", rExc.Message );
+ SAL_WARN( "xmlscript", rExc );
}
return xContext;
@@ -185,18 +185,18 @@ void MyApp::Main()
}
catch (const xml::sax::SAXException & rExc)
{
- OUString aStr( rExc.Message );
+ OUString aStr( rExc );
uno::Exception exc;
if (rExc.WrappedException >>= exc)
{
aStr += " >>> ";
- aStr += exc.Message;
+ aStr += exc;
}
SAL_WARN( "xmlscript", aStr );
}
catch (const uno::Exception & rExc)
{
- SAL_WARN( "xmlscript", rExc.Message );
+ SAL_WARN( "xmlscript", rExc );
}
Reference< lang::XComponent > xComp( xContext, UNO_QUERY );
diff --git a/xmlsecurity/source/helper/documentsignaturehelper.cxx b/xmlsecurity/source/helper/documentsignaturehelper.cxx
index a9515c18a9e5..43bc7eb5eadb 100644
--- a/xmlsecurity/source/helper/documentsignaturehelper.cxx
+++ b/xmlsecurity/source/helper/documentsignaturehelper.cxx
@@ -392,7 +392,7 @@ SignatureStreamHelper DocumentSignatureHelper::OpenSignatureStream(
}
catch (const io::IOException& rException)
{
- SAL_WARN_IF(nOpenMode != css::embed::ElementModes::READ, "xmlsecurity.helper", "DocumentSignatureHelper::OpenSignatureStream: " << rException.Message);
+ SAL_WARN_IF(nOpenMode != css::embed::ElementModes::READ, "xmlsecurity.helper", "DocumentSignatureHelper::OpenSignatureStream: " << rException);
}
}
diff --git a/xmlsecurity/source/helper/pdfsignaturehelper.cxx b/xmlsecurity/source/helper/pdfsignaturehelper.cxx
index 19efd7ae8195..5356705f7b17 100644
--- a/xmlsecurity/source/helper/pdfsignaturehelper.cxx
+++ b/xmlsecurity/source/helper/pdfsignaturehelper.cxx
@@ -89,7 +89,7 @@ uno::Sequence<security::DocumentSignatureInformation> PDFSignatureHelper::GetDoc
}
catch (const uno::SecurityException& rException)
{
- SAL_WARN("xmlsecurity.helper", "failed to verify certificate: " << rException.Message);
+ SAL_WARN("xmlsecurity.helper", "failed to verify certificate: " << rException);
rExternal.CertificateStatus = security::CertificateValidity::INVALID;
}
}
diff --git a/xmlsecurity/source/helper/xmlsignaturehelper.cxx b/xmlsecurity/source/helper/xmlsignaturehelper.cxx
index db29cd9a4bcd..c6cf9fbf9e4c 100644
--- a/xmlsecurity/source/helper/xmlsignaturehelper.cxx
+++ b/xmlsecurity/source/helper/xmlsignaturehelper.cxx
@@ -398,7 +398,7 @@ bool XMLSignatureHelper::ReadAndVerifySignatureStorageStream(const css::uno::Ref
}
catch(const uno::Exception& rException)
{
- SAL_WARN("xmlsecurity.helper", "XMLSignatureHelper::ReadAndVerifySignatureStorageStream: " << rException.Message);
+ SAL_WARN("xmlsecurity.helper", "XMLSignatureHelper::ReadAndVerifySignatureStorageStream: " << rException);
}
mpXSecController->releaseSignatureReader();
diff --git a/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx b/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx
index dd6336578ea4..14722cb8b474 100644
--- a/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx
+++ b/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx
@@ -176,9 +176,7 @@ OString getMozillaCurrentProfile( const css::uno::Reference< css::uno::XComponen
}
catch (const uno::Exception &e)
{
- SAL_WARN(
- "xmlsecurity.xmlsec",
- "getMozillaCurrentProfile: caught exception " << e.Message);
+ SAL_WARN("xmlsecurity.xmlsec", "getMozillaCurrentProfile: caught " << e);
}
// third, dig around to see if there's one available
diff --git a/xmlsecurity/workben/pdfverify.cxx b/xmlsecurity/workben/pdfverify.cxx
index 4f872a3dad1b..55a20d51a6b9 100644
--- a/xmlsecurity/workben/pdfverify.cxx
+++ b/xmlsecurity/workben/pdfverify.cxx
@@ -65,7 +65,7 @@ int pdfVerify(int nArgc, char** pArgv)
}
catch (const uno::RuntimeException& rException)
{
- SAL_WARN("xmlsecurity.pdfio", "cppu::defaultBootstrap_InitialComponentContext() failed: " << rException.Message);
+ SAL_WARN("xmlsecurity.pdfio", "cppu::defaultBootstrap_InitialComponentContext() failed: " << rException);
return 1;
}
uno::Reference<lang::XMultiComponentFactory> xMultiComponentFactory = xComponentContext->getServiceManager();
@@ -87,7 +87,7 @@ int pdfVerify(int nArgc, char** pArgv)
}
catch (const uno::DeploymentException& rException)
{
- SAL_WARN("xmlsecurity.pdfio", "DeploymentException while creating SEInitializer: " << rException.Message);
+ SAL_WARN("xmlsecurity.pdfio", "DeploymentException while creating SEInitializer: " << rException);
return 1;
}
uno::Reference<xml::crypto::XXMLSecurityContext> xSecurityContext = xSEInitializer->createSecurityContext(OUString());