diff options
-rw-r--r-- | accessibility/source/extended/textwindowaccessibility.cxx | 7 | ||||
-rw-r--r-- | avmedia/source/viewer/mediawindow_impl.cxx | 5 | ||||
-rw-r--r-- | basic/source/basmgr/basmgr.cxx | 8 | ||||
-rw-r--r-- | basic/source/classes/eventatt.cxx | 9 | ||||
-rw-r--r-- | basic/source/uno/namecont.cxx | 16 |
5 files changed, 23 insertions, 22 deletions
diff --git a/accessibility/source/extended/textwindowaccessibility.cxx b/accessibility/source/extended/textwindowaccessibility.cxx index 63ea654a3728..b1e8150d2163 100644 --- a/accessibility/source/extended/textwindowaccessibility.cxx +++ b/accessibility/source/extended/textwindowaccessibility.cxx @@ -29,6 +29,7 @@ #include <unotools/accessiblerelationsethelper.hxx> #include <unotools/accessiblestatesethelper.hxx> #include <vcl/window.hxx> +#include <tools/diagnose_ex.h> #include <toolkit/helper/convert.hxx> #include <comphelper/sequence.hxx> @@ -267,11 +268,9 @@ void SAL_CALL Paragraph::grabFocus() { m_xDocument->changeParagraphSelection(this, 0, 0); } - catch (const css::lang::IndexOutOfBoundsException & rEx) + catch (const css::lang::IndexOutOfBoundsException &) { - SAL_INFO("accessibility", - "textwindowaccessibility.cxx: Paragraph::grabFocus: caught unexpected " - << rEx); + TOOLS_INFO_EXCEPTION("accessibility", "Paragraph::grabFocus: caught unexpected"); } } diff --git a/avmedia/source/viewer/mediawindow_impl.cxx b/avmedia/source/viewer/mediawindow_impl.cxx index dfadbd1a2eb0..a7e053cb911a 100644 --- a/avmedia/source/viewer/mediawindow_impl.cxx +++ b/avmedia/source/viewer/mediawindow_impl.cxx @@ -31,6 +31,7 @@ #include <sal/log.hxx> #include <comphelper/processfactory.hxx> +#include <tools/diagnose_ex.h> #include <tools/urlobj.hxx> #include <unotools/securityoptions.hxx> #include <vcl/svapp.hxx> @@ -224,9 +225,9 @@ uno::Reference< media::XPlayer > MediaWindowImpl::createPlayer( xPlayer.set( xManager->createPlayer( rURL ), uno::UNO_QUERY ); else SAL_INFO( "avmedia", "failed to create media player service " << rManagerServName ); - } catch ( const uno::Exception &e ) + } catch ( const uno::Exception & ) { - SAL_WARN( "avmedia", "couldn't create media player " << rManagerServName << ", " << e); + TOOLS_WARN_EXCEPTION( "avmedia", "couldn't create media player " << rManagerServName); } return xPlayer; } diff --git a/basic/source/basmgr/basmgr.cxx b/basic/source/basmgr/basmgr.cxx index 31a799eb9191..88e12775f6ce 100644 --- a/basic/source/basmgr/basmgr.cxx +++ b/basic/source/basmgr/basmgr.cxx @@ -1129,9 +1129,9 @@ bool BasicManager::RemoveLib( sal_uInt16 nLib, bool bDelBasicFromStorage ) xStorage = new SotStorage(false, (*itLibInfo)->GetStorageName()); } } - catch (const css::ucb::ContentCreationException& e) + catch (const css::ucb::ContentCreationException&) { - SAL_WARN("basic", "BasicManager::RemoveLib: " << e); + TOOLS_WARN_EXCEPTION("basic", "BasicManager::RemoveLib:"); } if (xStorage.is() && xStorage->IsStorage(szBasicStorage)) @@ -1316,9 +1316,9 @@ StarBASIC* BasicManager::CreateLib( const OUString& rLibName, const OUString& Pa pLib = AddLib(*xStorage, rLibName, true); } } - catch (const css::ucb::ContentCreationException& e) + catch (const css::ucb::ContentCreationException&) { - SAL_WARN("basic", "BasicManager::RemoveLib: " << e); + TOOLS_WARN_EXCEPTION("basic", "BasicManager::RemoveLib:"); } 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 313d4a9f9ae1..5df743ab4589 100644 --- a/basic/source/classes/eventatt.cxx +++ b/basic/source/classes/eventatt.cxx @@ -42,6 +42,7 @@ #include <basic/basmgr.hxx> #include <sal/log.hxx> +#include <tools/diagnose_ex.h> #include <vcl/svapp.hxx> #include <xmlscript/xmldlg_imexp.hxx> #include <sbunoobj.hxx> @@ -118,13 +119,13 @@ void SFURL_firing_impl( const ScriptEvent& aScriptEvent, Any* pRet, const Refere *pRet = result; } } - catch ( const RuntimeException& re ) + catch ( const RuntimeException& ) { - SAL_INFO("basic", "Caught RuntimeException reason " << re); + TOOLS_INFO_EXCEPTION("basic", "" ); } - catch ( const Exception& e ) + catch ( const Exception& ) { - SAL_INFO("basic", "Caught Exception reason " << e); + TOOLS_INFO_EXCEPTION("basic", "" ); } } diff --git a/basic/source/uno/namecont.cxx b/basic/source/uno/namecont.cxx index 080d35a6027d..95a05bca652c 100644 --- a/basic/source/uno/namecont.cxx +++ b/basic/source/uno/namecont.cxx @@ -419,9 +419,9 @@ BasicManager* SfxLibraryContainer::getBasicManager() mpBasMgr = BasicManagerRepository::getDocumentBasicManager( xDocument ); } } - catch (const css::ucb::ContentCreationException& e) + catch (const css::ucb::ContentCreationException&) { - SAL_WARN( "basic", "SfxLibraryContainer::getBasicManager: " << e ); + TOOLS_WARN_EXCEPTION( "basic", "SfxLibraryContainer::getBasicManager:" ); } return mpBasMgr; } @@ -806,14 +806,14 @@ void SfxLibraryContainer::init_Impl( const OUString& rInitialDocumentURL, xParser->setDocumentHandler( ::xmlscript::importLibraryContainer( pLibArray.get() ) ); xParser->parseStream( source ); } - catch ( const xml::sax::SAXException& e ) + catch ( const xml::sax::SAXException& ) { - SAL_WARN("basic", e); + TOOLS_WARN_EXCEPTION( "basic", "" ); return; } - catch ( const io::IOException& e ) + catch ( const io::IOException& ) { - SAL_WARN("basic", e); + TOOLS_WARN_EXCEPTION( "basic", "" ); return; } @@ -1174,10 +1174,10 @@ void SfxLibraryContainer::init_Impl( const OUString& rInitialDocumentURL, mxSFI->kill( aPrevFolder ); } } - catch(const Exception& e) + catch(const Exception&) { + TOOLS_WARN_EXCEPTION("basic", "Upgrade of Basic installation failed somehow" ); bCleanUp = true; - SAL_WARN("basic", "Upgrade of Basic installation failed somehow: " << e); } // #i93163 |