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>

8 files changed, 38 insertions, 44 deletions

diff --git a/svtools/langsupport/langsupport.cxx b/svtools/langsupport/langsupport.cxx
index 7ef274571f7e..4da9b4a98a1e 100644
--- a/svtools/langsupport/langsupport.cxx
+++ b/svtools/langsupport/langsupport.cxx
@@ -65,12 +65,12 @@ SAL_IMPLEMENT_MAIN()
     }
     catch (const uno::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;
     }
 
diff --git a/svtools/source/config/accessibilityoptions.cxx b/svtools/source/config/accessibilityoptions.cxx
index 9ec4c798572e..4f00f2b73a44 100644
--- a/svtools/source/config/accessibilityoptions.cxx
+++ b/svtools/source/config/accessibilityoptions.cxx
@@ -95,7 +95,7 @@ SvtAccessibilityOptions_Impl::SvtAccessibilityOptions_Impl()
     catch(const css::uno::Exception& ex)
     {
         m_xCfg.clear();
-        SAL_WARN("svtools.config", "Caught unexpected: " << ex.Message);
+        SAL_WARN("svtools.config", "Caught unexpected: " << ex);
     }
 }
 
@@ -111,7 +111,7 @@ bool SvtAccessibilityOptions_Impl::GetIsForPagePreviews() const
     }
     catch(const css::uno::Exception& ex)
     {
-        SAL_WARN("svtools.config", "Caught unexpected: " << ex.Message);
+        SAL_WARN("svtools.config", "Caught unexpected: " << ex);
     }
     return bRet;
 }
@@ -128,7 +128,7 @@ bool SvtAccessibilityOptions_Impl::GetIsHelpTipsDisappear() const
     }
     catch(const css::uno::Exception& ex)
     {
-        SAL_WARN("svtools.config", "Caught unexpected: " << ex.Message);
+        SAL_WARN("svtools.config", "Caught unexpected: " << ex);
     }
 
     return bRet;
@@ -146,7 +146,7 @@ bool SvtAccessibilityOptions_Impl::GetIsAllowAnimatedGraphics() const
     }
     catch(const css::uno::Exception& ex)
     {
-        SAL_WARN("svtools.config", "Caught unexpected: " << ex.Message);
+        SAL_WARN("svtools.config", "Caught unexpected: " << ex);
     }
 
     return bRet;
@@ -164,7 +164,7 @@ bool SvtAccessibilityOptions_Impl::GetIsAllowAnimatedText() const
     }
     catch(const css::uno::Exception& ex)
     {
-        SAL_WARN("svtools.config", "Caught unexpected: " << ex.Message);
+        SAL_WARN("svtools.config", "Caught unexpected: " << ex);
     }
 
     return bRet;
@@ -182,7 +182,7 @@ bool SvtAccessibilityOptions_Impl::GetIsAutomaticFontColor() const
     }
     catch(const css::uno::Exception& ex)
     {
-        SAL_WARN("svtools.config", "Caught unexpected: " << ex.Message);
+        SAL_WARN("svtools.config", "Caught unexpected: " << ex);
     }
 
     return bRet;
@@ -200,7 +200,7 @@ sal_Int16 SvtAccessibilityOptions_Impl::GetHelpTipSeconds() const
     }
     catch(const css::uno::Exception& ex)
     {
-        SAL_WARN("svtools.config", "Caught unexpected: " << ex.Message);
+        SAL_WARN("svtools.config", "Caught unexpected: " << ex);
     }
 
     return nRet;
@@ -218,7 +218,7 @@ bool SvtAccessibilityOptions_Impl::IsSelectionInReadonly() const
     }
     catch(const css::uno::Exception& ex)
     {
-        SAL_WARN("svtools.config", "Caught unexpected: " << ex.Message);
+        SAL_WARN("svtools.config", "Caught unexpected: " << ex);
     }
 
     return bRet;
@@ -236,7 +236,7 @@ sal_Int16 SvtAccessibilityOptions_Impl::GetEdgeBlending() const
     }
     catch(const css::uno::Exception& ex)
     {
-        SAL_WARN("svtools.config", "Caught unexpected: " << ex.Message);
+        SAL_WARN("svtools.config", "Caught unexpected: " << ex);
     }
 
     return nRet;
