summaryrefslogtreecommitdiff
path: root/svx
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 /svx
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 'svx')
-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
11 files changed, 17 insertions, 19 deletions
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;
}