Replaced DBG_ERRORFILE with SAL_INFO.

9 files changed, 84 insertions, 346 deletions

diff --git a/unotools/source/i18n/calendarwrapper.cxx b/unotools/source/i18n/calendarwrapper.cxx
index 6bf1e2003b6c..748ed916a459 100644
--- a/unotools/source/i18n/calendarwrapper.cxx
+++ b/unotools/source/i18n/calendarwrapper.cxx
@@ -70,13 +70,7 @@ void CalendarWrapper::loadDefaultCalendar( const ::com::sun::star::lang::Locale&
     }
     catch (const Exception& e)
     {
-#ifdef DBG_UTIL
-        rtl::OStringBuffer aMsg("loadDefaultCalendar: Exception caught\n");
-        aMsg.append(rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8));
-        DBG_ERRORFILE(aMsg.getStr());
-#else
-        (void)e;
-#endif
+        SAL_INFO( "unotools.l18n", "loadDefaultCalendar: Exception caught " << e.Message );
     }
 }
 
@@ -90,18 +84,8 @@ void CalendarWrapper::loadCalendar( const ::rtl::OUString& rUniqueID, const ::co
     }
     catch (const Exception& e)
     {
-#ifdef DBG_UTIL
-        rtl::OStringBuffer aMsg(RTL_CONSTASCII_STRINGPARAM("loadCalendar: Exception caught\nrequested: "));
-        aMsg.append(rtl::OUStringToOString(rUniqueID, RTL_TEXTENCODING_UTF8));
-        aMsg.append(RTL_CONSTASCII_STRINGPARAM("   Locale: "));
-        aMsg.append(rtl::OUStringToOString(rLocale.Language, RTL_TEXTENCODING_UTF8));
-        aMsg.append('_');
-        aMsg.append(rtl::OUStringToOString(rLocale.Country, RTL_TEXTENCODING_UTF8));
-        aMsg.append(rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8));
-        DBG_ERRORFILE(aMsg.getStr());
-#else
-        (void)e;
-#endif
+        SAL_INFO( "unotools.l18n", "loadCalendar: Exception caught requested: "
+            << rUniqueID << "   Locale: " << rLocale.Language << "_" << rLocale.Country << " " << e.Message );
     }
 }
 
@@ -115,14 +99,9 @@ void CalendarWrapper::loadCalendar( const ::rtl::OUString& rUniqueID, const ::co
     }
     catch (const Exception& e)
     {
-#ifdef DBG_UTIL
-        rtl::OStringBuffer aMsg("getAllCalendars: Exception caught\n");
-        aMsg.append(rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8));
-        DBG_ERRORFILE(aMsg.getStr());
-#else
-        (void)e;
-#endif
+        SAL_INFO( "unotools.l18n", "getAllCalendars: Exception caught " << e.Message );
     }
+
     return ::com::sun::star::uno::Sequence< ::rtl::OUString > (0);
 }
 
@@ -136,13 +115,7 @@ void CalendarWrapper::loadCalendar( const ::rtl::OUString& rUniqueID, const ::co
     }
     catch (const Exception& e)
     {
-#ifdef DBG_UTIL
-        rtl::OStringBuffer aMsg("getUniqueID: Exception caught\n");
-        aMsg.append(rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8));
-        DBG_ERRORFILE(aMsg.getStr());
-#else
-        (void)e;
-#endif
+        SAL_INFO( "unotools.l18n", "getUniqueID: Exception caught " << e.Message );
     }
     return ::rtl::OUString();
 }
@@ -157,13 +130,7 @@ void CalendarWrapper::setDateTime( double nTimeInDays )
     }
     catch (const Exception& e)
     {
-#ifdef DBG_UTIL
-        rtl::OStringBuffer aMsg("setDateTime: Exception caught\n");
-        aMsg.append(rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8));
-        DBG_ERRORFILE(aMsg.getStr());
-#else
-        (void)e;
-#endif
+        SAL_INFO( "unotools.l18n", "setDateTime: Exception caught " << e.Message );
     }
 }
 
@@ -177,13 +144,7 @@ double CalendarWrapper::getDateTime() const
     }
     catch (const Exception& e)
     {
-#ifdef DBG_UTIL
-        rtl::OStringBuffer aMsg("getDateTime: Exception caught\n");
-        aMsg.append(rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8));
-        DBG_ERRORFILE(aMsg.getStr());
-#else
-        (void)e;
-#endif
+        SAL_INFO( "unotools.l18n", "getDateTime: Exception caught " << e.Message );
     }
     return 0.0;
 }
@@ -207,13 +168,7 @@ sal_Int32 CalendarWrapper::getCombinedOffsetInMillis(
     }
     catch (const Exception& e)
     {
-#ifdef DBG_UTIL
-        rtl::OStringBuffer aMsg("setLocalDateTime: Exception caught\n");
-        aMsg.append(rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8));
-        DBG_ERRORFILE(aMsg.getStr());
-#else
-        (void)e;
-#endif
+        SAL_INFO( "unotools.l18n", "setLocalDateTime: Exception caught " << e.Message );
     }
     return nOffset;
 }
@@ -279,13 +234,7 @@ void CalendarWrapper::setLocalDateTime( double nTimeInDays )
     }
     catch (const Exception& e)
     {
-#ifdef DBG_UTIL
-        rtl::OStringBuffer aMsg("setLocalDateTime: Exception caught\n");
-        aMsg.append(rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8));
-        DBG_ERRORFILE(aMsg.getStr());
-#else
-        (void)e;
-#endif
+        SAL_INFO( "unotools.l18n",  "setLocalDateTime: Exception caught " << e.Message );
     }
 }
 
