Unwound unhelpful LogHelper::logIt

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

Change-Id: I4d12d63782378cbbc446cdcd77c07676ffc81d78

4 files changed, 44 insertions, 96 deletions

diff --git a/unotools/Package_inc.mk b/unotools/Package_inc.mk
index 1812cb53dbdb..1442941ca1fb 100644
--- a/unotools/Package_inc.mk
+++ b/unotools/Package_inc.mk
@@ -69,7 +69,6 @@ $(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/linguprops.hxx,unoto
 $(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/localedatawrapper.hxx,unotools/localedatawrapper.hxx))
 $(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/localfilehelper.hxx,unotools/localfilehelper.hxx))
 $(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/localisationoptions.hxx,unotools/localisationoptions.hxx))
-$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/loghelper.hxx,unotools/loghelper.hxx))
 $(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/misccfg.hxx,unotools/misccfg.hxx))
 $(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/moduleoptions.hxx,unotools/moduleoptions.hxx))
 $(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/nativenumberwrapper.hxx,unotools/nativenumberwrapper.hxx))
diff --git a/unotools/inc/unotools/loghelper.hxx b/unotools/inc/unotools/loghelper.hxx
deleted file mode 100644
index 24f66bd91d38..000000000000
--- a/unotools/inc/unotools/loghelper.hxx
+++ /dev/null
@@ -1,48 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#ifndef _SVT_LOGHELPER_HXX
-#define _SVT_LOGHELPER_HXX
-
-namespace css = ::com::sun::star;
-
-namespace LogHelper {
-
-inline void logIt(const css::uno::Exception& ex)
-{
-    ::rtl::OUStringBuffer sMsg(256);
-    sMsg.appendAscii("Unexpected exception catched. Original message was:\n\""      );
-    sMsg.append(ex.Message);
-    sMsg.appendAscii("\"");
-    OSL_FAIL(::rtl::OUStringToOString(sMsg.makeStringAndClear(), RTL_TEXTENCODING_UTF8).getStr());
-}
-
-}
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/unotools/source/config/historyoptions.cxx b/unotools/source/config/historyoptions.cxx
index 8ee53ccbadd8..e681395c0a8d 100644
--- a/unotools/source/config/historyoptions.cxx
+++ b/unotools/source/config/historyoptions.cxx
@@ -52,8 +52,6 @@
 
 #include <comphelper/processfactory.hxx>
 
-#include <unotools/loghelper.hxx>
-
 using namespace ::std     ;
 using namespace ::utl     ;
 using namespace ::rtl     ;
@@ -167,7 +165,7 @@ SvtHistoryOptions_Impl::SvtHistoryOptions_Impl()
         m_xCfg.clear();
         m_xCommonXCU.clear();
 
-        LogHelper::logIt(ex);
+        SAL_WARN("unotools", "Caught unexpected: " << ex.Message);
     }
 }
 
@@ -213,7 +211,7 @@ sal_uInt32 SvtHistoryOptions_Impl::GetSize( EHistoryType eHistory )
     }
     catch(const css::uno::Exception& ex)
     {
-        LogHelper::logIt(ex);
+        SAL_WARN("unotools", "Caught unexpected: " << ex.Message);
     }
 
     return nSize;
@@ -273,7 +271,7 @@ void SvtHistoryOptions_Impl::impl_truncateList ( EHistoryType eHistory, sal_uInt
     }
     catch(const css::uno::Exception& ex)
     {
-        LogHelper::logIt(ex);
+        SAL_WARN("unotools", "Caught unexpected: " << ex.Message);
     }
 }
 
@@ -333,7 +331,7 @@ void SvtHistoryOptions_Impl::Clear( EHistoryType eHistory )
     }
     catch(const css::uno::Exception& ex)
     {
-        LogHelper::logIt(ex);
+        SAL_WARN("unotools", "Caught unexpected: " << ex.Message);
     }
 }
 
@@ -418,7 +416,7 @@ Sequence< Sequence< PropertyValue > > SvtHistoryOptions_Impl::GetList( EHistoryT
                     // ignore such corrupted individual items here, so that at
                     // least newly added items are successfully reported back
                     // from this function:
-                    LogHelper::logIt(ex);
+                    SAL_WARN("unotools", "Caught unexpected: " << ex.Message);
                 }
             }
             assert(nCount <= nLength);
@@ -428,7 +426,7 @@ Sequence< Sequence< PropertyValue > > SvtHistoryOptions_Impl::GetList( EHistoryT
     }
     catch(const css::uno::Exception& ex)
     {
-        LogHelper::logIt(ex);
+        SAL_WARN("unotools", "Caught unexpected: " << ex.Message);
     }
 
     return seqReturn;
