diff options
-rw-r--r-- | filter/source/config/cache/filtercache.cxx | 5 | ||||
-rw-r--r-- | filter/source/config/cache/typedetection.cxx | 6 | ||||
-rw-r--r-- | filter/source/msfilter/eschesdo.cxx | 5 | ||||
-rw-r--r-- | filter/source/pdf/impdialog.cxx | 5 | ||||
-rw-r--r-- | filter/source/svg/svgfilter.cxx | 5 | ||||
-rw-r--r-- | filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx | 10 | ||||
-rw-r--r-- | filter/source/xsltfilter/XSLTFilter.cxx | 6 | ||||
-rw-r--r-- | forms/source/component/Edit.cxx | 6 | ||||
-rw-r--r-- | forms/source/xforms/submission/replace.cxx | 5 | ||||
-rw-r--r-- | framework/source/dispatch/servicehandler.cxx | 5 | ||||
-rw-r--r-- | framework/source/fwi/jobs/configaccess.cxx | 5 | ||||
-rw-r--r-- | framework/source/jobs/job.cxx | 5 | ||||
-rw-r--r-- | framework/source/services/sessionlistener.cxx | 13 | ||||
-rw-r--r-- | framework/source/uielement/popuptoolbarcontroller.cxx | 9 |
14 files changed, 48 insertions, 42 deletions
diff --git a/filter/source/config/cache/filtercache.cxx b/filter/source/config/cache/filtercache.cxx index a1ae51b1f04c..251695ca738a 100644 --- a/filter/source/config/cache/filtercache.cxx +++ b/filter/source/config/cache/filtercache.cxx @@ -19,6 +19,7 @@ #include <memory> +#include <tools/diagnose_ex.h> #include "filtercache.hxx" #include "constant.hxx" #include "cacheupdatelistener.hxx" @@ -860,9 +861,9 @@ css::uno::Any FilterCache::impl_getDirectCFGValue(const OUString& sDirectKey) } catch(const css::uno::RuntimeException&) { throw; } - catch(const css::uno::Exception& ex) + catch(const css::uno::Exception&) { - SAL_WARN( "filter.config", ex); + TOOLS_WARN_EXCEPTION( "filter.config", ""); aValue.clear(); } diff --git a/filter/source/config/cache/typedetection.cxx b/filter/source/config/cache/typedetection.cxx index 60b68f4592c6..06aa7ae565f4 100644 --- a/filter/source/config/cache/typedetection.cxx +++ b/filter/source/config/cache/typedetection.cxx @@ -32,6 +32,7 @@ #include <rtl/ustrbuf.hxx> #include <sal/log.hxx> #include <framework/interaction.hxx> +#include <tools/diagnose_ex.h> #include <tools/urlobj.hxx> #include <comphelper/fileurl.hxx> #include <comphelper/processfactory.hxx> @@ -448,10 +449,9 @@ OUString SAL_CALL TypeDetection::queryTypeByDescriptor(css::uno::Sequence< css:: { throw; } - catch(const css::uno::Exception& e) + catch(const css::uno::Exception&) { - SAL_WARN("filter.config", "caught " << e - << " while querying type of " << sURL); + TOOLS_WARN_EXCEPTION("filter.config", "caught exception while querying type of " << sURL); sType.clear(); } diff --git a/filter/source/msfilter/eschesdo.cxx b/filter/source/msfilter/eschesdo.cxx index 9ed77a8b2280..365a620f5a4c 100644 --- a/filter/source/msfilter/eschesdo.cxx +++ b/filter/source/msfilter/eschesdo.cxx @@ -30,6 +30,7 @@ #include <vcl/bitmapex.hxx> #include <vcl/graph.hxx> #include <tools/debug.hxx> +#include <tools/diagnose_ex.h> #include <svx/fmdpage.hxx> #include <com/sun/star/style/VerticalAlignment.hpp> #include <com/sun/star/awt/Gradient.hpp> @@ -1219,9 +1220,9 @@ sal_uInt32 ImplEESdrObject::ImplGetText() { mnTextSize = xXText->getString().getLength(); } - catch (const uno::RuntimeException& e) + catch (const uno::RuntimeException&) { - SAL_WARN("filter.ms", "ImplGetText: " << e); + TOOLS_WARN_EXCEPTION("filter.ms", "ImplGetText"); } } return mnTextSize; diff --git a/filter/source/pdf/impdialog.cxx b/filter/source/pdf/impdialog.cxx index 52e22cf01a28..0eccc2da71ff 100644 --- a/filter/source/pdf/impdialog.cxx +++ b/filter/source/pdf/impdialog.cxx @@ -30,6 +30,7 @@ #include <svtools/miscopt.hxx> #include <unotools/resmgr.hxx> #include <sal/log.hxx> +#include <tools/diagnose_ex.h> #include <comphelper/propertyvalue.hxx> #include <comphelper/sequence.hxx> @@ -1501,9 +1502,9 @@ IMPL_LINK_NOARG(ImpPDFTabSigningPage, ClickmaPbSignCertSelect, weld::Button&, vo } } } - catch (const uno::Exception &e) + catch (const uno::Exception &) { - SAL_INFO("filter.pdf", "TSAURLsDialog::TSAURLsDialog(): " << e); + TOOLS_INFO_EXCEPTION("filter.pdf", "TSAURLsDialog::TSAURLsDialog()"); } // 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 252f13e89173..482c3ba7eb2f 100644 --- a/filter/source/svg/svgfilter.cxx +++ b/filter/source/svg/svgfilter.cxx @@ -50,6 +50,7 @@ #include <unotools/ucbstreamhelper.hxx> #include <unotools/streamwrap.hxx> #include <tools/debug.hxx> +#include <tools/diagnose_ex.h> #include <tools/zcodec.hxx> #include <drawinglayer/primitive2d/baseprimitive2d.hxx> @@ -822,9 +823,9 @@ OUString SAL_CALL SVGFilter::detect(Sequence<PropertyValue>& rDescriptor) } } } - catch (css::io::IOException & e) + catch (css::io::IOException &) { - SAL_WARN("filter.svg", "caught " << e); + TOOLS_WARN_EXCEPTION("filter.svg", ""); } return aRetval; diff --git a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx index 71d202d2eb24..400a9aa66d17 100644 --- a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx +++ b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx @@ -21,6 +21,7 @@ #include <stdlib.h> #include <rtl/ustring.hxx> #include <sal/log.hxx> +#include <tools/diagnose_ex.h> #include <tools/urlobj.hxx> #include "XmlFilterAdaptor.hxx" #include <com/sun/star/lang/XMultiServiceFactory.hpp> @@ -183,12 +184,11 @@ bool XmlFilterAdaptor::importImpl( const Sequence< css::beans::PropertyValue >& return false; } } - catch( const Exception& e ) + catch( const Exception& ) { + TOOLS_WARN_EXCEPTION("filter.xmlfa", "XmlFilterAdaptor"); if (xStatusIndicator.is()) xStatusIndicator->end(); - - SAL_WARN("filter.xmlfa", "XmlFilterAdaptor: " << e); return false; } if (xStatusIndicator.is()) { @@ -297,9 +297,9 @@ bool XmlFilterAdaptor::exportImpl( const Sequence< css::beans::PropertyValue >& return false; } } - catch (const Exception& e) + catch (const Exception&) { - SAL_WARN("filter.xmlfa", "XmlFilterAdaptor: " << e); + TOOLS_WARN_EXCEPTION("filter.xmlfa", "XmlFilterAdaptor"); if (xStatusIndicator.is()) xStatusIndicator->end(); return false; diff --git a/filter/source/xsltfilter/XSLTFilter.cxx b/filter/source/xsltfilter/XSLTFilter.cxx index bade0bdbac1a..a3b0940e1bc4 100644 --- a/filter/source/xsltfilter/XSLTFilter.cxx +++ b/filter/source/xsltfilter/XSLTFilter.cxx @@ -234,11 +234,7 @@ namespace XSLT void XSLTFilter::error(const Any& a) { - Exception e; - if (a >>= e) - { - SAL_WARN("filter.xslt", "XSLTFilter::error was called: " << e); - } + SAL_WARN("filter.xslt", "XSLTFilter::error was called: " << exceptionToString(a)); m_bError = true; m_cTransformed.set(); } diff --git a/forms/source/component/Edit.cxx b/forms/source/component/Edit.cxx index 5eacc041a2ba..c5f82e7fc30a 100644 --- a/forms/source/component/Edit.cxx +++ b/forms/source/component/Edit.cxx @@ -436,11 +436,11 @@ namespace { _rxDest->setPropertyValue( sourceprop.Name, _rxSource->getPropertyValue( sourceprop.Name ) ); } - catch(const IllegalArgumentException& e) + catch(const IllegalArgumentException&) { - SAL_WARN( "forms.component", "could not transfer the property named '" + TOOLS_WARN_EXCEPTION( "forms.component", "could not transfer the property named '" << sourceprop.Name - << "'. " << e ); + << "'" ); } } } diff --git a/forms/source/xforms/submission/replace.cxx b/forms/source/xforms/submission/replace.cxx index 4d3cb04888a8..aa9115ef60c7 100644 --- a/forms/source/xforms/submission/replace.cxx +++ b/forms/source/xforms/submission/replace.cxx @@ -25,6 +25,7 @@ #include <rtl/ustring.hxx> #include <rtl/string.hxx> #include <sal/log.hxx> +#include <tools/diagnose_ex.h> #include <comphelper/processfactory.hxx> #include <com/sun/star/uno/Reference.hxx> @@ -101,8 +102,8 @@ CSubmission::SubmissionResult CSubmission::replace(const OUString& aReplace, con // do nothing \o/ return CSubmission::SUCCESS; } - } catch (const Exception& e) { - SAL_WARN( "forms.xforms", "Exception during replace: " << e); + } catch (const Exception&) { + TOOLS_WARN_EXCEPTION( "forms.xforms", "Exception during replace"); } return CSubmission::UNKNOWN_ERROR; } diff --git a/framework/source/dispatch/servicehandler.cxx b/framework/source/dispatch/servicehandler.cxx index 35ef7daa70c9..d7d75328795e 100644 --- a/framework/source/dispatch/servicehandler.cxx +++ b/framework/source/dispatch/servicehandler.cxx @@ -27,6 +27,7 @@ #include <vcl/svapp.hxx> #include <sal/log.hxx> +#include <tools/diagnose_ex.h> namespace framework{ @@ -217,9 +218,9 @@ css::uno::Reference< css::uno::XInterface > ServiceHandler::implts_dispatch( con // ignore all errors - inclusive runtime errors! // E.g. a script based service (written in Python) could not be executed // because it contains syntax errors, which was detected at runtime... - catch(const css::uno::Exception& e) + catch(const css::uno::Exception&) { - SAL_WARN("fwk.dispatch", "ignored " << e); + TOOLS_WARN_EXCEPTION("fwk.dispatch", "ignored"); xService.clear(); } diff --git a/framework/source/fwi/jobs/configaccess.cxx b/framework/source/fwi/jobs/configaccess.cxx index e61db20e18a6..14e46c58f787 100644 --- a/framework/source/fwi/jobs/configaccess.cxx +++ b/framework/source/fwi/jobs/configaccess.cxx @@ -31,6 +31,7 @@ #include <unotools/configpaths.hxx> #include <rtl/ustrbuf.hxx> #include <sal/log.hxx> +#include <tools/diagnose_ex.h> namespace framework{ @@ -127,9 +128,9 @@ void ConfigAccess::open( /*IN*/ EOpenMode eMode ) if (eMode==E_READWRITE) m_xConfig = xConfigProvider->createInstanceWithArguments(SERVICENAME_CFGUPDATEACCESS, lParams); } - catch(const css::uno::Exception& ex) + catch(const css::uno::Exception&) { - SAL_INFO("fwk", "open config: " << ex); + TOOLS_INFO_EXCEPTION("fwk", "open config"); } m_eMode = E_CLOSED; diff --git a/framework/source/jobs/job.cxx b/framework/source/jobs/job.cxx index e693c6eff38b..89347a6200ff 100644 --- a/framework/source/jobs/job.cxx +++ b/framework/source/jobs/job.cxx @@ -33,6 +33,7 @@ #include <comphelper/sequence.hxx> #include <rtl/ustrbuf.hxx> #include <sal/log.hxx> +#include <tools/diagnose_ex.h> #include <vcl/svapp.hxx> namespace framework{ @@ -214,9 +215,9 @@ void Job::execute( /*IN*/ const css::uno::Sequence< css::beans::NamedValue >& lD } } #if OSL_DEBUG_LEVEL > 0 - catch(const css::uno::Exception& ex) + catch(const css::uno::Exception&) { - SAL_INFO("fwk", "Job::execute(): Got exception during job execution. Original Message was: \"" << ex << "\""); + TOOLS_INFO_EXCEPTION("fwk", "Job::execute(): Got exception during job execution"); } #else catch(const css::uno::Exception&) diff --git a/framework/source/services/sessionlistener.cxx b/framework/source/services/sessionlistener.cxx index b1be64620b0f..db19346d7f76 100644 --- a/framework/source/services/sessionlistener.cxx +++ b/framework/source/services/sessionlistener.cxx @@ -24,6 +24,7 @@ #include <protocols.h> #include <general.h> +#include <tools/diagnose_ex.h> #include <vcl/svapp.hxx> #include <unotools/tempfile.hxx> #include <com/sun/star/beans/NamedValue.hpp> @@ -186,8 +187,8 @@ void SessionListener::StoreSession( bool bAsync ) Sequence< PropertyValue > args(1); 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); + } catch (const css::uno::Exception&) { + TOOLS_WARN_EXCEPTION("fwk.session", ""); // 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() ) @@ -214,8 +215,8 @@ void SessionListener::QuitSessionQuietly() Sequence< PropertyValue > args(1); 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); + } catch (const css::uno::Exception&) { + TOOLS_WARN_EXCEPTION("fwk.session", ""); } } @@ -302,8 +303,8 @@ sal_Bool SAL_CALL SessionListener::doRestore() xDispatch->dispatch(aURL, args); m_bRestored = true; - } catch (const css::uno::Exception& e) { - SAL_WARN("fwk.session",e); + } catch (const css::uno::Exception&) { + TOOLS_WARN_EXCEPTION("fwk.session", ""); } return m_bRestored; diff --git a/framework/source/uielement/popuptoolbarcontroller.cxx b/framework/source/uielement/popuptoolbarcontroller.cxx index 43333b925831..5e85bf7ddde7 100644 --- a/framework/source/uielement/popuptoolbarcontroller.cxx +++ b/framework/source/uielement/popuptoolbarcontroller.cxx @@ -29,6 +29,7 @@ #include <svtools/toolboxcontroller.hxx> #include <toolkit/awt/vclxmenu.hxx> #include <toolkit/helper/vclunohelper.hxx> +#include <tools/diagnose_ex.h> #include <tools/urlobj.hxx> #include <unotools/moduleoptions.hxx> #include <vcl/commandinfoprovider.hxx> @@ -138,9 +139,9 @@ void SAL_CALL PopupMenuToolbarController::initialize( m_bHasController = m_xPopupMenuFactory->hasController( m_aPopupCommand, getModuleName() ); } - catch (const css::uno::Exception& e) + catch (const css::uno::Exception&) { - SAL_INFO( "fwk.uielement", e ); + TOOLS_INFO_EXCEPTION( "fwk.uielement", "" ); } SolarMutexGuard aSolarLock; @@ -245,10 +246,10 @@ void PopupMenuToolbarController::createPopupMenuController() m_xPopupMenuController->setPopupMenu( m_xPopupMenu ); } - catch ( const css::uno::Exception &e ) + catch ( const css::uno::Exception & ) { + TOOLS_INFO_EXCEPTION( "fwk.uielement", "" ); m_xPopupMenu.clear(); - SAL_INFO( "fwk.uielement", e ); } } } |