@@ -305,13 +254,7 @@ double CalendarWrapper::getLocalDateTime() const
     }
     catch (const Exception& e)
     {
-#ifdef DBG_UTIL
-        rtl::OStringBuffer aMsg("getLocalDateTime: Exception caught\n");
-        aMsg.append(rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8));
-        DBG_ERRORFILE(aMsg.getStr());
-#else
-        (void)e;
-#endif
+        SAL_INFO( "unotools.l18n",  "getLocalDateTime: Exception caught " << e.Message );
     }
     return 0.0;
 }
@@ -326,13 +269,7 @@ void CalendarWrapper::setValue( sal_Int16 nFieldIndex, sal_Int16 nValue )
     }
     catch (const Exception& e)
     {
-#ifdef DBG_UTIL
-        rtl::OStringBuffer aMsg("setValue: Exception caught\n");
-        aMsg.append(rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8));
-        DBG_ERRORFILE(aMsg.getStr());
-#else
-        (void)e;
-#endif
+        SAL_INFO( "unotools.l18n",  "setValue: Exception caught " << e.Message );
     }
 }
 
@@ -346,13 +283,7 @@ sal_Bool CalendarWrapper::isValid() const
     }
     catch (const Exception& e)
     {
-#ifdef DBG_UTIL
-        rtl::OStringBuffer aMsg("isValid: Exception caught\n");
-        aMsg.append(rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8));
-        DBG_ERRORFILE(aMsg.getStr());
-#else
-        (void)e;
-#endif
+        SAL_INFO( "unotools.l18n",  "isValue: Exception caught " << e.Message );
     }
     return sal_False;
 }
@@ -367,13 +298,7 @@ sal_Int16 CalendarWrapper::getValue( sal_Int16 nFieldIndex ) const
     }
     catch (const Exception& e)
     {
-#ifdef DBG_UTIL
-        rtl::OStringBuffer aMsg("getValue: Exception caught\n");
-        aMsg.append(rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8));
-        DBG_ERRORFILE(aMsg.getStr());
-#else
-        (void)e;
-#endif
+        SAL_INFO( "unotools.l18n", "getValue: Exception caught " << e.Message );
     }
     return 0;
 }
@@ -388,13 +313,7 @@ void CalendarWrapper::addValue( sal_Int16 nFieldIndex, sal_Int32 nAmount )
     }
     catch (const Exception& e)
     {
-#ifdef DBG_UTIL
-        rtl::OStringBuffer aMsg("addValue: Exception caught\n");
-        aMsg.append(rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8));
-        DBG_ERRORFILE(aMsg.getStr());
-#else
-        (void)e;
-#endif
+        SAL_INFO( "unotools.l18n", "addValue: Exception caught " << e.Message );
     }
 }
 
@@ -408,13 +327,7 @@ sal_Int16 CalendarWrapper::getFirstDayOfWeek() const
     }
     catch (const Exception& e)
     {
-#ifdef DBG_UTIL
-        rtl::OStringBuffer aMsg("getFirstDayOfWeek: Exception caught\n");
-        aMsg.append(rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8));
-        DBG_ERRORFILE(aMsg.getStr());
-#else
-        (void)e;
-#endif
+        SAL_INFO( "unotools.l18n", "getFirstDayOfWeek: Exception caught " << e.Message );
     }
     return 0;
 }
@@ -429,13 +342,7 @@ void CalendarWrapper::setFirstDayOfWeek( sal_Int16 nDay )
     }
     catch (const Exception& e)
     {
-#ifdef DBG_UTIL
-        rtl::OStringBuffer aMsg("setFirstDayOfWeek: Exception caught\n");
-        aMsg.append(rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8));
-        DBG_ERRORFILE(aMsg.getStr());
-#else
-        (void)e;
-#endif
+        SAL_INFO( "unotools.l18n", "setFirstDayOfWeek: Exception caught " << e.Message );
     }
 }
 
@@ -449,13 +356,7 @@ void CalendarWrapper::setMinimumNumberOfDaysForFirstWeek( sal_Int16 nDays )
     }
     catch (const Exception& e)
     {
-#ifdef DBG_UTIL
-        rtl::OStringBuffer aMsg("setMinimumNumberOfDaysForFirstWeek: Exception caught\n");
-        aMsg.append(rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8));
-        DBG_ERRORFILE(aMsg.getStr());
-#else
-        (void)e;
-#endif
+        SAL_INFO( "unotools.l18n", "setMinimumNumberOfDaysForFirstWeek: Exception caught " << e.Message );
     }
 }
 
@@ -469,13 +370,7 @@ sal_Int16 CalendarWrapper::getNumberOfMonthsInYear() const
     }
     catch (const Exception& e)
     {
-#ifdef DBG_UTIL
-        rtl::OStringBuffer aMsg("getNumberOfMonthsInYear: Exception caught\n");
-        aMsg.append(rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8));
-        DBG_ERRORFILE(aMsg.getStr());
-#else
-        (void)e;
-#endif
+        SAL_INFO( "unotools.l18n", "getNumberOfMonthsInYear: Exception caught " << e.Message );
     }
     return 0;
 }