@@ -569,7 +567,7 @@ void SvtHistoryOptions_Impl::AppendItem(       EHistoryType eHistory ,
     }
     catch(const css::uno::Exception& ex)
     {
-        LogHelper::logIt(ex);
+        SAL_WARN("unotools", "Caught unexpected: " << ex.Message);
     }
 }
 
diff --git a/unotools/source/config/useroptions.cxx b/unotools/source/config/useroptions.cxx
index 216aae26537e..fbe7ddf0f8c0 100644
--- a/unotools/source/config/useroptions.cxx
+++ b/unotools/source/config/useroptions.cxx
@@ -49,7 +49,6 @@
 #include <com/sun/star/util/ChangesEvent.hpp>
 #include <comphelper/configurationhelper.hxx>
 #include <comphelper/processfactory.hxx>
-#include <unotools/loghelper.hxx>
 
 using namespace utl;
 using namespace com::sun::star;
@@ -219,7 +218,7 @@ SvtUserOptions_Impl::SvtUserOptions_Impl() :
     catch(const css::uno::Exception& ex)
     {
         m_xCfg.clear();
-        LogHelper::logIt(ex);
+        SAL_WARN("unotools", "Caught unexpected: " << ex.Message);
     }
 }
 
@@ -240,7 +239,7 @@ SvtUserOptions_Impl::~SvtUserOptions_Impl()
     }
     catch ( const css::uno::Exception& ex )
     {
-        LogHelper::logIt(ex);
+        SAL_WARN("unotools", "Caught unexpected: " << ex.Message);
     }
 
     return sCompany;
@@ -257,7 +256,7 @@ SvtUserOptions_Impl::~SvtUserOptions_Impl()
     }
     catch ( const css::uno::Exception& ex )
     {
-        LogHelper::logIt(ex);
+        SAL_WARN("unotools", "Caught unexpected: " << ex.Message);
     }
 
     return  sFirstName;
@@ -274,7 +273,7 @@ SvtUserOptions_Impl::~SvtUserOptions_Impl()
     }
     catch ( const css::uno::Exception& ex )
     {
-        LogHelper::logIt(ex);
+        SAL_WARN("unotools", "Caught unexpected: " << ex.Message);
     }
 
     return  sLastName;
@@ -291,7 +290,7 @@ SvtUserOptions_Impl::~SvtUserOptions_Impl()
     }
     catch ( const css::uno::Exception& ex )
     {
-        LogHelper::logIt(ex);
+        SAL_WARN("unotools", "Caught unexpected: " << ex.Message);
     }
 
     return  sID;
@@ -308,7 +307,7 @@ SvtUserOptions_Impl::~SvtUserOptions_Impl()
     }
     catch ( const css::uno::Exception& ex )
     {
-        LogHelper::logIt(ex);
+        SAL_WARN("unotools", "Caught unexpected: " << ex.Message);
     }
 
     return  sStreet;
@@ -325,7 +324,7 @@ SvtUserOptions_Impl::~SvtUserOptions_Impl()
     }
     catch ( const css::uno::Exception& ex )
     {
-        LogHelper::logIt(ex);
+        SAL_WARN("unotools", "Caught unexpected: " << ex.Message);
     }
 
     return  sCity;
@@ -342,7 +341,7 @@ SvtUserOptions_Impl::~SvtUserOptions_Impl()
     }
     catch ( const css::uno::Exception& ex )
     {
-        LogHelper::logIt(ex);
+        SAL_WARN("unotools", "Caught unexpected: " << ex.Message);
     }
 
     return  sState;
@@ -359,7 +358,7 @@ SvtUserOptions_Impl::~SvtUserOptions_Impl()
     }
     catch ( const css::uno::Exception& ex )
     {
-        LogHelper::logIt(ex);
+        SAL_WARN("unotools", "Caught unexpected: " << ex.Message);
     }
 
     return  sZip;
@@ -376,7 +375,7 @@ SvtUserOptions_Impl::~SvtUserOptions_Impl()
     }
     catch ( const css::uno::Exception& ex )
     {
-        LogHelper::logIt(ex);
+        SAL_WARN("unotools", "Caught unexpected: " << ex.Message);
     }
 
     return  sCountry;
