Unwound unhelpful LogHelper::logIt

...where the OSL_FAIL line numbers did not point at the relevant code.

Change-Id: I4d12d63782378cbbc446cdcd77c07676ffc81d78

2 files changed, 32 insertions, 35 deletions

diff --git a/svtools/source/config/accessibilityoptions.cxx b/svtools/source/config/accessibilityoptions.cxx
index 2194e794305c..148cb0e69980 100644
--- a/svtools/source/config/accessibilityoptions.cxx
+++ b/svtools/source/config/accessibilityoptions.cxx
@@ -37,7 +37,6 @@
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <comphelper/configurationhelper.hxx>
 #include <comphelper/processfactory.hxx>
-#include <unotools/loghelper.hxx>
 
 #include <svl/smplhint.hxx>
 
@@ -134,7 +133,7 @@ SvtAccessibilityOptions_Impl::SvtAccessibilityOptions_Impl()
     catch(const css::uno::Exception& ex)
     {
         m_xCfg.clear();
-        LogHelper::logIt(ex);
+        SAL_WARN("svtools", "Caught unexpected: " << ex.Message);
     }
 }
 
@@ -155,7 +154,7 @@ sal_Bool SvtAccessibilityOptions_Impl::GetAutoDetectSystemHC()
     }
     catch(const css::uno::Exception& ex)
     {
-        LogHelper::logIt(ex);
+        SAL_WARN("svtools", "Caught unexpected: " << ex.Message);
     }
 
     return bRet;
@@ -173,7 +172,7 @@ sal_Bool SvtAccessibilityOptions_Impl::GetIsForPagePreviews() const
     }
     catch(const css::uno::Exception& ex)
     {
-        LogHelper::logIt(ex);
+        SAL_WARN("svtools", "Caught unexpected: " << ex.Message);
     }
     return bRet;
 }
@@ -190,7 +189,7 @@ sal_Bool SvtAccessibilityOptions_Impl::GetIsHelpTipsDisappear() const
     }
     catch(const css::uno::Exception& ex)
     {
-        LogHelper::logIt(ex);
+        SAL_WARN("svtools", "Caught unexpected: " << ex.Message);
     }
 
     return bRet;
@@ -208,7 +207,7 @@ sal_Bool SvtAccessibilityOptions_Impl::GetIsAllowAnimatedGraphics() const
     }
     catch(const css::uno::Exception& ex)
     {
-        LogHelper::logIt(ex);
+        SAL_WARN("svtools", "Caught unexpected: " << ex.Message);
     }
 
     return bRet;
@@ -226,7 +225,7 @@ sal_Bool SvtAccessibilityOptions_Impl::GetIsAllowAnimatedText() const
     }
     catch(const css::uno::Exception& ex)
     {
-        LogHelper::logIt(ex);
+        SAL_WARN("svtools", "Caught unexpected: " << ex.Message);
     }
 
     return bRet;
@@ -244,7 +243,7 @@ sal_Bool SvtAccessibilityOptions_Impl::GetIsAutomaticFontColor() const
     }
     catch(const css::uno::Exception& ex)
     {
-        LogHelper::logIt(ex);
+        SAL_WARN("svtools", "Caught unexpected: " << ex.Message);
     }
 
     return bRet;
@@ -262,7 +261,7 @@ sal_Bool SvtAccessibilityOptions_Impl::GetIsSystemFont() const
     }
     catch(const css::uno::Exception& ex)
     {
-        LogHelper::logIt(ex);
+        SAL_WARN("svtools", "Caught unexpected: " << ex.Message);
     }
 
     return bRet;
@@ -280,7 +279,7 @@ sal_Int16 SvtAccessibilityOptions_Impl::GetHelpTipSeconds() const
     }
     catch(const css::uno::Exception& ex)
     {
-        LogHelper::logIt(ex);
+        SAL_WARN("svtools", "Caught unexpected: " << ex.Message);
     }
 
     return nRet;
@@ -298,7 +297,7 @@ sal_Bool SvtAccessibilityOptions_Impl::IsSelectionInReadonly() const
     }
     catch(const css::uno::Exception& ex)
     {
-        LogHelper::logIt(ex);
+        SAL_WARN("svtools", "Caught unexpected: " << ex.Message);
     }
 
     return bRet;
