Hello lo-devs,
Eike Rathke asked me via IRC if I could replace the SAL_INFO calls with
SAL_WARN calls in the previous patch. The attached patches contain the
requested change.
regards
Marcel Metz
From e3c8dc11ca41a332a0b633c425d787ae49dc0dbc Mon Sep 17 00:00:00 2001
Message-Id: <e3c8dc11ca41a332a0b633c425d787ae49dc0dbc.1326807952.git.mmetz@adrian-broher.net>
From: Marcel Metz <mmetz@adrian-broher.net>
Date: Mon, 16 Jan 2012 18:03:17 +0100
Subject: [PATCH 1/7] Replaced SAL_INFO with SAL_WARN were applicable.
To: libreoffice@lists.freedesktop.org
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="------------true"
This is a multi-part message in MIME format.
--------------true
Content-Type: text/plain; charset=UTF-8; format=fixed
Content-Transfer-Encoding: 8bit
---
unotools/source/config/defaultoptions.cxx | 8 ++--
unotools/source/config/extendedsecurityoptions.cxx | 2 +-
unotools/source/config/pathoptions.cxx | 2 +-
unotools/source/config/saveopt.cxx | 8 ++--
unotools/source/config/sourceviewconfig.cxx | 2 +-
unotools/source/config/syslocaleoptions.cxx | 12 ++--
unotools/source/config/undoopt.cxx | 2 +-
unotools/source/config/useroptions.cxx | 4 +-
unotools/source/i18n/calendarwrapper.cxx | 50 ++++++++++----------
unotools/source/i18n/charclass.cxx | 36 +++++++-------
unotools/source/i18n/collatorwrapper.cxx | 8 ++--
unotools/source/i18n/instance.hxx | 2 +-
unotools/source/i18n/localedatawrapper.cxx | 26 +++++-----
unotools/source/i18n/nativenumberwrapper.cxx | 8 ++--
unotools/source/i18n/numberformatcodewrapper.cxx | 8 ++--
unotools/source/i18n/textsearch.cxx | 6 +-
unotools/source/i18n/transliterationwrapper.cxx | 14 +++---
17 files changed, 99 insertions(+), 99 deletions(-)
--------------true
Content-Type: text/x-patch; name="0001-Replaced-SAL_INFO-with-SAL_WARN-were-applicable.patch"
Content-Transfer-Encoding: 8bit
Content-Disposition: attachment;
filename="0001-Replaced-SAL_INFO-with-SAL_WARN-were-applicable.patch"
diff --git a/unotools/source/config/defaultoptions.cxx b/unotools/source/config/defaultoptions.cxx
index 735dc35..e37106f 100644
--- a/unotools/source/config/defaultoptions.cxx
+++ b/unotools/source/config/defaultoptions.cxx
@@ -253,7 +253,7 @@ SvtDefaultOptions_Impl::SvtDefaultOptions_Impl() : ConfigItem( ASCII_STR("Office
aFullPath = aPathOpt.SubstituteVariable( aTempStr );
else
{
- SAL_INFO( "unotools.config", "any operator >>= failed" );
+ SAL_WARN( "unotools.config", "any operator >>= failed" );
}
break;
}
@@ -276,14 +276,14 @@ SvtDefaultOptions_Impl::SvtDefaultOptions_Impl() : ConfigItem(
ASCII_STR("Office
}
else
{
- SAL_INFO( "unotools.config", "any operator >>= failed" );
+ SAL_WARN( "unotools.config", "any operator >>= failed" );
}
break;
}
default:
{
- SAL_INFO( "unotools.config", "Wrong any type" );
+ SAL_WARN( "unotools.config", "Wrong any type" );
}
}
@@ -313,7 +313,7 @@ SvtDefaultOptions_Impl::SvtDefaultOptions_Impl() : ConfigItem( ASCII_STR("Office
case DEFAULTPATH__USERDICTIONARY: m_aUserDictionaryPath = String( aFullPath
);break;
default:
- SAL_INFO( "unotools.config", "invalid index to load a default path" );
+ SAL_WARN( "unotools.config", "invalid index to load a default path" );
}
}
}
diff --git a/unotools/source/config/extendedsecurityoptions.cxx
b/unotools/source/config/extendedsecurityoptions.cxx
index f29a305..bdc39f3 100644
--- a/unotools/source/config/extendedsecurityoptions.cxx
+++ b/unotools/source/config/extendedsecurityoptions.cxx
@@ -284,7 +284,7 @@ void SvtExtendedSecurityOptions_Impl::FillExtensionHashMap( ExtensionHashMap& aH
aHashMap.insert( ExtensionHashMap::value_type( aValue.toAsciiLowerCase(), 1 ) );
else
{
- SAL_INFO( "unotools.config",
"SvtExtendedSecurityOptions_Impl::FillExtensionHashMap(): not string value?" );
+ SAL_WARN( "unotools.config",
"SvtExtendedSecurityOptions_Impl::FillExtensionHashMap(): not string value?" );
}
}
}
diff --git a/unotools/source/config/pathoptions.cxx b/unotools/source/config/pathoptions.cxx
index e8538dd..65300ba 100644
--- a/unotools/source/config/pathoptions.cxx
+++ b/unotools/source/config/pathoptions.cxx
@@ -871,7 +871,7 @@ sal_Bool SvtPathOptions::SearchFile( String& rIniFile, Pathes ePath )
// check parameter: empty inifile name?
if ( !rIniFile.Len() )
{
- SAL_INFO( "unotools.config", "SvtPathOptions::SearchFile(): invalid parameter" );
+ SAL_WARN( "unotools.config", "SvtPathOptions::SearchFile(): invalid parameter" );
return sal_False;
}
diff --git a/unotools/source/config/saveopt.cxx b/unotools/source/config/saveopt.cxx
index 24d7643..ed030a7 100644
--- a/unotools/source/config/saveopt.cxx
+++ b/unotools/source/config/saveopt.cxx
@@ -465,7 +465,7 @@ SvtSaveOptions_Impl::SvtSaveOptions_Impl()
eODFDefaultVersion = SvtSaveOptions::ODFDefaultVersion( nTmp );
}
else {
- SAL_INFO( "unotools.config",
"SvtSaveOptions_Impl::SvtSaveOptions_Impl(): Wrong Type!" );
+ SAL_WARN( "unotools.config",
"SvtSaveOptions_Impl::SvtSaveOptions_Impl(): Wrong Type!" );
};
bROODFDefaultVersion = pROStates[nProp];
break;
@@ -545,7 +545,7 @@ SvtSaveOptions_Impl::SvtSaveOptions_Impl()
break;
default :
- SAL_INFO( "unotools.config", "invalid index to load a path" );
+ SAL_WARN( "unotools.config", "invalid index to load a path" );
}
}
else
@@ -739,7 +739,7 @@ void SvtSaveOptions_Impl::Commit()
break;
default:
- SAL_INFO( "unotools.config", "invalid index to save a path" );
+ SAL_WARN( "unotools.config", "invalid index to save a path" );
}
}
@@ -821,7 +821,7 @@ void SvtLoadOptions_Impl::Commit()
// -----------------------------------------------------------------------
void SvtLoadOptions_Impl::Notify( const Sequence<rtl::OUString>& )
{
- SAL_INFO( "unotools.config", "properties have been changed" );
+ SAL_WARN( "unotools.config", "properties have been changed" );
}
// -----------------------------------------------------------------------
diff --git a/unotools/source/config/sourceviewconfig.cxx
b/unotools/source/config/sourceviewconfig.cxx
index 2c611ea..7f5bdbe 100644
--- a/unotools/source/config/sourceviewconfig.cxx
+++ b/unotools/source/config/sourceviewconfig.cxx
@@ -171,7 +171,7 @@ void SourceViewConfig_Impl::Commit()
case 1: pValues[nProp] <<= m_nFontHeight; break;
case 2: pValues[nProp] <<= m_bProportionalFontOnly; break;
default:
- SAL_INFO( "unotools.config", "invalid index to save a user token" );
+ SAL_WARN( "unotools.config", "invalid index to save a user token" );
}
}
PutProperties( aNames, aValues );
diff --git a/unotools/source/config/syslocaleoptions.cxx
b/unotools/source/config/syslocaleoptions.cxx
index a88d54a..7f40155 100644
--- a/unotools/source/config/syslocaleoptions.cxx
+++ b/unotools/source/config/syslocaleoptions.cxx
@@ -191,7 +191,7 @@ SvtSysLocaleOptions_Impl::SvtSysLocaleOptions_Impl()
m_aLocaleString = aStr;
else
{
- SAL_INFO( "unotools.config", "Wrong property type!" );
+ SAL_WARN( "unotools.config", "Wrong property type!" );
}
m_bROLocale = pROStates[nProp];
}
@@ -203,7 +203,7 @@ SvtSysLocaleOptions_Impl::SvtSysLocaleOptions_Impl()
m_aUILocaleString = aStr;
else
{
- SAL_INFO( "unotools.config", "Wrong property type!" );
+ SAL_WARN( "unotools.config", "Wrong property type!" );
}
m_bROUILocale = pROStates[nProp];
}
@@ -215,7 +215,7 @@ SvtSysLocaleOptions_Impl::SvtSysLocaleOptions_Impl()
m_aCurrencyString = aStr;
else
{
- SAL_INFO( "unotools.config", "Wrong property type!" );
+ SAL_WARN( "unotools.config", "Wrong property type!" );
}
m_bROCurrency = pROStates[nProp];
}
@@ -227,13 +227,13 @@ SvtSysLocaleOptions_Impl::SvtSysLocaleOptions_Impl()
m_bDecimalSeparator = bValue;
else
{
- SAL_INFO( "unotools.config", "Wrong property type!" );
+ SAL_WARN( "unotools.config", "Wrong property type!" );
}
m_bRODecimalSeparator = pROStates[nProp];
}
break;
default:
- SAL_INFO( "unotools.config", "Wrong property type!" );
+ SAL_WARN( "unotools.config", "Wrong property type!" );
}
}
}
@@ -361,7 +361,7 @@ void SvtSysLocaleOptions_Impl::Commit()
}
break;
default:
- SAL_INFO( "unotools.config", "invalid index to save a path" );
+ SAL_WARN( "unotools.config", "invalid index to save a path" );
}
}
aNames.realloc(nRealCount);
diff --git a/unotools/source/config/undoopt.cxx b/unotools/source/config/undoopt.cxx
index 1240fed..3233b85 100644
--- a/unotools/source/config/undoopt.cxx
+++ b/unotools/source/config/undoopt.cxx
@@ -85,7 +85,7 @@ void SvtUndoOptions_Impl::Commit()
pValues[nProp] <<= nUndoCount;
break;
default:
- SAL_INFO( "unotools.config", "invalid index to save a path" );
+ SAL_WARN( "unotools.config", "invalid index to save a path" );
}
}
diff --git a/unotools/source/config/useroptions.cxx b/unotools/source/config/useroptions.cxx
index 503b545..ccd42f4 100644
--- a/unotools/source/config/useroptions.cxx
+++ b/unotools/source/config/useroptions.cxx
@@ -901,7 +901,7 @@ sal_Bool SvtUserOptions_Impl::IsTokenReadonly( sal_uInt16 nToken ) const
break;
}
default:
- SAL_INFO( "unotools.config", "SvtUserOptions_Impl::IsTokenReadonly(): invalid token" );
+ SAL_WARN( "unotools.config", "SvtUserOptions_Impl::IsTokenReadonly(): invalid token" );
}
return bRet;
@@ -931,7 +931,7 @@ sal_Bool SvtUserOptions_Impl::IsTokenReadonly( sal_uInt16 nToken ) const
case USER_OPT_FATHERSNAME: pRet = GetFathersName(); break;
case USER_OPT_APARTMENT: pRet = GetApartment(); break;
default:
- SAL_INFO( "unotools.config", "SvtUserOptions_Impl::GetToken(): invalid token" );
+ SAL_WARN( "unotools.config", "SvtUserOptions_Impl::GetToken(): invalid token" );
}
return pRet;
}
diff --git a/unotools/source/i18n/calendarwrapper.cxx b/unotools/source/i18n/calendarwrapper.cxx
index 748ed91..2c82da1 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_INFO( "unotools.l18n", "loadDefaultCalendar: Exception caught " << e.Message );
+ SAL_WARN( "unotools.l18n", "loadDefaultCalendar: Exception caught " << e.Message );
}
}
@@ -84,7 +84,7 @@ void CalendarWrapper::loadCalendar( const ::rtl::OUString& rUniqueID, const ::co
}
catch (const Exception& e)
{
- SAL_INFO( "unotools.l18n", "loadCalendar: Exception caught requested: "
+ SAL_WARN( "unotools.l18n", "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_INFO( "unotools.l18n", "getAllCalendars: Exception caught " << e.Message );
+ SAL_WARN( "unotools.l18n", "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_INFO( "unotools.l18n", "getUniqueID: Exception caught " << e.Message );
+ SAL_WARN( "unotools.l18n", "getUniqueID: Exception caught " << e.Message );
}
return ::rtl::OUString();
}
@@ -130,7 +130,7 @@ void CalendarWrapper::setDateTime( double nTimeInDays )
}
catch (const Exception& e)
{
- SAL_INFO( "unotools.l18n", "setDateTime: Exception caught " << e.Message );
+ SAL_WARN( "unotools.l18n", "setDateTime: Exception caught " << e.Message );
}
}
@@ -144,7 +144,7 @@ double CalendarWrapper::getDateTime() const
}
catch (const Exception& e)
{
- SAL_INFO( "unotools.l18n", "getDateTime: Exception caught " << e.Message );
+ SAL_WARN( "unotools.l18n", "getDateTime: Exception caught " << e.Message );
}
return 0.0;
}
@@ -168,7 +168,7 @@ sal_Int32 CalendarWrapper::getCombinedOffsetInMillis(
}
catch (const Exception& e)
{
- SAL_INFO( "unotools.l18n", "setLocalDateTime: Exception caught " << e.Message );
+ SAL_WARN( "unotools.l18n", "setLocalDateTime: Exception caught " << e.Message );
}
return nOffset;
}
@@ -234,7 +234,7 @@ void CalendarWrapper::setLocalDateTime( double nTimeInDays )
}
catch (const Exception& e)
{
- SAL_INFO( "unotools.l18n", "setLocalDateTime: Exception caught " << e.Message );
+ SAL_WARN( "unotools.l18n", "setLocalDateTime: Exception caught " << e.Message );
}
}
@@ -254,7 +254,7 @@ double CalendarWrapper::getLocalDateTime() const
}
catch (const Exception& e)
{
- SAL_INFO( "unotools.l18n", "getLocalDateTime: Exception caught " << e.Message );
+ SAL_WARN( "unotools.l18n", "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_INFO( "unotools.l18n", "setValue: Exception caught " << e.Message );
+ SAL_WARN( "unotools.l18n", "setValue: Exception caught " << e.Message );
}
}
@@ -283,7 +283,7 @@ sal_Bool CalendarWrapper::isValid() const
}
catch (const Exception& e)
{
- SAL_INFO( "unotools.l18n", "isValue: Exception caught " << e.Message );
+ SAL_WARN( "unotools.l18n", "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_INFO( "unotools.l18n", "getValue: Exception caught " << e.Message );
+ SAL_WARN( "unotools.l18n", "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_INFO( "unotools.l18n", "addValue: Exception caught " << e.Message );
+ SAL_WARN( "unotools.l18n", "addValue: Exception caught " << e.Message );
}
}
@@ -327,7 +327,7 @@ sal_Int16 CalendarWrapper::getFirstDayOfWeek() const
}
catch (const Exception& e)
{
- SAL_INFO( "unotools.l18n", "getFirstDayOfWeek: Exception caught " << e.Message );
+ SAL_WARN( "unotools.l18n", "getFirstDayOfWeek: Exception caught " << e.Message );
}
return 0;
}
@@ -342,7 +342,7 @@ void CalendarWrapper::setFirstDayOfWeek( sal_Int16 nDay )
}
catch (const Exception& e)
{
- SAL_INFO( "unotools.l18n", "setFirstDayOfWeek: Exception caught " << e.Message );
+ SAL_WARN( "unotools.l18n", "setFirstDayOfWeek: Exception caught " << e.Message );
}
}
@@ -356,7 +356,7 @@ void CalendarWrapper::setMinimumNumberOfDaysForFirstWeek( sal_Int16 nDays )
}
catch (const Exception& e)
{
- SAL_INFO( "unotools.l18n", "setMinimumNumberOfDaysForFirstWeek: Exception caught " <<
e.Message );
+ SAL_WARN( "unotools.l18n", "setMinimumNumberOfDaysForFirstWeek: Exception caught " <<
e.Message );
}
}
@@ -370,7 +370,7 @@ sal_Int16 CalendarWrapper::getNumberOfMonthsInYear() const
}
catch (const Exception& e)
{
- SAL_INFO( "unotools.l18n", "getNumberOfMonthsInYear: Exception caught " << e.Message );
+ SAL_WARN( "unotools.l18n", "getNumberOfMonthsInYear: Exception caught " << e.Message );
}
return 0;
}
@@ -385,7 +385,7 @@ sal_Int16 CalendarWrapper::getNumberOfDaysInWeek() const
}
catch (const Exception& e)
{
- SAL_INFO( "unotools.l18n", "getNumberOfDaysInWeek: Exception caught " << e.Message );
+ SAL_WARN( "unotools.l18n", "getNumberOfDaysInWeek: Exception caught " << e.Message );
}
return 0;
}
@@ -400,7 +400,7 @@ sal_Int16 CalendarWrapper::getNumberOfDaysInWeek() const
}
catch (const Exception& e)
{
- SAL_INFO( "unotools.l18n", "getMonths: Exception caught " << e.Message );
+ SAL_WARN( "unotools.l18n", "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_INFO( "unotools.l18n", "getDays: Exception caught " << e.Message );
+ SAL_WARN( "unotools.l18n", "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_INFO( "unotools.l18n", "getDisplayName: Exception caught " << e.Message );
+ SAL_WARN( "unotools.l18n", "getDisplayName: Exception caught " << e.Message );
}
return String();
}
@@ -447,7 +447,7 @@ String CalendarWrapper::getDisplayString( sal_Int32 nCalendarDisplayCode, sal_In
}
catch (const Exception& e)
{
- SAL_INFO( "unotools.l18n", "getDisplayString: Exception caught " << e.Message );
+ SAL_WARN( "unotools.l18n", "getDisplayString: Exception caught " << e.Message );
}
return String();
}
@@ -464,7 +464,7 @@ String CalendarWrapper::getDisplayString( sal_Int32 nCalendarDisplayCode, sal_In
}
catch (const Exception& e)
{
- SAL_INFO( "unotools.l18n", "getLoadedCalendar2: Exception caught " << e.Message );
+ SAL_WARN( "unotools.l18n", "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_INFO( "unotools.l18n", "getGenitiveMonths: Exception caught " << e.Message );
+ SAL_WARN( "unotools.l18n", "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_INFO( "unotools.l18n", "getPartitiveMonths: Exception caught " << e.Message );
+ SAL_WARN( "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 6795a2e..b445c12 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& )
{
- SAL_INFO( "unotools", "isAlpha: Exception caught!" );
+ SAL_WARN( "unotools.i18n", "isAlpha: Exception caught!" );
return sal_False;
}
}
@@ -154,7 +154,7 @@ sal_Bool CharClass::isLetter( const String& rStr, xub_StrLen nPos ) const
}
catch ( const Exception& )
{
- SAL_INFO( "unotools", "isLetter: Exception caught!" );
+ SAL_WARN( "unotools.i18n", "isLetter: Exception caught!" );
return sal_False;
}
}
@@ -171,7 +171,7 @@ sal_Bool CharClass::isLetter( const String& rStr ) const
}
catch ( const Exception& )
{
- SAL_INFO( "unotools", "isLetter: Exception caught!" );
+ SAL_WARN( "unotools.i18n", "isLetter: Exception caught!" );
return sal_False;
}
}
@@ -193,7 +193,7 @@ sal_Bool CharClass::isDigit( const String& rStr, xub_StrLen nPos ) const
}
catch ( const Exception& )
{
- SAL_INFO( "unotools", "isDigit: Exception caught!" );
+ SAL_WARN( "unotools.i18n", "isDigit: Exception caught!" );
return sal_False;
}
}
@@ -210,7 +210,7 @@ sal_Bool CharClass::isNumeric( const String& rStr ) const
}
catch ( const Exception& )
{
- SAL_INFO( "unotools", "isNumeric: Exception caught!" );
+ SAL_WARN( "unotools.i18n", "isNumeric: Exception caught!" );
return sal_False;
}
}
@@ -232,7 +232,7 @@ sal_Bool CharClass::isAlphaNumeric( const String& rStr, xub_StrLen nPos ) const
}
catch ( const Exception& )
{
- SAL_INFO( "unotools", "isAlphaNumeric: Exception caught!" );
+ SAL_WARN( "unotools.i18n", "isAlphaNumeric: Exception caught!" );
return sal_False;
}
}
@@ -254,7 +254,7 @@ sal_Bool CharClass::isLetterNumeric( const String& rStr, xub_StrLen nPos ) const
}
catch ( const Exception& )
{
- SAL_INFO( "unotools", "isLetterNumeric: Exception caught!" );
+ SAL_WARN( "unotools.i18n", "isLetterNumeric: Exception caught!" );
return sal_False;
}
}
@@ -271,7 +271,7 @@ sal_Bool CharClass::isLetterNumeric( const String& rStr ) const
}
catch ( const Exception& )
{
- SAL_INFO( "unotools", "isLetterNumeric: Exception caught!" );
+ SAL_WARN( "unotools.i18n", "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& )
{
- SAL_INFO( "unotools", "titlecase: Exception caught!" );
+ SAL_WARN( "unotools.i18n", "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& )
{
- SAL_INFO( "unotools", "uppercase: Exception caught!" );
+ SAL_WARN( "unotools.i18n", "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& )
{
- SAL_INFO( "unotools", "lowercase: Exception caught!" );
+ SAL_WARN( "unotools.i18n", "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& )
{
- SAL_INFO( "unotools", "getType: Exception caught!" );
+ SAL_WARN( "unotools.i18n", "getType: Exception caught!" );
return 0;
}
}
@@ -352,7 +352,7 @@ sal_Int16 CharClass::getCharacterDirection( const String& rStr, xub_StrLen nPos
}
catch ( const Exception& )
{
- SAL_INFO( "unotools", "getCharacterDirection: Exception caught!" );
+ SAL_WARN( "unotools.i18n", "getCharacterDirection: Exception caught!" );
return 0;
}
}
@@ -369,7 +369,7 @@ sal_Int16 CharClass::getScript( const String& rStr, xub_StrLen nPos ) const
}
catch ( const Exception& )
{
- SAL_INFO( "unotools", "getScript: Exception caught!" );
+ SAL_WARN( "unotools.i18n", "getScript: Exception caught!" );
return 0;
}
}
@@ -386,7 +386,7 @@ sal_Int32 CharClass::getCharacterType( const String& rStr, xub_StrLen nPos ) con
}
catch ( const Exception& )
{
- SAL_INFO( "unotools", "getCharacterType: Exception caught!" );
+ SAL_WARN( "unotools.i18n", "getCharacterType: Exception caught!" );
return 0;
}
}
@@ -403,7 +403,7 @@ sal_Int32 CharClass::getStringType( const String& rStr, xub_StrLen nPos, xub_Str
}
catch ( const Exception& )
{
- SAL_INFO( "unotools", "getStringType: Exception caught!" );
+ SAL_WARN( "unotools.i18n", "getStringType: Exception caught!" );
return 0;
}
}
@@ -428,7 +428,7 @@ sal_Int32 CharClass::getStringType( const String& rStr, xub_StrLen nPos, xub_Str
}
catch ( const Exception& e )
{
- SAL_INFO( "unotools.l18n", "parseAnyToken: Exception caught " << e.Message );
+ SAL_WARN( "unotools.l18n", "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_INFO( "unotools.l18n", "parsePredefinedToken: Exception caught " << e.Message );
+ SAL_WARN( "unotools.l18n", "parsePredefinedToken: Exception caught " << e.Message );
return ParseResult();
}
}
diff --git a/unotools/source/i18n/collatorwrapper.cxx b/unotools/source/i18n/collatorwrapper.cxx
index 09f12bd..709e6f1 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&)
{
- SAL_INFO( "unotools","CollatorWrapper: compareString failed");
+ SAL_WARN( "unotools.i18n","CollatorWrapper: compareString failed");
}
return 0;
@@ -73,7 +73,7 @@ CollatorWrapper::listCollatorAlgorithms (const lang::Locale& rLocale) const
}
catch (const uno::RuntimeException&)
{
- SAL_INFO( "unotools","CollatorWrapper: listCollatorAlgorithms failed");
+ SAL_WARN( "unotools.i18n","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&)
{
- SAL_INFO( "unotools","CollatorWrapper: loadDefaultCollator failed");
+ SAL_WARN( "unotools.i18n","CollatorWrapper: loadDefaultCollator failed");
}
return 0;
@@ -107,7 +107,7 @@ CollatorWrapper::loadCollatorAlgorithm (const ::rtl::OUString& rAlgorithm,
}
catch (const uno::RuntimeException&)
{
- SAL_INFO( "unotools","CollatorWrapper: loadCollatorAlgorithm failed");
+ SAL_WARN( "unotools.i18n","CollatorWrapper: loadCollatorAlgorithm failed");
}
return 0;
diff --git a/unotools/source/i18n/instance.hxx b/unotools/source/i18n/instance.hxx
index 58ab1cb..2071add 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_INFO( "unotools.l18n", context << "ctor:Exception caught " << e.Message );
+ SAL_WARN( "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 3317690..316dc15 100644
--- a/unotools/source/i18n/localedatawrapper.cxx
+++ b/unotools/source/i18n/localedatawrapper.cxx
@@ -147,7 +147,7 @@ void LocaleDataWrapper::invalidateData()
}
catch (const Exception& e)
{
- SAL_INFO( "unotools.i18n", "getLanguageCountryInfo: Exception caught " << e.Message );
+ SAL_WARN( "unotools.i18n", "getLanguageCountryInfo: Exception caught " << e.Message );
}
return ::com::sun::star::i18n::LanguageCountryInfo();
}
@@ -162,7 +162,7 @@ void LocaleDataWrapper::invalidateData()
}
catch (const Exception& e)
{
- SAL_INFO( "unotools.l18n", "getLocaleItem: Exception caught " << e.Message );
+ SAL_WARN( "unotools.l18n", "getLocaleItem: Exception caught " << e.Message );
}
return ::com::sun::star::i18n::LocaleDataItem();
}
@@ -177,7 +177,7 @@ void LocaleDataWrapper::invalidateData()
}
catch (const Exception& e)
{
- SAL_INFO( "unotools.l18n", "getAllCurrencies: Exception caught " << e.Message );
+ SAL_WARN( "unotools.l18n", "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_INFO( "unotools.l18n", "getAllFormats: Exception caught " << e.Message );
+ SAL_WARN( "unotools.l18n", "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_INFO( "unotools.l18n", "getCollatorImplementations: Exception caught " << e.Message );
+ SAL_WARN( "unotools.l18n", "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_INFO( "unotools.l18n", "getTransliterations: Exception caught " << e.Message );
+ SAL_WARN( "unotools.l18n", "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_INFO( "unotools.l18n", "getForbiddenCharacters: Exception caught " << e.Message );
+ SAL_WARN( "unotools.l18n", "getForbiddenCharacters: Exception caught " << e.Message );
}
return ::com::sun::star::i18n::ForbiddenCharacters();
}
@@ -252,7 +252,7 @@ void LocaleDataWrapper::invalidateData()
}
catch ( const Exception& e )
{
- SAL_INFO( "unotools.l18n", "getReservedWord: Exception caught " << e.Message );
+ SAL_WARN( "unotools.l18n", "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_INFO( "unotools.l18n", "getAllInstalledLocaleNames: Exception caught " << e.Message );
+ SAL_WARN( "unotools.l18n", "getAllInstalledLocaleNames: Exception caught " << e.Message );
}
return rInstalledLocales;
}
@@ -404,7 +404,7 @@ const String& LocaleDataWrapper::getOneLocaleItem( sal_Int16 nItem ) const
::utl::ReadWriteGuard aGuard( aMutex );
if ( nItem >= LocaleItem::COUNT )
{
- SAL_INFO( "unotools", "getOneLocaleItem: bounds" );
+ SAL_WARN( "unotools", "getOneLocaleItem: bounds" );
return aLocaleItem[0];
}
if ( aLocaleItem[nItem].Len() == 0 )
@@ -477,7 +477,7 @@ void LocaleDataWrapper::getOneLocaleItemImpl( sal_Int16 nItem )
aLocaleItem[nItem] = aLocaleDataItem.LongDateYearSeparator;
break;
default:
- SAL_INFO( "unotools", "getOneLocaleItemImpl: which one?" );
+ SAL_WARN( "unotools", "getOneLocaleItemImpl: which one?" );
}
}
@@ -500,7 +500,7 @@ const String& LocaleDataWrapper::getOneReservedWord( sal_Int16 nWord ) const
::utl::ReadWriteGuard aGuard( aMutex );
if ( nWord < 0 || nWord >= reservedWords::COUNT )
{
- SAL_INFO( "unotools", "getOneReservedWord: bounds" );
+ SAL_WARN( "unotools", "getOneReservedWord: bounds" );
nWord = reservedWords::FALSE_WORD;
}
if ( aReservedWord[nWord].Len() == 0 )
@@ -1885,7 +1885,7 @@ void LocaleDataWrapper::evaluateLocaleDataChecking()
}
catch (const Exception& e)
{
- SAL_INFO( "unotools.l18n", "getAllCalendars: Exception caught " << e.Message );
+ SAL_WARN( "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 ac76f2d..d956355 100644
--- a/unotools/source/i18n/nativenumberwrapper.cxx
+++ b/unotools/source/i18n/nativenumberwrapper.cxx
@@ -64,7 +64,7 @@ NativeNumberWrapper::getNativeNumberString(
}
catch ( const uno::Exception& )
{
- SAL_INFO( "unotools", "getNativeNumberString: Exception caught!" );
+ SAL_WARN( "unotools.i18n", "getNativeNumberString: Exception caught!" );
}
return ::rtl::OUString();
}
@@ -82,7 +82,7 @@ NativeNumberWrapper::isValidNatNum(
}
catch ( const uno::Exception& )
{
- SAL_INFO( "unotools", "isValidNatNum: Exception caught!" );
+ SAL_WARN( "unotools.i18n", "isValidNatNum: Exception caught!" );
}
return sal_False;
}
@@ -100,7 +100,7 @@ NativeNumberWrapper::convertToXmlAttributes(
}
catch ( const uno::Exception& )
{
- SAL_INFO( "unotools", "convertToXmlAttributes: Exception caught!" );
+ SAL_WARN( "unotools.i18n", "convertToXmlAttributes: Exception caught!" );
}
return i18n::NativeNumberXmlAttributes();
}
@@ -117,7 +117,7 @@ NativeNumberWrapper::convertFromXmlAttributes(
}
catch ( const uno::Exception& )
{
- SAL_INFO( "unotools", "convertFromXmlAttributes: Exception caught!" );
+ SAL_WARN( "unotools.i18n", "convertFromXmlAttributes: Exception caught!" );
}
return 0;
}
diff --git a/unotools/source/i18n/numberformatcodewrapper.cxx
b/unotools/source/i18n/numberformatcodewrapper.cxx
index a67a7aa..0774c7b 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 )
{
- SAL_INFO( "unotools", "getDefault: Exception caught!" );
+ SAL_WARN( "unotools.i18n", "getDefault: Exception caught!" );
}
return ::com::sun::star::i18n::NumberFormatCode();
}
@@ -88,7 +88,7 @@ NumberFormatCodeWrapper::getFormatCode( sal_Int16 formatIndex ) const
}
catch ( const Exception& e )
{
- SAL_INFO( "unotools", "getFormatCode: Exception caught!" );
+ SAL_WARN( "unotools.i18n", "getFormatCode: Exception caught!" );
}
return ::com::sun::star::i18n::NumberFormatCode();
}
@@ -104,7 +104,7 @@ NumberFormatCodeWrapper::getAllFormatCode( sal_Int16 formatUsage ) const
}
catch ( const Exception& e )
{
- SAL_INFO( "unotools", "getAllFormatCode: Exception caught!" );
+ SAL_WARN( "unotools.i18n", "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 )
{
- SAL_INFO( "unotools", "getAllFormatCodes: Exception caught!" );
+ SAL_WARN( "unotools.i18n", "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 19fe451..ed6e491 100644
--- a/unotools/source/i18n/textsearch.cxx
+++ b/unotools/source/i18n/textsearch.cxx
@@ -132,7 +132,7 @@ Reference<XTextSearch> TextSearch::getXTextSearch( const SearchOptions& rPara )
}
catch ( Exception& )
{
- SAL_INFO( "unotools", "TextSearch ctor: Exception caught!" );
+ SAL_WARN( "unotools.i18n", "TextSearch ctor: Exception caught!" );
}
return rCache.xTextSearch;
}
@@ -252,7 +252,7 @@ int TextSearch::SearchFrwrd( const String & rStr, xub_StrLen* pStart,
}
catch ( Exception& )
{
- SAL_INFO( "unotools", "SearchForward: Exception caught!" );
+ SAL_WARN( "unotools.i18n", "SearchForward: Exception caught!" );
}
return nRet;
}
@@ -283,7 +283,7 @@ int TextSearch::SearchBkwrd( const String & rStr, xub_StrLen* pStart,
}
catch ( Exception& )
{
- SAL_INFO( "unotools", "SearchBackward: Exception caught!" );
+ SAL_WARN( "unotools.i18n", "SearchBackward: Exception caught!" );
}
return nRet;
}
diff --git a/unotools/source/i18n/transliterationwrapper.cxx
b/unotools/source/i18n/transliterationwrapper.cxx
index 5e3d84c..eaae56b 100644
--- a/unotools/source/i18n/transliterationwrapper.cxx
+++ b/unotools/source/i18n/transliterationwrapper.cxx
@@ -75,7 +75,7 @@ String TransliterationWrapper::transliterate(
}
catch( Exception& )
{
- SAL_INFO( "unotools", "transliterate: Exception caught!" );
+ SAL_WARN( "unotools", "transliterate: Exception caught!" );
}
}
return sRet;
@@ -99,7 +99,7 @@ String TransliterationWrapper::transliterate(
}
catch( Exception& )
{
- SAL_INFO( "unotools", "transliterate: Exception caught!" );
+ SAL_WARN( "unotools", "transliterate: Exception caught!" );
}
}
return sRet;
@@ -171,7 +171,7 @@ void TransliterationWrapper::loadModuleImpl() const
}
catch ( const Exception& e )
{
- SAL_INFO( "unotools.i18n", "loadModuleImpl: Exception caught " << e.Message );
+ SAL_WARN( "unotools.i18n", "loadModuleImpl: Exception caught " << e.Message );
}
bFirstCall = sal_False;
@@ -192,7 +192,7 @@ void TransliterationWrapper::loadModuleByImplName(
}
catch ( const Exception& e )
{
- SAL_INFO( "unotools.i18n", "loadModuleByImplName: Exception caught " << e.Message );
+ SAL_WARN( "unotools.i18n", "loadModuleByImplName: Exception caught " << e.Message );
}
bFirstCall = sal_False;
@@ -212,7 +212,7 @@ sal_Bool TransliterationWrapper::equals(
}
catch ( const Exception& e )
{
- SAL_INFO( "unotools.i18n", "equals: Exception caught " << e.Message );
+ SAL_WARN( "unotools.i18n", "equals: Exception caught " << e.Message );
}
return sal_False;
}
@@ -231,7 +231,7 @@ sal_Int32 TransliterationWrapper::compareSubstring(
}
catch (const Exception& e)
{
- SAL_INFO( "unotools.i18n", "compareSubstring: Exception caught " << e.Message );
+ SAL_WARN( "unotools.i18n", "compareSubstring: Exception caught " << e.Message );
}
return 0;
}
@@ -248,7 +248,7 @@ sal_Int32 TransliterationWrapper::compareString( const String& rStr1, const Stri
}
catch (const Exception& e)
{
- SAL_INFO( "unotools.i18n", "compareString: Exception caught " << e.Message );
+ SAL_WARN( "unotools.i18n", "compareString: Exception caught " << e.Message );
}
return 0;
}
--------------true--
From 8be9eee48f0081ee4ac51d6491f47a5489a83ec0 Mon Sep 17 00:00:00 2001
Message-Id: <8be9eee48f0081ee4ac51d6491f47a5489a83ec0.1326807952.git.mmetz@adrian-broher.net>
In-Reply-To: <e3c8dc11ca41a332a0b633c425d787ae49dc0dbc.1326807952.git.mmetz@adrian-broher.net>
References: <e3c8dc11ca41a332a0b633c425d787ae49dc0dbc.1326807952.git.mmetz@adrian-broher.net>
From: Marcel Metz <mmetz@adrian-broher.net>
Date: Mon, 16 Jan 2012 19:34:11 +0100
Subject: [PATCH 2/7] Replaced SAL_INFO with SAL_WARN were applicable.
To: libreoffice@lists.freedesktop.org
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="------------true"
This is a multi-part message in MIME format.
--------------true
Content-Type: text/plain; charset=UTF-8; format=fixed
Content-Transfer-Encoding: 8bit
---
svx/source/dialog/dlgutil.cxx | 2 +-
svx/source/dialog/framelink.cxx | 2 +-
svx/source/dialog/frmsel.cxx | 6 +-
svx/source/dialog/txencbox.cxx | 2 +-
svx/source/form/datalistener.cxx | 2 +-
svx/source/form/datanavi.cxx | 136 ++++++++++++++++----------------
svx/source/stbctrls/pszctrl.cxx | 4 +-
svx/source/stbctrls/xmlsecctrl.cxx | 2 +-
svx/source/table/tablertfimporter.cxx | 2 +-
svx/source/tbxctrls/tbxcolor.cxx | 2 +-
10 files changed, 80 insertions(+), 80 deletions(-)
--------------true
Content-Type: text/x-patch; name="0002-Replaced-SAL_INFO-with-SAL_WARN-were-applicable.patch"
Content-Transfer-Encoding: 8bit
Content-Disposition: attachment;
filename="0002-Replaced-SAL_INFO-with-SAL_WARN-were-applicable.patch"
diff --git a/svx/source/dialog/dlgutil.cxx b/svx/source/dialog/dlgutil.cxx
index 8e14e6ec..eda55fa 100644
--- a/svx/source/dialog/dlgutil.cxx
+++ b/svx/source/dialog/dlgutil.cxx
@@ -79,7 +79,7 @@ bool GetApplyCharUnit( const SfxItemSet& rSet )
}
else
{
- SAL_INFO( "svx", "GetApplyCharUnit(): no module found" );
+ SAL_WARN( "svx.dialog", "GetApplyCharUnit(): no module found" );
}
}
}
diff --git a/svx/source/dialog/framelink.cxx b/svx/source/dialog/framelink.cxx
index 6ef4903..a933b97 100644
--- a/svx/source/dialog/framelink.cxx
+++ b/svx/source/dialog/framelink.cxx
@@ -560,7 +560,7 @@ void lclLinkLeftEnd(
}
else
{
- SAL_INFO( "svx", "lclLinkLeftEnd - called for invisible frame style" );
+ SAL_WARN( "svx.dialog", "lclLinkLeftEnd - called for invisible frame style" );
}
}
diff --git a/svx/source/dialog/frmsel.cxx b/svx/source/dialog/frmsel.cxx
index a2daa27..597522a 100644
--- a/svx/source/dialog/frmsel.cxx
+++ b/svx/source/dialog/frmsel.cxx
@@ -164,7 +164,7 @@ void FrameBorder::SetState( FrameBorderState eState )
switch( meState )
{
case FRAMESTATE_SHOW:
- SAL_INFO( "svx", "svx::FrameBorder::SetState - use SetCoreStyle to make border
visible" );
+ SAL_WARN( "svx.dialog", "svx::FrameBorder::SetState - use SetCoreStyle to make border
visible" );
break;
case FRAMESTATE_HIDE:
maCoreStyle = SvxBorderLine();
@@ -220,7 +220,7 @@ FrameBorderType FrameBorder::GetKeyboardNeighbor( sal_uInt16 nKeyCode ) const
case KEY_RIGHT: eBorder = meKeyRight; break;
case KEY_UP: eBorder = meKeyTop; break;
case KEY_DOWN: eBorder = meKeyBottom; break;
- default: SAL_INFO( "svx", "svx::FrameBorder::GetKeyboardNeighbor - unknown key
code" );
+ default: SAL_WARN( "svx.dialog", "svx::FrameBorder::GetKeyboardNeighbor - unknown
key code" );
}
return eBorder;
}
@@ -515,7 +515,7 @@ const FrameBorder& FrameSelectorImpl::GetBorder( FrameBorderType eBorder ) const
size_t nIndex = GetIndexFromFrameBorderType( eBorder );
if( nIndex < maAllBorders.size() )
return *maAllBorders[ nIndex ];
- SAL_INFO( "svx", "svx::FrameSelectorImpl::GetBorder - unknown border type" );
+ SAL_WARN( "svx.dialog", "svx::FrameSelectorImpl::GetBorder - unknown border type" );
return maTop;
}
diff --git a/svx/source/dialog/txencbox.cxx b/svx/source/dialog/txencbox.cxx
index 4834c08..9a07c5f 100644
--- a/svx/source/dialog/txencbox.cxx
+++ b/svx/source/dialog/txencbox.cxx
@@ -199,7 +199,7 @@ void SvxTextEncodingBox::InsertTextEncoding( const rtl_TextEncoding nEnc, sal_uI
if ( rEntry.Len() )
InsertTextEncoding( nEnc, rEntry, nPos );
else
- SAL_INFO( "svx", "SvxTextEncodingBox::InsertTextEncoding: no resource string for text
encoding: " << static_cast<sal_Int32>( nEnc ) );
+ SAL_WARN( "svx.dialog", "SvxTextEncodingBox::InsertTextEncoding: no resource string for
text encoding: " << static_cast<sal_Int32>( nEnc ) );
}
//------------------------------------------------------------------------
diff --git a/svx/source/form/datalistener.cxx b/svx/source/form/datalistener.cxx
index d4311e7..15e06d1 100644
--- a/svx/source/form/datalistener.cxx
+++ b/svx/source/form/datalistener.cxx
@@ -88,7 +88,7 @@ namespace svxform
// lang::XEventListener
void SAL_CALL DataListener::disposing( const EventObject& /*Source*/ ) throw (RuntimeException)
{
- SAL_INFO( "svx", "disposing" );
+ SAL_WARN( "svx.form", "disposing" );
}
//............................................................................
diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx
index 73d5b54..0e0054c 100644
--- a/svx/source/form/datanavi.cxx
+++ b/svx/source/form/datanavi.cxx
@@ -473,7 +473,7 @@ namespace svxform
}
catch ( Exception& )
{
- SAL_INFO( "svx", "XFormsPage::DoToolBoxAction(): exception while adding
submission" );
+ SAL_WARN( "svx.form", "XFormsPage::DoToolBoxAction(): exception while
adding submission" );
}
}
}
@@ -509,7 +509,7 @@ namespace svxform
}
catch ( Exception& )
{
- SAL_INFO( "svx", "XFormsPage::DoToolBoxAction(): exception while
create element" );
+ SAL_WARN( "svx.form", "XFormsPage::DoToolBoxAction(): exception while
create element" );
}
}
else
@@ -523,7 +523,7 @@ namespace svxform
}
catch ( Exception& )
{
- SAL_INFO( "svx", "XFormsPage::DoToolBoxAction(): exception while
create attribute" );
+ SAL_WARN( "svx.form", "XFormsPage::DoToolBoxAction(): exception while
create attribute" );
}
}
@@ -535,13 +535,13 @@ namespace svxform
{
if ( e.Code == css::xml::dom::DOMExceptionType_DOMSTRING_SIZE_ERR )
{
- SAL_INFO( "svx", "XFormsPage::DoToolBoxAction(): domexception: size
error" );
+ SAL_WARN( "svx.form", "XFormsPage::DoToolBoxAction(): domexception:
size error" );
}
- SAL_INFO( "svx", "XFormsPage::DoToolBoxAction(): domexception while append
child" );
+ SAL_WARN( "svx.form", "XFormsPage::DoToolBoxAction(): domexception while
append child" );
}
catch ( Exception& )
{
- SAL_INFO( "svx", "XFormsPage::DoToolBoxAction(): exception while append
child" );
+ SAL_WARN( "svx.form", "XFormsPage::DoToolBoxAction(): exception while
append child" );
}
try
@@ -555,7 +555,7 @@ namespace svxform
}
catch ( Exception& )
{
- SAL_INFO( "svx", "XFormsPage::DoToolboxAction(): exception caught" );
+ SAL_WARN( "svx.form", "XFormsPage::DoToolboxAction(): exception caught" );
}
try
@@ -564,7 +564,7 @@ namespace svxform
}
catch ( Exception& )
{
- SAL_INFO( "svx", "XFormsPage::DoToolBoxAction(): exception while get
binding for node" );
+ SAL_WARN( "svx.form", "XFormsPage::DoToolBoxAction(): exception while get
binding for node" );
}
pNode = new ItemNode( xNewNode );
}
@@ -581,7 +581,7 @@ namespace svxform
}
catch ( Exception& )
{
- SAL_INFO( "svx", "XFormsPage::DoToolBoxAction(): exception while adding
binding" );
+ SAL_WARN( "svx.form", "XFormsPage::DoToolBoxAction(): exception while
adding binding" );
}
}
@@ -612,7 +612,7 @@ namespace svxform
}
catch ( Exception& )
{
- SAL_INFO( "svx", "XFormsPage::DoToolboxAction(): exception caught" );
+ SAL_WARN( "svx.form", "XFormsPage::DoToolboxAction(): exception
caught" );
}
}
}
@@ -633,7 +633,7 @@ namespace svxform
}
catch ( Exception& )
{
- SAL_INFO( "svx", "XFormsPage::DoToolboxAction(): exception caught" );
+ SAL_WARN( "svx.form", "XFormsPage::DoToolboxAction(): exception
caught" );
}
}
delete pNode;
@@ -676,7 +676,7 @@ namespace svxform
}
catch ( Exception& )
{
- SAL_INFO( "svx", "XFormsPage::DoToolboxAction(): exception caught" );
+ SAL_WARN( "svx.form", "XFormsPage::DoToolboxAction(): exception
caught" );
}
}
else if ( DGTBinding == m_eGroup )
@@ -699,7 +699,7 @@ namespace svxform
}
catch ( Exception& )
{
- SAL_INFO( "svx", "XFormsPage::DoToolboxAction(): exception caught"
);
+ SAL_WARN( "svx.form", "XFormsPage::DoToolboxAction(): exception
caught" );
}
}
else
@@ -716,7 +716,7 @@ namespace svxform
}
catch ( Exception& )
{
- SAL_INFO( "svx", "XFormsPage::DoToolboxAction(): exception caught"
);
+ SAL_WARN( "svx.form", "XFormsPage::DoToolboxAction(): exception
caught" );
}
}
@@ -1020,7 +1020,7 @@ namespace svxform
}
catch ( Exception& )
{
- SAL_INFO( "svx", "XFormsPage::AddEntry(Ref): exception caught" );
+ SAL_WARN( "svx.form", "XFormsPage::AddEntry(Ref): exception caught" );
}
}
else // then Binding Page
@@ -1039,7 +1039,7 @@ namespace svxform
}
catch ( Exception& )
{
- SAL_INFO( "svx", "XFormsPage::AddEntry(Ref): exception caught" );
+ SAL_WARN( "svx.form", "XFormsPage::AddEntry(Ref): exception caught" );
}
}
@@ -1098,7 +1098,7 @@ namespace svxform
}
catch ( Exception& )
{
- SAL_INFO( "svx", "XFormsPage::EditEntry(): exception caught" );
+ SAL_WARN( "svx.form", "XFormsPage::EditEntry(): exception caught" );
}
}
}
@@ -1148,7 +1148,7 @@ namespace svxform
}
catch ( Exception& )
{
- SAL_INFO( "svx", "XFormsPage::RemoveEntry(): exception caught" );
+ SAL_WARN( "svx.form", "XFormsPage::RemoveEntry(): exception caught" );
}
}
else
@@ -1165,7 +1165,7 @@ namespace svxform
}
catch ( Exception& )
{
- SAL_INFO( "svx", "XFormsPage::RemoveEntry(): exception caught" );
+ SAL_WARN( "svx.form", "XFormsPage::RemoveEntry(): exception caught" );
}
QueryBox aQBox( this, SVX_RES( nResId ) );
String sMessText = aQBox.GetMessText();
@@ -1183,7 +1183,7 @@ namespace svxform
}
catch ( Exception& )
{
- SAL_INFO( "svx", "XFormsPage::RemoveEntry(): exception caught" );
+ SAL_WARN( "svx.form", "XFormsPage::RemoveEntry(): exception caught" );
}
}
}
@@ -1263,7 +1263,7 @@ namespace svxform
sRet = LoadInstance( xPropSeq, rImageList );
else
{
- SAL_INFO( "svx", "XFormsPage::SetModel(): invalid
instance" );
+ SAL_WARN( "svx.form", "XFormsPage::SetModel(): invalid
instance" );
}
break;
}
@@ -1278,7 +1278,7 @@ namespace svxform
}
catch( Exception& )
{
- SAL_INFO( "svx", "XFormsPage::SetModel(): exception caught" );
+ SAL_WARN( "svx.form", "XFormsPage::SetModel(): exception caught" );
}
break;
}
@@ -1310,7 +1310,7 @@ namespace svxform
}
catch( Exception& )
{
- SAL_INFO( "svx", "XFormsPage::SetModel(): exception caught" );
+ SAL_WARN( "svx.form", "XFormsPage::SetModel(): exception caught" );
}
break;
}
@@ -1357,7 +1357,7 @@ namespace svxform
}
catch( Exception& )
{
- SAL_INFO( "svx", "XFormsPage::SetModel(): exception caught" );
+ SAL_WARN( "svx.form", "XFormsPage::SetModel(): exception caught" );
}
break;
}
@@ -1412,7 +1412,7 @@ namespace svxform
}
catch ( Exception& )
{
- SAL_INFO( "svx", "XFormsPage::LoadInstance(): exception caught" );
+ SAL_WARN( "svx.form", "XFormsPage::LoadInstance(): exception caught" );
}
}
}
@@ -1468,7 +1468,7 @@ namespace svxform
}
catch ( Exception& )
{
- SAL_INFO( "svx", "XFormsPage::EnableMenuItems(): exception caught" );
+ SAL_WARN( "svx.form", "XFormsPage::EnableMenuItems(): exception caught" );
}
}
}
@@ -1510,7 +1510,7 @@ namespace svxform
}
catch ( Exception& )
{
- SAL_INFO( "svx", "XFormsPage::EnableMenuItems(): exception caught" );
+ SAL_WARN( "svx.form", "XFormsPage::EnableMenuItems(): exception caught" );
}
}
}
@@ -1662,7 +1662,7 @@ namespace svxform
}
catch ( Exception& )
{
- SAL_INFO( "svx", "DataNavigatorWindow::MenuSelectHdl(): exception caught" );
+ SAL_WARN( "svx.form", "DataNavigatorWindow::MenuSelectHdl(): exception caught" );
}
DBG_ASSERT( xUIHelper.is(), "DataNavigatorWindow::MenuSelectHdl(): no UIHelper" );
@@ -1714,7 +1714,7 @@ namespace svxform
}
catch ( Exception& )
{
- SAL_INFO( "svx", "DataNavigatorWindow::MenuSelectHdl():
exception caught" );
+ SAL_WARN( "svx.form", "DataNavigatorWindow::MenuSelectHdl():
exception caught" );
}
}
}
@@ -1778,7 +1778,7 @@ namespace svxform
}
catch ( Exception& )
{
- SAL_INFO( "svx", "DataNavigatorWindow::MenuSelectHdl(): exception
caught" );
+ SAL_WARN( "svx.form", "DataNavigatorWindow::MenuSelectHdl():
exception caught" );
}
}
}
@@ -1798,7 +1798,7 @@ namespace svxform
}
catch ( Exception& )
{
- SAL_INFO( "svx", "DataNavigatorWindow::MenuSelectHdl(): exception
caught" );
+ SAL_WARN( "svx.form", "DataNavigatorWindow::MenuSelectHdl(): exception
caught" );
}
m_aModelsBox.RemoveEntry( nSelectedPos );
if ( m_aModelsBox.GetEntryCount() <= nSelectedPos )
@@ -1811,7 +1811,7 @@ namespace svxform
}
default:
{
- SAL_INFO( "svx", "DataNavigatorWindow::MenuSelectHdl(): wrong menu item" );
+ SAL_WARN( "svx.form", "DataNavigatorWindow::MenuSelectHdl(): wrong menu item"
);
}
}
}
@@ -1835,7 +1835,7 @@ namespace svxform
}
catch ( Exception& )
{
- SAL_INFO( "svx", "DataNavigatorWindow::MenuSelectHdl(): exception
caught" );
+ SAL_WARN( "svx.form", "DataNavigatorWindow::MenuSelectHdl(): exception
caught" );
}
ModelSelectHdl( NULL );
m_aTabCtrl.SetCurPageId( nInst );
@@ -1873,7 +1873,7 @@ namespace svxform
}
catch ( Exception& )
{
- SAL_INFO( "svx", "DataNavigatorWindow::MenuSelectHdl(): exception
caught" );
+ SAL_WARN( "svx.form", "DataNavigatorWindow::MenuSelectHdl():
exception caught" );
}
pPage->SetInstanceName(sNewName);
pPage->SetInstanceURL(sURL);
@@ -1925,7 +1925,7 @@ namespace svxform
}
catch ( Exception& )
{
- SAL_INFO( "svx", "DataNavigatorWindow::MenuSelectHdl():
exception caught" );
+ SAL_WARN( "svx.form", "DataNavigatorWindow::MenuSelectHdl():
exception caught" );
}
m_aTabCtrl.RemovePage( nId );
m_aTabCtrl.SetCurPageId( TID_INSTANCE );
@@ -1945,13 +1945,13 @@ namespace svxform
}
default:
{
- SAL_INFO( "svx", "DataNavigatorWindow::MenuSelectHdl(): wrong menu item" );
+ SAL_WARN( "svx.form", "DataNavigatorWindow::MenuSelectHdl(): wrong menu item"
);
}
}
}
else
{
- SAL_INFO( "svx", "DataNavigatorWindow::MenuSelectHdl(): wrong button" );
+ SAL_WARN( "svx.form", "DataNavigatorWindow::MenuSelectHdl(): wrong button" );
}
m_bIsNotifyDisabled = false;
@@ -1980,7 +1980,7 @@ namespace svxform
}
else
{
- SAL_INFO( "svx", "DataNavigatorWindow::MenuActivateHdl(): wrong button" );
+ SAL_WARN( "svx.form", "DataNavigatorWindow::MenuActivateHdl(): wrong button" );
}
return 0;
}
@@ -2067,7 +2067,7 @@ namespace svxform
}
catch ( Exception& )
{
- SAL_INFO( "svx", "DataNavigatorWindow::LoadModels(): exception caught" );
+ SAL_WARN( "svx.form", "DataNavigatorWindow::LoadModels(): exception caught" );
}
}
}
@@ -2099,7 +2099,7 @@ namespace svxform
}
catch( Exception& )
{
- SAL_INFO( "svx", "DataNavigatorWindow::LoadModels(): exception caught" );
+ SAL_WARN( "svx.form", "DataNavigatorWindow::LoadModels(): exception caught" );
}
}
@@ -2135,11 +2135,11 @@ namespace svxform
}
catch ( NoSuchElementException& )
{
- SAL_INFO( "svx", "DataNavigatorWindow::SetPageModel(): no such element" );
+ SAL_WARN( "svx.form", "DataNavigatorWindow::SetPageModel(): no such element" );
}
catch( Exception& )
{
- SAL_INFO( "svx", "DataNavigatorWindow::SetPageModel(): unexpected exception" );
+ SAL_WARN( "svx.form", "DataNavigatorWindow::SetPageModel(): unexpected exception" );
}
}
// -----------------------------------------------------------------------
@@ -2171,7 +2171,7 @@ namespace svxform
CreateInstancePage( xPropSeq );
else
{
- SAL_INFO( "svx", "DataNavigator::InitPages(): invalid
instance" );
+ SAL_WARN( "svx.form", "DataNavigator::InitPages(): invalid
instance" );
}
}
else
@@ -2184,11 +2184,11 @@ namespace svxform
}
catch ( NoSuchElementException& )
{
- SAL_INFO( "svx", "DataNavigatorWindow::SetPageModel(): no such element" );
+ SAL_WARN( "svx.form", "DataNavigatorWindow::SetPageModel(): no such element" );
}
catch( Exception& )
{
- SAL_INFO( "svx", "DataNavigatorWindow::SetPageModel(): unexpected exception" );
+ SAL_WARN( "svx.form", "DataNavigatorWindow::SetPageModel(): unexpected exception" );
}
}
// -----------------------------------------------------------------------
@@ -2236,7 +2236,7 @@ namespace svxform
sal_uInt16 nPageId = GetNewPageId();
if ( sInstName.isEmpty() )
{
- SAL_INFO( "svx", "DataNavigatorWindow::CreateInstancePage(): instance without name" );
+ SAL_WARN( "svx.form", "DataNavigatorWindow::CreateInstancePage(): instance without
name" );
String sTemp = String::CreateFromAscii( "untitled" );
sTemp += String::CreateFromInt32( nPageId );
sInstName = sTemp;
@@ -2555,7 +2555,7 @@ namespace svxform
}
catch ( Exception& )
{
- SAL_INFO( "svx", "AddDataItemDialog::Dtor(): exception caught" );
+ SAL_WARN( "svx.form", "AddDataItemDialog::Dtor(): exception caught" );
}
}
}
@@ -2676,7 +2676,7 @@ namespace svxform
}
catch ( Exception& )
{
- SAL_INFO( "svx", "copyPropSet(): exception caught" );
+ SAL_WARN( "svx.form", "copyPropSet(): exception caught" );
}
}
@@ -2715,7 +2715,7 @@ namespace svxform
}
catch ( Exception& )
{
- SAL_INFO( "svx", "AddDataDialog::OKHdl(): exception caught" );
+ SAL_WARN( "svx.form", "AddDataDialog::OKHdl(): exception caught" );
}
}
else
@@ -2736,7 +2736,7 @@ namespace svxform
}
catch ( Exception& )
{
- SAL_INFO( "svx", "AddDataDialog::OKHdl(): exception caught" );
+ SAL_WARN( "svx.form", "AddDataDialog::OKHdl(): exception caught" );
}
}
// then close the dialog
@@ -2822,7 +2822,7 @@ namespace svxform
}
catch( Exception& )
{
- SAL_INFO( "svx", "AddDataItemDialog::InitFromNode(): exception caught" );
+ SAL_WARN( "svx.form", "AddDataItemDialog::InitFromNode(): exception caught" );
}
}
else if ( m_pItemNode->m_xPropSet.is() )
@@ -2840,7 +2840,7 @@ namespace svxform
}
catch ( Exception& )
{
- SAL_INFO( "svx", "AddDataItemDialog::InitFromNode(): exception caught" );
+ SAL_WARN( "svx.form", "AddDataItemDialog::InitFromNode(): exception
caught" );
}
}
rtl::OUString sTemp;
@@ -2862,7 +2862,7 @@ namespace svxform
}
catch( Exception& )
{
- SAL_INFO( "svx", "AddDataItemDialog::InitFromNode(): exception caught" );
+ SAL_WARN( "svx.form", "AddDataItemDialog::InitFromNode(): exception caught" );
}
Size a3and1Sz = LogicToPixel( Size( 3, 1 ), MAP_APPFONT );
@@ -2897,7 +2897,7 @@ namespace svxform
}
catch ( Exception& )
{
- SAL_INFO( "svx", "AddDataItemDialog::InitFromNode(): exception caught" );
+ SAL_WARN( "svx.form", "AddDataItemDialog::InitFromNode(): exception caught" );
}
}
}
@@ -2972,7 +2972,7 @@ namespace svxform
}
catch ( Exception& )
{
- SAL_INFO( "svx", "AddDataItemDialog::InitDataTypeBox(): exception caught" );
+ SAL_WARN( "svx.form", "AddDataItemDialog::InitDataTypeBox(): exception caught"
);
}
}
}
@@ -3063,7 +3063,7 @@ namespace svxform
}
catch ( Exception& )
{
- SAL_INFO( "svx", "AddConditionDialog::Ctor(): exception caught" );
+ SAL_WARN( "svx.form", "AddConditionDialog::Ctor(): exception caught" );
}
}
@@ -3086,7 +3086,7 @@ namespace svxform
}
catch ( Exception& )
{
- SAL_INFO( "svx", "AddDataItemDialog::EditHdl(): exception caught" );
+ SAL_WARN( "svx.form", "AddDataItemDialog::EditHdl(): exception caught" );
}
NamespaceItemDialog aDlg( this, xNameContnr );
aDlg.Execute();
@@ -3096,7 +3096,7 @@ namespace svxform
}
catch ( Exception& )
{
- SAL_INFO( "svx", "AddDataItemDialog::EditHdl(): exception caught" );
+ SAL_WARN( "svx.form", "AddDataItemDialog::EditHdl(): exception caught" );
}
return 0;
}
@@ -3112,7 +3112,7 @@ namespace svxform
}
catch( const Exception& )
{
- SAL_INFO( "svx", "AddConditionDialog, OKHdl: caught an exception!" );
+ SAL_WARN( "svx.form", "AddConditionDialog, OKHdl: caught an exception!" );
}
*/
EndDialog( RET_OK );
@@ -3139,7 +3139,7 @@ namespace svxform
}
catch ( Exception& )
{
- SAL_INFO( "svx", "AddConditionDialog::ResultHdl(): exception caught" );
+ SAL_WARN( "svx.form", "AddConditionDialog::ResultHdl(): exception caught" );
}
}
m_aResultWin.SetText( sResult );
@@ -3249,7 +3249,7 @@ namespace svxform
}
else
{
- SAL_INFO( "svx", "NamespaceItemDialog::ClickHdl(): invalid button" );
+ SAL_WARN( "svx.form", "NamespaceItemDialog::ClickHdl(): invalid button" );
}
SelectHdl( &m_aNamespacesList );
@@ -3281,7 +3281,7 @@ namespace svxform
}
catch ( Exception& )
{
- SAL_INFO( "svx", "NamespaceItemDialog::OKHdl(): exception caught" );
+ SAL_WARN( "svx.form", "NamespaceItemDialog::OKHdl(): exception caught" );
}
// and close the dialog
EndDialog( RET_OK );
@@ -3316,7 +3316,7 @@ namespace svxform
}
catch ( Exception& )
{
- SAL_INFO( "svx", "NamespaceItemDialog::LoadNamespaces(): exception caught" );
+ SAL_WARN( "svx.form", "NamespaceItemDialog::LoadNamespaces(): exception caught" );
}
}
@@ -3373,7 +3373,7 @@ namespace svxform
}
catch ( Exception& )
{
- SAL_INFO( "svx", "ManageNamespacesDialog::OKHdl(): exception caught" );
+ SAL_WARN( "svx.form", "ManageNamespacesDialog::OKHdl(): exception caught" );
}
// no error so close the dialog
@@ -3470,7 +3470,7 @@ namespace svxform
}
catch ( Exception& )
{
- SAL_INFO( "svx", "AddSubmissionDialog::OKHdl(): exception caught" );
+ SAL_WARN( "svx.form", "AddSubmissionDialog::OKHdl(): exception caught" );
}
}
}
@@ -3496,7 +3496,7 @@ namespace svxform
}
catch ( Exception& )
{
- SAL_INFO( "svx", "AddSubmissionDialog::OKHdl(): exception caught" );
+ SAL_WARN( "svx.form", "AddSubmissionDialog::OKHdl(): exception caught" );
}
}
@@ -3550,7 +3550,7 @@ namespace svxform
}
catch ( Exception& )
{
- SAL_INFO( "svx", "AddSubmissionDialog::FillAllBoxes(): exception caught" );
+ SAL_WARN( "svx.form", "AddSubmissionDialog::FillAllBoxes(): exception caught" );
}
}
@@ -3610,7 +3610,7 @@ namespace svxform
}
catch ( Exception& )
{
- SAL_INFO( "svx", "AddSubmissionDialog::FillAllBoxes(): exception caught" );
+ SAL_WARN( "svx.form", "AddSubmissionDialog::FillAllBoxes(): exception caught" );
}
}
diff --git a/svx/source/stbctrls/pszctrl.cxx b/svx/source/stbctrls/pszctrl.cxx
index 31fb428..a912fa5 100644
--- a/svx/source/stbctrls/pszctrl.cxx
+++ b/svx/source/stbctrls/pszctrl.cxx
@@ -266,7 +266,7 @@ void SvxPosSizeStatusBarControl::StateChanged( sal_uInt16 nSID, SfxItemState eSt
pImp->bSize = sal_False;
else
{
- SAL_INFO( "svx","unknown slot id");
+ SAL_WARN( "svx.stbcrtls","unknown slot id");
}
}
else if ( pState->ISA( SfxPointItem ) )
@@ -293,7 +293,7 @@ void SvxPosSizeStatusBarControl::StateChanged( sal_uInt16 nSID, SfxItemState eSt
}
else
{
- SAL_INFO( "svx", "invalid item type" );
+ SAL_WARN( "svx.stbcrtls", "invalid item type" );
pImp->bPos = sal_False;
pImp->bSize = sal_False;
pImp->bTable = sal_False;
diff --git a/svx/source/stbctrls/xmlsecctrl.cxx b/svx/source/stbctrls/xmlsecctrl.cxx
index bc5df40..abe08b6 100644
--- a/svx/source/stbctrls/xmlsecctrl.cxx
+++ b/svx/source/stbctrls/xmlsecctrl.cxx
@@ -91,7 +91,7 @@ void XmlSecStatusBarControl::StateChanged( sal_uInt16, SfxItemState eState, cons
}
else
{
- SAL_INFO( "svx", "+XmlSecStatusBarControl::StateChanged(): invalid item type" );
+ SAL_WARN( "svx.stbcrtls", "+XmlSecStatusBarControl::StateChanged(): invalid item type" );
mpImpl->mnState = (sal_uInt16)SIGNATURESTATE_UNKNOWN;
}
diff --git a/svx/source/table/tablertfimporter.cxx b/svx/source/table/tablertfimporter.cxx
index a908595..80a28bb 100644
--- a/svx/source/table/tablertfimporter.cxx
+++ b/svx/source/table/tablertfimporter.cxx
@@ -207,7 +207,7 @@ IMPL_LINK( SdrTableRTFParser, RTFImportHdl, ImportInfo*, pInfo )
case RTFIMP_INSERTPARA:
break;
default:
- SAL_INFO( "svx","unknown ImportInfo.eState");
+ SAL_WARN( "svx.table","unknown ImportInfo.eState");
}
return 0;
}
diff --git a/svx/source/tbxctrls/tbxcolor.cxx b/svx/source/tbxctrls/tbxcolor.cxx
index 4961e75..c2ca032 100644
--- a/svx/source/tbxctrls/tbxcolor.cxx
+++ b/svx/source/tbxctrls/tbxcolor.cxx
@@ -68,7 +68,7 @@ namespace svx
}
catch ( Exception& )
{
- SAL_INFO( "svx", "ToolboxAccess::Ctor(): exception" );
+ SAL_WARN( "svx.tbxcrtls", "ToolboxAccess::Ctor(): exception" );
}
}
}
--------------true--
From d1b01c7c9acc7a63ab25dac8cd9c378f9d430828 Mon Sep 17 00:00:00 2001
Message-Id: <d1b01c7c9acc7a63ab25dac8cd9c378f9d430828.1326807952.git.mmetz@adrian-broher.net>
In-Reply-To: <e3c8dc11ca41a332a0b633c425d787ae49dc0dbc.1326807952.git.mmetz@adrian-broher.net>
References: <e3c8dc11ca41a332a0b633c425d787ae49dc0dbc.1326807952.git.mmetz@adrian-broher.net>
From: Marcel Metz <mmetz@adrian-broher.net>
Date: Mon, 16 Jan 2012 21:38:13 +0100
Subject: [PATCH 3/7] Replaced SAL_INFO with SAL_WARN were applicable.
To: libreoffice@lists.freedesktop.org
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="------------true"
This is a multi-part message in MIME format.
--------------true
Content-Type: text/plain; charset=UTF-8; format=fixed
Content-Transfer-Encoding: 8bit
---
sfx2/source/appl/appcfg.cxx | 2 +-
sfx2/source/appl/appdde.cxx | 2 +-
sfx2/source/appl/appserv.cxx | 2 +-
sfx2/source/appl/fileobj.cxx | 2 +-
sfx2/source/appl/module.cxx | 6 +++---
sfx2/source/appl/newhelp.cxx | 12 ++++++------
sfx2/source/appl/sfxhelp.cxx | 14 +++++++-------
sfx2/source/bastyp/helper.cxx | 16 ++++++++--------
sfx2/source/config/evntconf.cxx | 10 +++++++---
sfx2/source/dialog/dinfdlg.cxx | 8 ++++----
sfx2/source/dialog/filedlghelper.cxx | 22 +++++++++++-----------
sfx2/source/dialog/filtergrouping.cxx | 8 ++++----
sfx2/source/dialog/mailmodel.cxx | 2 +-
sfx2/source/dialog/tabdlg.cxx | 8 ++++----
sfx2/source/doc/doctempl.cxx | 8 ++++----
sfx2/source/doc/doctemplates.cxx | 18 +++++++++++-------
sfx2/source/doc/objstor.cxx | 2 +-
sfx2/source/doc/oleprops.cxx | 10 +++++-----
sfx2/source/notify/eventsupplier.cxx | 6 +++---
sfx2/source/view/viewfrm.cxx | 2 +-
20 files changed, 84 insertions(+), 76 deletions(-)
--------------true
Content-Type: text/x-patch; name="0003-Replaced-SAL_INFO-with-SAL_WARN-were-applicable.patch"
Content-Transfer-Encoding: 8bit
Content-Disposition: attachment;
filename="0003-Replaced-SAL_INFO-with-SAL_WARN-were-applicable.patch"
diff --git a/sfx2/source/appl/appcfg.cxx b/sfx2/source/appl/appcfg.cxx
index 500d60f..f68f72d 100644
--- a/sfx2/source/appl/appcfg.cxx
+++ b/sfx2/source/appl/appcfg.cxx
@@ -877,7 +877,7 @@ void SfxApplication::SetOptions(const SfxItemSet &rSet)
case SvtPathOptions::PATH_TEMPLATE: aPathOptions.SetTemplatePath( sValue
);break;
case SvtPathOptions::PATH_USERCONFIG: aPathOptions.SetUserConfigPath( sValue
);break;
case SvtPathOptions::PATH_WORK: aPathOptions.SetWorkPath( sValue
);break;
- default: SAL_INFO( "sfx2", "SfxApplication::SetOptions_Impl() Invalid path
number found for set directories!" );
+ default: SAL_WARN( "sfx2.appl", "SfxApplication::SetOptions_Impl() Invalid
path number found for set directories!" );
}
}
}
diff --git a/sfx2/source/appl/appdde.cxx b/sfx2/source/appl/appdde.cxx
index 067747c..85149bf 100644
--- a/sfx2/source/appl/appdde.cxx
+++ b/sfx2/source/appl/appdde.cxx
@@ -113,7 +113,7 @@ namespace
}
catch( const uno::Exception& )
{
- SAL_INFO( "sfx2", "Any other exception" );
+ SAL_WARN( "sfx2.appl", "Any other exception" );
}
return bRet;
diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index ab6b930..9199daf 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -961,7 +961,7 @@ void SfxApplication::OfaExec_Impl( SfxRequest& rReq )
}
catch( const ::com::sun::star::uno::Exception& )
{
- SAL_INFO( "sfx2", "SfxApplication::OfaExec_Impl(SID_MORE_DICTIONARIES): caught an
exception!" );
+ SAL_WARN( "sfx2.appl", "SfxApplication::OfaExec_Impl(SID_MORE_DICTIONARIES):
caught an exception!" );
}
break;
}
diff --git a/sfx2/source/appl/fileobj.cxx b/sfx2/source/appl/fileobj.cxx
index bbf9cb6..9111c35 100644
--- a/sfx2/source/appl/fileobj.cxx
+++ b/sfx2/source/appl/fileobj.cxx
@@ -614,7 +614,7 @@ IMPL_LINK( SvFileObject, DialogClosedHdl, sfx2::FileDialogHelper*, _pFileDlg )
}
else
{
- SAL_INFO( "sfx2", "SvFileObject::DialogClosedHdl(): wrong file type" );
+ SAL_WARN( "sfx2.appl", "SvFileObject::DialogClosedHdl(): wrong file type" );
}
if ( aEndEditLink.IsSet() )
diff --git a/sfx2/source/appl/module.cxx b/sfx2/source/appl/module.cxx
index e486eb4..47ec441 100644
--- a/sfx2/source/appl/module.cxx
+++ b/sfx2/source/appl/module.cxx
@@ -207,7 +207,7 @@ void SfxModule::RegisterChildWindow(SfxChildWinFactory *pFact)
if (pFact->nId == (*pImpl->pFactArr)[nFactory]->nId)
{
pImpl->pFactArr->Remove( nFactory );
- SAL_WARN("sfx2", "ChildWindow registered multiple times!");
+ SAL_WARN("sfx2.appl", "ChildWindow registered multiple times!");
return;
}
}
@@ -391,7 +391,7 @@ FieldUnit SfxModule::GetModuleFieldUnit( ::com::sun::star::uno::Reference< ::com
if ( pItem == NULL )
{
SAL_WARN(
- "sfx2",
+ "sfx2.appl",
"SfxModule::GetFieldUnit: no metric item in the module implemented"
" by '" << typeid(*pModule).name() << "'!");
return FUNIT_100TH_MM;
@@ -411,7 +411,7 @@ FieldUnit SfxModule::GetCurrentFieldUnit()
eUnit = (FieldUnit)( (SfxUInt16Item*)pItem )->GetValue();
}
else
- SAL_INFO( "sfx2", "GetModuleFieldUnit(): no module found" );
+ SAL_WARN( "sfx2.appl", "GetModuleFieldUnit(): no module found" );
return eUnit;
}
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx
index 37d3918..0f0c2f1 100644
--- a/sfx2/source/appl/newhelp.cxx
+++ b/sfx2/source/appl/newhelp.cxx
@@ -2230,7 +2230,7 @@ void SfxHelpTextWindow_Impl::InitOnStartupBox( bool bOnlyText )
}
catch( Exception& )
{
- SAL_INFO( "sfx2", "SfxHelpTextWindow_Impl::InitOnStartupBox(): unexpected
exception" );
+ SAL_WARN( "sfx2.appl", "SfxHelpTextWindow_Impl::InitOnStartupBox(): unexpected
exception" );
}
sModuleName = String( sTemp );
}
@@ -2515,7 +2515,7 @@ IMPL_LINK( SfxHelpTextWindow_Impl, CheckHdl, CheckBox*, pBox )
}
catch( Exception& )
{
- SAL_INFO( "sfx2", "SfxHelpTextWindow_Impl::CheckHdl(): unexpected exception" );
+ SAL_WARN( "sfx2.appl", "SfxHelpTextWindow_Impl::CheckHdl(): unexpected exception" );
}
}
@@ -2678,7 +2678,7 @@ void SfxHelpTextWindow_Impl::GetFocus()
}
catch( Exception& )
{
- SAL_INFO( "sfx2", "SfxHelpTextWindow_Impl::GetFocus(): unexpected exception" );
+ SAL_WARN( "sfx2.appl", "SfxHelpTextWindow_Impl::GetFocus(): unexpected exception" );
}
}
}
@@ -2775,13 +2775,13 @@ void SfxHelpTextWindow_Impl::SetPageStyleHeaderOff() const
}
catch( Exception& )
{
- SAL_INFO( "sfx2", "SfxHelpTextWindow_Impl::SetPageStyleHeaderOff(): unexpected exception"
);
+ SAL_WARN( "sfx2.appl", "SfxHelpTextWindow_Impl::SetPageStyleHeaderOff(): unexpected
exception" );
}
#ifdef DBG_UTIL
if ( !bSetOff )
{
- SAL_INFO( "sfx2", "SfxHelpTextWindow_Impl::SetPageStyleHeaderOff(): set off failed" );
+ SAL_WARN( "sfx2.appl", "SfxHelpTextWindow_Impl::SetPageStyleHeaderOff(): set off failed" );
}
#endif
}
@@ -3402,7 +3402,7 @@ void SfxHelpWindow_Impl::CloseWindow()
}
catch( Exception& )
{
- SAL_INFO( "sfx2", "SfxHelpWindow_Impl::CloseWindow(): caught an exception" );
+ SAL_WARN( "sfx2.appl", "SfxHelpWindow_Impl::CloseWindow(): caught an exception" );
}
}
diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx
index ca6e482..9bf2be9 100644
--- a/sfx2/source/appl/sfxhelp.cxx
+++ b/sfx2/source/appl/sfxhelp.cxx
@@ -202,7 +202,7 @@ sal_Bool GetHelpAnchor_Impl( const String& _rURL, String& _rAnchor )
}
else
{
- SAL_INFO( "sfx2", "Property 'AnchorName' is missing" );
+ SAL_WARN( "sfx2.appl", "Property 'AnchorName' is missing" );
}
}
catch (const ::com::sun::star::uno::Exception&)
@@ -279,14 +279,14 @@ SfxHelpOptions_Impl::SfxHelpOptions_Impl()
while ( nIndex >= 0 );
}
else {
- SAL_INFO( "sfx2", "Wrong property type!" );
+ SAL_WARN( "sfx2.appl", "Wrong property type!" );
}
break;
}
default:
- SAL_INFO( "sfx2", "Wrong property!" );
+ SAL_WARN( "sfx2.appl", "Wrong property!" );
break;
}
}
@@ -420,7 +420,7 @@ SfxHelp::~SfxHelp()
sDefaultModule = DEFINE_CONST_UNICODE("sdatabase");
else
{
- SAL_INFO( "sfx2", "getDefaultModule_Impl(): no module installed" );
+ SAL_WARN( "sfx2.appl", "getDefaultModule_Impl(): no module installed" );
}
return sDefaultModule;
}
@@ -448,7 +448,7 @@ SfxHelp::~SfxHelp()
}
catch (const Exception&)
{
- SAL_INFO( "sfx2", "SfxHelp::getCurrentModuleIdentifier_Impl(): exception of
XModuleManager::identify()" );
+ SAL_WARN( "sfx2.appl", "SfxHelp::getCurrentModuleIdentifier_Impl(): exception of
XModuleManager::identify()" );
}
}
@@ -483,7 +483,7 @@ String SfxHelp::GetHelpModuleName_Impl()
}
catch (const Exception&)
{
- SAL_INFO( "sfx2", "SfxHelp::GetHelpModuleName_Impl(): exception of
XNameAccess::getByName()" );
+ SAL_WARN( "sfx2.appl", "SfxHelp::GetHelpModuleName_Impl(): exception of
XNameAccess::getByName()" );
}
}
@@ -865,7 +865,7 @@ void SfxHelp::OpenHelpAgent( const rtl::OString& sHelpId )
}
catch (const Exception&)
{
- SAL_INFO( "sfx2", "OpenHelpAgent: caught an exception while executing the
dispatch!" );
+ SAL_WARN( "sfx2.appl", "OpenHelpAgent: caught an exception while executing the
dispatch!" );
}
}
}
diff --git a/sfx2/source/bastyp/helper.cxx b/sfx2/source/bastyp/helper.cxx
index c60d9a0..7885f0d 100644
--- a/sfx2/source/bastyp/helper.cxx
+++ b/sfx2/source/bastyp/helper.cxx
@@ -108,11 +108,11 @@ uno::Sequence < OUString > SfxContentHelper::GetResultSet( const String& rURL
)
}
catch( const ucb::CommandAbortedException& )
{
- SAL_INFO( "sfx2", "createCursor: CommandAbortedException" );
+ SAL_WARN( "sfx2.bastyp", "createCursor: CommandAbortedException" );
}
catch( const uno::Exception& )
{
- SAL_INFO( "sfx2", "createCursor: Any other exception" );
+ SAL_WARN( "sfx2.bastyp", "createCursor: Any other exception" );
}
if ( xResultSet.is() )
@@ -138,17 +138,17 @@ uno::Sequence < OUString > SfxContentHelper::GetResultSet( const String& rURL
)
}
catch( const ucb::CommandAbortedException& )
{
- SAL_INFO( "sfx2", "XContentAccess::next(): CommandAbortedException" );
+ SAL_WARN( "sfx2.bastyp", "XContentAccess::next(): CommandAbortedException" );
}
catch( const uno::Exception& )
{
- SAL_INFO( "sfx2", "XContentAccess::next(): Any other exception" );
+ SAL_WARN( "sfx2.bastyp", "XContentAccess::next(): Any other exception" );
}
}
}
catch( const uno::Exception& e )
{
- SAL_INFO( "sfx2", "GetResultSet: Any other exception: " << e.Message );
+ SAL_WARN( "sfx2.bastyp", "GetResultSet: Any other exception: " << e.Message );
}
if ( pList )
@@ -299,7 +299,7 @@ sal_Bool SfxContentHelper::IsHelpErrorDocument( const String& rURL )
uno::Reference< ucb::XCommandEnvironment > () );
if ( !( aCnt.getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("IsErrorDocument")) )
= bRet ) )
{
- SAL_INFO( "sfx2", "Property 'IsErrorDocument' is missing" );
+ SAL_WARN( "sfx2.bastyp", "Property 'IsErrorDocument' is missing" );
}
}
catch( const uno::Exception& )
@@ -324,11 +324,11 @@ sal_uIntPtr SfxContentHelper::GetSize( const String& rContent )
}
catch( const ucb::CommandAbortedException& )
{
- SAL_INFO( "sfx2", "CommandAbortedException" );
+ SAL_WARN( "sfx2.bastyp", "CommandAbortedException" );
}
catch( const uno::Exception& )
{
- SAL_INFO( "sfx2", "Any other exception" );
+ SAL_WARN( "sfx2.bastyp", "Any other exception" );
}
nSize = (sal_uInt32)nTemp;
return nSize;
diff --git a/sfx2/source/config/evntconf.cxx b/sfx2/source/config/evntconf.cxx
index 1c18d3f..5ae485b 100644
--- a/sfx2/source/config/evntconf.cxx
+++ b/sfx2/source/config/evntconf.cxx
@@ -217,7 +217,7 @@ uno::Any CreateEventData_Impl( const SvxMacro *pMacro )
}
else
{
- SAL_INFO( "sfx2", "CreateEventData_Impl(): ScriptType not supported!");
+ SAL_WARN( "sfx2.config", "CreateEventData_Impl(): ScriptType not supported!");
}
}
else
@@ -256,9 +256,13 @@ void PropagateEvent_Impl( SfxObjectShell *pDoc, rtl::OUString aEventName, const
xEvents->replaceByName( aEventName, aEventData );
}
catch( const ::com::sun::star::lang::IllegalArgumentException& )
- { SAL_INFO( "sfx2", "PropagateEvents_Impl: caught IllegalArgumentException" ); }
+ {
+ SAL_WARN( "sfx2.config", "PropagateEvents_Impl: caught IllegalArgumentException" );
+ }
catch( const ::com::sun::star::container::NoSuchElementException& )
- { SAL_INFO( "sfx2", "PropagateEvents_Impl: caught NoSuchElementException" ); }
+ {
+ SAL_WARN( "sfx2.config", "PropagateEvents_Impl: caught NoSuchElementException" );
+ }
}
else {
DBG_WARNING( "PropagateEvents_Impl: Got unkown event" );
diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index 66b2474..2152121 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -451,13 +451,13 @@ void SfxDocumentInfoItem::UpdateDocumentInfo(
}
catch ( Exception& )
{
- SAL_INFO( "sfx2", "SfxDocumentInfoItem::updateDocumentInfo(): exception while
adding custom properties" );
+ SAL_WARN( "sfx2.dialog", "SfxDocumentInfoItem::updateDocumentInfo(): exception
while adding custom properties" );
}
}
}
catch ( Exception& )
{
- SAL_INFO( "sfx2", "SfxDocumentInfoItem::updateDocumentInfo(): exception while removing
custom properties" );
+ SAL_WARN( "sfx2.dialog", "SfxDocumentInfoItem::updateDocumentInfo(): exception while
removing custom properties" );
}
}
@@ -696,7 +696,7 @@ sal_Bool SfxDocumentDescPage::FillItemSet(SfxItemSet &rSet)
if ( !pInfo )
{
- SAL_INFO( "sfx2", "SfxDocumentDescPage::FillItemSet(): no item found" );
+ SAL_WARN( "sfx2.dialog", "SfxDocumentDescPage::FillItemSet(): no item found" );
return sal_False;
}
@@ -1413,7 +1413,7 @@ sal_Bool SfxInternetPage::FillItemSet( SfxItemSet& rSet )
if ( !pInfo )
{
- SAL_INFO( "sfx2", "SfxInternetPage::FillItemSet(): no item found" );
+ SAL_WARN( "sfx2.dialog", "SfxInternetPage::FillItemSet(): no item found" );
return sal_False;
}
diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx
index 7500a7a..6b00c44 100644
--- a/sfx2/source/dialog/filedlghelper.cxx
+++ b/sfx2/source/dialog/filedlghelper.cxx
@@ -274,7 +274,7 @@ OUString FileDialogHelper_Impl::handleHelpRequested( const FilePickerEvent& aEve
break;
default:
- SAL_INFO( "sfx2", "invalid element id" );
+ SAL_WARN( "sfx2.dialog", "invalid element id" );
}
OUString aHelpText;
@@ -511,7 +511,7 @@ void FileDialogHelper_Impl::updateExportButton()
}
catch( const IllegalArgumentException& )
{
- SAL_INFO( "sfx2", "FileDialogHelper_Impl::updateExportButton: caught an
exception!" );
+ SAL_WARN( "sfx2.dialog", "FileDialogHelper_Impl::updateExportButton: caught an
exception!" );
}
}
}
@@ -621,7 +621,7 @@ void FileDialogHelper_Impl::updatePreviewState( sal_Bool _bUpdatePreviewWindow )
}
catch( const Exception& )
{
- SAL_INFO( "sfx2", "FileDialogHelper_Impl::updatePreviewState: caught an
exception!" );
+ SAL_WARN( "sfx2.dialog", "FileDialogHelper_Impl::updatePreviewState: caught an
exception!" );
}
}
}
@@ -1048,7 +1048,7 @@ FileDialogHelper_Impl::FileDialogHelper_Impl(
break;
default:
- SAL_INFO( "sfx2", "FileDialogHelper::ctor with unknown type" );
+ SAL_WARN( "sfx2.dialog", "FileDialogHelper::ctor with unknown type" );
break;
}
@@ -1188,7 +1188,7 @@ void SAL_CALL PickerThread_Impl::run()
catch( const RuntimeException& )
{
SetReturnValue( ExecutableDialogResults::CANCEL );
- SAL_INFO( "sfx2", "RuntimeException caught" );
+ SAL_WARN( "sfx2.dialog", "RuntimeException caught" );
}
}
@@ -1332,7 +1332,7 @@ sal_Int16 FileDialogHelper_Impl::implDoExecute()
}
catch( const Exception& )
{
- SAL_INFO( "sfx2", "FileDialogHelper_Impl::implDoExecute: caught an exception!" );
+ SAL_WARN( "sfx2.dialog", "FileDialogHelper_Impl::implDoExecute: caught an exception!"
);
}
}
@@ -1361,7 +1361,7 @@ void FileDialogHelper_Impl::implStartExecute()
}
catch( const Exception& )
{
- SAL_INFO( "sfx2", "FileDialogHelper_Impl::implDoExecute: caught an exception!" );
+ SAL_WARN( "sfx2.dialog", "FileDialogHelper_Impl::implDoExecute: caught an exception!"
);
}
}
}
@@ -1757,7 +1757,7 @@ void FileDialogHelper_Impl::addFilters( const String& rFactory,
}
catch( const uno::Exception& )
{
- SAL_INFO( "sfx2", "Could not get filters from the configuration!" );
+ SAL_WARN( "sfx2.dialog", "Could not get filters from the configuration!" );
}
TSortedFilterList aIter (xResult);
@@ -1797,7 +1797,7 @@ void FileDialogHelper_Impl::addFilter( const OUString& rFilterName,
}
catch( const IllegalArgumentException& )
{
- SAL_INFO( "sfx2", "Could not append Filter" << rFilterName );
+ SAL_WARN( "sfx2.dialog", "Could not append Filter" << rFilterName );
}
}
@@ -1850,7 +1850,7 @@ void FileDialogHelper_Impl::addGraphicFilter()
}
catch( const IllegalArgumentException& )
{
- SAL_INFO( "sfx2", "Could not append Filter" );
+ SAL_WARN( "sfx2.dialog", "Could not append Filter" );
}
// Now add the filter
@@ -1879,7 +1879,7 @@ void FileDialogHelper_Impl::addGraphicFilter()
}
catch( const IllegalArgumentException& )
{
- SAL_INFO( "sfx2", "Could not append Filter" );
+ SAL_WARN( "sfx2.dialog", "Could not append Filter" );
}
}
}
diff --git a/sfx2/source/dialog/filtergrouping.cxx b/sfx2/source/dialog/filtergrouping.cxx
index 4eaf796..bf04732 100644
--- a/sfx2/source/dialog/filtergrouping.cxx
+++ b/sfx2/source/dialog/filtergrouping.cxx
@@ -977,7 +977,7 @@ namespace sfx2
}
catch( const IllegalArgumentException& )
{
- SAL_INFO( "sfx2", "Could not append DefaultFilter" << sUIName );
+ SAL_WARN( "sfx2.dialog", "Could not append DefaultFilter" << sUIName );
}
for ( const SfxFilter* pFilter = _rFilterMatcher.First(); pFilter; pFilter =
_rFilterMatcher.Next() )
@@ -997,7 +997,7 @@ namespace sfx2
}
catch( const IllegalArgumentException& )
{
- SAL_INFO( "sfx2", "Could not append Filter" << sUIName );
+ SAL_WARN( "sfx2.dialog", "Could not append Filter" << sUIName );
}
}
}
@@ -1147,7 +1147,7 @@ namespace sfx2
}
catch( const IllegalArgumentException& )
{
- SAL_INFO( "sfx2", "Could not append Filter" << sUIName );
+ SAL_WARN( "sfx2.dialog", "Could not append Filter" << sUIName );
}
}
@@ -1165,7 +1165,7 @@ namespace sfx2
}
catch( const IllegalArgumentException& )
{
- SAL_INFO( "sfx2", "Could not append Filter" << sUIName );
+ SAL_WARN( "sfx2.dialog", "Could not append Filter" << sUIName );
}
}
}
diff --git a/sfx2/source/dialog/mailmodel.cxx b/sfx2/source/dialog/mailmodel.cxx
index 5e0c2bf..0284df0 100644
--- a/sfx2/source/dialog/mailmodel.cxx
+++ b/sfx2/source/dialog/mailmodel.cxx
@@ -774,7 +774,7 @@ void SfxMailModel::AddAddress( const String& rAddress, AddressRole eRole )
}
else
{
- SAL_INFO( "sfx2", "invalid address role" );
+ SAL_WARN( "sfx2.dialog", "invalid address role" );
}
if ( pList )
diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx
index decc637..fece885 100644
--- a/sfx2/source/dialog/tabdlg.cxx
+++ b/sfx2/source/dialog/tabdlg.cxx
@@ -834,7 +834,7 @@ void SfxTabDialog::RemoveTabPage( sal_uInt16 nId )
}
else
{
- SAL_INFO( "sfx2", "TabPage-Id not known" );
+ SAL_INFO( "sfx2.dialog", "TabPage-Id not known" );
}
}
@@ -973,7 +973,7 @@ SfxItemSet* SfxTabDialog::CreateInputItemSet( sal_uInt16 )
*/
{
- SAL_INFO( "sfx2", "CreateInputItemSet not implemented" );
+ SAL_WARN( "sfx2.dialog", "CreateInputItemSet not implemented" );
return new SfxAllItemSet( SFX_APP()->GetPool() );
}
@@ -989,7 +989,7 @@ const SfxItemSet* SfxTabDialog::GetRefreshedSet()
*/
{
- SAL_INFO ( "sfx2", "GetRefreshedSet not implemented" );
+ SAL_INFO ( "sfx2.dialog", "GetRefreshedSet not implemented" );
return 0;
}
@@ -1395,7 +1395,7 @@ const sal_uInt16* SfxTabDialog::GetInputRanges( const SfxItemPool& rPool )
{
if ( pSet )
{
- SAL_INFO( "sfx2", "Set already exists!" );
+ SAL_WARN( "sfx2.dialog", "Set already exists!" );
return pSet->GetRanges();
}
diff --git a/sfx2/source/doc/doctempl.cxx b/sfx2/source/doc/doctempl.cxx
index 61ca3f6..f140aa6 100644
--- a/sfx2/source/doc/doctempl.cxx
+++ b/sfx2/source/doc/doctempl.cxx
@@ -664,7 +664,7 @@ sal_Bool SfxDocumentTemplates::CopyOrMove
if ( nSourceRegion == nTargetRegion )
{
- SAL_INFO( "sfx2", "Don't know, what to do!" );
+ SAL_WARN( "sfx2.doc", "Don't know, what to do!" );
return sal_False;
}
@@ -1694,7 +1694,7 @@ const OUString& DocTempl_EntryData_Impl::GetTargetURL()
}
else
{
- SAL_INFO( "sfx2", "GetTargetURL(): Could not create hierarchy content!" );
+ SAL_WARN( "sfx2.doc", "GetTargetURL(): Could not create hierarchy content!" );
}
}
@@ -1857,7 +1857,7 @@ const OUString& RegionData_Impl::GetTargetURL()
}
else
{
- SAL_INFO( "sfx2", "GetTargetURL(): Could not create hierarchy content!" );
+ SAL_WARN( "sfx2.doc", "GetTargetURL(): Could not create hierarchy content!" );
}
}
@@ -2171,7 +2171,7 @@ void SfxDocTemplate_Impl::Rescan()
}
catch( const Exception& )
{
- SAL_INFO( "sfx2", "SfxDocTemplate_Impl::Rescan: caught an exception while doing the
update!" );
+ SAL_WARN( "sfx2.doc", "SfxDocTemplate_Impl::Rescan: caught an exception while doing the
update!" );
}
}
diff --git a/sfx2/source/doc/doctemplates.cxx b/sfx2/source/doc/doctemplates.cxx
index 923c18c..f620bc3 100644
--- a/sfx2/source/doc/doctemplates.cxx
+++ b/sfx2/source/doc/doctemplates.cxx
@@ -489,7 +489,7 @@ void SfxDocTplService_Impl::init_Impl()
}
else
{
- SAL_INFO( "sfx2", "init_Impl(): Could not create root" );
+ SAL_WARN( "sfx2.doc", "init_Impl(): Could not create root" );
}
mbIsInitialized = bIsInitialized;
@@ -839,11 +839,11 @@ sal_Bool SfxDocTplService_Impl::createFolder( const OUString& rNewFolderURL,
}
catch( RuntimeException& )
{
- SAL_INFO( "sfx2", "createFolder(): got runtime exception" );
+ SAL_WARN( "sfx2.doc", "createFolder(): got runtime exception" );
}
catch( Exception& )
{
- SAL_INFO( "sfx2", "createFolder(): Could not create new folder" );
+ SAL_WARN( "sfx2.doc", "createFolder(): Could not create new folder" );
}
}
else if ( bCreateParent )
@@ -1042,8 +1042,12 @@ sal_Bool SfxDocTplService_Impl::setProperty( Content& rContent,
xProperties->addProperty( rPropName, PropertyAttribute::MAYBEVOID, rPropValue
);
}
catch( PropertyExistException& ) {}
- catch( IllegalTypeException& ) { SAL_INFO( "sfx2", "IllegalTypeException" ); }
- catch( IllegalArgumentException& ) { SAL_INFO( "sfx2", "IllegalArgumentException"
); }
+ catch( IllegalTypeException& ) {
+ SAL_WARN( "sfx2.doc", "IllegalTypeException" );
+ }
+ catch( IllegalArgumentException& ) {
+ SAL_WARN( "sfx2.doc", "IllegalArgumentException" );
+ }
}
}
@@ -2466,7 +2470,7 @@ void SfxDocTplService_Impl::addHierGroup( GroupList_Impl& rList,
}
catch ( ContentCreationException& )
{
- SAL_INFO( "sfx2", "addHierGroup: ContentCreationException" );
+ SAL_WARN( "sfx2.doc", "addHierGroup: ContentCreationException" );
}
catch ( Exception& ) {}
@@ -2499,7 +2503,7 @@ void SfxDocTplService_Impl::addHierGroup( GroupList_Impl& rList,
sal_Bool bDocHasTitle = sal_False;
if( !getTitleFromURL( aTargetDir, aTmpTitle, aType, bDocHasTitle ) )
{
- SAL_INFO( "sfx2", "addHierGroup(): template of alien format" );
+ SAL_WARN( "sfx2.doc", "addHierGroup(): template of alien format" );
continue;
}
diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx
index 7003c0d..a4f165d 100644
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.cxx
@@ -2897,7 +2897,7 @@ sal_Int16 SfxObjectShell::QueryHiddenInformation( HiddenWarningFact eFact,
Windo
}
default:
{
- SAL_INFO( "sfx2", "SfxObjectShell::DetectHiddenInformation(): what fact?" );
+ SAL_WARN( "sfx2.doc", "SfxObjectShell::DetectHiddenInformation(): what fact?" );
}
}
diff --git a/sfx2/source/doc/oleprops.cxx b/sfx2/source/doc/oleprops.cxx
index 42250f8..91d9c5b 100644
--- a/sfx2/source/doc/oleprops.cxx
+++ b/sfx2/source/doc/oleprops.cxx
@@ -687,7 +687,7 @@ SfxOleThumbnailProperty::SfxOleThumbnailProperty(
void SfxOleThumbnailProperty::ImplLoad( SvStream& )
{
- SAL_INFO( "sfx2", "SfxOleThumbnailProperty::ImplLoad - not implemented" );
+ SAL_WARN( "sfx2.doc", "SfxOleThumbnailProperty::ImplLoad - not implemented" );
SetError( SVSTREAM_INVALID_ACCESS );
}
@@ -721,7 +721,7 @@ void SfxOleThumbnailProperty::ImplSave( SvStream& rStrm )
}
else
{
- SAL_INFO( "sfx2", "SfxOleThumbnailProperty::ImplSave - invalid thumbnail property" );
+ SAL_WARN( "sfx2.doc", "SfxOleThumbnailProperty::ImplSave - invalid thumbnail property" );
SetError( SVSTREAM_INVALID_ACCESS );
}
}
@@ -737,7 +737,7 @@ SfxOleBlobProperty::SfxOleBlobProperty( sal_Int32 nPropId,
void SfxOleBlobProperty::ImplLoad( SvStream& )
{
- SAL_INFO( "sfx2", "SfxOleBlobProperty::ImplLoad - not implemented" );
+ SAL_WARN( "sfx2.doc", "SfxOleBlobProperty::ImplLoad - not implemented" );
SetError( SVSTREAM_INVALID_ACCESS );
}
@@ -746,7 +746,7 @@ void SfxOleBlobProperty::ImplSave( SvStream& rStrm )
if (IsValid()) {
rStrm.Write( mData.getConstArray(), mData.getLength() );
} else {
- SAL_INFO( "sfx2", "SfxOleBlobProperty::ImplSave - invalid BLOB property" );
+ SAL_WARN( "sfx2.doc", "SfxOleBlobProperty::ImplSave - invalid BLOB property" );
SetError( SVSTREAM_INVALID_ACCESS );
}
}
@@ -1320,7 +1320,7 @@ const SvGlobalName& SfxOlePropertySet::GetSectionGuid( SfxOleSectionType
eSectio
case SECTION_GLOBAL: return saGlobalGuid;
case SECTION_BUILTIN: return saBuiltInGuid;
case SECTION_CUSTOM: return saCustomGuid;
- default: SAL_INFO( "sfx2", "SfxOlePropertySet::GetSectionGuid - unknown section type" );
+ default: SAL_WARN( "sfx2.doc", "SfxOlePropertySet::GetSectionGuid - unknown section
type" );
}
return saEmptyGuid;
}
diff --git a/sfx2/source/notify/eventsupplier.cxx b/sfx2/source/notify/eventsupplier.cxx
index 18276e7..fd65065 100644
--- a/sfx2/source/notify/eventsupplier.cxx
+++ b/sfx2/source/notify/eventsupplier.cxx
@@ -290,7 +290,7 @@ static void Execute( ANY& aEventData, const css::document::DocumentEvent& aTrigg
}
else
{
- SAL_INFO( "sfx2", "notifyEvent(): Unsupported event type" );
+ SAL_WARN( "sfx2.notify", "notifyEvent(): Unsupported event type" );
}
}
}
@@ -413,7 +413,7 @@ SvxMacro* SfxEvents_Impl::ConvertToMacro( const ANY& rElement, SfxObjectShell* p
else if (aType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(SVX_MACRO_LANGUAGE_JAVASCRIPT)))
eType = JAVASCRIPT;
else {
- SAL_INFO( "sfx2", "ConvertToMacro: Unknown macro type" );
+ SAL_WARN( "sfx2.notify", "ConvertToMacro: Unknown macro type" );
}
if ( !aMacroName.isEmpty() )
@@ -479,7 +479,7 @@ void SfxEvents_Impl::NormalizeMacro( const ::comphelper::NamedValueCollection& i
}
else
{
- SAL_INFO( "sfx2", "ConvertToMacro: Unknown macro url format" );
+ SAL_WARN( "sfx2.notify", "ConvertToMacro: Unknown macro url format" );
}
}
}
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index b226f48..b6584e0 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -2734,7 +2734,7 @@ void SfxViewFrame::AddDispatchMacroToBasic_Impl( const ::rtl::OUString&
sMacro )
if(!xLibCont.is())
{
- SAL_INFO( "sfx2", "couldn't get access to the basic lib container. Adding of macro
isn't possible." );
+ SAL_WARN( "sfx2.view", "couldn't get access to the basic lib container. Adding of
macro isn't possible." );
return;
}
--------------true--
From aa7af1203c5330bafe741904a08f858f5c0d51c4 Mon Sep 17 00:00:00 2001
Message-Id: <aa7af1203c5330bafe741904a08f858f5c0d51c4.1326807953.git.mmetz@adrian-broher.net>
In-Reply-To: <e3c8dc11ca41a332a0b633c425d787ae49dc0dbc.1326807952.git.mmetz@adrian-broher.net>
References: <e3c8dc11ca41a332a0b633c425d787ae49dc0dbc.1326807952.git.mmetz@adrian-broher.net>
From: Marcel Metz <mmetz@adrian-broher.net>
Date: Mon, 16 Jan 2012 22:16:03 +0100
Subject: [PATCH 4/7] Replaced SAL_INFO with SAL_WARN were applicable.
To: libreoffice@lists.freedesktop.org
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="------------true"
This is a multi-part message in MIME format.
--------------true
Content-Type: text/plain; charset=UTF-8; format=fixed
Content-Transfer-Encoding: 8bit
---
cui/source/customize/cfg.cxx | 4 ++--
cui/source/dialogs/iconcdlg.cxx | 6 +++---
cui/source/dialogs/srchxtra.cxx | 2 +-
cui/source/factory/dlgfact.cxx | 2 +-
cui/source/options/cfgchart.cxx | 4 ++--
cui/source/options/optctl.cxx | 2 +-
cui/source/options/optgdlg.cxx | 2 +-
cui/source/options/optjava.cxx | 4 ++--
cui/source/options/optlingu.cxx | 4 ++--
cui/source/options/optpath.cxx | 4 ++--
cui/source/options/treeopt.cxx | 12 ++++++------
cui/source/tabpages/chardlg.cxx | 4 ++--
cui/source/tabpages/paragrph.cxx | 2 +-
13 files changed, 26 insertions(+), 26 deletions(-)
--------------true
Content-Type: text/x-patch; name="0004-Replaced-SAL_INFO-with-SAL_WARN-were-applicable.patch"
Content-Transfer-Encoding: 8bit
Content-Disposition: attachment;
filename="0004-Replaced-SAL_INFO-with-SAL_WARN-were-applicable.patch"
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index f744d3b..769789e 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -1921,7 +1921,7 @@ void SvxConfigPage::Reset( const SfxItemSet& )
if ( !_inout_rxFrame.is() )
{
- SAL_INFO( "cui", "SvxConfigPage::GetFrameWithDefaultAndIdentify(): no frame found!" );
+ SAL_WARN( "cui.customize", "SvxConfigPage::GetFrameWithDefaultAndIdentify(): no frame
found!" );
return sModuleID;
}
@@ -3293,7 +3293,7 @@ void SvxToolbarConfigPage::MoveEntry( bool bMoveUp )
((ToolbarSaveInData*)GetSaveInData())->ApplyToolbar( pToolbar );
else
{
- SAL_INFO( "cui", "SvxToolbarConfigPage::MoveEntry(): no entry" );
+ SAL_WARN( "cui.customize", "SvxToolbarConfigPage::MoveEntry(): no entry" );
UpdateButtonStates();
}
}
diff --git a/cui/source/dialogs/iconcdlg.cxx b/cui/source/dialogs/iconcdlg.cxx
index 1c16293..6774c98 100644
--- a/cui/source/dialogs/iconcdlg.cxx
+++ b/cui/source/dialogs/iconcdlg.cxx
@@ -875,7 +875,7 @@ const sal_uInt16* IconChoiceDialog::GetInputRanges( const SfxItemPool& rPool )
{
if ( pSet )
{
- SAL_INFO( "cui", "Set does already exist!" );
+ SAL_WARN( "cui.dialogs", "Set does already exist!" );
return pSet->GetRanges();
}
@@ -945,7 +945,7 @@ void IconChoiceDialog::PageCreated( sal_uInt16 /*nId*/, IconChoicePage& /*rPage*
SfxItemSet* IconChoiceDialog::CreateInputItemSet( sal_uInt16 )
{
- SAL_INFO( "cui", "CreateInputItemSet not implemented" );
+ SAL_INFO( "cui.dialogs", "CreateInputItemSet not implemented" );
return 0;
}
@@ -1041,7 +1041,7 @@ void IconChoiceDialog::Start_Impl()
const SfxItemSet* IconChoiceDialog::GetRefreshedSet()
{
- SAL_INFO( "cui", "GetRefreshedSet not implemented" );
+ SAL_WARN( "cui.dialogs", "GetRefreshedSet not implemented" );
return 0;
}
diff --git a/cui/source/dialogs/srchxtra.cxx b/cui/source/dialogs/srchxtra.cxx
index 34aaf9e..2013e69 100644
--- a/cui/source/dialogs/srchxtra.cxx
+++ b/cui/source/dialogs/srchxtra.cxx
@@ -186,7 +186,7 @@ SvxSearchAttributeDialog::SvxSearchAttributeDialog( Window* pParent,
if ( RESARRAY_INDEX_NOTFOUND != nId )
pEntry = aAttrLB.SvTreeListBox::InsertEntry( aAttrNames.GetString(nId) );
else
- SAL_INFO( "cui", "no resource for slot id\nslot = " <<
static_cast<sal_Int32>(nSlot) );
+ SAL_WARN( "cui.dialogs", "no resource for slot id " <<
static_cast<sal_Int32>(nSlot) );
if ( pEntry )
{
diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx
index 8425b80..04fa895 100644
--- a/cui/source/factory/dlgfact.cxx
+++ b/cui/source/factory/dlgfact.cxx
@@ -189,7 +189,7 @@ IMPL_LINK( VclAbstractDialog2_Impl, EndDialogHdl, Dialog*, pDlg )
{
if ( pDlg != m_pDlg )
{
- SAL_INFO( "cui", "VclAbstractDialog2_Impl::EndDialogHdl(): wrong dialog" );
+ SAL_WARN( "cui.factory", "VclAbstractDialog2_Impl::EndDialogHdl(): wrong dialog" );
}
m_aEndDlgHdl.Call( this );
diff --git a/cui/source/options/cfgchart.cxx b/cui/source/options/cfgchart.cxx
index edef3a1..2556df1 100644
--- a/cui/source/options/cfgchart.cxx
+++ b/cui/source/options/cfgchart.cxx
@@ -57,7 +57,7 @@ const XColorEntry & SvxChartColorTable::operator[]( size_t _nIndex ) const
{
if ( _nIndex >= m_aColorEntries.size() )
{
- SAL_INFO( "cui", "SvxChartColorTable::[] invalid index" );
+ SAL_WARN( "cui.options", "SvxChartColorTable::[] invalid index" );
return m_aColorEntries[ 0 ];
}
@@ -68,7 +68,7 @@ ColorData SvxChartColorTable::getColorData( size_t _nIndex ) const
{
if ( _nIndex >= m_aColorEntries.size() )
{
- SAL_INFO( "cui", "SvxChartColorTable::getColorData invalid index" );
+ SAL_WARN( "cui.options", "SvxChartColorTable::getColorData invalid index" );
return COL_BLACK;
}
diff --git a/cui/source/options/optctl.cxx b/cui/source/options/optctl.cxx
index 51bf7ad..d6e87b1 100644
--- a/cui/source/options/optctl.cxx
+++ b/cui/source/options/optctl.cxx
@@ -148,7 +148,7 @@ void SvxCTLOptionsPage::Reset( const SfxItemSet& )
break;
default:
- SAL_INFO( "cui", "SvxCTLOptionsPage::Reset(): invalid movement enum" );
+ SAL_WARN( "cui.options", "SvxCTLOptionsPage::Reset(): invalid movement enum" );
}
sal_uInt16 nPos = (sal_uInt16)aCTLOptions.GetCTLTextNumerals();
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index c55e8e4..25a45c6 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -1857,7 +1857,7 @@ IMPL_LINK( OfaLanguagesTabPage, SupportHdl, CheckBox*, pBox )
m_bOldCtl = bCheck;
}
else
- SAL_INFO( "cui", "OfaLanguagesTabPage::SupportHdl(): wrong pBox" );
+ SAL_WARN( "cui.options", "OfaLanguagesTabPage::SupportHdl(): wrong pBox" );
return 0;
}
diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx
index 43f2373..25d6b5a 100644
--- a/cui/source/options/optjava.cxx
+++ b/cui/source/options/optjava.cxx
@@ -259,7 +259,7 @@ IMPL_LINK( SvxJavaOptionsPage, AddHdl_Impl, PushButton *, EMPTYARG )
}
catch ( Exception& )
{
- SAL_INFO( "cui", "SvxJavaOptionsPage::AddHdl_Impl(): caught exception" );
+ SAL_WARN( "cui.options", "SvxJavaOptionsPage::AddHdl_Impl(): caught exception" );
}
return 0;
@@ -379,7 +379,7 @@ IMPL_LINK( SvxJavaOptionsPage, StartFolderPickerHdl, void*, EMPTYARG )
}
catch ( Exception& )
{
- SAL_INFO( "cui", "SvxJavaOptionsPage::StartFolderPickerHdl(): caught exception" );
+ SAL_WARN( "cui.options", "SvxJavaOptionsPage::StartFolderPickerHdl(): caught exception" );
}
return 0L;
diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx
index 8a800d3..3319c32 100644
--- a/cui/source/options/optlingu.cxx
+++ b/cui/source/options/optlingu.cxx
@@ -187,12 +187,12 @@ sal_Bool KillFile_Impl( const String& rURL )
}
catch( ::com::sun::star::ucb::CommandAbortedException& )
{
- SAL_INFO( "cui", "KillFile: CommandAbortedException" );
+ SAL_WARN( "cui.options", "KillFile: CommandAbortedException" );
bRet = sal_False;
}
catch( ... )
{
- SAL_INFO( "cui", "KillFile: Any other exception" );
+ SAL_WARN( "cui.options", "KillFile: Any other exception" );
bRet = sal_False;
}
diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx
index 7abc6ff..cdecf06 100644
--- a/cui/source/options/optpath.cxx
+++ b/cui/source/options/optpath.cxx
@@ -483,7 +483,7 @@ void SvxPathTabPage::ChangeCurrentEntry( const String& _rFolder )
SvLBoxEntry* pEntry = pPathBox->GetCurEntry();
if ( !pEntry )
{
- SAL_INFO( "cui", "SvxPathTabPage::ChangeCurrentEntry(): no entry" );
+ SAL_WARN( "cui.options", "SvxPathTabPage::ChangeCurrentEntry(): no entry" );
return;
}
@@ -646,7 +646,7 @@ IMPL_LINK( SvxPathTabPage, PathHdl_Impl, PushButton *, EMPTYARG )
}
catch( Exception& )
{
- SAL_INFO( "cui", "SvxPathTabPage::PathHdl_Impl: exception from folder picker" );
+ SAL_WARN( "cui.options", "SvxPathTabPage::PathHdl_Impl: exception from folder picker"
);
}
}
return 0;
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index 64fe2c5..6668f68 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -996,7 +996,7 @@ void OfaTreeOptionsDialog::SelectHdl_Impl()
ActivatePage(RID_SFXPAGE_SAVE);
break;
default:
- SAL_WARN("cui", "Unrecognized options category " << pGroupInfo->m_nDialogId);
+ SAL_WARN("cui.options", "Unrecognized options category " << pGroupInfo->m_nDialogId);
break;
}
@@ -1637,7 +1637,7 @@ rtl::OUString getCurrentFactory_Impl( const Reference< XFrame >& _xFrame )
}
catch ( Exception& )
{
- SAL_INFO( "cui", "getActiveModule_Impl(): exception of XModuleManager::identify()" );
+ SAL_WARN( "cui.options", "getActiveModule_Impl(): exception of
XModuleManager::identify()" );
}
}
@@ -2095,7 +2095,7 @@ rtl::OUString OfaTreeOptionsDialog::GetModuleIdentifier(
}
catch ( Exception& )
{
- SAL_INFO( "cui", "OfaTreeOptionsDialog::GetModuleIdentifier(): exception of
XModuleManager::identify()" );
+ SAL_WARN( "cui.options", "OfaTreeOptionsDialog::GetModuleIdentifier(): exception of
XModuleManager::identify()" );
}
}
return sModule;
@@ -2474,11 +2474,11 @@ void ExtensionsTabPage::CreateDialogWithHandler()
}
catch ( ::com::sun::star::lang::IllegalArgumentException& )
{
- SAL_INFO( "cui", "ExtensionsTabPage::CreateDialogWithHandler(): illegal argument" );
+ SAL_WARN( "cui.options", "ExtensionsTabPage::CreateDialogWithHandler(): illegal argument"
);
}
catch ( Exception& )
{
- SAL_INFO( "cui", "ExtensionsTabPage::CreateDialogWithHandler(): exception of
XDialogProvider2::createDialogWithHandler()" );
+ SAL_WARN( "cui.options", "ExtensionsTabPage::CreateDialogWithHandler(): exception of
XDialogProvider2::createDialogWithHandler()" );
}
}
@@ -2495,7 +2495,7 @@ sal_Bool ExtensionsTabPage::DispatchAction( const rtl::OUString& rAction )
}
catch ( Exception& )
{
- SAL_INFO( "cui", "ExtensionsTabPage::DispatchAction(): exception of
XDialogEventHandler::callHandlerMethod()" );
+ SAL_WARN( "cui.options", "ExtensionsTabPage::DispatchAction(): exception of
XDialogEventHandler::callHandlerMethod()" );
}
}
return bRet;
diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx
index adb6597..7efd965 100644
--- a/cui/source/tabpages/chardlg.cxx
+++ b/cui/source/tabpages/chardlg.cxx
@@ -657,7 +657,7 @@ void SvxCharNamePage::FillStyleBox_Impl( const FontNameBox* pNameBox )
pStyleBox = m_pCTLFontStyleLB;
else
{
- SAL_INFO( "cui", "invalid font name box" );
+ SAL_WARN( "cui.tabpages", "invalid font name box" );
return;
}
@@ -704,7 +704,7 @@ void SvxCharNamePage::FillSizeBox_Impl( const FontNameBox* pNameBox )
}
else
{
- SAL_INFO( "cui", "invalid font name box" );
+ SAL_WARN( "cui.tabpages", "invalid font name box" );
return;
}
diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx
index 2bdebeb..4191ee0 100644
--- a/cui/source/tabpages/paragrph.cxx
+++ b/cui/source/tabpages/paragrph.cxx
@@ -1343,7 +1343,7 @@ IMPL_LINK( SvxParaAlignTabPage, TextDirectionHdl_Impl, ListBox*, EMPTYARG )
case FRMDIR_ENVIRONMENT : /* do nothing */ break;
default:
{
- SAL_INFO( "cui", "SvxParaAlignTabPage::TextDirectionHdl_Impl(): other directions not
supported" );
+ SAL_WARN( "cui.tabpages", "SvxParaAlignTabPage::TextDirectionHdl_Impl(): other
directions not supported" );
}
}
--------------true--
From 2eed719f7df75f2a8003b78e944c47e77e53f48a Mon Sep 17 00:00:00 2001
Message-Id: <2eed719f7df75f2a8003b78e944c47e77e53f48a.1326807953.git.mmetz@adrian-broher.net>
In-Reply-To: <e3c8dc11ca41a332a0b633c425d787ae49dc0dbc.1326807952.git.mmetz@adrian-broher.net>
References: <e3c8dc11ca41a332a0b633c425d787ae49dc0dbc.1326807952.git.mmetz@adrian-broher.net>
From: Marcel Metz <mmetz@adrian-broher.net>
Date: Mon, 16 Jan 2012 23:11:06 +0100
Subject: [PATCH 5/7] Replaced SAL_INFO with SAL_WARN were applicable.
To: libreoffice@lists.freedesktop.org
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="------------true"
This is a multi-part message in MIME format.
--------------true
Content-Type: text/plain; charset=UTF-8; format=fixed
Content-Transfer-Encoding: 8bit
---
svtools/source/config/helpopt.cxx | 10 +++++-----
svtools/source/contnr/contentenumeration.cxx | 10 +++++-----
svtools/source/contnr/fileview.cxx | 4 ++--
svtools/source/contnr/svlbox.cxx | 4 ++--
svtools/source/contnr/svtabbx.cxx | 2 +-
svtools/source/control/calendar.cxx | 6 +++---
svtools/source/control/ruler.cxx | 2 +-
svtools/source/dialogs/prnsetup.cxx | 2 +-
svtools/source/filter/filter.cxx | 10 +++++-----
svtools/source/misc/ehdl.cxx | 6 +++---
svtools/source/misc/templatefoldercache.cxx | 4 ++--
11 files changed, 30 insertions(+), 30 deletions(-)
--------------true
Content-Type: text/x-patch; name="0005-Replaced-SAL_INFO-with-SAL_WARN-were-applicable.patch"
Content-Transfer-Encoding: 8bit
Content-Disposition: attachment;
filename="0005-Replaced-SAL_INFO-with-SAL_WARN-were-applicable.patch"
diff --git a/svtools/source/config/helpopt.cxx b/svtools/source/config/helpopt.cxx
index aeac457..810a879 100644
--- a/svtools/source/config/helpopt.cxx
+++ b/svtools/source/config/helpopt.cxx
@@ -214,7 +214,7 @@ void SvtHelpOptions_Impl::Load(const uno::Sequence< ::rtl::OUString>& rProperty
bHelpAgentEnabled = bTmp;
break;
default:
- SAL_INFO( "svtools", "Wrong Member!" );
+ SAL_WARN( "svtools.config", "Wrong Member!" );
break;
}
}
@@ -233,7 +233,7 @@ void SvtHelpOptions_Impl::Load(const uno::Sequence< ::rtl::OUString>& rProperty
sHelpStyleSheet = aTmpStr;
break;
default:
- SAL_INFO( "svtools", "Wrong Member!" );
+ SAL_WARN( "svtools.config", "Wrong Member!" );
break;
}
}
@@ -250,13 +250,13 @@ void SvtHelpOptions_Impl::Load(const uno::Sequence< ::rtl::OUString>&
rProperty
break;
default:
- SAL_INFO( "svtools", "Wrong Member!" );
+ SAL_WARN( "svtools.config", "Wrong Member!" );
break;
}
}
else
{
- SAL_INFO( "svtools", "Wrong Type!" );
+ SAL_WARN( "svtools.config", "Wrong Type!" );
}
}
}
@@ -431,7 +431,7 @@ void SvtHelpOptions_Impl::implSaveURLCounters()
sNewNodeName = sNodeNameBase;
if (!getUniqueSetElementName(sIgnoreListNodePath, sNewNodeName))
{
- SAL_INFO( "svtools", "SvtHelpOptions_Impl::implSaveURLCounters: could not get a
free name!" );
+ SAL_WARN( "svtools.config", "SvtHelpOptions_Impl::implSaveURLCounters: could not
get a free name!" );
continue;
}
AddNode(sIgnoreListNodePath, sNewNodeName);
diff --git a/svtools/source/contnr/contentenumeration.cxx
b/svtools/source/contnr/contentenumeration.cxx
index 94fd227..ea846b6 100644
--- a/svtools/source/contnr/contentenumeration.cxx
+++ b/svtools/source/contnr/contentenumeration.cxx
@@ -230,7 +230,7 @@ namespace svt
}
catch( CommandAbortedException& )
{
- SAL_INFO( "svtools", "createCursor: CommandAbortedException" );
+ SAL_WARN( "svtools.contnr", "createCursor: CommandAbortedException" );
}
catch( Exception& )
{
@@ -353,21 +353,21 @@ namespace svt
}
catch( CommandAbortedException& )
{
- SAL_INFO( "svtools", "FileViewContentEnumerator::enumerateFolderContent:
caught an CommandAbortedException while enumerating!" );
+ SAL_WARN( "svtools.contnr",
"FileViewContentEnumerator::enumerateFolderContent: caught an CommandAbortedException while
enumerating!" );
}
catch( Exception& )
{
- SAL_INFO( "svtools", "FileViewContentEnumerator::enumerateFolderContent:
caught an exception other than CommandAbortedException while enumerating!" );
+ SAL_WARN( "svtools.contnr",
"FileViewContentEnumerator::enumerateFolderContent: caught an exception other than
CommandAbortedException while enumerating!" );
}
}
}
catch( CommandAbortedException& )
{
- SAL_INFO( "svtools", "FileViewContentEnumerator::enumerateFolderContent: caught an
CommandAbortedException!" );
+ SAL_WARN( "svtools.contnr", "FileViewContentEnumerator::enumerateFolderContent: caught
an CommandAbortedException!" );
}
catch( Exception& )
{
- SAL_INFO( "svtools", "FileViewContentEnumerator::enumerateFolderContent: caught an
exception other than CommandAbortedException!" );
+ SAL_WARN( "svtools.contnr", "FileViewContentEnumerator::enumerateFolderContent: caught
an exception other than CommandAbortedException!" );
}
IEnumerationResultHandler* pHandler = NULL;
diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx
index 83449fe..7fdc9fa 100644
--- a/svtools/source/contnr/fileview.cxx
+++ b/svtools/source/contnr/fileview.cxx
@@ -1942,7 +1942,7 @@ FileViewResult SvtFileView_Impl::GetFolderContent_Impl(
return eStillRunning;
}
- SAL_INFO( "svtools", "SvtFileView_Impl::GetFolderContent_Impl: unreachable!" );
+ SAL_WARN( "svtools.contnr", "SvtFileView_Impl::GetFolderContent_Impl: unreachable!" );
return eFailure;
}
@@ -2303,7 +2303,7 @@ void SvtFileView_Impl::CreateVector_Impl( const Sequence < OUString > &rList )
if ( !aDate.isEmpty() )
{
- SAL_INFO( "svtools", "Don't know, how to convert date" );
+ SAL_WARN( "svtools.contnr", "Don't know, how to convert date" );
;// convert date string to date
}
}
diff --git a/svtools/source/contnr/svlbox.cxx b/svtools/source/contnr/svlbox.cxx
index d86468a..19068e6 100644
--- a/svtools/source/contnr/svlbox.cxx
+++ b/svtools/source/contnr/svlbox.cxx
@@ -1681,14 +1681,14 @@ sal_Int8 SvLBox::AcceptDrop( const AcceptDropEvent& rEvt )
}
else if( !nDragDropMode )
{
- SAL_INFO( "svtools", "SvLBox::QueryDrop(): no target" );
+ SAL_WARN( "svtools.contnr", "SvLBox::QueryDrop(): no target" );
}
else
{
SvLBoxEntry* pEntry = GetDropTarget( rEvt.maPosPixel );
if( !IsDropFormatSupported( SOT_FORMATSTR_ID_TREELISTBOX ) )
{
- SAL_INFO( "svtools", "SvLBox::QueryDrop(): no format" );
+ SAL_WARN( "svtools.contnr", "SvLBox::QueryDrop(): no format" );
}
else
{
diff --git a/svtools/source/contnr/svtabbx.cxx b/svtools/source/contnr/svtabbx.cxx
index f68dce2..8d1ad28 100644
--- a/svtools/source/contnr/svtabbx.cxx
+++ b/svtools/source/contnr/svtabbx.cxx
@@ -773,7 +773,7 @@ sal_Bool SvHeaderTabListBox::IsCellCheckBox( long _nRow, sal_uInt16 _nColumn, Tr
}
else
{
- SAL_INFO( "svtools", "SvHeaderTabListBox::IsCellCheckBox(): column out of range" );
+ SAL_WARN( "svtools.contnr", "SvHeaderTabListBox::IsCellCheckBox(): column out of
range" );
}
}
return bRet;
diff --git a/svtools/source/control/calendar.cxx b/svtools/source/control/calendar.cxx
index 0b291e0..f7919dc 100644
--- a/svtools/source/control/calendar.cxx
+++ b/svtools/source/control/calendar.cxx
@@ -215,9 +215,9 @@ void Calendar::ImplInit( WinBits nWinStyle )
Application::GetAppLocaleDataWrapper().getLocale());
if (maCalendarWrapper.getUniqueID() != aGregorian)
{
-#ifdef SAL_LOG_INFO
+#ifdef SAL_LOG_WARN
lang::Locale aLoc( Application::GetAppLocaleDataWrapper().getLocale() );
- SAL_INFO( "svtools", "Calendar::ImplInit: No ``gregorian'' calendar available for locale
``"
+ SAL_WARN( "svtools.control", "Calendar::ImplInit: No ``gregorian'' calendar available for
locale ``"
<< aLoc.Language << "-" << aLoc.Country
<< "'' and other calendars aren't supported. Using en-US fallback." );
#endif
@@ -327,7 +327,7 @@ DayOfWeek Calendar::ImplGetWeekStart() const
eDay = SATURDAY;
break;
default:
- SAL_INFO( "svtools", "Calendar::ImplGetWeekStart: broken i18n Gregorian calendar
(getFirstDayOfWeek())");
+ SAL_WARN( "svtools.control", "Calendar::ImplGetWeekStart: broken i18n Gregorian
calendar (getFirstDayOfWeek())");
eDay = SUNDAY;
}
return eDay;
diff --git a/svtools/source/control/ruler.cxx b/svtools/source/control/ruler.cxx
index 95e4371..d014cbb 100644
--- a/svtools/source/control/ruler.cxx
+++ b/svtools/source/control/ruler.cxx
@@ -2728,7 +2728,7 @@ void Ruler::SetUnit( FieldUnit eNewUnit )
mnUnitIndex = RULER_UNIT_LINE;
break;
default:
- SAL_INFO( "svtools", "Ruler::SetUnit() - Wrong Unit" );
+ SAL_WARN( "svtools.control", "Ruler::SetUnit() - Wrong Unit" );
break;
}
diff --git a/svtools/source/dialogs/prnsetup.cxx b/svtools/source/dialogs/prnsetup.cxx
index 3e0a140..d26d58e 100644
--- a/svtools/source/dialogs/prnsetup.cxx
+++ b/svtools/source/dialogs/prnsetup.cxx
@@ -365,7 +365,7 @@ short PrinterSetupDialog::Execute()
{
if ( !mpPrinter || mpPrinter->IsPrinting() || mpPrinter->IsJobActive() )
{
- SAL_INFO( "svtools", "PrinterSetupDialog::Execute() - No Printer or printer is printing" );
+ SAL_WARN( "svtools.dialogs", "PrinterSetupDialog::Execute() - No Printer or printer is
printing" );
return sal_False;
}
diff --git a/svtools/source/filter/filter.cxx b/svtools/source/filter/filter.cxx
index 318383a..bd95ab7 100644
--- a/svtools/source/filter/filter.cxx
+++ b/svtools/source/filter/filter.cxx
@@ -133,15 +133,15 @@ sal_Bool ImplDirEntryHelper::Exists( const INetURLObject& rObj )
}
catch(const ::com::sun::star::ucb::CommandAbortedException&)
{
- SAL_INFO( "svtools", "CommandAbortedException" );
+ SAL_WARN( "svtools.filter", "CommandAbortedException" );
}
catch(const ::com::sun::star::ucb::ContentCreationException&)
{
- SAL_INFO( "svtools", "ContentCreationException" );
+ SAL_WARN( "svtools.filter", "ContentCreationException" );
}
catch( ... )
{
- SAL_INFO( "svtools", "Any other exception" );
+ SAL_WARN( "svtools.filter", "Any other exception" );
}
return bExists;
}
@@ -160,11 +160,11 @@ void ImplDirEntryHelper::Kill( const String& rMainUrl )
}
catch(const ::com::sun::star::ucb::CommandAbortedException&)
{
- SAL_INFO( "svtools", "CommandAbortedException" );
+ SAL_WARN( "svtools.filter", "CommandAbortedException" );
}
catch( ... )
{
- SAL_INFO( "svtools", "Any other exception" );
+ SAL_WARN( "svtools.filter", "Any other exception" );
}
}
diff --git a/svtools/source/misc/ehdl.cxx b/svtools/source/misc/ehdl.cxx
index d6ee5eb..5d16ec9 100644
--- a/svtools/source/misc/ehdl.cxx
+++ b/svtools/source/misc/ehdl.cxx
@@ -118,7 +118,7 @@ static sal_uInt16 aWndFunc(
default:
{
- SAL_INFO( "svtools", "no MessBox type");
+ SAL_WARN( "svtools.misc", "no MessBox type");
pBox = NULL;
return ERRCODE_BUTTON_OK;
}
@@ -143,7 +143,7 @@ static sal_uInt16 aWndFunc(
nRet = ERRCODE_BUTTON_NO;
break;
default:
- SAL_INFO( "svtools", "Unknown MessBox return value" );
+ SAL_WARN( "svtools.misc", "Unknown MessBox return value" );
break;
}
delete pBox;
@@ -458,7 +458,7 @@ sal_Bool SfxErrorContext::GetString(sal_uLong nErrId, String &rStr)
}
else
{
- SAL_INFO( "svtools", "ErrorContext cannot find the resource" );
+ SAL_WARN( "svtools.misc", "ErrorContext cannot find the resource" );
bRet = false;
}
diff --git a/svtools/source/misc/templatefoldercache.cxx
b/svtools/source/misc/templatefoldercache.cxx
index 8962946..d7a5679 100644
--- a/svtools/source/misc/templatefoldercache.cxx
+++ b/svtools/source/misc/templatefoldercache.cxx
@@ -306,7 +306,7 @@ namespace svt
void operator() ( const ::rtl::Reference< TemplateContent >& _rxContent ) const
{
- SAL_INFO( "svtools", "This method must not be used, the whole URL must be stored!" );
+ SAL_WARN( "svtools.misc", "This method must not be used, the whole URL must be
stored!" );
// use the base class operator with the local name of the content
StoreString::operator() ( _rxContent->getName() );
@@ -629,7 +629,7 @@ namespace svt
}
catch( CommandAbortedException& )
{
- SAL_INFO( "svtools", "TemplateFolderCacheImpl::implReadFolder: caught a
CommandAbortedException!" );
+ SAL_WARN( "svtools.misc", "TemplateFolderCacheImpl::implReadFolder: caught a
CommandAbortedException!" );
return sal_False;
}
catch( ::com::sun::star::uno::Exception& )
--------------true--
From 547fb8ede73d48be90ca5a83197b74cb9d1d21a7 Mon Sep 17 00:00:00 2001
Message-Id: <547fb8ede73d48be90ca5a83197b74cb9d1d21a7.1326807953.git.mmetz@adrian-broher.net>
In-Reply-To: <e3c8dc11ca41a332a0b633c425d787ae49dc0dbc.1326807952.git.mmetz@adrian-broher.net>
References: <e3c8dc11ca41a332a0b633c425d787ae49dc0dbc.1326807952.git.mmetz@adrian-broher.net>
From: Marcel Metz <mmetz@adrian-broher.net>
Date: Mon, 16 Jan 2012 23:15:55 +0100
Subject: [PATCH 6/7] Replaced SAL_INFO with SAL_WARN were applicable.
To: libreoffice@lists.freedesktop.org
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="------------true"
This is a multi-part message in MIME format.
--------------true
Content-Type: text/plain; charset=UTF-8; format=fixed
Content-Transfer-Encoding: 8bit
---
.../source/extended/AccessibleBrowseBoxBase.cxx | 4 +-
.../source/extended/AccessibleGridControlBase.cxx | 4 +-
.../source/standard/vclxaccessibletoolboxitem.cxx | 2 +-
dbaccess/source/ui/misc/UITools.cxx | 2 +-
editeng/source/items/frmitems.cxx | 4 +-
editeng/source/items/paraitem.cxx | 4 +-
editeng/source/items/textitem.cxx | 2 +-
formula/source/core/api/FormulaCompiler.cxx | 4 +-
formula/source/core/api/token.cxx | 28 ++++++++++----------
fpicker/source/office/OfficeControlAccess.cxx | 8 +++---
fpicker/source/office/OfficeFilePicker.cxx | 2 +-
fpicker/source/office/iodlg.cxx | 4 +-
framework/source/classes/fwktabwindow.cxx | 6 ++--
linguistic/source/convdiclist.cxx | 4 +-
sc/inc/formularesult.hxx | 2 +-
sc/source/core/data/dptabsrc.cxx | 2 +-
sc/source/core/tool/lookupcache.cxx | 2 +-
sc/source/ui/docshell/dbdocimp.cxx | 2 +-
18 files changed, 43 insertions(+), 43 deletions(-)
--------------true
Content-Type: text/x-patch; name="0006-Replaced-SAL_INFO-with-SAL_WARN-were-applicable.patch"
Content-Transfer-Encoding: 8bit
Content-Disposition: attachment;
filename="0006-Replaced-SAL_INFO-with-SAL_WARN-were-applicable.patch"
diff --git a/accessibility/source/extended/AccessibleBrowseBoxBase.cxx
b/accessibility/source/extended/AccessibleBrowseBoxBase.cxx
index 8f15672..4391ec5 100644
--- a/accessibility/source/extended/AccessibleBrowseBoxBase.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBoxBase.cxx
@@ -469,7 +469,7 @@ Rectangle AccessibleBrowseBoxBase::getBoundingBox()
Rectangle aRect = implGetBoundingBox();
if ( 0 == aRect.Left() && 0 == aRect.Top() && 0 == aRect.Right() && 0 == aRect.Bottom() )
{
- SAL_INFO( "accessibility", "rectangle doesn't exist" );
+ SAL_WARN( "accessibility", "rectangle doesn't exist" );
}
return aRect;
}
@@ -483,7 +483,7 @@ Rectangle AccessibleBrowseBoxBase::getBoundingBoxOnScreen()
Rectangle aRect = implGetBoundingBoxOnScreen();
if ( 0 == aRect.Left() && 0 == aRect.Top() && 0 == aRect.Right() && 0 == aRect.Bottom() )
{
- SAL_INFO( "accessibility", "rectangle doesn't exist" );
+ SAL_WARN( "accessibility", "rectangle doesn't exist" );
}
return aRect;
}
diff --git a/accessibility/source/extended/AccessibleGridControlBase.cxx
b/accessibility/source/extended/AccessibleGridControlBase.cxx
index 147aaee..6bf0ea7 100644
--- a/accessibility/source/extended/AccessibleGridControlBase.cxx
+++ b/accessibility/source/extended/AccessibleGridControlBase.cxx
@@ -368,7 +368,7 @@ Rectangle AccessibleGridControlBase::getBoundingBox()
Rectangle aRect = implGetBoundingBox();
if ( 0 == aRect.Left() && 0 == aRect.Top() && 0 == aRect.Right() && 0 == aRect.Bottom() )
{
- SAL_INFO( "accessibility", "rectangle doesn't exist" );
+ SAL_WARN( "accessibility", "rectangle doesn't exist" );
}
return aRect;
}
@@ -382,7 +382,7 @@ Rectangle AccessibleGridControlBase::getBoundingBoxOnScreen()
Rectangle aRect = implGetBoundingBoxOnScreen();
if ( 0 == aRect.Left() && 0 == aRect.Top() && 0 == aRect.Right() && 0 == aRect.Bottom() )
{
- SAL_INFO( "accessibility", "rectangle doesn't exist" );
+ SAL_WARN( "accessibility", "rectangle doesn't exist" );
}
return aRect;
}
diff --git a/accessibility/source/standard/vclxaccessibletoolboxitem.cxx
b/accessibility/source/standard/vclxaccessibletoolboxitem.cxx
index c8a3c1b..575d672 100644
--- a/accessibility/source/standard/vclxaccessibletoolboxitem.cxx
+++ b/accessibility/source/standard/vclxaccessibletoolboxitem.cxx
@@ -116,7 +116,7 @@ VCLXAccessibleToolBoxItem::VCLXAccessibleToolBoxItem( ToolBox* _pToolBox, sal_In
default:
{
- SAL_INFO( "accessibility", "unsupported toolbox itemtype" );
+ SAL_WARN( "accessibility", "unsupported toolbox itemtype" );
}
}
}
diff --git a/dbaccess/source/ui/misc/UITools.cxx b/dbaccess/source/ui/misc/UITools.cxx
index d77c9da..2deb607 100644
--- a/dbaccess/source/ui/misc/UITools.cxx
+++ b/dbaccess/source/ui/misc/UITools.cxx
@@ -1281,7 +1281,7 @@ namespace
}
else
{
- SAL_INFO( "dbaccess", "Property 'AnchorName' is missing" );
+ SAL_WARN( "dbaccess.ui", "Property 'AnchorName' is missing" );
}
}
catch( Exception& )
diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx
index 08b8379..7627b00 100644
--- a/editeng/source/items/frmitems.cxx
+++ b/editeng/source/items/frmitems.cxx
@@ -3527,7 +3527,7 @@ bool SvxBrushItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
break;
case MID_GRAPHIC:
- SAL_INFO( "editeng", "not implemented" );
+ SAL_WARN( "editeng.items", "not implemented" );
break;
case MID_GRAPHIC_TRANSPARENT:
@@ -3613,7 +3613,7 @@ bool SvxBrushItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
break;
case MID_GRAPHIC:
- SAL_INFO( "editeng", "not implemented" );
+ SAL_WARN( "editeng.items", "not implemented" );
break;
case MID_GRAPHIC_TRANSPARENT:
diff --git a/editeng/source/items/paraitem.cxx b/editeng/source/items/paraitem.cxx
index 283b1bd..36986d1 100644
--- a/editeng/source/items/paraitem.cxx
+++ b/editeng/source/items/paraitem.cxx
@@ -601,7 +601,7 @@ SfxItemPresentation SvxWidowsItem::GetPresentation
default:
{
- SAL_INFO( "editeng", "SvxWidowsItem::GetPresentation(): unknown SfxItemPresentation" );
+ SAL_WARN( "editeng.items", "SvxWidowsItem::GetPresentation(): unknown
SfxItemPresentation" );
}
}
@@ -673,7 +673,7 @@ SfxItemPresentation SvxOrphansItem::GetPresentation
default:
{
- SAL_INFO( "editeng", "SvxOrphansItem::GetPresentation(): unknown SfxItemPresentation"
);
+ SAL_WARN( "editeng.items", "SvxOrphansItem::GetPresentation(): unknown
SfxItemPresentation" );
}
}
diff --git a/editeng/source/items/textitem.cxx b/editeng/source/items/textitem.cxx
index 2a1dfee..abbb903 100644
--- a/editeng/source/items/textitem.cxx
+++ b/editeng/source/items/textitem.cxx
@@ -2559,7 +2559,7 @@ SvxLanguageItem::SvxLanguageItem( const LanguageType eLang, const sal_uInt16
nId
sal_uInt16 SvxLanguageItem::GetValueCount() const
{
// #i50205# got rid of class International
- SAL_INFO( "editeng", "SvxLanguageItem::GetValueCount: supposed to return a count of what?");
+ SAL_WARN( "editeng.items", "SvxLanguageItem::GetValueCount: supposed to return a count of
what?");
// FIXME: previously returned LANGUAGE_COUNT from tools/intn.hxx which was wrong anyway.
// Could be SvtLanguageTable::GetEntryCount() (all locales with resource string)?
// Could be LocaleDataWrapper::getInstalledLanguageTypes() (all locales with locale data)?
diff --git a/formula/source/core/api/FormulaCompiler.cxx
b/formula/source/core/api/FormulaCompiler.cxx
index 9242415..6496184 100644
--- a/formula/source/core/api/FormulaCompiler.cxx
+++ b/formula/source/core/api/FormulaCompiler.cxx
@@ -606,7 +606,7 @@ FormulaCompiler::OpCodeMapPtr FormulaCompiler::CreateOpCodeMap(
xMap->putExternal( pArr2->Name, aExternalName);
else
{
- SAL_INFO( "xmlsecurity", "FormulaCompiler::CreateOpCodeMap: no Token.Data external
name");
+ SAL_WARN( "formula.core", "FormulaCompiler::CreateOpCodeMap: no Token.Data
external name");
}
}
}
@@ -1661,7 +1661,7 @@ FormulaToken* FormulaCompiler::CreateStringFromToken( rtl::OUStringBuffer&
rBuff
rBuffer.append(mxSymbols->getSymbol(eOp));
else
{
- SAL_INFO( "xmlsecurity","unknown OpCode");
+ SAL_WARN( "formula.core","unknown OpCode");
rBuffer.append(GetNativeSymbol( ocErrName ));
}
if( bNext )
diff --git a/formula/source/core/api/token.cxx b/formula/source/core/api/token.cxx
index c8bd3ab..8dab7d7 100644
--- a/formula/source/core/api/token.cxx
+++ b/formula/source/core/api/token.cxx
@@ -165,7 +165,7 @@ sal_uInt8 FormulaToken::GetByte() const
void FormulaToken::SetByte( sal_uInt8 )
{
- SAL_INFO( "formula", "FormulaToken::SetByte: virtual dummy called" );
+ SAL_WARN( "formula.core", "FormulaToken::SetByte: virtual dummy called" );
}
bool FormulaToken::HasForceArray() const
@@ -176,80 +176,80 @@ bool FormulaToken::HasForceArray() const
void FormulaToken::SetForceArray( bool )
{
- SAL_INFO( "formula", "FormulaToken::SetForceArray: virtual dummy called" );
+ SAL_WARN( "formula.core", "FormulaToken::SetForceArray: virtual dummy called" );
}
double FormulaToken::GetDouble() const
{
- SAL_INFO( "formula", "FormulaToken::GetDouble: virtual dummy called" );
+ SAL_WARN( "formula.core", "FormulaToken::GetDouble: virtual dummy called" );
return 0.0;
}
double & FormulaToken::GetDoubleAsReference()
{
- SAL_INFO( "formula", "FormulaToken::GetDouble: virtual dummy called" );
+ SAL_WARN( "formula.core", "FormulaToken::GetDouble: virtual dummy called" );
static double fVal = 0.0;
return fVal;
}
const String& FormulaToken::GetString() const
{
- SAL_INFO( "formula", "FormulaToken::GetString: virtual dummy called" );
+ SAL_WARN( "formula.core", "FormulaToken::GetString: virtual dummy called" );
static String aDummyString;
return aDummyString;
}
sal_uInt16 FormulaToken::GetIndex() const
{
- SAL_INFO( "formula", "FormulaToken::GetIndex: virtual dummy called" );
+ SAL_WARN( "formula.core", "FormulaToken::GetIndex: virtual dummy called" );
return 0;
}
void FormulaToken::SetIndex( sal_uInt16 )
{
- SAL_INFO( "formula", "FormulaToken::SetIndex: virtual dummy called" );
+ SAL_WARN( "formula.core", "FormulaToken::SetIndex: virtual dummy called" );
}
bool FormulaToken::IsGlobal() const
{
- SAL_INFO( "formula", "FormulaToken::IsGlobal: virtual dummy called" );
+ SAL_WARN( "formula.core", "FormulaToken::IsGlobal: virtual dummy called" );
return true;
}
void FormulaToken::SetGlobal( bool )
{
- SAL_INFO( "formula", "FormulaToken::SetGlobal: virtual dummy called" );
+ SAL_WARN( "formula.core", "FormulaToken::SetGlobal: virtual dummy called" );
}
short* FormulaToken::GetJump() const
{
- SAL_INFO( "formula", "FormulaToken::GetJump: virtual dummy called" );
+ SAL_WARN( "formula.core", "FormulaToken::GetJump: virtual dummy called" );
return NULL;
}
const String& FormulaToken::GetExternal() const
{
- SAL_INFO( "formula", "FormulaToken::GetExternal: virtual dummy called" );
+ SAL_WARN( "formula.core", "FormulaToken::GetExternal: virtual dummy called" );
static String aDummyString;
return aDummyString;
}
FormulaToken* FormulaToken::GetFAPOrigToken() const
{
- SAL_INFO( "formula", "FormulaToken::GetFAPOrigToken: virtual dummy called" );
+ SAL_WARN( "formula.core", "FormulaToken::GetFAPOrigToken: virtual dummy called" );
return NULL;
}
sal_uInt16 FormulaToken::GetError() const
{
- SAL_INFO( "formula", "FormulaToken::GetError: virtual dummy called" );
+ SAL_WARN( "formula.core", "FormulaToken::GetError: virtual dummy called" );
return 0;
}
void FormulaToken::SetError( sal_uInt16 )
{
- SAL_INFO( "formula", "FormulaToken::SetError: virtual dummy called" );
+ SAL_WARN( "formula.core", "FormulaToken::SetError: virtual dummy called" );
}
bool FormulaToken::TextEqual( const FormulaToken& rToken ) const
diff --git a/fpicker/source/office/OfficeControlAccess.cxx
b/fpicker/source/office/OfficeControlAccess.cxx
index 45a3e33..21bcf83 100644
--- a/fpicker/source/office/OfficeControlAccess.cxx
+++ b/fpicker/source/office/OfficeControlAccess.cxx
@@ -386,7 +386,7 @@ namespace svt
break;
case LISTBOX_FILTER:
- SAL_INFO( "fpicker", "Use the XFilterManager to access the filter listbox"
);
+ SAL_WARN( "fpicker.office", "Use the XFilterManager to access the filter
listbox" );
break;
case LISTBOX_VERSION:
@@ -445,7 +445,7 @@ namespace svt
}
else
{
- SAL_INFO( "fpicker", "Use the XFilterManager to access the filter
listbox" );
+ SAL_WARN( "fpicker.office", "Use the XFilterManager to access the
filter listbox" );
}
break;
@@ -464,7 +464,7 @@ namespace svt
nPropertyId = PROPERTY_FLAG_LISTITEMS;
break;
default:
- SAL_INFO( "fpicker", "OControlAccess::GetValue: invalid control
action for the listbox!" );
+ SAL_WARN( "fpicker.office", "OControlAccess::GetValue: invalid
control action for the listbox!" );
break;
}
break;
@@ -546,7 +546,7 @@ namespace svt
break;
default:
- SAL_INFO( "fpicker", "Wrong ControlAction for implDoListboxAction()" );
+ SAL_WARN( "fpicker.office", "Wrong ControlAction for implDoListboxAction()" );
}
}
diff --git a/fpicker/source/office/OfficeFilePicker.cxx b/fpicker/source/office/OfficeFilePicker.cxx
index f789f4b..e7d1add 100644
--- a/fpicker/source/office/OfficeFilePicker.cxx
+++ b/fpicker/source/office/OfficeFilePicker.cxx
@@ -349,7 +349,7 @@ void SvtFilePicker::notify( sal_Int16 _nEventId, sal_Int16 _nControlId )
m_xListener->dialogSizeChanged();
break;
default:
- SAL_INFO( "fpicker", "SvtFilePicker::notify(): Unknown event id!" );
+ SAL_WARN( "fpicker.office", "SvtFilePicker::notify(): Unknown event id!" );
break;
}
}
diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx
index 0ab97df..fd02d6b 100644
--- a/fpicker/source/office/iodlg.cxx
+++ b/fpicker/source/office/iodlg.cxx
@@ -2005,7 +2005,7 @@ void SvtFileDialog::EnableControl( Control* _pControl, sal_Bool _bEnable )
{
if ( !_pControl )
{
- SAL_INFO( "fpicker", "SvtFileDialog::EnableControl: invalid control!" );
+ SAL_WARN( "fpicker.office", "SvtFileDialog::EnableControl: invalid control!" );
return;
}
@@ -2871,7 +2871,7 @@ Control* SvtFileDialog::getControl( sal_Int16 _nControlId, sal_Bool
_bLabelContr
break;
default:
- SAL_INFO( "fpicker", "SvtFileDialog::getControl: invalid id!" );
+ SAL_WARN( "fpicker.office", "SvtFileDialog::getControl: invalid id!" );
}
return pReturn;
}
diff --git a/framework/source/classes/fwktabwindow.cxx b/framework/source/classes/fwktabwindow.cxx
index b43895e..2f89d8d 100644
--- a/framework/source/classes/fwktabwindow.cxx
+++ b/framework/source/classes/fwktabwindow.cxx
@@ -76,7 +76,7 @@ void FwkTabControl::BroadcastEvent( sal_uLong nEvent )
ImplCallEventListeners( nEvent, (void*)(sal_uIntPtr)GetCurPageId() );
else
{
- SAL_INFO( "sfx2", "FwkTabControl::BroadcastEvent(): illegal event" );
+ SAL_WARN( "framework", "FwkTabControl::BroadcastEvent(): illegal event" );
}
}
@@ -135,11 +135,11 @@ void FwkTabPage::CreateDialog()
}
catch ( const lang::IllegalArgumentException& )
{
- SAL_INFO( "sfx2", "FwkTabPage::CreateDialog(): illegal argument" );
+ SAL_WARN( "framework", "FwkTabPage::CreateDialog(): illegal argument" );
}
catch ( const uno::Exception& )
{
- SAL_INFO( "sfx2", "FwkTabPage::CreateDialog(): exception of
XDialogProvider2::createContainerWindow()" );
+ SAL_WARN( "framework", "FwkTabPage::CreateDialog(): exception of
XDialogProvider2::createContainerWindow()" );
}
}
diff --git a/linguistic/source/convdiclist.cxx b/linguistic/source/convdiclist.cxx
index 93af0f0..05b3a9b 100644
--- a/linguistic/source/convdiclist.cxx
+++ b/linguistic/source/convdiclist.cxx
@@ -319,11 +319,11 @@ void SAL_CALL ConvDicNameContainer::removeByName( const OUString& rName )
}
catch( ::com::sun::star::ucb::CommandAbortedException& )
{
- SAL_INFO( "linguistic", "HangulHanjaOptionsDialog::OkHdl(): CommandAbortedException" );
+ SAL_WARN( "linguistic", "HangulHanjaOptionsDialog::OkHdl(): CommandAbortedException" );
}
catch( ... )
{
- SAL_INFO( "linguistic", "HangulHanjaOptionsDialog::OkHdl(): Any other exception" );
+ SAL_WARN( "linguistic", "HangulHanjaOptionsDialog::OkHdl(): Any other exception" );
}
}
diff --git a/sc/inc/formularesult.hxx b/sc/inc/formularesult.hxx
index 7a34de8..c1cb9060 100644
--- a/sc/inc/formularesult.hxx
+++ b/sc/inc/formularesult.hxx
@@ -324,7 +324,7 @@ inline void ScFormulaResult::SetToken( const formula::FormulaToken* p )
dynamic_cast<const ScMatrixFormulaCellToken*>(pMatResult);
if (pNewMatFormula)
{
- SAL_INFO( "sc", "ScFormulaResult::SetToken: pNewMatFormula and pMatFormula,
overriding matrix formula dimension; intended?");
+ SAL_WARN( "sc", "ScFormulaResult::SetToken: pNewMatFormula and pMatFormula,
overriding matrix formula dimension; intended?");
pMatFormula->SetMatColsRows( pNewMatFormula->GetMatCols(),
pNewMatFormula->GetMatRows());
}
diff --git a/sc/source/core/data/dptabsrc.cxx b/sc/source/core/data/dptabsrc.cxx
index 5dc0d2e..7693197 100644
--- a/sc/source/core/data/dptabsrc.cxx
+++ b/sc/source/core/data/dptabsrc.cxx
@@ -735,7 +735,7 @@ void ScDPSource::FilterCacheTableByPageDimensions()
if (bPageFiltered)
{
- SAL_INFO( "sc.core","tried to apply page field filters several times");
+ SAL_WARN( "sc.core","tried to apply page field filters several times");
pData->DisposeData();
pData->CreateCacheTable(); // re-initialize the cache table
diff --git a/sc/source/core/tool/lookupcache.cxx b/sc/source/core/tool/lookupcache.cxx
index a9b42ca..2b85476 100644
--- a/sc/source/core/tool/lookupcache.cxx
+++ b/sc/source/core/tool/lookupcache.cxx
@@ -47,7 +47,7 @@ ScLookupCache::QueryCriteria::QueryCriteria( const ScQueryEntry& rEntry ) :
break;
default:
meOp = UNKNOWN;
- SAL_INFO( "sc.core", "ScLookupCache::QueryCriteria not prepared for this ScQueryOp");
+ SAL_WARN( "sc.core", "ScLookupCache::QueryCriteria not prepared for this ScQueryOp");
}
const ScQueryEntry::Item& rItem = rEntry.GetQueryItem();
diff --git a/sc/source/ui/docshell/dbdocimp.cxx b/sc/source/ui/docshell/dbdocimp.cxx
index 09f4b71..d3bd84b 100644
--- a/sc/source/ui/docshell/dbdocimp.cxx
+++ b/sc/source/ui/docshell/dbdocimp.cxx
@@ -293,7 +293,7 @@ bool ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam,
xLocate.set( xRowSet, uno::UNO_QUERY );
if ( !xLocate.is() )
{
- SAL_INFO( "sc.ui","can't get XRowLocate");
+ SAL_WARN( "sc.ui","can't get XRowLocate");
bDoSelection = bRealSelection = bBookmarkSelection = sal_False;
}
}
--------------true--
From 41586fc78edca9999565b4f1263e0dd442da72ed Mon Sep 17 00:00:00 2001
Message-Id: <41586fc78edca9999565b4f1263e0dd442da72ed.1326807954.git.mmetz@adrian-broher.net>
In-Reply-To: <e3c8dc11ca41a332a0b633c425d787ae49dc0dbc.1326807952.git.mmetz@adrian-broher.net>
References: <e3c8dc11ca41a332a0b633c425d787ae49dc0dbc.1326807952.git.mmetz@adrian-broher.net>
From: Marcel Metz <mmetz@adrian-broher.net>
Date: Mon, 16 Jan 2012 23:21:15 +0100
Subject: [PATCH 7/7] Replaced SAL_INFO with SAL_WARN were applicable.
To: libreoffice@lists.freedesktop.org
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="------------true"
This is a multi-part message in MIME format.
--------------true
Content-Type: text/plain; charset=UTF-8; format=fixed
Content-Transfer-Encoding: 8bit
---
sd/source/ui/dlg/sdtreelb.cxx | 2 +-
svl/source/items/srchitem.cxx | 2 +-
svl/source/numbers/zforfind.cxx | 4 ++--
svl/source/numbers/zforlist.cxx | 10 +++++-----
svl/source/numbers/zformat.cxx | 4 ++--
svl/source/numbers/zforscan.cxx | 8 ++++----
tools/source/datetime/tdate.cxx | 2 +-
tools/source/inet/inetstrm.cxx | 2 +-
vcl/source/app/settings.cxx | 2 +-
vcl/source/control/field2.cxx | 2 +-
vcl/source/gdi/outdev.cxx | 4 ++--
vcl/source/gdi/outmap.cxx | 4 ++--
vcl/source/gdi/print3.cxx | 2 +-
vcl/source/window/btndlg.cxx | 2 +-
xmloff/source/chart/SchXMLExport.cxx | 2 +-
xmloff/source/chart/SchXMLPlotAreaContext.cxx | 2 +-
xmloff/source/core/xmlexp.cxx | 2 +-
xmloff/source/core/xmlimp.cxx | 2 +-
.../source/dialogs/digitalsignaturesdialog.cxx | 2 +-
xmlsecurity/source/dialogs/macrosecurity.cxx | 2 +-
xmlsecurity/source/dialogs/stbcontrl.cxx | 2 +-
21 files changed, 32 insertions(+), 32 deletions(-)
--------------true
Content-Type: text/x-patch; name="0007-Replaced-SAL_INFO-with-SAL_WARN-were-applicable.patch"
Content-Transfer-Encoding: 8bit
Content-Disposition: attachment;
filename="0007-Replaced-SAL_INFO-with-SAL_WARN-were-applicable.patch"
diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx
index 50e3486..ed79b24 100644
--- a/sd/source/ui/dlg/sdtreelb.cxx
+++ b/sd/source/ui/dlg/sdtreelb.cxx
@@ -1096,7 +1096,7 @@ sal_Int8 SdPageObjsTLB::AcceptDrop (const AcceptDropEvent& rEvent)
}
else if( !nDragDropMode )
{
- SAL_INFO( "sc.ui", "SdPageObjsTLB::AcceptDrop(): no target" );
+ SAL_WARN( "sc.ui", "SdPageObjsTLB::AcceptDrop(): no target" );
}
else if (IsDropAllowed(pEntry))
{
diff --git a/svl/source/items/srchitem.cxx b/svl/source/items/srchitem.cxx
index 776fc9f..0e01172 100644
--- a/svl/source/items/srchitem.cxx
+++ b/svl/source/items/srchitem.cxx
@@ -512,7 +512,7 @@ bool SvxSearchItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMembe
}
default:
- SAL_INFO( "svl", "SvxSearchItem::QueryValue(): Unknown MemberId" );
+ SAL_WARN( "svl.ui", "SvxSearchItem::QueryValue(): Unknown MemberId" );
return false;
}
diff --git a/svl/source/numbers/zforfind.cxx b/svl/source/numbers/zforfind.cxx
index d944a11..02e8890 100644
--- a/svl/source/numbers/zforfind.cxx
+++ b/svl/source/numbers/zforfind.cxx
@@ -892,7 +892,7 @@ void ImpSvNumberInputScan::GetTimeRef(
else
{
nHour = 0;
- SAL_INFO( "svl", "ImpSvNumberInputScan::GetTimeRef: bad number index");
+ SAL_WARN( "svl.items", "ImpSvNumberInputScan::GetTimeRef: bad number index");
}
if (nDecPos == 2 && nAnz == 2) // 45.5
nMinute = 0;
@@ -3148,7 +3148,7 @@ bool ImpSvNumberInputScan::IsNumberFormat(
break;
default:
- SAL_INFO( "svl", "Some number recognized but what's it?" );
+ SAL_WARN( "svl.items", "Some number recognized but what's it?" );
fOutNumber = 0.0;
break;
}
diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx
index e2de447..ed7b523 100644
--- a/svl/source/numbers/zforlist.cxx
+++ b/svl/source/numbers/zforlist.cxx
@@ -616,7 +616,7 @@ sal_uInt32 SvNumberFormatter::GetIndexPuttingAndConverting( String & rString,
nKey, eLnge, SvtSysLocale().GetLanguage());
if (rCheckPos > 0)
{
- SAL_INFO( "svl", "SvNumberFormatter::GetIndexPuttingAndConverting: bad format code
string for current locale");
+ SAL_WARN( "svl.numbers", "SvNumberFormatter::GetIndexPuttingAndConverting: bad
format code string for current locale");
nKey = NUMBERFORMAT_ENTRY_NOT_FOUND;
}
}
@@ -629,7 +629,7 @@ sal_uInt32 SvNumberFormatter::GetIndexPuttingAndConverting( String & rString,
rNewInserted = PutEntry( rString, rCheckPos, rType, nKey, eLnge);
if (rCheckPos > 0)
{
- SAL_INFO( "svl", "SvNumberFormatter::GetIndexPuttingAndConverting: bad format code
string for specified locale");
+ SAL_WARN( "svl.numbers", "SvNumberFormatter::GetIndexPuttingAndConverting: bad
format code string for specified locale");
nKey = NUMBERFORMAT_ENTRY_NOT_FOUND;
}
}
@@ -2646,7 +2646,7 @@ void SvNumberFormatter::ImpGenerateAdditionalFormats( sal_uInt32 CLOffset,
(SvNumberformat*) aFTable.Get( CLOffset + ZF_STANDARD );
if ( !pStdFormat )
{
- SAL_INFO( "svl", "ImpGenerateAdditionalFormats: no GENERAL format" );
+ SAL_WARN( "svl.numbers", "ImpGenerateAdditionalFormats: no GENERAL format" );
return ;
}
sal_uInt32 nPos = CLOffset + pStdFormat->GetLastInsertKey();
@@ -2664,7 +2664,7 @@ void SvNumberFormatter::ImpGenerateAdditionalFormats( sal_uInt32 CLOffset,
{
if ( nPos - CLOffset >= SV_COUNTRY_LANGUAGE_OFFSET )
{
- SAL_INFO( "svl", "ImpGenerateAdditionalFormats: too many formats" );
+ SAL_WARN( "svl.numbers", "ImpGenerateAdditionalFormats: too many formats" );
break; // for
}
if ( pFormatArr[j].Index < NF_INDEX_TABLE_ENTRIES &&
@@ -2700,7 +2700,7 @@ void SvNumberFormatter::ImpGenerateAdditionalFormats( sal_uInt32 CLOffset,
{
if ( nPos - CLOffset >= SV_COUNTRY_LANGUAGE_OFFSET )
{
- SAL_INFO( "svl", "ImpGenerateAdditionalFormats: too many formats" );
+ SAL_WARN( "svl.numbers", "ImpGenerateAdditionalFormats: too many formats" );
break; // for
}
if ( pFormatArr[j].Index >= NF_INDEX_TABLE_ENTRIES )
diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx
index 0317ddb..06c70b8 100644
--- a/svl/source/numbers/zformat.cxx
+++ b/svl/source/numbers/zformat.cxx
@@ -1675,7 +1675,7 @@ NfHackConversion SvNumberformat::Load( SvStream& rStream,
}
break;
default:
- SAL_INFO( "svl", "SvNumberformat::Load: unknown header bytes left nId" );
+ SAL_WARN( "svl.numbers", "SvNumberformat::Load: unknown header bytes left nId" );
bGoOn = false; // stop reading unknown stream left over of newer versions
// Would be nice to have multiple read/write headers instead
// but old versions wouldn't know it, TLOT.
@@ -1727,7 +1727,7 @@ NfHackConversion SvNumberformat::Load( SvStream& rStream,
LANGUAGE_GERMAN, LANGUAGE_ENGLISH_US, true );
break;
default:
- SAL_INFO( "svl", "SvNumberformat::Load: eHackConversion unknown" );
+ SAL_WARN( "svl.numbers", "SvNumberformat::Load: eHackConversion unknown" );
}
}
return eHackConversion;
diff --git a/svl/source/numbers/zforscan.cxx b/svl/source/numbers/zforscan.cxx
index 7f14297..af3c866 100644
--- a/svl/source/numbers/zforscan.cxx
+++ b/svl/source/numbers/zforscan.cxx
@@ -140,7 +140,7 @@ void ImpSvNumberformatScan::InitSpecialKeyword( NfKeywordIndex eIdx ) const
pFormatter->GetLocaleData()->getTrueWord() );
if ( !sKeyword[NF_KEY_TRUE].Len() )
{
- SAL_INFO( "svl", "InitSpecialKeyword: TRUE_WORD?" );
+ SAL_WARN( "svl.numbers", "InitSpecialKeyword: TRUE_WORD?" );
((ImpSvNumberformatScan*)this)->sKeyword[NF_KEY_TRUE].AssignAscii(
RTL_CONSTASCII_STRINGPARAM( "TRUE" ) );
}
break;
@@ -150,12 +150,12 @@ void ImpSvNumberformatScan::InitSpecialKeyword( NfKeywordIndex eIdx ) const
pFormatter->GetLocaleData()->getFalseWord() );
if ( !sKeyword[NF_KEY_FALSE].Len() )
{
- SAL_INFO( "svl", "InitSpecialKeyword: FALSE_WORD?" );
+ SAL_WARN( "svl.numbers", "InitSpecialKeyword: FALSE_WORD?" );
((ImpSvNumberformatScan*)this)->sKeyword[NF_KEY_FALSE].AssignAscii(
RTL_CONSTASCII_STRINGPARAM( "FALSE" ) );
}
break;
default:
- SAL_INFO( "svl", "InitSpecialKeyword: unknown request" );
+ SAL_WARN( "svl.numbers", "InitSpecialKeyword: unknown request" );
}
}
@@ -2010,7 +2010,7 @@ xub_StrLen ImpSvNumberformatScan::FinalScan( String& rString )
} // of else Del
else
{
- SAL_INFO( "svl", "unknown NF_SYMBOLTYPE_..." );
+ SAL_WARN( "svl.numbers", "unknown NF_SYMBOLTYPE_..." );
nPos = nPos + sStrArray[i].Len();
i++;
}
diff --git a/tools/source/datetime/tdate.cxx b/tools/source/datetime/tdate.cxx
index d7eb401..9d17ec6 100644
--- a/tools/source/datetime/tdate.cxx
+++ b/tools/source/datetime/tdate.cxx
@@ -233,7 +233,7 @@ sal_uInt16 Date::GetWeekOfYear( DayOfWeek eStartDay,
if (nMinimumNumberOfDaysInWeek < 1 || 7 < nMinimumNumberOfDaysInWeek)
{
- SAL_INFO( "tools", "Date::GetWeekOfYear: invalid nMinimumNumberOfDaysInWeek" );
+ SAL_WARN( "tools", "Date::GetWeekOfYear: invalid nMinimumNumberOfDaysInWeek" );
nMinimumNumberOfDaysInWeek = 4;
}
diff --git a/tools/source/inet/inetstrm.cxx b/tools/source/inet/inetstrm.cxx
index a525b57..d787baa 100644
--- a/tools/source/inet/inetstrm.cxx
+++ b/tools/source/inet/inetstrm.cxx
@@ -1671,7 +1671,7 @@ int INetMIMEMessageStream::PutMsgLine (const sal_Char *pData, sal_uIntPtr
nSize)
return status;
}
else {
- SAL_INFO( "tools", "Boundary not found." );
+ SAL_WARN( "tools", "Boundary not found." );
}
status = INetMessageIOStream::PutMsgLine(
pOldPos, pChar - pOldPos + 1 );
diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx
index 00137a2..d74ac36 100644
--- a/vcl/source/app/settings.cxx
+++ b/vcl/source/app/settings.cxx
@@ -1685,7 +1685,7 @@ sal_uLong AllSettings::Update( sal_uLong nFlags, const AllSettings& rSet )
if ( nFlags & SETTINGS_INTERNATIONAL )
{
// Nothing, class International is gone.
- SAL_INFO( "vcl","AllSettings::Update: who calls with SETTINGS_INTERNATIONAL and why?
You're flogging a dead horse.");
+ SAL_WARN( "vcl.app","AllSettings::Update: who calls with SETTINGS_INTERNATIONAL and why?
You're flogging a dead horse.");
}
if ( nFlags & SETTINGS_LOCALE )
diff --git a/vcl/source/control/field2.cxx b/vcl/source/control/field2.cxx
index e93b78e..93c36ef 100644
--- a/vcl/source/control/field2.cxx
+++ b/vcl/source/control/field2.cxx
@@ -168,7 +168,7 @@ static int ImplIsPatternChar( xub_Unicode cChar, sal_Char cEditMask )
}
catch ( ::com::sun::star::uno::Exception& )
{
- SAL_INFO( "vcl", "ImplIsPatternChar: Exception caught!" );
+ SAL_WARN( "vcl.control", "ImplIsPatternChar: Exception caught!" );
return sal_False;
}
diff --git a/vcl/source/gdi/outdev.cxx b/vcl/source/gdi/outdev.cxx
index 44b2758..fe49527 100644
--- a/vcl/source/gdi/outdev.cxx
+++ b/vcl/source/gdi/outdev.cxx
@@ -436,7 +436,7 @@ OutputDevice::~OutputDevice()
ImplObjStack* pData = mpObjStack;
if ( pData )
{
- SAL_INFO( "vcl", "OutputDevice::~OutputDevice(): OutputDevice::Push() calls !=
OutputDevice::Pop() calls" );
+ SAL_WARN( "vcl.gdi", "OutputDevice::~OutputDevice(): OutputDevice::Push() calls !=
OutputDevice::Pop() calls" );
while ( pData )
{
ImplObjStack* pTemp = pData;
@@ -2461,7 +2461,7 @@ void OutputDevice::Pop()
if ( !pData )
{
- SAL_INFO( "vcl", "OutputDevice::Pop() without OutputDevice::Push()" );
+ SAL_WARN( "vcl.gdi", "OutputDevice::Pop() without OutputDevice::Push()" );
return;
}
diff --git a/vcl/source/gdi/outmap.cxx b/vcl/source/gdi/outmap.cxx
index abda8cb..583e1c8 100644
--- a/vcl/source/gdi/outmap.cxx
+++ b/vcl/source/gdi/outmap.cxx
@@ -871,11 +871,11 @@ void OutputDevice::SetRelativeMapMode( const MapMode& rNewMapMode )
{
if ( eOld > MAP_PIXEL )
{
- SAL_INFO( "vcl", "Not implemented MapUnit" );
+ SAL_WARN( "vcl.gdi", "Not implemented MapUnit" );
}
else if ( eNew > MAP_PIXEL )
{
- SAL_INFO( "vcl", "Not implemented MapUnit" );
+ SAL_WARN( "vcl.gdi", "Not implemented MapUnit" );
}
else
{
diff --git a/vcl/source/gdi/print3.cxx b/vcl/source/gdi/print3.cxx
index 0c484c5..60b449e 100644
--- a/vcl/source/gdi/print3.cxx
+++ b/vcl/source/gdi/print3.cxx
@@ -248,7 +248,7 @@ static rtl::OUString queryFile( Printer* pPrinter )
}
catch (const lang::IllegalArgumentException&)
{
- SAL_INFO( "vcl", "caught IllegalArgumentException when registering filter\n" );
+ SAL_WARN( "vcl.gdi", "caught IllegalArgumentException when registering filter" );
}
if( xFilePicker->execute() == ui::dialogs::ExecutableDialogResults::OK )
diff --git a/vcl/source/window/btndlg.cxx b/vcl/source/window/btndlg.cxx
index d19196f..ebd0912 100644
--- a/vcl/source/window/btndlg.cxx
+++ b/vcl/source/window/btndlg.cxx
@@ -344,7 +344,7 @@ void ButtonDialog::RemoveButton( sal_uInt16 nId )
}
if (it == maItemList.end())
- SAL_INFO( "vcl", "ButtonDialog::RemoveButton(): ButtonId invalid" );
+ SAL_WARN( "vcl.window", "ButtonDialog::RemoveButton(): ButtonId invalid" );
}
void ButtonDialog::Clear()
diff --git a/xmloff/source/chart/SchXMLExport.cxx b/xmloff/source/chart/SchXMLExport.cxx
index 48d0b69..9059210 100644
--- a/xmloff/source/chart/SchXMLExport.cxx
+++ b/xmloff/source/chart/SchXMLExport.cxx
@@ -2009,7 +2009,7 @@ void SchXMLExportHelper_Impl::exportPlotArea(
}
catch( const beans::UnknownPropertyException & )
{
- SAL_INFO( "vcl", "Properties missing" );
+ SAL_WARN( "xmloff.chart", "Properties missing" );
}
}
}
diff --git a/xmloff/source/chart/SchXMLPlotAreaContext.cxx
b/xmloff/source/chart/SchXMLPlotAreaContext.cxx
index 3b0e4c2..ae1a274 100644
--- a/xmloff/source/chart/SchXMLPlotAreaContext.cxx
+++ b/xmloff/source/chart/SchXMLPlotAreaContext.cxx
@@ -322,7 +322,7 @@ void SchXMLPlotAreaContext::StartElement( const uno::Reference< xml::sax::XAttri
}
catch( const beans::UnknownPropertyException & )
{
- SAL_INFO( "vcl", "Properties missing" );
+ SAL_WARN( "xmloff.chart", "Properties missing" );
}
}
}
diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx
index f80a0ed..10d8dcc 100644
--- a/xmloff/source/core/xmlexp.cxx
+++ b/xmloff/source/core/xmlexp.cxx
@@ -2077,7 +2077,7 @@ ProgressBarHelper* SvXMLExport::GetProgressBarHelper()
if (aAny.getValueType() == getBooleanCppuType())
mpProgressBarHelper->SetRepeat(::cppu::any2bool(aAny));
else {
- SAL_INFO( "xmloff","why is it no boolean?");
+ SAL_WARN( "xmloff.core", "why is it no boolean?" );
}
}
}
diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx
index 4440b05..3b73a6f 100644
--- a/xmloff/source/core/xmlimp.cxx
+++ b/xmloff/source/core/xmlimp.cxx
@@ -1388,7 +1388,7 @@ ProgressBarHelper* SvXMLImport::GetProgressBarHelper()
if (aAny.getValueType() == getBooleanCppuType())
mpProgressBarHelper->SetRepeat(::cppu::any2bool(aAny));
else {
- SAL_INFO( "xmloff","why is it no boolean?");
+ SAL_WARN( "xmloff.core", "why is it no boolean?" );
}
}
}
diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
index 142d209..5f2870f 100644
--- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
+++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
@@ -437,7 +437,7 @@ IMPL_LINK( DigitalSignaturesDialog, AddButtonHdl, Button*, EMPTYARG )
uno::Reference< ::com::sun::star::security::XCertificate > xCert =
aChooser.GetSelectedCertificate();
if ( !xCert.is() )
{
- SAL_INFO( "xmloff", "no certificate selected" );
+ SAL_WARN( "xmlsecurity.dialogs", "no certificate selected" );
return -1;
}
rtl::OUString aCertSerial = xSerialNumberAdapter->toString( xCert->getSerialNumber() );
diff --git a/xmlsecurity/source/dialogs/macrosecurity.cxx
b/xmlsecurity/source/dialogs/macrosecurity.cxx
index 078fc88..010cf7a 100644
--- a/xmlsecurity/source/dialogs/macrosecurity.cxx
+++ b/xmlsecurity/source/dialogs/macrosecurity.cxx
@@ -268,7 +268,7 @@ IMPL_LINK( MacroSecurityTrustedSourcesTP, AddLocPBHdl, void*, EMPTYARG )
}
catch( uno::Exception& )
{
- SAL_INFO( "xmlsecurity", "MacroSecurityTrustedSourcesTP::AddLocPBHdl(): exception from
folder picker" );
+ SAL_WARN( "xmlsecurity.dialogs", "MacroSecurityTrustedSourcesTP::AddLocPBHdl(): exception
from folder picker" );
}
return 0;
diff --git a/xmlsecurity/source/dialogs/stbcontrl.cxx b/xmlsecurity/source/dialogs/stbcontrl.cxx
index 863b418..b5c0509 100644
--- a/xmlsecurity/source/dialogs/stbcontrl.cxx
+++ b/xmlsecurity/source/dialogs/stbcontrl.cxx
@@ -80,7 +80,7 @@ void XmlSecStatusBarControl::StateChanged( sal_uInt16 nSID, SfxItemState eState,
}
else
{
- SAL_INFO( "xmlsecurity", "+XmlSecStatusBarControl::StateChanged(): invalid item type" );
+ SAL_WARN( "xmlsecurity.dialogs", "+XmlSecStatusBarControl::StateChanged(): invalid item
type" );
mpImpl->mbSigned = false;
}
--------------true--
Context
Privacy Policy |
Impressum (Legal Info) |
Copyright information: Unless otherwise specified, all text and images
on this website are licensed under the
Creative Commons Attribution-Share Alike 3.0 License.
This does not include the source code of LibreOffice, which is
licensed under the Mozilla Public License (
MPLv2).
"LibreOffice" and "The Document Foundation" are
registered trademarks of their corresponding registered owners or are
in actual use as trademarks in one or more countries. Their respective
logos and icons are also subject to international copyright laws. Use
thereof is explained in our
trademark policy.