Kaydet (Commit) 8b5e23ea authored tarafından Noel Grandin's avatar Noel Grandin

log nice exception messages whereever possible

Change-Id: Idd125c18bee1a39b9ea8cc4f8c55cddfd37c33e1
Reviewed-on: https://gerrit.libreoffice.org/68579
Tested-by: Jenkins
Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst 4f810905
......@@ -39,6 +39,7 @@
#include <comphelper/storagehelper.hxx>
#include <mediamisc.hxx>
#include <osl/file.hxx>
#include <tools/diagnose_ex.h>
using namespace ::com::sun::star;
......@@ -506,9 +507,10 @@ bool CreateMediaTempFile(uno::Reference<io::XInputStream> const& xInStream,
comphelper::getProcessComponentContext());
tempContent.writeStream(xInStream, true); // copy stream to file
}
catch (uno::Exception const& e)
catch (uno::Exception const&)
{
SAL_WARN("avmedia", "exception: '" << e << "'");
css::uno::Any ex( cppu::getCaughtException() );
SAL_WARN("avmedia", "exception: " << exceptionToString(ex));
return false;
}
o_rTempFileURL = tempFileURL;
......
......@@ -408,9 +408,10 @@ namespace basctl
return ::basic::BasicManagerRepository::getDocumentBasicManager( m_xDocument );
}
catch (const css::ucb::ContentCreationException& e)
catch (const css::ucb::ContentCreationException&)
{
SAL_WARN( "basctl.basicide", "ScriptDocument::getBasicManager: Caught exception: " << e );
css::uno::Any ex( cppu::getCaughtException() );
SAL_WARN( "basctl.basicide", "ScriptDocument::getBasicManager: Caught exception: " << exceptionToString(ex) );
}
return nullptr;
}
......
......@@ -20,6 +20,7 @@
#include <vcl/svapp.hxx>
#include <tools/stream.hxx>
#include <tools/diagnose_ex.h>
#include <svl/SfxBroadcaster.hxx>
#include <basic/sbx.hxx>
#include <basic/sbuno.hxx>
......@@ -145,7 +146,8 @@ DocObjectWrapper::DocObjectWrapper( SbModule* pVar ) : m_pMod( pVar )
}
catch(const Exception& )
{
SAL_WARN( "basic", "DocObjectWrapper::DocObjectWrapper: Caught exception!" );
css::uno::Any ex( cppu::getCaughtException() );
SAL_WARN( "basic", "DocObjectWrapper::DocObjectWrapper: Caught exception! " << exceptionToString(ex) );
}
}
......
......@@ -36,6 +36,7 @@
#include <sal/log.hxx>
#include <tools/wldcrd.hxx>
#include <tools/diagnose_ex.h>
#include <vcl/svapp.hxx>
#include <vcl/settings.hxx>
......@@ -343,7 +344,8 @@ SbiInstance::~SbiInstance()
}
catch( const Exception& )
{
SAL_WARN("basic", "SbiInstance::~SbiInstance: caught an exception while disposing the components!" );
css::uno::Any ex( cppu::getCaughtException() );
SAL_WARN("basic", "SbiInstance::~SbiInstance: caught an exception while disposing the components! " << exceptionToString(ex) );
}
}
......
......@@ -209,11 +209,18 @@ OUString getSourceRangeStrFromLabeledSequences( const uno::Sequence< uno::Refere
}
}
}
catch (uno::Exception const &)
{
css::uno::Any ex( cppu::getCaughtException() );
// we can't be sure that this is 100% safe and we don't want to kill the export
// we should at least check why the exception is thrown
SAL_WARN("chart2", "unexpected exception! " << exceptionToString(ex));
}
catch (...)
{
// we can't be sure that this is 100% safe and we don't want to kill the export
// we should at least check why the exception is thrown
SAL_WARN("chart2", "unexpected exception!");
SAL_WARN("chart2", "unexpected exception! ");
}
}
......
......@@ -29,6 +29,7 @@ $(eval $(call gb_Library_use_libraries,dbpool2,\
dbtools \
sal \
salhelper \
tl \
))
$(eval $(call gb_Library_add_exception_objects,dbpool2,\
......
......@@ -197,7 +197,8 @@ namespace dbtools
}
catch( const Exception& )
{
SAL_WARN( "connectivity.commontools", "ParameterManager::collectInnerParameters: caught an exception!" );
css::uno::Any ex( cppu::getCaughtException() );
SAL_WARN( "connectivity.commontools", "ParameterManager::collectInnerParameters: caught an exception! " << exceptionToString(ex) );
}
}
}
......@@ -426,7 +427,8 @@ namespace dbtools
}
catch( const Exception& )
{
SAL_WARN( "connectivity.commontools", "ParameterManager::analyzeFieldLinks: caught an exception!" );
css::uno::Any ex( cppu::getCaughtException() );
SAL_WARN( "connectivity.commontools", "ParameterManager::analyzeFieldLinks: caught an exception! " << exceptionToString(ex) );
}
}
......@@ -664,7 +666,8 @@ namespace dbtools
}
catch( const Exception& )
{
SAL_WARN( "connectivity.commontools", "ParameterManager::completeParameters: caught an exception while calling the handler!" );
css::uno::Any ex( cppu::getCaughtException() );
SAL_WARN( "connectivity.commontools", "ParameterManager::completeParameters: caught an exception while calling the handler! " << exceptionToString(ex) );
}
if ( !pParams->wasSelected() )
......@@ -694,7 +697,8 @@ namespace dbtools
}
catch( const Exception& )
{
SAL_WARN( "connectivity.commontools", "ParameterManager::completeParameters: caught an exception while propagating the values!" );
css::uno::Any ex( cppu::getCaughtException() );
SAL_WARN( "connectivity.commontools", "ParameterManager::completeParameters: caught an exception while propagating the values! " << exceptionToString(ex) );
}
return true;
}
......@@ -788,7 +792,8 @@ namespace dbtools
}
catch( const Exception& )
{
SAL_WARN( "connectivity.commontools", "ParameterManager::cacheConnectionInfo: caught an exception!" );
css::uno::Any ex( cppu::getCaughtException() );
SAL_WARN( "connectivity.commontools", "ParameterManager::cacheConnectionInfo: caught an exception! " << exceptionToString(ex) );
}
}
......@@ -844,7 +849,8 @@ namespace dbtools
}
catch( const Exception& )
{
SAL_WARN( "connectivity.commontools", "ParameterManager::getParentColumns: caught an exception!" );
css::uno::Any ex( cppu::getCaughtException() );
SAL_WARN( "connectivity.commontools", "ParameterManager::getParentColumns: caught an exception! " << exceptionToString(ex) );
}
return _out_rxParentColumns.is();
}
......@@ -940,7 +946,8 @@ namespace dbtools
}
catch( const Exception& )
{
SAL_WARN( "connectivity.commontools", "ParameterManager::resetParameterValues: caught an exception!" );
css::uno::Any ex( cppu::getCaughtException() );
SAL_WARN( "connectivity.commontools", "ParameterManager::resetParameterValues: caught an exception! " << exceptionToString(ex) );
}
}
......
......@@ -32,6 +32,7 @@
#include <com/sun/star/beans/XPropertySet.hpp>
#include <osl/diagnose.h>
#include <sal/log.hxx>
#include <tools/diagnose_ex.h>
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
......@@ -364,7 +365,8 @@ Reference<XInterface> OPoolCollection::openNode(const OUString& _rPath,const Ref
}
catch(Exception&)
{
SAL_WARN("connectivity.cpool", "OConfigurationNode::openNode: caught an exception while retrieving the node!");
css::uno::Any ex( cppu::getCaughtException() );
SAL_WARN("connectivity.cpool", "OConfigurationNode::openNode: caught an exception while retrieving the node! " << exceptionToString(ex));
}
return xNode;
}
......
......@@ -32,6 +32,7 @@
#include <file/FDriver.hxx>
#include <file/FTable.hxx>
#include <comphelper/processfactory.hxx>
#include <tools/diagnose_ex.h>
#include <ucbhelper/content.hxx>
using namespace com::sun::star::ucb;
......@@ -147,7 +148,8 @@ namespace
}
catch( const Exception& )
{
SAL_WARN( "connectivity.drivers", "isCaseSensitiveParentFolder: caught an unexpected exception!" );
css::uno::Any ex( cppu::getCaughtException() );
SAL_WARN( "connectivity.drivers", "isCaseSensitiveParentFolder: caught an unexpected exception! " << exceptionToString(ex) );
}
return nIsCS;
......
......@@ -35,6 +35,7 @@
// include search util
#include <com/sun/star/util/SearchFlags.hpp>
#include <com/sun/star/util/SearchAlgorithms2.hpp>
#include <tools/diagnose_ex.h>
#include <unotools/textsearch.hxx>
#include <dialmgr.hxx>
......@@ -331,9 +332,10 @@ void CommandCategoryListBox::categorySelected( const VclPtr<SfxConfigFunctionLi
= css::script::browse::theBrowseNodeFactory::get( m_xContext );
rootNode.set( xFac->createView( css::script::browse::BrowseNodeFactoryViewTypes::MACROSELECTOR ) );
}
catch( css::uno::Exception& e )
catch( css::uno::Exception const & )
{
SAL_WARN("cui.customize", "Caught some exception whilst retrieving browse nodes from factory... Exception: " << e);
css::uno::Any ex( cppu::getCaughtException() );
SAL_WARN("cui.customize", "Caught some exception whilst retrieving browse nodes from factory... Exception: " << exceptionToString(ex));
// TODO exception handling
}
......
......@@ -590,17 +590,10 @@ bool MenuSaveInData::Apply()
m_aMenuResourceURL, m_xMenuSettings );
}
}
catch ( container::NoSuchElementException& )
{
SAL_WARN("cui.customize", "caught container::NoSuchElementException saving settings");
}
catch ( css::io::IOException& )
{
SAL_WARN("cui.customize", "caught IOException saving settings");
}
catch ( css::uno::Exception& )
{
SAL_WARN("cui.customize", "caught some other exception saving settings");
css::uno::Any ex( cppu::getCaughtException() );
SAL_WARN("cui.customize", "caught some other exception saving settings " << exceptionToString(ex));
}
SetModified( false );
......@@ -2604,17 +2597,10 @@ void ToolbarSaveInData::ApplyToolbar( SvxConfigEntry* pToolbar )
pToolbar->SetParentData( false );
}
}
catch ( container::NoSuchElementException& )
{
SAL_WARN("cui.customize", "caught container::NoSuchElementException saving settings");
}
catch ( css::io::IOException& )
catch ( css::uno::Exception const & )
{
SAL_WARN("cui.customize", "caught IOException saving settings");
}
catch ( css::uno::Exception& )
{
SAL_WARN("cui.customize", "caught some other exception saving settings");
css::uno::Any ex( cppu::getCaughtException() );
SAL_WARN("cui.customize", "caught exception saving settings " << exceptionToString(ex));
}
PersistChanges( GetConfigManager() );
......@@ -2637,21 +2623,10 @@ void ToolbarSaveInData::CreateToolbar( SvxConfigEntry* pToolbar )
{
GetConfigManager()->insertSettings( pToolbar->GetCommand(), xSettings );
}
catch ( container::ElementExistException& )
{
SAL_WARN("cui.customize", "caught ElementExistsException saving settings");
}
catch ( css::lang::IllegalArgumentException& )
{
SAL_WARN("cui.customize", "caught IOException saving settings");
}
catch ( css::lang::IllegalAccessException& )
{
SAL_WARN("cui.customize", "caught IOException saving settings");
}
catch ( css::uno::Exception& )
catch ( css::uno::Exception const & )
{
SAL_WARN("cui.customize", "caught some other exception saving settings");
css::uno::Any ex( cppu::getCaughtException() );
SAL_WARN("cui.customize", "caught exception saving settings " << exceptionToString(ex));
}
GetEntries()->push_back( pToolbar );
......@@ -3363,9 +3338,10 @@ bool SvxIconSelectorDialog::ImportGraphic( const OUString& aURL )
SAL_WARN("cui.customize", "could not get query XGraphic");
}
}
catch( uno::Exception& e )
catch( uno::Exception const & )
{
SAL_WARN("cui.customize", "Caught exception importing XGraphic: " << e);
css::uno::Any ex( cppu::getCaughtException() );
SAL_WARN("cui.customize", "Caught exception importing XGraphic: " << exceptionToString(ex));
}
return result;
}
......
......@@ -55,6 +55,7 @@
#include <svtools/imagemgr.hxx>
#include <vcl/treelistentry.hxx>
#include <tools/urlobj.hxx>
#include <tools/diagnose_ex.h>
#include <vector>
#include <algorithm>
......@@ -659,9 +660,10 @@ IMPL_LINK(SvxScriptOrgDialog, ButtonHdl, weld::Button&, rButton, void)
// ISSUE need code to run script here
xInv->invoke( "Editable", args, outIndex, outArgs );
}
catch( Exception& e )
catch( Exception const & )
{
SAL_WARN("cui.dialogs", "Caught exception trying to invoke " << e );
css::uno::Any ex( cppu::getCaughtException() );
SAL_WARN("cui.dialogs", "Caught exception trying to invoke " << exceptionToString(ex) );
}
}
}
......@@ -828,9 +830,10 @@ void SvxScriptOrgDialog::createEntry(weld::TreeIter& rEntry)
aChildNode = newNode;
}
catch( Exception& e )
catch( Exception const & )
{
SAL_WARN("cui.dialogs", "Caught exception trying to Create " << e );
css::uno::Any ex( cppu::getCaughtException() );
SAL_WARN("cui.dialogs", "Caught exception trying to Create " << exceptionToString(ex) );
}
}
if ( aChildNode.is() )
......@@ -912,9 +915,10 @@ void SvxScriptOrgDialog::renameEntry(weld::TreeIter& rEntry)
aChildNode = newNode;
}
catch( Exception& e )
catch( Exception const & )
{
SAL_WARN("cui.dialogs", "Caught exception trying to Rename " << e );
css::uno::Any ex( cppu::getCaughtException() );
SAL_WARN("cui.dialogs", "Caught exception trying to Rename " << exceptionToString(ex) );
}
}
if ( aChildNode.is() )
......@@ -961,9 +965,10 @@ void SvxScriptOrgDialog::deleteEntry(weld::TreeIter& rEntry)
aResult = xInv->invoke( "Deletable", args, outIndex, outArgs );
aResult >>= result; // or do we just assume true if no exception ?
}
catch( Exception& e )
catch( Exception const & )
{
SAL_WARN("cui.dialogs", "Caught exception trying to delete " << e );
css::uno::Any ex( cppu::getCaughtException() );
SAL_WARN("cui.dialogs", "Caught exception trying to delete " << exceptionToString(ex) );
}
}
......
......@@ -45,6 +45,7 @@
#include <vcl/treelistentry.hxx>
#include <sfx2/filedlghelper.hxx>
#include <sfx2/inputdlg.hxx>
#include <tools/diagnose_ex.h>
#include <comphelper/processfactory.hxx>
#include <comphelper/string.hxx>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
......@@ -354,9 +355,10 @@ IMPL_LINK_NOARG(SvxJavaOptionsPage, StartFolderPickerHdl, void*, void)
else if ( xFolderPicker.is() && xFolderPicker->execute() == ExecutableDialogResults::OK )
AddFolder( xFolderPicker->getDirectory() );
}
catch ( Exception& )
catch ( Exception const & )
{
SAL_WARN( "cui.options", "SvxJavaOptionsPage::StartFolderPickerHdl(): caught exception" );
css::uno::Any ex( cppu::getCaughtException() );
SAL_WARN( "cui.options", "SvxJavaOptionsPage::StartFolderPickerHdl(): caught exception " << exceptionToString(ex) );
}
}
......
......@@ -32,6 +32,7 @@
#include <sfx2/sfxuno.hxx>
#include <sfx2/dispatch.hxx>
#include <tools/urlobj.hxx>
#include <tools/diagnose_ex.h>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <comphelper/processfactory.hxx>
#include <com/sun/star/linguistic2/LinguServiceManager.hpp>
......@@ -135,7 +136,8 @@ static bool KillFile_Impl( const OUString& rURL )
}
catch( ... )
{
SAL_WARN( "cui.options", "KillFile: Any other exception" );
css::uno::Any ex( cppu::getCaughtException() );
SAL_WARN( "cui.options", "KillFile: Any other exception " << exceptionToString(ex) );
bRet = false;
}
......
......@@ -629,9 +629,10 @@ IMPL_LINK_NOARG(SvxPathTabPage, PathHdl_Impl, Button*, void)
ChangeCurrentEntry(sFolder);
}
}
catch( Exception& )
catch( Exception const & )
{
SAL_WARN( "cui.options", "SvxPathTabPage::PathHdl_Impl: exception from folder picker" );
css::uno::Any ex( cppu::getCaughtException() );
SAL_WARN( "cui.options", "SvxPathTabPage::PathHdl_Impl: exception from folder picker " << exceptionToString(ex) );
}
}
else if (pEntry)
......
......@@ -37,6 +37,7 @@
#include <unotools/optionsdlg.hxx>
#include <sal/log.hxx>
#include <osl/diagnose.h>
#include <tools/diagnose_ex.h>
#include <sfx2/fcontnr.hxx>
......@@ -445,9 +446,10 @@ void SvxSaveTabPage::Reset( const SfxItemSet* )
aDocTypeLB->SelectEntryPos(0);
FilterHdl_Impl(*aDocTypeLB);
}
catch(Exception& e)
catch(Exception const &)
{
SAL_WARN( "cui.options", "exception in FilterFactory access: " << e );
css::uno::Any ex( cppu::getCaughtException() );
SAL_WARN( "cui.options", "exception in FilterFactory access: " << exceptionToString(ex) );
}
pImpl->bInitialized = true;
......
......@@ -40,6 +40,7 @@
#include <osl/file.hxx>
#include <osl/security.hxx>
#include <sal/log.hxx>
#include <tools/diagnose_ex.h>
using namespace ::css;
......@@ -193,7 +194,8 @@ void SvxOnlineUpdateTabPage::UpdateUserAgent()
}
}
} catch (const uno::Exception &) {
SAL_WARN( "cui.options", "Unexpected exception fetching User Agent" );
css::uno::Any ex( cppu::getCaughtException() );
SAL_WARN( "cui.options", "Unexpected exception fetching User Agent " << exceptionToString(ex) );
}
}
......@@ -410,9 +412,10 @@ IMPL_LINK_NOARG(SvxOnlineUpdateTabPage, CheckNowHdl_Impl, Button*, void)
UpdateLastCheckedText();
}
catch( const uno::Exception& e )
catch( const uno::Exception& )
{
SAL_WARN("cui.options", "Caught exception, thread terminated. " << e);
css::uno::Any ex( cppu::getCaughtException() );
SAL_WARN("cui.options", "Caught exception, thread terminated. " << exceptionToString(ex));
}
}
......
......@@ -94,6 +94,7 @@
#include <svx/xpool.hxx>
#include <toolkit/helper/vclunohelper.hxx>
#include <tools/urlobj.hxx>
#include <tools/diagnose_ex.h>
#include <unotools/configmgr.hxx>
#include <unotools/linguprops.hxx>
#include <unotools/misccfg.hxx>
......@@ -1410,9 +1411,10 @@ static OUString getCurrentFactory_Impl( const Reference< XFrame >& _xFrame )
{
SAL_INFO( "cui.options", "unknown module" );
}
catch ( Exception& )
catch ( Exception const & )
{
SAL_WARN( "cui.options", "getActiveModule_Impl(): exception of XModuleManager::identify()" );
css::uno::Any ex( cppu::getCaughtException() );
SAL_WARN( "cui.options", "getActiveModule_Impl(): exception of XModuleManager::identify() " << exceptionToString(ex) );
}
}
......@@ -1753,9 +1755,10 @@ OUString OfaTreeOptionsDialog::GetModuleIdentifier( const Reference< XFrame >& r
{
SAL_INFO( "cui.options", "unknown module" );
}
catch ( Exception& )
catch ( Exception const & )
{
SAL_WARN( "cui.options", "OfaTreeOptionsDialog::GetModuleIdentifier(): exception of XModuleManager::identify()" );
css::uno::Any ex( cppu::getCaughtException() );
SAL_WARN( "cui.options", "OfaTreeOptionsDialog::GetModuleIdentifier(): exception of XModuleManager::identify() " << exceptionToString(ex));
}
}
return sModule;
......@@ -2111,13 +2114,10 @@ void ExtensionsTabPage::CreateDialogWithHandler()
}
}
}
catch (const css::lang::IllegalArgumentException& e)
catch (const Exception&)
{
SAL_WARN("cui.options", "ExtensionsTabPage::CreateDialogWithHandler(): illegal argument:" << e);
}
catch (const Exception& e)
{
SAL_WARN( "cui.options", "ExtensionsTabPage::CreateDialogWithHandler(): exception of XDialogProvider2::createDialogWithHandler(): " << e);
css::uno::Any ex( cppu::getCaughtException() );
SAL_WARN( "cui.options", "ExtensionsTabPage::CreateDialogWithHandler(): exception of XDialogProvider2::createDialogWithHandler(): " << exceptionToString(ex));
}
}
......@@ -2131,9 +2131,10 @@ bool ExtensionsTabPage::DispatchAction( const OUString& rAction )
{
bRet = m_xEventHdl->callHandlerMethod( m_xPage, Any( rAction ), "external_event" );
}
catch ( Exception& )
catch ( Exception const & )
{
SAL_WARN( "cui.options", "ExtensionsTabPage::DispatchAction(): exception of XDialogEventHandler::callHandlerMethod()" );
css::uno::Any ex( cppu::getCaughtException() );
SAL_WARN( "cui.options", "ExtensionsTabPage::DispatchAction(): exception of XDialogEventHandler::callHandlerMethod() " << exceptionToString(ex) );
}
}
return bRet;
......
......@@ -1472,9 +1472,10 @@ void SAL_CALL ORowSet::executeWithCompletion( const Reference< XInteractionHandl
{
throw;
}
catch(Exception&)
catch(Exception const &)
{
SAL_WARN("dbaccess", "ORowSet::executeWithCompletion: caught an unexpected exception type while filling in the parameters!");
css::uno::Any ex( cppu::getCaughtException() );
SAL_WARN("dbaccess", "ORowSet::executeWithCompletion: caught an unexpected exception type while filling in the parameters! " << exceptionToString(ex));
}
// we're done with the parameters, now for the real execution
......
......@@ -1671,9 +1671,10 @@ void ODatabaseDocument::impl_writeStorage_throw( const Reference< XStorage >& _r
{
xProp->setPropertyValue("Version" , uno::makeAny(aVersion));
}
catch (const uno::Exception& e)
catch (const uno::Exception&)
{
SAL_WARN("dbaccess", "exception setting Version: " << e);
css::uno::Any ex( cppu::getCaughtException() );
SAL_WARN("dbaccess", "exception setting Version: " << exceptionToString(ex));
}
}
......
......@@ -691,7 +691,8 @@ Reference< XConnection > ODatabaseSource::buildLowLevelConnection(const OUString
}
catch( const Exception& )
{
SAL_WARN("dbaccess", "ODatabaseSource::buildLowLevelConnection: got a strange exception while analyzing the error!" );
css::uno::Any ex( cppu::getCaughtException() );
SAL_WARN("dbaccess", "ODatabaseSource::buildLowLevelConnection: got a strange exception while analyzing the error! " << exceptionToString(ex) );
}
if ( !xDriver.is() || !xDriver->acceptsURL( m_pImpl->m_sConnectURL ) )
{
......
......@@ -203,7 +203,10 @@ SQLExceptionInfo createConnection( const Reference< css::beans::XPropertySet>&
catch(const SQLContext& e) { aInfo = SQLExceptionInfo(e); }
catch(const SQLWarning& e) { aInfo = SQLExceptionInfo(e); }
catch(const SQLException& e) { aInfo = SQLExceptionInfo(e); }
catch(const Exception&) { SAL_WARN("dbaccess.ui", "SbaTableQueryBrowser::OnExpandEntry: could not connect - unknown exception!"); }
catch(const Exception&) {
css::uno::Any ex( cppu::getCaughtException() );
SAL_WARN("dbaccess.ui", "SbaTableQueryBrowser::OnExpandEntry: could not connect - unknown exception! " << exceptionToString(ex));
}
return aInfo;
}
......
......@@ -118,13 +118,13 @@
#include <basic/sbstar.hxx>
#include <desktop/crashreport.hxx>
#include <tools/urlobj.hxx>
#include <tools/diagnose_ex.h>
#include <svtools/fontsubstconfig.hxx>
#include <svtools/accessibilityoptions.hxx>
#include <svtools/apearcfg.hxx>
#include <vcl/graphicfilter.hxx>
#include <vcl/window.hxx>
#include <tools/diagnose_ex.h>
#include "langselect.hxx"
#if HAVE_FEATURE_BREAKPAD
......@@ -2502,7 +2502,8 @@ IMPL_STATIC_LINK_NOARG(Desktop, AsyncInitFirstRun, Timer *, void)
}
catch(const css::uno::Exception&)
{
SAL_WARN( "desktop.app", "Desktop::DoFirstRunInitializations: caught an exception while trigger job executor ..." );
css::uno::Any ex( cppu::getCaughtException() );
SAL_WARN( "desktop.app", "Desktop::DoFirstRunInitializations: caught an exception while trigger job executor ... " << exceptionToString(ex) );
}
}
......
......@@ -31,6 +31,7 @@
#include <vcl/timer.hxx>
#include <unotools/configmgr.hxx>
#include <tools/diagnose_ex.h>
#include <toolkit/helper/vclunohelper.hxx>
#include <comphelper/lok.hxx>
......@@ -293,8 +294,9 @@ static bool impl_checkDependencies( const uno::Reference< uno::XComponentContext
bRegistered = false;
}
catch ( const uno::RuntimeException & ) { throw; }
catch (const uno::Exception & exc) {
SAL_WARN( "desktop.app", exc );
catch (const uno::Exception & ) {
css::uno::Any ex( cppu::getCaughtException() );
SAL_WARN( "desktop.app", exceptionToString(ex) );
}
if ( bRegistered )
......
......@@ -56,6 +56,7 @@
#include <cppuhelper/bootstrap.hxx>
#include <comphelper/processfactory.hxx>
#include <tools/diagnose_ex.h>
#include <ucbhelper/content.hxx>
#include <unotools/collatorwrapper.hxx>
#include <unotools/configmgr.hxx>
......@@ -738,9 +739,10 @@ uno::Sequence< OUString > ExtMgrDialog::raiseAddPicker()
{
xFilePicker->appendFilter( elem.first, elem.second );
}
catch (const lang::IllegalArgumentException & exc)
catch (const lang::IllegalArgumentException &)
{
SAL_WARN( "desktop", exc );
css::uno::Any ex( cppu::getCaughtException() );
SAL_WARN( "desktop", exceptionToString(ex) );
}
}
xFilePicker->setCurrentFilter( sDefaultFilter );
......@@ -1388,8 +1390,9 @@ bool UpdateRequiredDialog::isEnabled( const uno::Reference< deployment::XPackage
bRegistered = false;
}
catch ( const uno::RuntimeException & ) { throw; }
catch (const uno::Exception & exc) {
SAL_WARN( "desktop", exc );
catch (const uno::Exception & ) {
css::uno::Any ex( cppu::getCaughtException() );
SAL_WARN( "desktop", exceptionToString(ex) );
bRegistered = false;
}
......
......@@ -33,6 +33,7 @@
#include <cppuhelper/exc_hlp.hxx>
#include <sal/log.hxx>