@@ -490,13 +385,7 @@ sal_Int16 CalendarWrapper::getNumberOfDaysInWeek() const
     }
     catch (const Exception& e)
     {
-#ifdef DBG_UTIL
-        rtl::OStringBuffer aMsg("getNumberOfDaysInWeek: Exception caught\n");
-        aMsg.append(rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8));
-        DBG_ERRORFILE(aMsg.getStr());
-#else
-        (void)e;
-#endif
+        SAL_INFO( "unotools.l18n", "getNumberOfDaysInWeek: Exception caught " << e.Message );
     }
     return 0;
 }
@@ -511,13 +400,7 @@ sal_Int16 CalendarWrapper::getNumberOfDaysInWeek() const
     }
     catch (const Exception& e)
     {
-#ifdef DBG_UTIL
-        rtl::OStringBuffer aMsg("getMonths: Exception caught\n");
-        aMsg.append(rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8));
-        DBG_ERRORFILE(aMsg.getStr());
-#else
-        (void)e;
-#endif
+        SAL_INFO( "unotools.l18n", "getMonths: Exception caught " << e.Message );
     }
     return ::com::sun::star::uno::Sequence< ::com::sun::star::i18n::CalendarItem2 > (0);
 }
@@ -532,13 +415,7 @@ sal_Int16 CalendarWrapper::getNumberOfDaysInWeek() const
     }
     catch (const Exception& e)
     {
-#ifdef DBG_UTIL
-        rtl::OStringBuffer aMsg("getDays: Exception caught\n");
-        aMsg.append(rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8));
-        DBG_ERRORFILE(aMsg.getStr());
-#else
-        (void)e;
-#endif
+        SAL_INFO( "unotools.l18n", "getDays: Exception caught " << e.Message );
     }
     return ::com::sun::star::uno::Sequence< ::com::sun::star::i18n::CalendarItem2 > (0);
 }
@@ -553,13 +430,7 @@ String CalendarWrapper::getDisplayName( sal_Int16 nCalendarDisplayIndex, sal_Int
     }
     catch (const Exception& e)
     {
-#ifdef DBG_UTIL
-        rtl::OStringBuffer aMsg("getDisplayName: Exception caught\n");
-        aMsg.append(rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8));
-        DBG_ERRORFILE(aMsg.getStr());
-#else
-        (void)e;
-#endif
+        SAL_INFO( "unotools.l18n", "getDisplayName: Exception caught " << e.Message );
     }
     return String();
 }
@@ -576,13 +447,7 @@ String CalendarWrapper::getDisplayString( sal_Int32 nCalendarDisplayCode, sal_In
     }
     catch (const Exception& e)
     {
-#ifdef DBG_UTIL
-        rtl::OStringBuffer aMsg("getDisplayString: Exception caught\n");
-        aMsg.append(rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8));
-        DBG_ERRORFILE(aMsg.getStr());
-#else
-        (void)e;
-#endif
+        SAL_INFO( "unotools.l18n", "getDisplayString: Exception caught " << e.Message );
     }
     return String();
 }
@@ -599,13 +464,7 @@ String CalendarWrapper::getDisplayString( sal_Int32 nCalendarDisplayCode, sal_In
     }
     catch (const Exception& e)
     {
-#ifdef DBG_UTIL
-        rtl::OStringBuffer aMsg( "getLoadedCalendar2: Exception caught\n" );
-        aMsg.append(rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8));
-        DBG_ERRORFILE(aMsg.getStr());
-#else
-        (void)e;
-#endif
+        SAL_INFO( "unotools.l18n", "getLoadedCalendar2: Exception caught " << e.Message );
     }
     return ::com::sun::star::i18n::Calendar2();
 }
@@ -620,13 +479,7 @@ String CalendarWrapper::getDisplayString( sal_Int32 nCalendarDisplayCode, sal_In
     }
     catch (const Exception& e)
     {
-#ifdef DBG_UTIL
-        rtl::OStringBuffer aMsg("getGenitiveMonths: Exception caught\n");
-        aMsg.append(rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8));
-        DBG_ERRORFILE(aMsg.getStr());
-#else
-        (void)e;
-#endif
+        SAL_INFO( "unotools.l18n", "getGenitiveMonths: Exception caught " << e.Message );
     }
     return ::com::sun::star::uno::Sequence< ::com::sun::star::i18n::CalendarItem2 > (0);
 }
@@ -641,13 +494,7 @@ String CalendarWrapper::getDisplayString( sal_Int32 nCalendarDisplayCode, sal_In
     }
     catch (const Exception& e)
     {
-#ifdef DBG_UTIL
-        rtl::OStringBuffer aMsg("getPartitiveMonths: Exception caught\n");
-        aMsg.append(rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8));
-        DBG_ERRORFILE(aMsg.getStr());
-#else
-        (void)e;
-#endif
+        SAL_INFO( "unotools.l18n", "getPartitiveMonths: Exception caught " << e.Message );
     }
     return ::com::sun::star::uno::Sequence< ::com::sun::star::i18n::CalendarItem2 > (0);
 }
diff --git a/unotools/source/i18n/charclass.cxx b/unotools/source/i18n/charclass.cxx
index c169a6614b6a..6795a2e8b32a 100644
--- a/unotools/source/i18n/charclass.cxx
+++ b/unotools/source/i18n/charclass.cxx
@@ -131,7 +131,7 @@ sal_Bool CharClass::isAlpha( const String& rStr, xub_StrLen nPos ) const
     }
     catch ( const Exception& )
     {
-        DBG_ERRORFILE( "isAlpha: Exception caught!" );
+        SAL_INFO( "unotools", "isAlpha: Exception caught!" );
         return sal_False;
     }
 }