@@ -254,7 +254,7 @@ sal_Int16 SvtAccessibilityOptions_Impl::GetListBoxMaximumLineCount() const
     }
     catch(const css::uno::Exception& ex)
     {
-        SAL_WARN("svtools.config", "Caught unexpected: " << ex.Message);
+        SAL_WARN("svtools.config", "Caught unexpected: " << ex);
     }
 
     return nRet;
@@ -272,7 +272,7 @@ sal_Int16 SvtAccessibilityOptions_Impl::GetColorValueSetColumnCount() const
     }
     catch(const css::uno::Exception& ex)
     {
-        SAL_WARN("svtools.config", "Caught unexpected: " << ex.Message);
+        SAL_WARN("svtools.config", "Caught unexpected: " << ex);
     }
 
     return nRet;
@@ -290,7 +290,7 @@ bool SvtAccessibilityOptions_Impl::GetPreviewUsesCheckeredBackground() const
     }
     catch(const css::uno::Exception& ex)
     {
-        SAL_WARN("svtools.config", "Caught unexpected: " << ex.Message);
+        SAL_WARN("svtools.config", "Caught unexpected: " << ex);
     }
 
     return bRet;
diff --git a/svtools/source/config/itemholder2.cxx b/svtools/source/config/itemholder2.cxx
index 2512715caab8..e9a18b21054a 100644
--- a/svtools/source/config/itemholder2.cxx
+++ b/svtools/source/config/itemholder2.cxx
@@ -59,7 +59,7 @@ ItemHolder2::ItemHolder2()
         if(bMessage)
         {
             bMessage = false;
-            SAL_WARN( "svtools", "CreateInstance with arguments exception: " << rEx.Message );
+            SAL_WARN( "svtools", "CreateInstance with arguments: " << rEx );
         }
     }
 #else
diff --git a/svtools/source/config/printoptions.cxx b/svtools/source/config/printoptions.cxx
index 2e3cc7d7642a..81d7c7a275d3 100644
--- a/svtools/source/config/printoptions.cxx
+++ b/svtools/source/config/printoptions.cxx
@@ -138,7 +138,7 @@ SvtPrintOptions_Impl::SvtPrintOptions_Impl(const OUString& rConfigRoot)
     {
         m_xNode.clear();
         m_xCfg.clear();
-        SAL_WARN("svtools.config", "Caught unexpected: " << ex.Message);
+        SAL_WARN("svtools.config", "Caught unexpected: " << ex);
     }
 }
 
@@ -156,7 +156,7 @@ bool SvtPrintOptions_Impl::IsReduceTransparency() const
     }
     catch (const css::uno::Exception& ex)
     {
-        SAL_WARN("svtools.config", "Caught unexpected: " << ex.Message);
+        SAL_WARN("svtools.config", "Caught unexpected: " << ex);
     }
 
     return bRet;
@@ -176,7 +176,7 @@ sal_Int16 SvtPrintOptions_Impl::GetReducedTransparencyMode() const
     }
     catch (const css::uno::Exception& ex)
     {
-        SAL_WARN("svtools.config", "Caught unexpected: " << ex.Message);
+        SAL_WARN("svtools.config", "Caught unexpected: " << ex);
     }
 
     return  nRet;
@@ -198,7 +198,7 @@ bool SvtPrintOptions_Impl::IsReduceGradients() const
     }
     catch (const css::uno::Exception& ex)
     {
-        SAL_WARN("svtools.config", "Caught unexpected: " << ex.Message);
+        SAL_WARN("svtools.config", "Caught unexpected: " << ex);
     }
 
     return bRet;
@@ -220,7 +220,7 @@ sal_Int16 SvtPrintOptions_Impl::GetReducedGradientMode() const
     }
     catch (const css::uno::Exception& ex)
     {
-        SAL_WARN("svtools.config", "Caught unexpected: " << ex.Message);
+        SAL_WARN("svtools.config", "Caught unexpected: " << ex);
     }
 
     return nRet;