@@ -320,7 +319,7 @@ void SvtAccessibilityOptions_Impl::SetAutoDetectSystemHC(sal_Bool bSet)
     }
     catch(const css::uno::Exception& ex)
     {
-        LogHelper::logIt(ex);
+        SAL_WARN("svtools", "Caught unexpected: " << ex.Message);
     }
 }
 
@@ -340,7 +339,7 @@ void SvtAccessibilityOptions_Impl::SetIsForPagePreviews(sal_Bool bSet)
     }
     catch(const css::uno::Exception& ex)
     {
-        LogHelper::logIt(ex);
+        SAL_WARN("svtools", "Caught unexpected: " << ex.Message);
     }
 }
 
@@ -360,7 +359,7 @@ void SvtAccessibilityOptions_Impl::SetIsHelpTipsDisappear(sal_Bool bSet)
     }
     catch(const css::uno::Exception& ex)
     {
-        LogHelper::logIt(ex);
+        SAL_WARN("svtools", "Caught unexpected: " << ex.Message);
     }
 }
 
@@ -380,7 +379,7 @@ void SvtAccessibilityOptions_Impl::SetIsAllowAnimatedGraphics(sal_Bool bSet)
     }
     catch(const css::uno::Exception& ex)
     {
-        LogHelper::logIt(ex);
+        SAL_WARN("svtools", "Caught unexpected: " << ex.Message);
     }
 }
 
@@ -400,7 +399,7 @@ void SvtAccessibilityOptions_Impl::SetIsAllowAnimatedText(sal_Bool bSet)
     }
     catch(const css::uno::Exception& ex)
     {
-        LogHelper::logIt(ex);
+        SAL_WARN("svtools", "Caught unexpected: " << ex.Message);
     }
 }
 
@@ -420,7 +419,7 @@ void SvtAccessibilityOptions_Impl::SetIsAutomaticFontColor(sal_Bool bSet)
     }
     catch(const css::uno::Exception& ex)
     {
-        LogHelper::logIt(ex);
+        SAL_WARN("svtools", "Caught unexpected: " << ex.Message);
     }
 }
 
@@ -440,7 +439,7 @@ void SvtAccessibilityOptions_Impl::SetIsSystemFont(sal_Bool bSet)
     }
     catch(const css::uno::Exception& ex)
     {
-        LogHelper::logIt(ex);
+        SAL_WARN("svtools", "Caught unexpected: " << ex.Message);
     }
 }
 
@@ -460,7 +459,7 @@ void SvtAccessibilityOptions_Impl::SetHelpTipSeconds(sal_Int16 nSet)
     }
     catch(const css::uno::Exception& ex)
     {
-        LogHelper::logIt(ex);
+        SAL_WARN("svtools", "Caught unexpected: " << ex.Message);
     }
 }
 
@@ -480,7 +479,7 @@ void SvtAccessibilityOptions_Impl::SetSelectionInReadonly(sal_Bool bSet)
     }
     catch(const css::uno::Exception& ex)
     {
-        LogHelper::logIt(ex);
+        SAL_WARN("svtools", "Caught unexpected: " << ex.Message);
     }
 }
 
diff --git a/svtools/source/config/printoptions.cxx b/svtools/source/config/printoptions.cxx
index 789c7e6a6a1a..105f767540dc 100644
--- a/svtools/source/config/printoptions.cxx
+++ b/svtools/source/config/printoptions.cxx
@@ -50,8 +50,6 @@
 #include <comphelper/processfactory.hxx>
 #include <comphelper/string.hxx>
 
-#include <unotools/loghelper.hxx>
-
 #include <itemholder2.hxx>
 
 #include <sal/macros.h>
@@ -188,7 +186,7 @@ SvtPrintOptions_Impl::SvtPrintOptions_Impl(const OUString& rConfigRoot)
     {
         m_xNode.clear();
         m_xCfg.clear();
-        LogHelper::logIt(ex);
+        SAL_WARN("svtools", "Caught unexpected: " << ex.Message);
     }
 }
 