@@ -154,7 +154,7 @@ sal_Bool CharClass::isLetter( const String& rStr, xub_StrLen nPos ) const
     }
     catch ( const Exception& )
     {
-        DBG_ERRORFILE( "isLetter: Exception caught!" );
+        SAL_INFO( "unotools", "isLetter: Exception caught!" );
         return sal_False;
     }
 }
@@ -171,7 +171,7 @@ sal_Bool CharClass::isLetter( const String& rStr ) const
     }
     catch ( const Exception& )
     {
-        DBG_ERRORFILE( "isLetter: Exception caught!" );
+        SAL_INFO( "unotools", "isLetter: Exception caught!" );
         return sal_False;
     }
 }
@@ -193,7 +193,7 @@ sal_Bool CharClass::isDigit( const String& rStr, xub_StrLen nPos ) const
     }
     catch ( const Exception& )
     {
-        DBG_ERRORFILE( "isDigit: Exception caught!" );
+        SAL_INFO( "unotools", "isDigit: Exception caught!" );
         return sal_False;
     }
 }
@@ -210,7 +210,7 @@ sal_Bool CharClass::isNumeric( const String& rStr ) const
     }
     catch ( const Exception& )
     {
-        DBG_ERRORFILE( "isNumeric: Exception caught!" );
+        SAL_INFO( "unotools", "isNumeric: Exception caught!" );
         return sal_False;
     }
 }
@@ -232,7 +232,7 @@ sal_Bool CharClass::isAlphaNumeric( const String& rStr, xub_StrLen nPos ) const
     }
     catch ( const Exception& )
     {
-        DBG_ERRORFILE( "isAlphaNumeric: Exception caught!" );
+        SAL_INFO( "unotools", "isAlphaNumeric: Exception caught!" );
         return sal_False;
     }
 }
@@ -254,7 +254,7 @@ sal_Bool CharClass::isLetterNumeric( const String& rStr, xub_StrLen nPos ) const
     }
     catch ( const Exception& )
     {
-        DBG_ERRORFILE( "isLetterNumeric: Exception caught!" );
+        SAL_INFO( "unotools", "isLetterNumeric: Exception caught!" );
         return sal_False;
     }
 }
@@ -271,7 +271,7 @@ sal_Bool CharClass::isLetterNumeric( const String& rStr ) const
     }
     catch ( const Exception& )
     {
-        DBG_ERRORFILE( "isLetterNumeric: Exception caught!" );
+        SAL_INFO( "unotools", "isLetterNumeric: Exception caught!" );
         return sal_False;
     }
 }
@@ -287,7 +287,7 @@ rtl::OUString CharClass::titlecase(const rtl::OUString& rStr, sal_Int32 nPos, sa
     }
     catch ( const Exception& )
     {
-        DBG_ERRORFILE( "titlecase: Exception caught!" );
+        SAL_INFO( "unotools", "titlecase: Exception caught!" );
         return rStr.copy( nPos, nCount );
     }
 }
@@ -303,7 +303,7 @@ rtl::OUString CharClass::titlecase(const rtl::OUString& rStr, sal_Int32 nPos, sa
     }
     catch ( const Exception& )
     {
-        DBG_ERRORFILE( "uppercase: Exception caught!" );
+        SAL_INFO( "unotools", "uppercase: Exception caught!" );
         return rStr.copy( nPos, nCount );
     }
 }
@@ -319,7 +319,7 @@ rtl::OUString CharClass::titlecase(const rtl::OUString& rStr, sal_Int32 nPos, sa
     }
     catch ( const Exception& )
     {
-        DBG_ERRORFILE( "lowercase: Exception caught!" );
+        SAL_INFO( "unotools", "lowercase: Exception caught!" );
         return rStr.copy( nPos, nCount );
     }
 }
@@ -335,7 +335,7 @@ sal_Int16 CharClass::getType( const String& rStr, xub_StrLen nPos ) const
     }
     catch ( const Exception& )
     {
-        DBG_ERRORFILE( "getType: Exception caught!" );
+        SAL_INFO( "unotools", "getType: Exception caught!" );
         return 0;
     }
 }
@@ -352,7 +352,7 @@ sal_Int16 CharClass::getCharacterDirection( const String& rStr, xub_StrLen nPos
     }
     catch ( const Exception& )
     {
-        DBG_ERRORFILE( "getCharacterDirection: Exception caught!" );
+        SAL_INFO( "unotools", "getCharacterDirection: Exception caught!" );
         return 0;
     }
 }
@@ -369,7 +369,7 @@ sal_Int16 CharClass::getScript( const String& rStr, xub_StrLen nPos ) const
     }
     catch ( const Exception& )
     {
-        DBG_ERRORFILE( "getScript: Exception caught!" );
+        SAL_INFO( "unotools", "getScript: Exception caught!" );
         return 0;
     }
 }
@@ -386,7 +386,7 @@ sal_Int32 CharClass::getCharacterType( const String& rStr, xub_StrLen nPos ) con
     }
     catch ( const Exception& )
     {
-        DBG_ERRORFILE( "getCharacterType: Exception caught!" );
+        SAL_INFO( "unotools", "getCharacterType: Exception caught!" );
         return 0;
     }
 }
@@ -403,7 +403,7 @@ sal_Int32 CharClass::getStringType( const String& rStr, xub_StrLen nPos, xub_Str
     }
     catch ( const Exception& )
     {
-        DBG_ERRORFILE( "getStringType: Exception caught!" );
+        SAL_INFO( "unotools", "getStringType: Exception caught!" );
         return 0;
     }
 }