@@ -242,7 +242,7 @@ sal_Int16 SvtPrintOptions_Impl::GetReducedGradientStepCount() const
     }
     catch (const css::uno::Exception& ex)
     {
-        SAL_WARN("svtools.config", "Caught unexpected: " << ex.Message);
+        SAL_WARN("svtools.config", "Caught unexpected: " << ex);
     }
 
     return nRet;
@@ -264,7 +264,7 @@ bool SvtPrintOptions_Impl::IsReduceBitmaps() const
     }
     catch (const css::uno::Exception& ex)
     {
-        SAL_WARN("svtools.config", "Caught unexpected: " << ex.Message);
+        SAL_WARN("svtools.config", "Caught unexpected: " << ex);
     }
 
     return bRet;
@@ -286,7 +286,7 @@ sal_Int16 SvtPrintOptions_Impl::GetReducedBitmapMode() const
     }
     catch (const css::uno::Exception& ex)
     {
-        SAL_WARN("svtools.config", "Caught unexpected: " << ex.Message);
+        SAL_WARN("svtools.config", "Caught unexpected: " << ex);
     }
 
     return nRet;
@@ -308,7 +308,7 @@ sal_Int16 SvtPrintOptions_Impl::GetReducedBitmapResolution() const
     }
     catch (const css::uno::Exception& ex)
     {
-        SAL_WARN("svtools.config", "Caught unexpected: " << ex.Message);
+        SAL_WARN("svtools.config", "Caught unexpected: " << ex);
     }
 
     return  nRet;
@@ -330,7 +330,7 @@ bool SvtPrintOptions_Impl::IsReducedBitmapIncludesTransparency() const
     }
     catch (const css::uno::Exception& ex)
     {
-        SAL_WARN("svtools.config", "Caught unexpected: " << ex.Message);
+        SAL_WARN("svtools.config", "Caught unexpected: " << ex);
     }
 
     return  bRet;
@@ -352,7 +352,7 @@ bool SvtPrintOptions_Impl::IsConvertToGreyscales() const
     }
     catch (const css::uno::Exception& ex)
     {
-        SAL_WARN("svtools.config", "Caught unexpected: " << ex.Message);
+        SAL_WARN("svtools.config", "Caught unexpected: " << ex);
     }
 
     return  bRet;
@@ -375,7 +375,7 @@ bool SvtPrintOptions_Impl::IsPDFAsStandardPrintJobFormat() const
     }
     catch (const css::uno::Exception& ex)
     {
-        SAL_WARN("svtools.config", "Caught unexpected: " << ex.Message);
+        SAL_WARN("svtools.config", "Caught unexpected: " << ex);
     }
 
     return  bRet;
@@ -465,7 +465,7 @@ void SvtPrintOptions_Impl::impl_setValue (const OUString& sProp, bool bNew )
     }
     catch(const css::uno::Exception& ex)
     {
-        SAL_WARN("svtools.config", "Caught unexpected: " << ex.Message);
+        SAL_WARN("svtools.config", "Caught unexpected: " << ex);
     }
 }
 
@@ -493,7 +493,7 @@ void SvtPrintOptions_Impl::impl_setValue (const OUString& sProp,
     }
     catch(const css::uno::Exception& ex)
     {
-        SAL_WARN("svtools.config", "Caught unexpected: " << ex.Message);
+        SAL_WARN("svtools.config", "Caught unexpected: " << ex);
     }
 }
 
diff --git a/svtools/source/contnr/DocumentInfoPreview.cxx b/svtools/source/contnr/DocumentInfoPreview.cxx
index 7a5df2ad4614..7338412e01f7 100644
--- a/svtools/source/contnr/DocumentInfoPreview.cxx
+++ b/svtools/source/contnr/DocumentInfoPreview.cxx
@@ -112,7 +112,7 @@ void ODocumentInfoPreview::fill(
             value = conv->convertToSimpleType(aAny, css::uno::TypeClass_STRING).
                 get< OUString >();
         } catch (css::script::CannotConvertException & e) {
-            SAL_INFO("svtools.contnr", "ignored CannotConvertException " << e.Message);
+            SAL_INFO("svtools.contnr", "ignored " << e);
         }
         if (!value.isEmpty()) {
             insertEntry(name, value);
diff --git a/svtools/source/control/inettbc.cxx b/svtools/source/control/inettbc.cxx
index 0db56b44794b..725ff7136a82 100644
--- a/svtools/source/control/inettbc.cxx
+++ b/svtools/source/control/inettbc.cxx
@@ -634,10 +634,7 @@ void SvtMatchContext_Impl::doExecute()
                                     try {
                                         proc2->releaseCommandIdentifier(id);
                                     } catch (css::uno::RuntimeException & e) {
-                                        SAL_WARN(
-                                            "svtools.control",
-                                            "ignoring UNO RuntimeException "
-                                            << e.Message);
+                                        SAL_WARN("svtools.control", "ignoring " << e);
                                     }
                                 }
                                 throw;