@@ -206,7 +204,7 @@ sal_Bool SvtPrintOptions_Impl::IsReduceTransparency() const
     }
     catch (const css::uno::Exception& ex)
     {
-        LogHelper::logIt(ex);
+        SAL_WARN("svtools", "Caught unexpected: " << ex.Message);
     }
 
     return bRet;
@@ -226,7 +224,7 @@ sal_Int16 SvtPrintOptions_Impl::GetReducedTransparencyMode() const
     }
     catch (const css::uno::Exception& ex)
     {
-        LogHelper::logIt(ex);
+        SAL_WARN("svtools", "Caught unexpected: " << ex.Message);
     }
 
     return  nRet;
@@ -248,7 +246,7 @@ sal_Bool SvtPrintOptions_Impl::IsReduceGradients() const
     }
     catch (const css::uno::Exception& ex)
     {
-        LogHelper::logIt(ex);
+        SAL_WARN("svtools", "Caught unexpected: " << ex.Message);
     }
 
     return bRet;
@@ -270,7 +268,7 @@ sal_Int16 SvtPrintOptions_Impl::GetReducedGradientMode() const
     }
     catch (const css::uno::Exception& ex)
     {
-        LogHelper::logIt(ex);
+        SAL_WARN("svtools", "Caught unexpected: " << ex.Message);
     }
 
     return nRet;
@@ -292,7 +290,7 @@ sal_Int16 SvtPrintOptions_Impl::GetReducedGradientStepCount() const
     }
     catch (const css::uno::Exception& ex)
     {
-        LogHelper::logIt(ex);
+        SAL_WARN("svtools", "Caught unexpected: " << ex.Message);
     }
 
     return nRet;
@@ -314,7 +312,7 @@ sal_Bool SvtPrintOptions_Impl::IsReduceBitmaps() const
     }
     catch (const css::uno::Exception& ex)
     {
-        LogHelper::logIt(ex);
+        SAL_WARN("svtools", "Caught unexpected: " << ex.Message);
     }
 
     return bRet;
@@ -336,7 +334,7 @@ sal_Int16 SvtPrintOptions_Impl::GetReducedBitmapMode() const
     }
     catch (const css::uno::Exception& ex)
     {
-        LogHelper::logIt(ex);
+        SAL_WARN("svtools", "Caught unexpected: " << ex.Message);
     }
 
     return nRet;
@@ -358,7 +356,7 @@ sal_Int16 SvtPrintOptions_Impl::GetReducedBitmapResolution() const
     }
     catch (const css::uno::Exception& ex)
     {
-        LogHelper::logIt(ex);
+        SAL_WARN("svtools", "Caught unexpected: " << ex.Message);
     }
 
     return  nRet;
@@ -380,7 +378,7 @@ sal_Bool SvtPrintOptions_Impl::IsReducedBitmapIncludesTransparency() const
     }
     catch (const css::uno::Exception& ex)
     {
-        LogHelper::logIt(ex);
+        SAL_WARN("svtools", "Caught unexpected: " << ex.Message);
     }
 
     return  bRet;
@@ -402,7 +400,7 @@ sal_Bool SvtPrintOptions_Impl::IsConvertToGreyscales() const
     }
     catch (const css::uno::Exception& ex)
     {
-        LogHelper::logIt(ex);
+        SAL_WARN("svtools", "Caught unexpected: " << ex.Message);
     }
 
     return  bRet;
@@ -489,7 +487,7 @@ void SvtPrintOptions_Impl::impl_setValue (const ::rtl::OUString& sProp,
     }
     catch(const css::uno::Exception& ex)
     {
-        LogHelper::logIt(ex);
+        SAL_WARN("svtools", "Caught unexpected: " << ex.Message);
     }
 }
 
@@ -517,7 +515,7 @@ void SvtPrintOptions_Impl::impl_setValue (const ::rtl::OUString& sProp,
     }
     catch(const css::uno::Exception& ex)
     {
-        LogHelper::logIt(ex);
+        SAL_WARN("svtools", "Caught unexpected: " << ex.Message);
     }
 }