@@ -428,13 +428,7 @@ sal_Int32 CharClass::getStringType( const String& rStr, xub_StrLen nPos, xub_Str
     }
     catch ( const Exception& e )
     {
-#ifdef DBG_UTIL
-        rtl::OStringBuffer aMsg("parseAnyToken: Exception caught\n");
-        aMsg.append(rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8));
-        DBG_ERRORFILE(aMsg.getStr());
-#else
-        (void)e;
-#endif
+        SAL_INFO( "unotools.l18n", "parseAnyToken: Exception caught " << e.Message );
         return ParseResult();
     }
 }
@@ -460,13 +454,7 @@ sal_Int32 CharClass::getStringType( const String& rStr, xub_StrLen nPos, xub_Str
     }
     catch ( const Exception& e )
     {
-#ifdef DBG_UTIL
-        rtl::OStringBuffer aMsg("parsePredefinedToken: Exception caught\n");
-        aMsg.append(rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8));
-        DBG_ERRORFILE(aMsg.getStr());
-#else
-        (void)e;
-#endif
+        SAL_INFO( "unotools.l18n", "parsePredefinedToken: Exception caught " << e.Message );
         return ParseResult();
     }
 }
diff --git a/unotools/source/i18n/collatorwrapper.cxx b/unotools/source/i18n/collatorwrapper.cxx
index 6c59d438152c..09f12bdb63a2 100644
--- a/unotools/source/i18n/collatorwrapper.cxx
+++ b/unotools/source/i18n/collatorwrapper.cxx
@@ -57,7 +57,7 @@ CollatorWrapper::compareString (const ::rtl::OUString& s1, const ::rtl::OUString
     }
     catch (const uno::RuntimeException&)
     {
-        DBG_ERRORFILE ("CollatorWrapper: compareString failed");
+        SAL_INFO( "unotools","CollatorWrapper: compareString failed");
     }
 
     return 0;
@@ -73,7 +73,7 @@ CollatorWrapper::listCollatorAlgorithms (const lang::Locale& rLocale) const
     }
     catch (const uno::RuntimeException&)
     {
-        DBG_ERRORFILE ("CollatorWrapper: listCollatorAlgorithms failed");
+        SAL_INFO( "unotools","CollatorWrapper: listCollatorAlgorithms failed");
     }
 
     return uno::Sequence< ::rtl::OUString > ();
@@ -89,7 +89,7 @@ CollatorWrapper::loadDefaultCollator (const lang::Locale& rLocale, sal_Int32 nOp
     }
     catch (const uno::RuntimeException&)
     {
-        DBG_ERRORFILE ("CollatorWrapper: loadDefaultCollator failed");
+        SAL_INFO( "unotools","CollatorWrapper: loadDefaultCollator failed");
     }
 
     return 0;
@@ -107,7 +107,7 @@ CollatorWrapper::loadCollatorAlgorithm (const ::rtl::OUString& rAlgorithm,
     }
     catch (const uno::RuntimeException&)
     {
-        DBG_ERRORFILE ("CollatorWrapper: loadCollatorAlgorithm failed");
+        SAL_INFO( "unotools","CollatorWrapper: loadCollatorAlgorithm failed");
     }
 
     return 0;
diff --git a/unotools/source/i18n/instance.hxx b/unotools/source/i18n/instance.hxx
index da9e172c7cdd..58ab1cb400ca 100644
--- a/unotools/source/i18n/instance.hxx
+++ b/unotools/source/i18n/instance.hxx
@@ -30,6 +30,7 @@
 
 #include <comphelper/processfactory.hxx>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#include <rtl/oustringostreaminserter.hxx>
 #include <rtl/strbuf.hxx>
 
 // ugly but so is this namespacing evil.
@@ -47,20 +48,13 @@ inline css::uno::Reference<css::uno::XInterface>
     try
     {
         if (!xSMgr.is())
-	    xSMgr = ::comphelper::getProcessServiceFactory();
+            xSMgr = ::comphelper::getProcessServiceFactory();
         xRet = xSMgr->createInstance( rtl::OUString::createFromAscii( serviceName ) );
     }
     catch (const css::uno::Exception &e)
     {
-#ifdef DBG_UTIL
-        rtl::OStringBuffer aMsg( context );
-	aMsg.append(RTL_CONSTASCII_STRINGPARAM("ctor: Exception caught\n"));
-	aMsg.append(rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8));
-	DBG_ERRORFILE(aMsg.getStr());
-#else
-	(void)e; (void)context;
-#endif
-	xRet = css::uno::Reference<css::uno::XInterface>();
+        SAL_INFO( "unotools.l18n", context << "ctor:Exception caught " << e.Message );
+        xRet = css::uno::Reference<css::uno::XInterface>();
     }
     return xRet;
 }
diff --git a/unotools/source/i18n/localedatawrapper.cxx b/unotools/source/i18n/localedatawrapper.cxx
index 704415d84aac..33176902ce62 100644
--- a/unotools/source/i18n/localedatawrapper.cxx
+++ b/unotools/source/i18n/localedatawrapper.cxx
@@ -147,13 +147,7 @@ void LocaleDataWrapper::invalidateData()
     }
     catch (const Exception& e)
     {
-#ifdef DBG_UTIL
-        rtl::OStringBuffer aMsg( "getLanguageCountryInfo: Exception caught\n");
-        aMsg.append(rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8));
-        DBG_ERRORFILE(aMsg.getStr());
-#else
-        (void)e;
-#endif
+        SAL_INFO( "unotools.i18n", "getLanguageCountryInfo: Exception caught " << e.Message );
     }
     return ::com::sun::star::i18n::LanguageCountryInfo();
 }