@@ -661,10 +658,7 @@ void SvtMatchContext_Impl::doExecute()
                                 res, css::uno::UNO_QUERY_THROW);
                             folder = row->getBoolean(1) && !row->wasNull();
                         } catch (css::uno::Exception & e) {
-                            SAL_WARN(
-                                "svtools.control",
-                                "ignoring UNO Exception " << typeid(*&e).name()
-                                << ": " << e.Message);
+                            SAL_WARN("svtools.control", "ignoring " << e);
                             return;
                         }
                     }
diff --git a/svtools/source/misc/embedhlp.cxx b/svtools/source/misc/embedhlp.cxx
index 68691df709d7..636e5458500c 100644
--- a/svtools/source/misc/embedhlp.cxx
+++ b/svtools/source/misc/embedhlp.cxx
@@ -342,7 +342,7 @@ void EmbeddedObjectRef::Clear()
                 }
                 catch (const uno::Exception& e)
                 {
-                    SAL_WARN("svtools.misc", "Error on switching of the object to loaded state and closing: \"" << e.Message << "\"");
+                    SAL_WARN("svtools.misc", "Error on switching of the object to loaded state and closing: \"" << e << "\"");
                 }
             }
         }
@@ -442,7 +442,7 @@ const Graphic* EmbeddedObjectRef::GetGraphic() const
     }
     catch( const uno::Exception& ex )
     {
-        SAL_WARN("svtools.misc", "Something went wrong on getting the graphic: " << ex.Message);
+        SAL_WARN("svtools.misc", "Something went wrong on getting the graphic: " << ex);
     }
 
     return mpImpl->pGraphic.get();
@@ -479,7 +479,7 @@ Size EmbeddedObjectRef::GetSize( MapMode const * pTargetMapMode ) const
             }
             catch (const uno::Exception& e)
             {
-                SAL_WARN("svtools.misc", "Something went wrong on getting of the size of the object: \"" << e.Message << "\"");
+                SAL_WARN("svtools.misc", "Something went wrong on getting of the size of the object: \"" << e << "\"");
             }
 
             try
@@ -488,7 +488,7 @@ Size EmbeddedObjectRef::GetSize( MapMode const * pTargetMapMode ) const
             }
             catch (const uno::Exception& e)
             {
-                SAL_WARN("svtools.misc", "Can not get the map mode: \"" << e.Message << "\"");
+                SAL_WARN("svtools.misc", "Can not get the map mode: \"" << e << "\"");
             }
         }
 
@@ -575,7 +575,7 @@ SvStream* EmbeddedObjectRef::GetGraphicStream( bool bUpdate ) const
             }
             catch (const uno::Exception& ex)
             {
-                SAL_WARN("svtools.misc", "discarding broken embedded object preview: " << ex.Message);
+                SAL_WARN("svtools.misc", "discarding broken embedded object preview: " << ex);
                 delete pStream;
                 xStream.clear();
             }
diff --git a/svtools/source/misc/imagemgr.cxx b/svtools/source/misc/imagemgr.cxx
index 26af30e533b5..d3bffc243761 100644
--- a/svtools/source/misc/imagemgr.cxx
+++ b/svtools/source/misc/imagemgr.cxx
@@ -394,7 +394,7 @@ static SvImageId GetImageId_Impl( const INetURLObject& rObject, bool bDetectFold
             }
             catch (const css::ucb::ContentCreationException& e)
             {
-                SAL_WARN("svtools.misc", "GetImageId_Impl: Caught exception: " << e.Message);
+                SAL_WARN("svtools.misc", "GetImageId_Impl: Caught " << e);
             }
 
             return nId;