summaryrefslogtreecommitdiff
path: root/cui
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2017-09-29 16:21:54 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2017-10-04 15:18:00 +0200
commit2c05d758b2b62c9df413e2514fb3cd233d0f3ec7 (patch)
treee0a23d3da6fb17ae97d18957fc14f4a4a8de2d3f /cui
parenta3088b1e72ef17babe3d3664c610afd02cfe0891 (diff)
add << operator for css::uno::Exception
Change-Id: Ia23dafd07133779144965682df3b7125a3214235 Reviewed-on: https://gerrit.libreoffice.org/43046 Reviewed-by: Stephan Bergmann <sbergman@redhat.com> Tested-by: Jenkins <ci@libreoffice.org>
Diffstat (limited to 'cui')
-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
15 files changed, 28 insertions, 28 deletions
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 )