@@ -393,7 +392,7 @@ SvtUserOptions_Impl::~SvtUserOptions_Impl()
     }
     catch ( const css::uno::Exception& ex )
     {
-        LogHelper::logIt(ex);
+        SAL_WARN("unotools", "Caught unexpected: " << ex.Message);
     }
 
     return  sPosition;
@@ -410,7 +409,7 @@ SvtUserOptions_Impl::~SvtUserOptions_Impl()
     }
     catch ( const css::uno::Exception& ex )
     {
-        LogHelper::logIt(ex);
+        SAL_WARN("unotools", "Caught unexpected: " << ex.Message);
     }
 
     return  sTitle;
@@ -427,7 +426,7 @@ SvtUserOptions_Impl::~SvtUserOptions_Impl()
     }
     catch ( const css::uno::Exception& ex )
     {
-        LogHelper::logIt(ex);
+        SAL_WARN("unotools", "Caught unexpected: " << ex.Message);
     }
 
     return  sTelephoneHome;
@@ -444,7 +443,7 @@ SvtUserOptions_Impl::~SvtUserOptions_Impl()
     }
     catch ( const css::uno::Exception& ex )
     {
-        LogHelper::logIt(ex);
+        SAL_WARN("unotools", "Caught unexpected: " << ex.Message);
     }
 
     return  sTelephoneWork;
@@ -461,7 +460,7 @@ SvtUserOptions_Impl::~SvtUserOptions_Impl()
     }
     catch ( const css::uno::Exception& ex )
     {
-        LogHelper::logIt(ex);
+        SAL_WARN("unotools", "Caught unexpected: " << ex.Message);
     }
 
     return  sFax;
@@ -478,7 +477,7 @@ SvtUserOptions_Impl::~SvtUserOptions_Impl()
     }
     catch ( const css::uno::Exception& ex )
     {
-        LogHelper::logIt(ex);
+        SAL_WARN("unotools", "Caught unexpected: " << ex.Message);
     }
 
     return  sEmail;
@@ -495,7 +494,7 @@ SvtUserOptions_Impl::~SvtUserOptions_Impl()
     }
     catch ( const css::uno::Exception& ex )
     {
-        LogHelper::logIt(ex);
+        SAL_WARN("unotools", "Caught unexpected: " << ex.Message);
     }
 
     return  sCustomerNumber;
@@ -512,7 +511,7 @@ SvtUserOptions_Impl::~SvtUserOptions_Impl()
     }
     catch ( const css::uno::Exception& ex )
     {
-        LogHelper::logIt(ex);
+        SAL_WARN("unotools", "Caught unexpected: " << ex.Message);
     }
 
     return  sFathersName;
@@ -529,7 +528,7 @@ SvtUserOptions_Impl::~SvtUserOptions_Impl()
     }
     catch ( const css::uno::Exception& ex )
     {
-        LogHelper::logIt(ex);
+        SAL_WARN("unotools", "Caught unexpected: " << ex.Message);
     }
 
     return  sApartment;
@@ -545,7 +544,7 @@ void SvtUserOptions_Impl::SetCompany( const ::rtl::OUString& sCompany )
     }
     catch ( const css::uno::Exception& ex)
     {
-        LogHelper::logIt(ex);
+        SAL_WARN("unotools", "Caught unexpected: " << ex.Message);
     }
 }
 
@@ -559,7 +558,7 @@ void SvtUserOptions_Impl::SetFirstName( const ::rtl::OUString& sFirstName )
     }
     catch ( const css::uno::Exception& ex)
     {
-        LogHelper::logIt(ex);
+        SAL_WARN("unotools", "Caught unexpected: " << ex.Message);
     }
 }
 
@@ -573,7 +572,7 @@ void SvtUserOptions_Impl::SetLastName( const ::rtl::OUString& sLastName )
     }
     catch ( const css::uno::Exception& ex)
     {
-        LogHelper::logIt(ex);
+        SAL_WARN("unotools", "Caught unexpected: " << ex.Message);
     }
 }
 void SvtUserOptions_Impl::SetID( const ::rtl::OUString& sID )
@@ -586,7 +585,7 @@ void SvtUserOptions_Impl::SetID( const ::rtl::OUString& sID )
     }
     catch ( const css::uno::Exception& ex)
     {
-        LogHelper::logIt(ex);
+        SAL_WARN("unotools", "Caught unexpected: " << ex.Message);
     }
 }
 
@@ -600,7 +599,7 @@ void SvtUserOptions_Impl::SetStreet( const ::rtl::OUString& sStreet )
     }
     catch ( const css::uno::Exception& ex)
     {
-        LogHelper::logIt(ex);
+        SAL_WARN("unotools", "Caught unexpected: " << ex.Message);
     }
 }
 