@@ -168,13 +162,7 @@ void LocaleDataWrapper::invalidateData()
     }
     catch (const Exception& e)
     {
-#ifdef DBG_UTIL
-        rtl::OStringBuffer aMsg("getLocaleItem: Exception caught\n");
-        aMsg.append(rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8));
-        DBG_ERRORFILE(aMsg.getStr());
-#else
-        (void)e;
-#endif
+        SAL_INFO( "unotools.l18n", "getLocaleItem: Exception caught " << e.Message );
     }
     return ::com::sun::star::i18n::LocaleDataItem();
 }
@@ -189,13 +177,7 @@ void LocaleDataWrapper::invalidateData()
     }
     catch (const Exception& e)
     {
-#ifdef DBG_UTIL
-        rtl::OStringBuffer aMsg("getAllCurrencies: Exception caught\n");
-        aMsg.append(rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8));
-        DBG_ERRORFILE(aMsg.getStr());
-#else
-        (void)e;
-#endif
+        SAL_INFO( "unotools.l18n", "getAllCurrencies: Exception caught " << e.Message );
     }
     return ::com::sun::star::uno::Sequence< ::com::sun::star::i18n::Currency2 >(0);
 }
@@ -210,13 +192,7 @@ void LocaleDataWrapper::invalidateData()
     }
     catch (const Exception& e)
     {
-#ifdef DBG_UTIL
-        rtl::OStringBuffer aMsg("getAllFormats: Exception caught\n");
-        aMsg.append(rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8));
-        DBG_ERRORFILE(aMsg.getStr());
-#else
-        (void)e;
-#endif
+        SAL_INFO( "unotools.l18n", "getAllFormats: Exception caught " << e.Message );
     }
     return ::com::sun::star::uno::Sequence< ::com::sun::star::i18n::FormatElement >(0);
 }
@@ -231,13 +207,7 @@ void LocaleDataWrapper::invalidateData()
     }
     catch (const Exception& e)
     {
-#ifdef DBG_UTIL
-        rtl::OStringBuffer aMsg("getCollatorImplementations: Exception caught\n");
-        aMsg.append(rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8));
-        DBG_ERRORFILE(aMsg.getStr());
-#else
-        (void)e;
-#endif
+        SAL_INFO( "unotools.l18n", "getCollatorImplementations: Exception caught " << e.Message );
     }
     return ::com::sun::star::uno::Sequence< ::com::sun::star::i18n::Implementation >(0);
 }
@@ -252,13 +222,7 @@ void LocaleDataWrapper::invalidateData()
     }
     catch (const Exception& e)
     {
-#ifdef DBG_UTIL
-        rtl::OStringBuffer aMsg("getTransliterations: Exception caught\n");
-        aMsg.append(rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8));
-        DBG_ERRORFILE(aMsg.getStr());
-#else
-        (void)e;
-#endif
+        SAL_INFO( "unotools.l18n", "getTransliterations: Exception caught " << e.Message );
     }
     return ::com::sun::star::uno::Sequence< ::rtl::OUString >(0);
 }
@@ -273,13 +237,7 @@ void LocaleDataWrapper::invalidateData()
     }
     catch (const Exception& e)
     {
-#ifdef DBG_UTIL
-        rtl::OStringBuffer aMsg("getForbiddenCharacters: Exception caught\n");
-        aMsg.append(rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8));
-        DBG_ERRORFILE(aMsg.getStr());
-#else
-        (void)e;
-#endif
+        SAL_INFO( "unotools.l18n", "getForbiddenCharacters: Exception caught " << e.Message );
     }
     return ::com::sun::star::i18n::ForbiddenCharacters();
 }
@@ -294,13 +252,7 @@ void LocaleDataWrapper::invalidateData()
     }
     catch ( const Exception& e )
     {
-#ifdef DBG_UTIL
-        rtl::OStringBuffer aMsg("getReservedWord: Exception caught\n");
-        aMsg.append(rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8));
-        DBG_ERRORFILE(aMsg.getStr());
-#else
-        (void)e;
-#endif
+        SAL_INFO( "unotools.l18n", "getReservedWord: Exception caught " << e.Message );
     }
     return ::com::sun::star::uno::Sequence< ::rtl::OUString >(0);
 }
@@ -320,13 +272,7 @@ void LocaleDataWrapper::invalidateData()
     }
     catch ( const Exception& e )
     {
-#ifdef DBG_UTIL
-        rtl::OStringBuffer aMsg("getAllInstalledLocaleNames: Exception caught\n");
-        aMsg.append(rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8));
-        DBG_ERRORFILE(aMsg.getStr());
-#else
-        (void)e;
-#endif
+        SAL_INFO( "unotools.l18n", "getAllInstalledLocaleNames: Exception caught " << e.Message );
     }
     return rInstalledLocales;
 }
@@ -458,7 +404,7 @@ const String& LocaleDataWrapper::getOneLocaleItem( sal_Int16 nItem ) const
     ::utl::ReadWriteGuard aGuard( aMutex );
     if ( nItem >= LocaleItem::COUNT )
     {
-        DBG_ERRORFILE( "getOneLocaleItem: bounds" );
+        SAL_INFO( "unotools", "getOneLocaleItem: bounds" );
         return aLocaleItem[0];
     }
     if ( aLocaleItem[nItem].Len() == 0 )
