[Libreoffice-commits] .: 2 commits - unotools/source
Eike Rathke
erack at kemper.freedesktop.org
Wed Jan 18 05:06:56 PST 2012
unotools/source/i18n/calendarwrapper.cxx | 50 ++++++++++++++---------------
unotools/source/i18n/charclass.cxx | 4 +-
unotools/source/i18n/instance.hxx | 2 -
unotools/source/i18n/localedatawrapper.cxx | 28 ++++++----------
4 files changed, 39 insertions(+), 45 deletions(-)
New commits:
commit 1de8ddb72e6a1bc75f3e70b0024c940098948a4f
Author: Eike Rathke <erack at redhat.com>
Date: Wed Jan 18 14:05:54 2012 +0100
convert one freshly introduced DBG_ERRORFILE to SAL_WARN
diff --git a/unotools/source/i18n/localedatawrapper.cxx b/unotools/source/i18n/localedatawrapper.cxx
index ed95598..2e8ebf7 100644
--- a/unotools/source/i18n/localedatawrapper.cxx
+++ b/unotools/source/i18n/localedatawrapper.cxx
@@ -1900,15 +1900,9 @@ void LocaleDataWrapper::evaluateLocaleDataChecking()
if ( xLD.is() )
return xLD->getDateAcceptancePatterns( getLocale() );
}
- catch ( Exception& e )
+ catch (const Exception& e)
{
-#ifdef DBG_UTIL
- rtl::OStringBuffer aMsg("getDateAcceptancePatterns: Exception caught\n");
- aMsg.append(rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8));
- DBG_ERRORFILE(aMsg.getStr());
-#else
- (void)e;
-#endif
+ SAL_WARN( "unotools.i18n", "getDateAcceptancePatterns: Exception caught " << e.Message );
}
return ::com::sun::star::uno::Sequence< ::rtl::OUString >(0);
}
commit 923934d0f41b5b54c9aa4491958cd1939779902d
Author: Eike Rathke <erack at redhat.com>
Date: Wed Jan 18 14:02:36 2012 +0100
nitpick, it's i18n, not l18n
diff --git a/unotools/source/i18n/calendarwrapper.cxx b/unotools/source/i18n/calendarwrapper.cxx
index 2c82da1..23390f9 100644
--- a/unotools/source/i18n/calendarwrapper.cxx
+++ b/unotools/source/i18n/calendarwrapper.cxx
@@ -70,7 +70,7 @@ void CalendarWrapper::loadDefaultCalendar( const ::com::sun::star::lang::Locale&
}
catch (const Exception& e)
{
- SAL_WARN( "unotools.l18n", "loadDefaultCalendar: Exception caught " << e.Message );
+ SAL_WARN( "unotools.i18n", "loadDefaultCalendar: Exception caught " << e.Message );
}
}
@@ -84,7 +84,7 @@ void CalendarWrapper::loadCalendar( const ::rtl::OUString& rUniqueID, const ::co
}
catch (const Exception& e)
{
- SAL_WARN( "unotools.l18n", "loadCalendar: Exception caught requested: "
+ SAL_WARN( "unotools.i18n", "loadCalendar: Exception caught requested: "
<< rUniqueID << " Locale: " << rLocale.Language << "_" << rLocale.Country << " " << e.Message );
}
}
@@ -99,7 +99,7 @@ void CalendarWrapper::loadCalendar( const ::rtl::OUString& rUniqueID, const ::co
}
catch (const Exception& e)
{
- SAL_WARN( "unotools.l18n", "getAllCalendars: Exception caught " << e.Message );
+ SAL_WARN( "unotools.i18n", "getAllCalendars: Exception caught " << e.Message );
}
return ::com::sun::star::uno::Sequence< ::rtl::OUString > (0);
@@ -115,7 +115,7 @@ void CalendarWrapper::loadCalendar( const ::rtl::OUString& rUniqueID, const ::co
}
catch (const Exception& e)
{
- SAL_WARN( "unotools.l18n", "getUniqueID: Exception caught " << e.Message );
+ SAL_WARN( "unotools.i18n", "getUniqueID: Exception caught " << e.Message );
}
return ::rtl::OUString();
}
@@ -130,7 +130,7 @@ void CalendarWrapper::setDateTime( double nTimeInDays )
}
catch (const Exception& e)
{
- SAL_WARN( "unotools.l18n", "setDateTime: Exception caught " << e.Message );
+ SAL_WARN( "unotools.i18n", "setDateTime: Exception caught " << e.Message );
}
}
@@ -144,7 +144,7 @@ double CalendarWrapper::getDateTime() const
}
catch (const Exception& e)
{
- SAL_WARN( "unotools.l18n", "getDateTime: Exception caught " << e.Message );
+ SAL_WARN( "unotools.i18n", "getDateTime: Exception caught " << e.Message );
}
return 0.0;
}
@@ -168,7 +168,7 @@ sal_Int32 CalendarWrapper::getCombinedOffsetInMillis(
}
catch (const Exception& e)
{
- SAL_WARN( "unotools.l18n", "setLocalDateTime: Exception caught " << e.Message );
+ SAL_WARN( "unotools.i18n", "setLocalDateTime: Exception caught " << e.Message );
}
return nOffset;
}
@@ -234,7 +234,7 @@ void CalendarWrapper::setLocalDateTime( double nTimeInDays )
}
catch (const Exception& e)
{
- SAL_WARN( "unotools.l18n", "setLocalDateTime: Exception caught " << e.Message );
+ SAL_WARN( "unotools.i18n", "setLocalDateTime: Exception caught " << e.Message );
}
}
@@ -254,7 +254,7 @@ double CalendarWrapper::getLocalDateTime() const
}
catch (const Exception& e)
{
- SAL_WARN( "unotools.l18n", "getLocalDateTime: Exception caught " << e.Message );
+ SAL_WARN( "unotools.i18n", "getLocalDateTime: Exception caught " << e.Message );
}
return 0.0;
}
@@ -269,7 +269,7 @@ void CalendarWrapper::setValue( sal_Int16 nFieldIndex, sal_Int16 nValue )
}
catch (const Exception& e)
{
- SAL_WARN( "unotools.l18n", "setValue: Exception caught " << e.Message );
+ SAL_WARN( "unotools.i18n", "setValue: Exception caught " << e.Message );
}
}
@@ -283,7 +283,7 @@ sal_Bool CalendarWrapper::isValid() const
}
catch (const Exception& e)
{
- SAL_WARN( "unotools.l18n", "isValue: Exception caught " << e.Message );
+ SAL_WARN( "unotools.i18n", "isValue: Exception caught " << e.Message );
}
return sal_False;
}
@@ -298,7 +298,7 @@ sal_Int16 CalendarWrapper::getValue( sal_Int16 nFieldIndex ) const
}
catch (const Exception& e)
{
- SAL_WARN( "unotools.l18n", "getValue: Exception caught " << e.Message );
+ SAL_WARN( "unotools.i18n", "getValue: Exception caught " << e.Message );
}
return 0;
}
@@ -313,7 +313,7 @@ void CalendarWrapper::addValue( sal_Int16 nFieldIndex, sal_Int32 nAmount )
}
catch (const Exception& e)
{
- SAL_WARN( "unotools.l18n", "addValue: Exception caught " << e.Message );
+ SAL_WARN( "unotools.i18n", "addValue: Exception caught " << e.Message );
}
}
@@ -327,7 +327,7 @@ sal_Int16 CalendarWrapper::getFirstDayOfWeek() const
}
catch (const Exception& e)
{
- SAL_WARN( "unotools.l18n", "getFirstDayOfWeek: Exception caught " << e.Message );
+ SAL_WARN( "unotools.i18n", "getFirstDayOfWeek: Exception caught " << e.Message );
}
return 0;
}
@@ -342,7 +342,7 @@ void CalendarWrapper::setFirstDayOfWeek( sal_Int16 nDay )
}
catch (const Exception& e)
{
- SAL_WARN( "unotools.l18n", "setFirstDayOfWeek: Exception caught " << e.Message );
+ SAL_WARN( "unotools.i18n", "setFirstDayOfWeek: Exception caught " << e.Message );
}
}
@@ -356,7 +356,7 @@ void CalendarWrapper::setMinimumNumberOfDaysForFirstWeek( sal_Int16 nDays )
}
catch (const Exception& e)
{
- SAL_WARN( "unotools.l18n", "setMinimumNumberOfDaysForFirstWeek: Exception caught " << e.Message );
+ SAL_WARN( "unotools.i18n", "setMinimumNumberOfDaysForFirstWeek: Exception caught " << e.Message );
}
}
@@ -370,7 +370,7 @@ sal_Int16 CalendarWrapper::getNumberOfMonthsInYear() const
}
catch (const Exception& e)
{
- SAL_WARN( "unotools.l18n", "getNumberOfMonthsInYear: Exception caught " << e.Message );
+ SAL_WARN( "unotools.i18n", "getNumberOfMonthsInYear: Exception caught " << e.Message );
}
return 0;
}
@@ -385,7 +385,7 @@ sal_Int16 CalendarWrapper::getNumberOfDaysInWeek() const
}
catch (const Exception& e)
{
- SAL_WARN( "unotools.l18n", "getNumberOfDaysInWeek: Exception caught " << e.Message );
+ SAL_WARN( "unotools.i18n", "getNumberOfDaysInWeek: Exception caught " << e.Message );
}
return 0;
}
@@ -400,7 +400,7 @@ sal_Int16 CalendarWrapper::getNumberOfDaysInWeek() const
}
catch (const Exception& e)
{
- SAL_WARN( "unotools.l18n", "getMonths: Exception caught " << e.Message );
+ SAL_WARN( "unotools.i18n", "getMonths: Exception caught " << e.Message );
}
return ::com::sun::star::uno::Sequence< ::com::sun::star::i18n::CalendarItem2 > (0);
}
@@ -415,7 +415,7 @@ sal_Int16 CalendarWrapper::getNumberOfDaysInWeek() const
}
catch (const Exception& e)
{
- SAL_WARN( "unotools.l18n", "getDays: Exception caught " << e.Message );
+ SAL_WARN( "unotools.i18n", "getDays: Exception caught " << e.Message );
}
return ::com::sun::star::uno::Sequence< ::com::sun::star::i18n::CalendarItem2 > (0);
}
@@ -430,7 +430,7 @@ String CalendarWrapper::getDisplayName( sal_Int16 nCalendarDisplayIndex, sal_Int
}
catch (const Exception& e)
{
- SAL_WARN( "unotools.l18n", "getDisplayName: Exception caught " << e.Message );
+ SAL_WARN( "unotools.i18n", "getDisplayName: Exception caught " << e.Message );
}
return String();
}
@@ -447,7 +447,7 @@ String CalendarWrapper::getDisplayString( sal_Int32 nCalendarDisplayCode, sal_In
}
catch (const Exception& e)
{
- SAL_WARN( "unotools.l18n", "getDisplayString: Exception caught " << e.Message );
+ SAL_WARN( "unotools.i18n", "getDisplayString: Exception caught " << e.Message );
}
return String();
}
@@ -464,7 +464,7 @@ String CalendarWrapper::getDisplayString( sal_Int32 nCalendarDisplayCode, sal_In
}
catch (const Exception& e)
{
- SAL_WARN( "unotools.l18n", "getLoadedCalendar2: Exception caught " << e.Message );
+ SAL_WARN( "unotools.i18n", "getLoadedCalendar2: Exception caught " << e.Message );
}
return ::com::sun::star::i18n::Calendar2();
}
@@ -479,7 +479,7 @@ String CalendarWrapper::getDisplayString( sal_Int32 nCalendarDisplayCode, sal_In
}
catch (const Exception& e)
{
- SAL_WARN( "unotools.l18n", "getGenitiveMonths: Exception caught " << e.Message );
+ SAL_WARN( "unotools.i18n", "getGenitiveMonths: Exception caught " << e.Message );
}
return ::com::sun::star::uno::Sequence< ::com::sun::star::i18n::CalendarItem2 > (0);
}
@@ -494,7 +494,7 @@ String CalendarWrapper::getDisplayString( sal_Int32 nCalendarDisplayCode, sal_In
}
catch (const Exception& e)
{
- SAL_WARN( "unotools.l18n", "getPartitiveMonths: Exception caught " << e.Message );
+ SAL_WARN( "unotools.i18n", "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 b445c12..58af0e5 100644
--- a/unotools/source/i18n/charclass.cxx
+++ b/unotools/source/i18n/charclass.cxx
@@ -428,7 +428,7 @@ sal_Int32 CharClass::getStringType( const String& rStr, xub_StrLen nPos, xub_Str
}
catch ( const Exception& e )
{
- SAL_WARN( "unotools.l18n", "parseAnyToken: Exception caught " << e.Message );
+ SAL_WARN( "unotools.i18n", "parseAnyToken: Exception caught " << e.Message );
return ParseResult();
}
}
@@ -454,7 +454,7 @@ sal_Int32 CharClass::getStringType( const String& rStr, xub_StrLen nPos, xub_Str
}
catch ( const Exception& e )
{
- SAL_WARN( "unotools.l18n", "parsePredefinedToken: Exception caught " << e.Message );
+ SAL_WARN( "unotools.i18n", "parsePredefinedToken: Exception caught " << e.Message );
return ParseResult();
}
}
diff --git a/unotools/source/i18n/instance.hxx b/unotools/source/i18n/instance.hxx
index 2071add..4c18d38 100644
--- a/unotools/source/i18n/instance.hxx
+++ b/unotools/source/i18n/instance.hxx
@@ -53,7 +53,7 @@ inline css::uno::Reference<css::uno::XInterface>
}
catch (const css::uno::Exception &e)
{
- SAL_WARN( "unotools.l18n", context << "ctor:Exception caught " << e.Message );
+ SAL_WARN( "unotools.i18n", 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 316dc15..ed95598 100644
--- a/unotools/source/i18n/localedatawrapper.cxx
+++ b/unotools/source/i18n/localedatawrapper.cxx
@@ -162,7 +162,7 @@ void LocaleDataWrapper::invalidateData()
}
catch (const Exception& e)
{
- SAL_WARN( "unotools.l18n", "getLocaleItem: Exception caught " << e.Message );
+ SAL_WARN( "unotools.i18n", "getLocaleItem: Exception caught " << e.Message );
}
return ::com::sun::star::i18n::LocaleDataItem();
}
@@ -177,7 +177,7 @@ void LocaleDataWrapper::invalidateData()
}
catch (const Exception& e)
{
- SAL_WARN( "unotools.l18n", "getAllCurrencies: Exception caught " << e.Message );
+ SAL_WARN( "unotools.i18n", "getAllCurrencies: Exception caught " << e.Message );
}
return ::com::sun::star::uno::Sequence< ::com::sun::star::i18n::Currency2 >(0);
}
@@ -192,7 +192,7 @@ void LocaleDataWrapper::invalidateData()
}
catch (const Exception& e)
{
- SAL_WARN( "unotools.l18n", "getAllFormats: Exception caught " << e.Message );
+ SAL_WARN( "unotools.i18n", "getAllFormats: Exception caught " << e.Message );
}
return ::com::sun::star::uno::Sequence< ::com::sun::star::i18n::FormatElement >(0);
}
@@ -207,7 +207,7 @@ void LocaleDataWrapper::invalidateData()
}
catch (const Exception& e)
{
- SAL_WARN( "unotools.l18n", "getCollatorImplementations: Exception caught " << e.Message );
+ SAL_WARN( "unotools.i18n", "getCollatorImplementations: Exception caught " << e.Message );
}
return ::com::sun::star::uno::Sequence< ::com::sun::star::i18n::Implementation >(0);
}
@@ -222,7 +222,7 @@ void LocaleDataWrapper::invalidateData()
}
catch (const Exception& e)
{
- SAL_WARN( "unotools.l18n", "getTransliterations: Exception caught " << e.Message );
+ SAL_WARN( "unotools.i18n", "getTransliterations: Exception caught " << e.Message );
}
return ::com::sun::star::uno::Sequence< ::rtl::OUString >(0);
}
@@ -237,7 +237,7 @@ void LocaleDataWrapper::invalidateData()
}
catch (const Exception& e)
{
- SAL_WARN( "unotools.l18n", "getForbiddenCharacters: Exception caught " << e.Message );
+ SAL_WARN( "unotools.i18n", "getForbiddenCharacters: Exception caught " << e.Message );
}
return ::com::sun::star::i18n::ForbiddenCharacters();
}
@@ -252,7 +252,7 @@ void LocaleDataWrapper::invalidateData()
}
catch ( const Exception& e )
{
- SAL_WARN( "unotools.l18n", "getReservedWord: Exception caught " << e.Message );
+ SAL_WARN( "unotools.i18n", "getReservedWord: Exception caught " << e.Message );
}
return ::com::sun::star::uno::Sequence< ::rtl::OUString >(0);
}
@@ -272,7 +272,7 @@ void LocaleDataWrapper::invalidateData()
}
catch ( const Exception& e )
{
- SAL_WARN( "unotools.l18n", "getAllInstalledLocaleNames: Exception caught " << e.Message );
+ SAL_WARN( "unotools.i18n", "getAllInstalledLocaleNames: Exception caught " << e.Message );
}
return rInstalledLocales;
}
@@ -1885,7 +1885,7 @@ void LocaleDataWrapper::evaluateLocaleDataChecking()
}
catch (const Exception& e)
{
- SAL_WARN( "unotools.l18n", "getAllCalendars: Exception caught " << e.Message );
+ SAL_WARN( "unotools.i18n", "getAllCalendars: Exception caught " << e.Message );
}
return ::com::sun::star::uno::Sequence< ::com::sun::star::i18n::Calendar2 >(0);
}
More information about the Libreoffice-commits
mailing list