@@ -614,7 +613,7 @@ void SvtUserOptions_Impl::SetCity( const ::rtl::OUString& sCity )
     }
     catch ( const css::uno::Exception& ex)
     {
-        LogHelper::logIt(ex);
+        SAL_WARN("unotools", "Caught unexpected: " << ex.Message);
     }
 }
 
@@ -628,7 +627,7 @@ void SvtUserOptions_Impl::SetState( const ::rtl::OUString& sState )
     }
     catch ( const css::uno::Exception& ex)
     {
-        LogHelper::logIt(ex);
+        SAL_WARN("unotools", "Caught unexpected: " << ex.Message);
     }
 }
 
@@ -642,7 +641,7 @@ void SvtUserOptions_Impl::SetZip( const ::rtl::OUString& sZip )
     }
     catch ( const css::uno::Exception& ex)
     {
-        LogHelper::logIt(ex);
+        SAL_WARN("unotools", "Caught unexpected: " << ex.Message);
     }
 }
 
@@ -656,7 +655,7 @@ void SvtUserOptions_Impl::SetCountry( const ::rtl::OUString& sCountry )
     }
     catch ( const css::uno::Exception& ex)
     {
-        LogHelper::logIt(ex);
+        SAL_WARN("unotools", "Caught unexpected: " << ex.Message);
     }
 }
 
@@ -670,7 +669,7 @@ void SvtUserOptions_Impl::SetPosition( const ::rtl::OUString& sPosition )
     }
     catch ( const css::uno::Exception& ex)
     {
-        LogHelper::logIt(ex);
+        SAL_WARN("unotools", "Caught unexpected: " << ex.Message);
     }
 }
 
@@ -684,7 +683,7 @@ void SvtUserOptions_Impl::SetTitle( const ::rtl::OUString& sTitle )
     }
     catch ( const css::uno::Exception& ex)
     {
-        LogHelper::logIt(ex);
+        SAL_WARN("unotools", "Caught unexpected: " << ex.Message);
     }
 }
 
@@ -698,7 +697,7 @@ void SvtUserOptions_Impl::SetTelephoneHome( const ::rtl::OUString& sTelephoneHom
     }
     catch ( const css::uno::Exception& ex)
     {
-        LogHelper::logIt(ex);
+        SAL_WARN("unotools", "Caught unexpected: " << ex.Message);
     }
 }
 
@@ -712,7 +711,7 @@ void SvtUserOptions_Impl::SetTelephoneWork( const ::rtl::OUString& sTelephoneWor
     }
     catch ( const css::uno::Exception& ex)
     {
-        LogHelper::logIt(ex);
+        SAL_WARN("unotools", "Caught unexpected: " << ex.Message);
     }
 }
 
@@ -726,7 +725,7 @@ void SvtUserOptions_Impl::SetFax( const ::rtl::OUString& sFax )
     }
     catch ( const css::uno::Exception& ex)
     {
-        LogHelper::logIt(ex);
+        SAL_WARN("unotools", "Caught unexpected: " << ex.Message);
     }
 }
 
@@ -740,7 +739,7 @@ void SvtUserOptions_Impl::SetEmail( const ::rtl::OUString& sEmail )
     }
     catch ( const css::uno::Exception& ex)
     {
-        LogHelper::logIt(ex);
+        SAL_WARN("unotools", "Caught unexpected: " << ex.Message);
     }
 }
 
@@ -754,7 +753,7 @@ void SvtUserOptions_Impl::SetCustomerNumber( const ::rtl::OUString& sCustomerNum
     }
     catch ( const css::uno::Exception& ex)
     {
-        LogHelper::logIt(ex);
+        SAL_WARN("unotools", "Caught unexpected: " << ex.Message);
     }
 }
 
@@ -768,7 +767,7 @@ void SvtUserOptions_Impl::SetFathersName( const ::rtl::OUString& sFathersName )
     }
     catch ( const css::uno::Exception& ex)
     {
-        LogHelper::logIt(ex);
+        SAL_WARN("unotools", "Caught unexpected: " << ex.Message);
     }
 }
 
@@ -782,7 +781,7 @@ void SvtUserOptions_Impl::SetApartment( const ::rtl::OUString& sApartment )
     }
     catch ( const css::uno::Exception& ex)
     {
-        LogHelper::logIt(ex);
+        SAL_WARN("unotools", "Caught unexpected: " << ex.Message);
     }
 }