@@ -531,7 +477,7 @@ void LocaleDataWrapper::getOneLocaleItemImpl( sal_Int16 nItem )
             aLocaleItem[nItem] = aLocaleDataItem.LongDateYearSeparator;
         break;
         default:
-            DBG_ERRORFILE( "getOneLocaleItemImpl: which one?" );
+            SAL_INFO( "unotools", "getOneLocaleItemImpl: which one?" );
     }
 }
 
@@ -554,7 +500,7 @@ const String& LocaleDataWrapper::getOneReservedWord( sal_Int16 nWord ) const
     ::utl::ReadWriteGuard aGuard( aMutex );
     if ( nWord < 0 || nWord >= reservedWords::COUNT )
     {
-        DBG_ERRORFILE( "getOneReservedWord: bounds" );
+        SAL_INFO( "unotools", "getOneReservedWord: bounds" );
         nWord = reservedWords::FALSE_WORD;
     }
     if ( aReservedWord[nWord].Len() == 0 )
@@ -1939,13 +1885,7 @@ void LocaleDataWrapper::evaluateLocaleDataChecking()
     }
     catch (const Exception& e)
     {
-#ifdef DBG_UTIL
-        rtl::OStringBuffer aMsg("getAllCalendars: Exception caught\n");
-        aMsg.append(rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8));
-        DBG_ERRORFILE(aMsg.getStr());
-#else
-        (void)e;
-#endif
+        SAL_INFO( "unotools.l18n", "getAllCalendars: Exception caught " << e.Message );
     }
     return ::com::sun::star::uno::Sequence< ::com::sun::star::i18n::Calendar2 >(0);
 }
diff --git a/unotools/source/i18n/nativenumberwrapper.cxx b/unotools/source/i18n/nativenumberwrapper.cxx
index 9f831fd4e5de..ac76f2d5e170 100644
--- a/unotools/source/i18n/nativenumberwrapper.cxx
+++ b/unotools/source/i18n/nativenumberwrapper.cxx
@@ -64,7 +64,7 @@ NativeNumberWrapper::getNativeNumberString(
     }
     catch ( const uno::Exception& )
     {
-        DBG_ERRORFILE( "getNativeNumberString: Exception caught!" );
+        SAL_INFO( "unotools", "getNativeNumberString: Exception caught!" );
     }
     return ::rtl::OUString();
 }
@@ -82,7 +82,7 @@ NativeNumberWrapper::isValidNatNum(
     }
     catch ( const uno::Exception& )
     {
-        DBG_ERRORFILE( "isValidNatNum: Exception caught!" );
+        SAL_INFO( "unotools", "isValidNatNum: Exception caught!" );
     }
     return sal_False;
 }
@@ -100,7 +100,7 @@ NativeNumberWrapper::convertToXmlAttributes(
     }
     catch ( const uno::Exception& )
     {
-        DBG_ERRORFILE( "convertToXmlAttributes: Exception caught!" );
+        SAL_INFO( "unotools", "convertToXmlAttributes: Exception caught!" );
     }
     return i18n::NativeNumberXmlAttributes();
 }
@@ -117,7 +117,7 @@ NativeNumberWrapper::convertFromXmlAttributes(
     }
     catch ( const uno::Exception& )
     {
-        DBG_ERRORFILE( "convertFromXmlAttributes: Exception caught!" );
+        SAL_INFO( "unotools", "convertFromXmlAttributes: Exception caught!" );
     }
     return 0;
 }
diff --git a/unotools/source/i18n/numberformatcodewrapper.cxx b/unotools/source/i18n/numberformatcodewrapper.cxx
index 418337e301f1..a67a7aa750cc 100644
--- a/unotools/source/i18n/numberformatcodewrapper.cxx
+++ b/unotools/source/i18n/numberformatcodewrapper.cxx
@@ -72,7 +72,7 @@ NumberFormatCodeWrapper::getDefault( sal_Int16 formatType, sal_Int16 formatUsage
     }
     catch ( const Exception& e )
     {
-        DBG_ERRORFILE( "getDefault: Exception caught!" );
+        SAL_INFO( "unotools", "getDefault: Exception caught!" );
     }
     return ::com::sun::star::i18n::NumberFormatCode();
 }
@@ -88,7 +88,7 @@ NumberFormatCodeWrapper::getFormatCode( sal_Int16 formatIndex ) const
     }
     catch ( const Exception& e )
     {
-        DBG_ERRORFILE( "getFormatCode: Exception caught!" );
+        SAL_INFO( "unotools", "getFormatCode: Exception caught!" );
     }
     return ::com::sun::star::i18n::NumberFormatCode();
 }
@@ -104,7 +104,7 @@ NumberFormatCodeWrapper::getAllFormatCode( sal_Int16 formatUsage ) const
     }
     catch ( const Exception& e )
     {
-        DBG_ERRORFILE( "getAllFormatCode: Exception caught!" );
+        SAL_INFO( "unotools", "getAllFormatCode: Exception caught!" );
     }
     return ::com::sun::star::uno::Sequence< ::com::sun::star::i18n::NumberFormatCode > (0);
 }
@@ -120,7 +120,7 @@ NumberFormatCodeWrapper::getAllFormatCodes() const
     }
     catch ( const Exception& e )
     {
-        DBG_ERRORFILE( "getAllFormatCodes: Exception caught!" );
+        SAL_INFO( "unotools", "getAllFormatCodes: Exception caught!" );
     }
     return ::com::sun::star::uno::Sequence< ::com::sun::star::i18n::NumberFormatCode > (0);
 }
diff --git a/unotools/source/i18n/textsearch.cxx b/unotools/source/i18n/textsearch.cxx
index 8b9b5f38c9dc..19fe451f43a0 100644
--- a/unotools/source/i18n/textsearch.cxx
+++ b/unotools/source/i18n/textsearch.cxx
@@ -27,7 +27,6 @@
  ************************************************************************/
 
 #include <i18npool/mslangid.hxx>
-#include <tools/debug.hxx>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/util/SearchFlags.hdl>
 #include <com/sun/star/i18n/TransliterationModules.hpp>
@@ -133,7 +132,7 @@ Reference<XTextSearch> TextSearch::getXTextSearch( const SearchOptions& rPara )
     }
     catch ( Exception& )
     {
-        DBG_ERRORFILE( "TextSearch ctor: Exception caught!" );
+        SAL_INFO( "unotools", "TextSearch ctor: Exception caught!" );
     }
     return rCache.xTextSearch;
 }
@@ -253,7 +252,7 @@ int TextSearch::SearchFrwrd( const String & rStr, xub_StrLen* pStart,
     }
     catch ( Exception& )
     {
-        DBG_ERRORFILE( "SearchForward: Exception caught!" );
+        SAL_INFO( "unotools", "SearchForward: Exception caught!" );
     }
     return nRet;
 }
@@ -284,7 +283,7 @@ int TextSearch::SearchBkwrd( const String & rStr, xub_StrLen* pStart,
     }
     catch ( Exception& )
     {
-        DBG_ERRORFILE( "SearchBackward: Exception caught!" );
+        SAL_INFO( "unotools", "SearchBackward: Exception caught!" );
     }
     return nRet;
 }
diff --git a/unotools/source/i18n/transliterationwrapper.cxx b/unotools/source/i18n/transliterationwrapper.cxx
index 06030ce26616..5e3d84ce9209 100644
--- a/unotools/source/i18n/transliterationwrapper.cxx
+++ b/unotools/source/i18n/transliterationwrapper.cxx
@@ -75,7 +75,7 @@ String TransliterationWrapper::transliterate(
         }
         catch( Exception&  )
         {
-            DBG_ERRORFILE( "transliterate: Exception caught!" );
+            SAL_INFO( "unotools", "transliterate: Exception caught!" );
         }
     }
     return sRet;
@@ -99,7 +99,7 @@ String TransliterationWrapper::transliterate(
         }
         catch( Exception&  )
         {
-            DBG_ERRORFILE( "transliterate: Exception caught!" );
+            SAL_INFO( "unotools", "transliterate: Exception caught!" );
         }
     }
     return sRet;
@@ -171,13 +171,7 @@ void TransliterationWrapper::loadModuleImpl() const
     }
     catch ( const Exception& e )
     {
-#ifdef DBG_UTIL
-        rtl::OStringBuffer aMsg("loadModuleImpl: Exception caught\n");
-        aMsg.append(rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8));
-        DBG_ERRORFILE(aMsg.getStr());
-#else
-        (void)e;
-#endif
+        SAL_INFO( "unotools.i18n", "loadModuleImpl: Exception caught " << e.Message );
     }
 
     bFirstCall = sal_False;
@@ -198,13 +192,7 @@ void TransliterationWrapper::loadModuleByImplName(
     }
     catch ( const Exception& e )
     {
-#ifdef DBG_UTIL
-        rtl::OStringBuffer aMsg("loadModuleByImplName: Exception caught\n");
-        aMsg.append(rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8));
-        DBG_ERRORFILE(aMsg.getStr());
-#else
-        (void)e;
-#endif
+        SAL_INFO( "unotools.i18n", "loadModuleByImplName: Exception caught " << e.Message );
     }
 
     bFirstCall = sal_False;
@@ -224,13 +212,7 @@ sal_Bool TransliterationWrapper::equals(
     }
     catch ( const Exception& e )
     {
-#ifdef DBG_UTIL
-        rtl::OStringBuffer aMsg("equals: Exception caught\n");
-        aMsg.append(rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8));
-        DBG_ERRORFILE(aMsg.getStr());
-#else
-        (void)e;
-#endif
+        SAL_INFO( "unotools.i18n", "equals: Exception caught " << e.Message );
     }
     return sal_False;
 }
@@ -249,13 +231,7 @@ sal_Int32 TransliterationWrapper::compareSubstring(
     }
     catch (const Exception& e)
     {
-#ifdef DBG_UTIL
-        rtl::OStringBuffer aMsg("compareSubstring: Exception caught\n");
-        aMsg.append(rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8));
-        DBG_ERRORFILE(aMsg.getStr());
-#else
-        (void)e;
-#endif
+        SAL_INFO( "unotools.i18n", "compareSubstring: Exception caught " << e.Message );
     }
     return 0;
 }
@@ -272,13 +248,7 @@ sal_Int32 TransliterationWrapper::compareString( const String& rStr1, const Stri
     }
     catch (const Exception& e)
     {
-#ifdef DBG_UTIL
-        rtl::OStringBuffer aMsg("compareString: Exception caught\n");
-        aMsg.append(rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8));
-        DBG_ERRORFILE(aMsg.getStr());
-#else
-        (void)e;
-#endif
+        SAL_INFO( "unotools.i18n", "compareString: Exception caught " << e.Message );
     }
     return 0;
 }