Hello lo-devs,
as mentioned in the subject these patches replace the DBG_ERRORFILE
macro with SAL_INFO as suggested in the tools/debug.hxx header. The
patches were created with git format-patch.
regards
Marcel Metz
From b89c66bd936b49f652dffe7895818068c5587386 Mon Sep 17 00:00:00 2001
Message-Id: <b89c66bd936b49f652dffe7895818068c5587386.1326618396.git.mmetz@adrian-broher.net>
From: Marcel Metz <mmetz@adrian-broher.net>
Date: Wed, 11 Jan 2012 10:02:26 +0100
Subject: [PATCH 1/4] Replaced DBG_ERRORFILE with SAL_INFO.
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 | 3 +-
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 | 6 +-
unotools/source/i18n/calendarwrapper.cxx | 207 +++-----------------
unotools/source/i18n/charclass.cxx | 48 ++---
unotools/source/i18n/collatorwrapper.cxx | 8 +-
unotools/source/i18n/instance.hxx | 14 +-
unotools/source/i18n/localedatawrapper.cxx | 86 ++-------
unotools/source/i18n/nativenumberwrapper.cxx | 8 +-
unotools/source/i18n/numberformatcodewrapper.cxx | 8 +-
unotools/source/i18n/textsearch.cxx | 7 +-
unotools/source/i18n/transliterationwrapper.cxx | 44 +----
17 files changed, 105 insertions(+), 368 deletions(-)
--------------true
Content-Type: text/x-patch; name="0001-Replaced-DBG_ERRORFILE-with-SAL_INFO.patch"
Content-Transfer-Encoding: 8bit
Content-Disposition: attachment; filename="0001-Replaced-DBG_ERRORFILE-with-SAL_INFO.patch"
diff --git a/unotools/source/config/defaultoptions.cxx b/unotools/source/config/defaultoptions.cxx
index 1b9d386..735dc35 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
{
- DBG_ERRORFILE( "any operator >>= failed" );
+ SAL_INFO( "unotools.config", "any operator >>= failed" );
}
break;
}
@@ -276,14 +276,14 @@ SvtDefaultOptions_Impl::SvtDefaultOptions_Impl() : ConfigItem(
ASCII_STR("Office
}
else
{
- DBG_ERRORFILE( "any operator >>= failed" );
+ SAL_INFO( "unotools.config", "any operator >>= failed" );
}
break;
}
default:
{
- DBG_ERRORFILE( "Wrong any type" );
+ SAL_INFO( "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:
- DBG_ERRORFILE( "invalid index to load a default path" );
+ SAL_INFO( "unotools.config", "invalid index to load a default path" );
}
}
}
diff --git a/unotools/source/config/extendedsecurityoptions.cxx
b/unotools/source/config/extendedsecurityoptions.cxx
index 1608cdc..f29a305 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
{
- DBG_ERRORFILE( "SvtExtendedSecurityOptions_Impl::FillExtensionHashMap(): not
string value?" );
+ SAL_INFO( "unotools.config",
"SvtExtendedSecurityOptions_Impl::FillExtensionHashMap(): not string value?" );
}
}
}
diff --git a/unotools/source/config/pathoptions.cxx b/unotools/source/config/pathoptions.cxx
index 3be2d1c..e8538dd 100644
--- a/unotools/source/config/pathoptions.cxx
+++ b/unotools/source/config/pathoptions.cxx
@@ -29,7 +29,6 @@
#include <unotools/pathoptions.hxx>
#include <unotools/configitem.hxx>
#include <unotools/configmgr.hxx>
-#include <tools/debug.hxx>
#include <tools/urlobj.hxx>
#include <com/sun/star/uno/Any.hxx>
#include <com/sun/star/uno/Sequence.hxx>
@@ -872,7 +871,7 @@ sal_Bool SvtPathOptions::SearchFile( String& rIniFile, Pathes ePath )
// check parameter: empty inifile name?
if ( !rIniFile.Len() )
{
- DBG_ERRORFILE( "SvtPathOptions::SearchFile(): invalid parameter" );
+ SAL_INFO( "unotools.config", "SvtPathOptions::SearchFile(): invalid parameter" );
return sal_False;
}
diff --git a/unotools/source/config/saveopt.cxx b/unotools/source/config/saveopt.cxx
index e0846d8..24d7643 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 {
- DBG_ERRORFILE( "SvtSaveOptions_Impl::SvtSaveOptions_Impl(): Wrong
Type!" );
+ SAL_INFO( "unotools.config",
"SvtSaveOptions_Impl::SvtSaveOptions_Impl(): Wrong Type!" );
};
bROODFDefaultVersion = pROStates[nProp];
break;
@@ -545,7 +545,7 @@ SvtSaveOptions_Impl::SvtSaveOptions_Impl()
break;
default :
- DBG_ERRORFILE( "invalid index to load a path" );
+ SAL_INFO( "unotools.config", "invalid index to load a path" );
}
}
else
@@ -739,7 +739,7 @@ void SvtSaveOptions_Impl::Commit()
break;
default:
- DBG_ERRORFILE( "invalid index to save a path" );
+ SAL_INFO( "unotools.config", "invalid index to save a path" );
}
}
@@ -821,7 +821,7 @@ void SvtLoadOptions_Impl::Commit()
// -----------------------------------------------------------------------
void SvtLoadOptions_Impl::Notify( const Sequence<rtl::OUString>& )
{
- DBG_ERRORFILE( "properties have been changed" );
+ SAL_INFO( "unotools.config", "properties have been changed" );
}
// -----------------------------------------------------------------------
diff --git a/unotools/source/config/sourceviewconfig.cxx
b/unotools/source/config/sourceviewconfig.cxx
index 843e755..2c611ea 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:
- DBG_ERRORFILE( "invalid index to save a user token" );
+ SAL_INFO( "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 d0ca931..a88d54a 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
{
- DBG_ERRORFILE( "Wrong property type!" );
+ SAL_INFO( "unotools.config", "Wrong property type!" );
}
m_bROLocale = pROStates[nProp];
}
@@ -203,7 +203,7 @@ SvtSysLocaleOptions_Impl::SvtSysLocaleOptions_Impl()
m_aUILocaleString = aStr;
else
{
- DBG_ERRORFILE( "Wrong property type!" );
+ SAL_INFO( "unotools.config", "Wrong property type!" );
}
m_bROUILocale = pROStates[nProp];
}
@@ -215,7 +215,7 @@ SvtSysLocaleOptions_Impl::SvtSysLocaleOptions_Impl()
m_aCurrencyString = aStr;
else
{
- DBG_ERRORFILE( "Wrong property type!" );
+ SAL_INFO( "unotools.config", "Wrong property type!" );
}
m_bROCurrency = pROStates[nProp];
}
@@ -227,13 +227,13 @@ SvtSysLocaleOptions_Impl::SvtSysLocaleOptions_Impl()
m_bDecimalSeparator = bValue;
else
{
- DBG_ERRORFILE( "Wrong property type!" );
+ SAL_INFO( "unotools.config", "Wrong property type!" );
}
m_bRODecimalSeparator = pROStates[nProp];
}
break;
default:
- DBG_ERRORFILE( "Wrong property type!" );
+ SAL_INFO( "unotools.config", "Wrong property type!" );
}
}
}
@@ -361,7 +361,7 @@ void SvtSysLocaleOptions_Impl::Commit()
}
break;
default:
- DBG_ERRORFILE( "invalid index to save a path" );
+ SAL_INFO( "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 ad01ca4..1240fed 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:
- DBG_ERRORFILE( "invalid index to save a path" );
+ SAL_INFO( "unotools.config", "invalid index to save a path" );
}
}
diff --git a/unotools/source/config/useroptions.cxx b/unotools/source/config/useroptions.cxx
index cec823e..503b545 100644
--- a/unotools/source/config/useroptions.cxx
+++ b/unotools/source/config/useroptions.cxx
@@ -31,9 +31,9 @@
#include <unotools/useroptions_const.hxx>
#include <unotools/configmgr.hxx>
-#include <tools/debug.hxx>
#include <com/sun/star/uno/Any.hxx>
#include <com/sun/star/uno/Sequence.hxx>
+#include <tools/solar.h>
#include <osl/mutex.hxx>
#include <rtl/instance.hxx>
#include <rtl/logfile.hxx>
@@ -901,7 +901,7 @@ sal_Bool SvtUserOptions_Impl::IsTokenReadonly( sal_uInt16 nToken ) const
break;
}
default:
- DBG_ERRORFILE( "SvtUserOptions_Impl::IsTokenReadonly(): invalid token" );
+ SAL_INFO( "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:
- DBG_ERRORFILE( "SvtUserOptions_Impl::GetToken(): invalid token" );
+ SAL_INFO( "unotools.config", "SvtUserOptions_Impl::GetToken(): invalid token" );
}
return pRet;
}
diff --git a/unotools/source/i18n/calendarwrapper.cxx b/unotools/source/i18n/calendarwrapper.cxx
index 6bf1e20..748ed91 100644
--- a/unotools/source/i18n/calendarwrapper.cxx
+++ b/unotools/source/i18n/calendarwrapper.cxx
@@ -70,13 +70,7 @@ void CalendarWrapper::loadDefaultCalendar( const ::com::sun::star::lang::Locale&
}
catch (const Exception& e)
{
-#ifdef DBG_UTIL
- rtl::OStringBuffer aMsg("loadDefaultCalendar: Exception caught\n");
- aMsg.append(rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8));
- DBG_ERRORFILE(aMsg.getStr());
-#else
- (void)e;
-#endif
+ SAL_INFO( "unotools.l18n", "loadDefaultCalendar: Exception caught " << e.Message );
}
}
@@ -90,18 +84,8 @@ void CalendarWrapper::loadCalendar( const ::rtl::OUString& rUniqueID, const ::co
}
catch (const Exception& e)
{
-#ifdef DBG_UTIL
- rtl::OStringBuffer aMsg(RTL_CONSTASCII_STRINGPARAM("loadCalendar: Exception
caught\nrequested: "));
- aMsg.append(rtl::OUStringToOString(rUniqueID, RTL_TEXTENCODING_UTF8));
- aMsg.append(RTL_CONSTASCII_STRINGPARAM(" Locale: "));
- aMsg.append(rtl::OUStringToOString(rLocale.Language, RTL_TEXTENCODING_UTF8));
- aMsg.append('_');
- aMsg.append(rtl::OUStringToOString(rLocale.Country, RTL_TEXTENCODING_UTF8));
- aMsg.append(rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8));
- DBG_ERRORFILE(aMsg.getStr());
-#else
- (void)e;
-#endif
+ SAL_INFO( "unotools.l18n", "loadCalendar: Exception caught requested: "
+ << rUniqueID << " Locale: " << rLocale.Language << "_" << rLocale.Country << " " <<
e.Message );
}
}
@@ -115,14 +99,9 @@ void CalendarWrapper::loadCalendar( const ::rtl::OUString& rUniqueID, const ::co
}
catch (const Exception& e)
{
-#ifdef DBG_UTIL
- rtl::OStringBuffer aMsg("getAllCalendars: Exception caught\n");
- aMsg.append(rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8));
- DBG_ERRORFILE(aMsg.getStr());
-#else
- (void)e;
-#endif
+ SAL_INFO( "unotools.l18n", "getAllCalendars: Exception caught " << e.Message );
}
+
return ::com::sun::star::uno::Sequence< ::rtl::OUString > (0);
}
@@ -136,13 +115,7 @@ void CalendarWrapper::loadCalendar( const ::rtl::OUString& rUniqueID, const
::co
}
catch (const Exception& e)
{
-#ifdef DBG_UTIL
- rtl::OStringBuffer aMsg("getUniqueID: Exception caught\n");
- aMsg.append(rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8));
- DBG_ERRORFILE(aMsg.getStr());
-#else
- (void)e;
-#endif
+ SAL_INFO( "unotools.l18n", "getUniqueID: Exception caught " << e.Message );
}
return ::rtl::OUString();
}
@@ -157,13 +130,7 @@ void CalendarWrapper::setDateTime( double nTimeInDays )
}
catch (const Exception& e)
{
-#ifdef DBG_UTIL
- rtl::OStringBuffer aMsg("setDateTime: Exception caught\n");
- aMsg.append(rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8));
- DBG_ERRORFILE(aMsg.getStr());
-#else
- (void)e;
-#endif
+ SAL_INFO( "unotools.l18n", "setDateTime: Exception caught " << e.Message );
}
}
@@ -177,13 +144,7 @@ double CalendarWrapper::getDateTime() const
}
catch (const Exception& e)
{
-#ifdef DBG_UTIL
- rtl::OStringBuffer aMsg("getDateTime: Exception caught\n");
- aMsg.append(rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8));
- DBG_ERRORFILE(aMsg.getStr());
-#else
- (void)e;
-#endif
+ SAL_INFO( "unotools.l18n", "getDateTime: Exception caught " << e.Message );
}
return 0.0;
}
@@ -207,13 +168,7 @@ sal_Int32 CalendarWrapper::getCombinedOffsetInMillis(
}
catch (const Exception& e)
{
-#ifdef DBG_UTIL
- rtl::OStringBuffer aMsg("setLocalDateTime: Exception caught\n");
- aMsg.append(rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8));
- DBG_ERRORFILE(aMsg.getStr());
-#else
- (void)e;
-#endif
+ SAL_INFO( "unotools.l18n", "setLocalDateTime: Exception caught " << e.Message );
}
return nOffset;
}
@@ -279,13 +234,7 @@ void CalendarWrapper::setLocalDateTime( double nTimeInDays )
}
catch (const Exception& e)
{
-#ifdef DBG_UTIL
- rtl::OStringBuffer aMsg("setLocalDateTime: Exception caught\n");
- aMsg.append(rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8));
- DBG_ERRORFILE(aMsg.getStr());
-#else
- (void)e;
-#endif
+ SAL_INFO( "unotools.l18n", "setLocalDateTime: Exception caught " << e.Message );
}
}
@@ -305,13 +254,7 @@ double CalendarWrapper::getLocalDateTime() const
}
catch (const Exception& e)
{
-#ifdef DBG_UTIL
- rtl::OStringBuffer aMsg("getLocalDateTime: Exception caught\n");
- aMsg.append(rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8));
- DBG_ERRORFILE(aMsg.getStr());
-#else
- (void)e;
-#endif
+ SAL_INFO( "unotools.l18n", "getLocalDateTime: Exception caught " << e.Message );
}
return 0.0;
}
@@ -326,13 +269,7 @@ void CalendarWrapper::setValue( sal_Int16 nFieldIndex, sal_Int16 nValue )
}
catch (const Exception& e)
{
-#ifdef DBG_UTIL
- rtl::OStringBuffer aMsg("setValue: Exception caught\n");
- aMsg.append(rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8));
- DBG_ERRORFILE(aMsg.getStr());
-#else
- (void)e;
-#endif
+ SAL_INFO( "unotools.l18n", "setValue: Exception caught " << e.Message );
}
}
@@ -346,13 +283,7 @@ sal_Bool CalendarWrapper::isValid() const
}
catch (const Exception& e)
{
-#ifdef DBG_UTIL
- rtl::OStringBuffer aMsg("isValid: Exception caught\n");
- aMsg.append(rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8));
- DBG_ERRORFILE(aMsg.getStr());
-#else
- (void)e;
-#endif
+ SAL_INFO( "unotools.l18n", "isValue: Exception caught " << e.Message );
}
return sal_False;
}
@@ -367,13 +298,7 @@ sal_Int16 CalendarWrapper::getValue( sal_Int16 nFieldIndex ) const
}
catch (const Exception& e)
{
-#ifdef DBG_UTIL
- rtl::OStringBuffer aMsg("getValue: Exception caught\n");
- aMsg.append(rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8));
- DBG_ERRORFILE(aMsg.getStr());
-#else
- (void)e;
-#endif
+ SAL_INFO( "unotools.l18n", "getValue: Exception caught " << e.Message );
}
return 0;
}
@@ -388,13 +313,7 @@ void CalendarWrapper::addValue( sal_Int16 nFieldIndex, sal_Int32 nAmount )
}
catch (const Exception& e)
{
-#ifdef DBG_UTIL
- rtl::OStringBuffer aMsg("addValue: Exception caught\n");
- aMsg.append(rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8));
- DBG_ERRORFILE(aMsg.getStr());
-#else
- (void)e;
-#endif
+ SAL_INFO( "unotools.l18n", "addValue: Exception caught " << e.Message );
}
}
@@ -408,13 +327,7 @@ sal_Int16 CalendarWrapper::getFirstDayOfWeek() const
}
catch (const Exception& e)
{
-#ifdef DBG_UTIL
- rtl::OStringBuffer aMsg("getFirstDayOfWeek: Exception caught\n");
- aMsg.append(rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8));
- DBG_ERRORFILE(aMsg.getStr());
-#else
- (void)e;
-#endif
+ SAL_INFO( "unotools.l18n", "getFirstDayOfWeek: Exception caught " << e.Message );
}
return 0;
}
@@ -429,13 +342,7 @@ void CalendarWrapper::setFirstDayOfWeek( sal_Int16 nDay )
}
catch (const Exception& e)
{
-#ifdef DBG_UTIL
- rtl::OStringBuffer aMsg("setFirstDayOfWeek: Exception caught\n");
- aMsg.append(rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8));
- DBG_ERRORFILE(aMsg.getStr());
-#else
- (void)e;
-#endif
+ SAL_INFO( "unotools.l18n", "setFirstDayOfWeek: Exception caught " << e.Message );
}
}
@@ -449,13 +356,7 @@ void CalendarWrapper::setMinimumNumberOfDaysForFirstWeek( sal_Int16 nDays )
}
catch (const Exception& e)
{
-#ifdef DBG_UTIL
- rtl::OStringBuffer aMsg("setMinimumNumberOfDaysForFirstWeek: Exception caught\n");
- aMsg.append(rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8));
- DBG_ERRORFILE(aMsg.getStr());
-#else
- (void)e;
-#endif
+ SAL_INFO( "unotools.l18n", "setMinimumNumberOfDaysForFirstWeek: Exception caught " <<
e.Message );
}
}
@@ -469,13 +370,7 @@ sal_Int16 CalendarWrapper::getNumberOfMonthsInYear() const
}
catch (const Exception& e)
{
-#ifdef DBG_UTIL
- rtl::OStringBuffer aMsg("getNumberOfMonthsInYear: Exception caught\n");
- aMsg.append(rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8));
- DBG_ERRORFILE(aMsg.getStr());
-#else
- (void)e;
-#endif
+ SAL_INFO( "unotools.l18n", "getNumberOfMonthsInYear: Exception caught " << e.Message );
}
return 0;
}
@@ -490,13 +385,7 @@ sal_Int16 CalendarWrapper::getNumberOfDaysInWeek() const
}
catch (const Exception& e)
{
-#ifdef DBG_UTIL
- rtl::OStringBuffer aMsg("getNumberOfDaysInWeek: Exception caught\n");
- aMsg.append(rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8));
- DBG_ERRORFILE(aMsg.getStr());
-#else
- (void)e;
-#endif
+ SAL_INFO( "unotools.l18n", "getNumberOfDaysInWeek: Exception caught " << e.Message );
}
return 0;
}
@@ -511,13 +400,7 @@ sal_Int16 CalendarWrapper::getNumberOfDaysInWeek() const
}
catch (const Exception& e)
{
-#ifdef DBG_UTIL
- rtl::OStringBuffer aMsg("getMonths: Exception caught\n");
- aMsg.append(rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8));
- DBG_ERRORFILE(aMsg.getStr());
-#else
- (void)e;
-#endif
+ SAL_INFO( "unotools.l18n", "getMonths: Exception caught " << e.Message );
}
return ::com::sun::star::uno::Sequence< ::com::sun::star::i18n::CalendarItem2 > (0);
}
@@ -532,13 +415,7 @@ sal_Int16 CalendarWrapper::getNumberOfDaysInWeek() const
}
catch (const Exception& e)
{
-#ifdef DBG_UTIL
- rtl::OStringBuffer aMsg("getDays: Exception caught\n");
- aMsg.append(rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8));
- DBG_ERRORFILE(aMsg.getStr());
-#else
- (void)e;
-#endif
+ SAL_INFO( "unotools.l18n", "getDays: Exception caught " << e.Message );
}
return ::com::sun::star::uno::Sequence< ::com::sun::star::i18n::CalendarItem2 > (0);
}
@@ -553,13 +430,7 @@ String CalendarWrapper::getDisplayName( sal_Int16 nCalendarDisplayIndex,
sal_Int
}
catch (const Exception& e)
{
-#ifdef DBG_UTIL
- rtl::OStringBuffer aMsg("getDisplayName: Exception caught\n");
- aMsg.append(rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8));
- DBG_ERRORFILE(aMsg.getStr());
-#else
- (void)e;
-#endif
+ SAL_INFO( "unotools.l18n", "getDisplayName: Exception caught " << e.Message );
}
return String();
}
@@ -576,13 +447,7 @@ String CalendarWrapper::getDisplayString( sal_Int32 nCalendarDisplayCode,
sal_In
}
catch (const Exception& e)
{
-#ifdef DBG_UTIL
- rtl::OStringBuffer aMsg("getDisplayString: Exception caught\n");
- aMsg.append(rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8));
- DBG_ERRORFILE(aMsg.getStr());
-#else
- (void)e;
-#endif
+ SAL_INFO( "unotools.l18n", "getDisplayString: Exception caught " << e.Message );
}
return String();
}
@@ -599,13 +464,7 @@ String CalendarWrapper::getDisplayString( sal_Int32 nCalendarDisplayCode,
sal_In
}
catch (const Exception& e)
{
-#ifdef DBG_UTIL
- rtl::OStringBuffer aMsg( "getLoadedCalendar2: Exception caught\n" );
- aMsg.append(rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8));
- DBG_ERRORFILE(aMsg.getStr());
-#else
- (void)e;
-#endif
+ SAL_INFO( "unotools.l18n", "getLoadedCalendar2: Exception caught " << e.Message );
}
return ::com::sun::star::i18n::Calendar2();
}
@@ -620,13 +479,7 @@ String CalendarWrapper::getDisplayString( sal_Int32 nCalendarDisplayCode,
sal_In
}
catch (const Exception& e)
{
-#ifdef DBG_UTIL
- rtl::OStringBuffer aMsg("getGenitiveMonths: Exception caught\n");
- aMsg.append(rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8));
- DBG_ERRORFILE(aMsg.getStr());
-#else
- (void)e;
-#endif
+ SAL_INFO( "unotools.l18n", "getGenitiveMonths: Exception caught " << e.Message );
}
return ::com::sun::star::uno::Sequence< ::com::sun::star::i18n::CalendarItem2 > (0);
}
@@ -641,13 +494,7 @@ String CalendarWrapper::getDisplayString( sal_Int32 nCalendarDisplayCode,
sal_In
}
catch (const Exception& e)
{
-#ifdef DBG_UTIL
- rtl::OStringBuffer aMsg("getPartitiveMonths: Exception caught\n");
- aMsg.append(rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8));
- DBG_ERRORFILE(aMsg.getStr());
-#else
- (void)e;
-#endif
+ SAL_INFO( "unotools.l18n", "getPartitiveMonths: Exception caught " << e.Message );
}
return ::com::sun::star::uno::Sequence< ::com::sun::star::i18n::CalendarItem2 > (0);
}
diff --git a/unotools/source/i18n/charclass.cxx b/unotools/source/i18n/charclass.cxx
index c169a66..6795a2e 100644
--- a/unotools/source/i18n/charclass.cxx
+++ b/unotools/source/i18n/charclass.cxx
@@ -131,7 +131,7 @@ sal_Bool CharClass::isAlpha( const String& rStr, xub_StrLen nPos ) const
}
catch ( const Exception& )
{
- DBG_ERRORFILE( "isAlpha: Exception caught!" );
+ SAL_INFO( "unotools", "isAlpha: Exception caught!" );
return sal_False;
}
}
@@ -154,7 +154,7 @@ sal_Bool CharClass::isLetter( const String& rStr, xub_StrLen nPos ) const
}
catch ( const Exception& )
{
- DBG_ERRORFILE( "isLetter: Exception caught!" );
+ SAL_INFO( "unotools", "isLetter: Exception caught!" );
return sal_False;
}
}
@@ -171,7 +171,7 @@ sal_Bool CharClass::isLetter( const String& rStr ) const
}
catch ( const Exception& )
{
- DBG_ERRORFILE( "isLetter: Exception caught!" );
+ SAL_INFO( "unotools", "isLetter: Exception caught!" );
return sal_False;
}
}
@@ -193,7 +193,7 @@ sal_Bool CharClass::isDigit( const String& rStr, xub_StrLen nPos ) const
}
catch ( const Exception& )
{
- DBG_ERRORFILE( "isDigit: Exception caught!" );
+ SAL_INFO( "unotools", "isDigit: Exception caught!" );
return sal_False;
}
}
@@ -210,7 +210,7 @@ sal_Bool CharClass::isNumeric( const String& rStr ) const
}
catch ( const Exception& )
{
- DBG_ERRORFILE( "isNumeric: Exception caught!" );
+ SAL_INFO( "unotools", "isNumeric: Exception caught!" );
return sal_False;
}
}
@@ -232,7 +232,7 @@ sal_Bool CharClass::isAlphaNumeric( const String& rStr, xub_StrLen nPos ) const
}
catch ( const Exception& )
{
- DBG_ERRORFILE( "isAlphaNumeric: Exception caught!" );
+ SAL_INFO( "unotools", "isAlphaNumeric: Exception caught!" );
return sal_False;
}
}
@@ -254,7 +254,7 @@ sal_Bool CharClass::isLetterNumeric( const String& rStr, xub_StrLen nPos ) const
}
catch ( const Exception& )
{
- DBG_ERRORFILE( "isLetterNumeric: Exception caught!" );
+ SAL_INFO( "unotools", "isLetterNumeric: Exception caught!" );
return sal_False;
}
}
@@ -271,7 +271,7 @@ sal_Bool CharClass::isLetterNumeric( const String& rStr ) const
}
catch ( const Exception& )
{
- DBG_ERRORFILE( "isLetterNumeric: Exception caught!" );
+ SAL_INFO( "unotools", "isLetterNumeric: Exception caught!" );
return sal_False;
}
}
@@ -287,7 +287,7 @@ rtl::OUString CharClass::titlecase(const rtl::OUString& rStr, sal_Int32 nPos, sa
}
catch ( const Exception& )
{
- DBG_ERRORFILE( "titlecase: Exception caught!" );
+ SAL_INFO( "unotools", "titlecase: Exception caught!" );
return rStr.copy( nPos, nCount );
}
}
@@ -303,7 +303,7 @@ rtl::OUString CharClass::titlecase(const rtl::OUString& rStr, sal_Int32 nPos, sa
}
catch ( const Exception& )
{
- DBG_ERRORFILE( "uppercase: Exception caught!" );
+ SAL_INFO( "unotools", "uppercase: Exception caught!" );
return rStr.copy( nPos, nCount );
}
}
@@ -319,7 +319,7 @@ rtl::OUString CharClass::titlecase(const rtl::OUString& rStr, sal_Int32 nPos, sa
}
catch ( const Exception& )
{
- DBG_ERRORFILE( "lowercase: Exception caught!" );
+ SAL_INFO( "unotools", "lowercase: Exception caught!" );
return rStr.copy( nPos, nCount );
}
}
@@ -335,7 +335,7 @@ sal_Int16 CharClass::getType( const String& rStr, xub_StrLen nPos ) const
}
catch ( const Exception& )
{
- DBG_ERRORFILE( "getType: Exception caught!" );
+ SAL_INFO( "unotools", "getType: Exception caught!" );
return 0;
}
}
@@ -352,7 +352,7 @@ sal_Int16 CharClass::getCharacterDirection( const String& rStr, xub_StrLen nPos
}
catch ( const Exception& )
{
- DBG_ERRORFILE( "getCharacterDirection: Exception caught!" );
+ SAL_INFO( "unotools", "getCharacterDirection: Exception caught!" );
return 0;
}
}
@@ -369,7 +369,7 @@ sal_Int16 CharClass::getScript( const String& rStr, xub_StrLen nPos ) const
}
catch ( const Exception& )
{
- DBG_ERRORFILE( "getScript: Exception caught!" );
+ SAL_INFO( "unotools", "getScript: Exception caught!" );
return 0;
}
}
@@ -386,7 +386,7 @@ sal_Int32 CharClass::getCharacterType( const String& rStr, xub_StrLen nPos ) con
}
catch ( const Exception& )
{
- DBG_ERRORFILE( "getCharacterType: Exception caught!" );
+ SAL_INFO( "unotools", "getCharacterType: Exception caught!" );
return 0;
}
}
@@ -403,7 +403,7 @@ sal_Int32 CharClass::getStringType( const String& rStr, xub_StrLen nPos, xub_Str
}
catch ( const Exception& )
{
- DBG_ERRORFILE( "getStringType: Exception caught!" );
+ SAL_INFO( "unotools", "getStringType: Exception caught!" );
return 0;
}
}
@@ -428,13 +428,7 @@ sal_Int32 CharClass::getStringType( const String& rStr, xub_StrLen nPos,
xub_Str
}
catch ( const Exception& e )
{
-#ifdef DBG_UTIL
- rtl::OStringBuffer aMsg("parseAnyToken: Exception caught\n");
- aMsg.append(rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8));
- DBG_ERRORFILE(aMsg.getStr());
-#else
- (void)e;
-#endif
+ SAL_INFO( "unotools.l18n", "parseAnyToken: Exception caught " << e.Message );
return ParseResult();
}
}
@@ -460,13 +454,7 @@ sal_Int32 CharClass::getStringType( const String& rStr, xub_StrLen nPos,
xub_Str
}
catch ( const Exception& e )
{
-#ifdef DBG_UTIL
- rtl::OStringBuffer aMsg("parsePredefinedToken: Exception caught\n");
- aMsg.append(rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8));
- DBG_ERRORFILE(aMsg.getStr());
-#else
- (void)e;
-#endif
+ SAL_INFO( "unotools.l18n", "parsePredefinedToken: Exception caught " << e.Message );
return ParseResult();
}
}
diff --git a/unotools/source/i18n/collatorwrapper.cxx b/unotools/source/i18n/collatorwrapper.cxx
index 6c59d43..09f12bd 100644
--- a/unotools/source/i18n/collatorwrapper.cxx
+++ b/unotools/source/i18n/collatorwrapper.cxx
@@ -57,7 +57,7 @@ CollatorWrapper::compareString (const ::rtl::OUString& s1, const ::rtl::OUString
}
catch (const uno::RuntimeException&)
{
- DBG_ERRORFILE ("CollatorWrapper: compareString failed");
+ SAL_INFO( "unotools","CollatorWrapper: compareString failed");
}
return 0;
@@ -73,7 +73,7 @@ CollatorWrapper::listCollatorAlgorithms (const lang::Locale& rLocale) const
}
catch (const uno::RuntimeException&)
{
- DBG_ERRORFILE ("CollatorWrapper: listCollatorAlgorithms failed");
+ SAL_INFO( "unotools","CollatorWrapper: listCollatorAlgorithms failed");
}
return uno::Sequence< ::rtl::OUString > ();
@@ -89,7 +89,7 @@ CollatorWrapper::loadDefaultCollator (const lang::Locale& rLocale, sal_Int32 nOp
}
catch (const uno::RuntimeException&)
{
- DBG_ERRORFILE ("CollatorWrapper: loadDefaultCollator failed");
+ SAL_INFO( "unotools","CollatorWrapper: loadDefaultCollator failed");
}
return 0;
@@ -107,7 +107,7 @@ CollatorWrapper::loadCollatorAlgorithm (const ::rtl::OUString& rAlgorithm,
}
catch (const uno::RuntimeException&)
{
- DBG_ERRORFILE ("CollatorWrapper: loadCollatorAlgorithm failed");
+ SAL_INFO( "unotools","CollatorWrapper: loadCollatorAlgorithm failed");
}
return 0;
diff --git a/unotools/source/i18n/instance.hxx b/unotools/source/i18n/instance.hxx
index da9e172..58ab1cb 100644
--- a/unotools/source/i18n/instance.hxx
+++ b/unotools/source/i18n/instance.hxx
@@ -30,6 +30,7 @@
#include <comphelper/processfactory.hxx>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#include <rtl/oustringostreaminserter.hxx>
#include <rtl/strbuf.hxx>
// ugly but so is this namespacing evil.
@@ -47,20 +48,13 @@ inline css::uno::Reference<css::uno::XInterface>
try
{
if (!xSMgr.is())
- xSMgr = ::comphelper::getProcessServiceFactory();
+ xSMgr = ::comphelper::getProcessServiceFactory();
xRet = xSMgr->createInstance( rtl::OUString::createFromAscii( serviceName ) );
}
catch (const css::uno::Exception &e)
{
-#ifdef DBG_UTIL
- rtl::OStringBuffer aMsg( context );
- aMsg.append(RTL_CONSTASCII_STRINGPARAM("ctor: Exception caught\n"));
- aMsg.append(rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8));
- DBG_ERRORFILE(aMsg.getStr());
-#else
- (void)e; (void)context;
-#endif
- xRet = css::uno::Reference<css::uno::XInterface>();
+ SAL_INFO( "unotools.l18n", context << "ctor:Exception caught " << e.Message );
+ xRet = css::uno::Reference<css::uno::XInterface>();
}
return xRet;
}
diff --git a/unotools/source/i18n/localedatawrapper.cxx b/unotools/source/i18n/localedatawrapper.cxx
index 704415d..3317690 100644
--- a/unotools/source/i18n/localedatawrapper.cxx
+++ b/unotools/source/i18n/localedatawrapper.cxx
@@ -147,13 +147,7 @@ void LocaleDataWrapper::invalidateData()
}
catch (const Exception& e)
{
-#ifdef DBG_UTIL
- rtl::OStringBuffer aMsg( "getLanguageCountryInfo: Exception caught\n");
- aMsg.append(rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8));
- DBG_ERRORFILE(aMsg.getStr());
-#else
- (void)e;
-#endif
+ SAL_INFO( "unotools.i18n", "getLanguageCountryInfo: Exception caught " << e.Message );
}
return ::com::sun::star::i18n::LanguageCountryInfo();
}
@@ -168,13 +162,7 @@ void LocaleDataWrapper::invalidateData()
}
catch (const Exception& e)
{
-#ifdef DBG_UTIL
- rtl::OStringBuffer aMsg("getLocaleItem: Exception caught\n");
- aMsg.append(rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8));
- DBG_ERRORFILE(aMsg.getStr());
-#else
- (void)e;
-#endif
+ SAL_INFO( "unotools.l18n", "getLocaleItem: Exception caught " << e.Message );
}
return ::com::sun::star::i18n::LocaleDataItem();
}
@@ -189,13 +177,7 @@ void LocaleDataWrapper::invalidateData()
}
catch (const Exception& e)
{
-#ifdef DBG_UTIL
- rtl::OStringBuffer aMsg("getAllCurrencies: Exception caught\n");
- aMsg.append(rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8));
- DBG_ERRORFILE(aMsg.getStr());
-#else
- (void)e;
-#endif
+ SAL_INFO( "unotools.l18n", "getAllCurrencies: Exception caught " << e.Message );
}
return ::com::sun::star::uno::Sequence< ::com::sun::star::i18n::Currency2 >(0);
}
@@ -210,13 +192,7 @@ void LocaleDataWrapper::invalidateData()
}
catch (const Exception& e)
{
-#ifdef DBG_UTIL
- rtl::OStringBuffer aMsg("getAllFormats: Exception caught\n");
- aMsg.append(rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8));
- DBG_ERRORFILE(aMsg.getStr());
-#else
- (void)e;
-#endif
+ SAL_INFO( "unotools.l18n", "getAllFormats: Exception caught " << e.Message );
}
return ::com::sun::star::uno::Sequence< ::com::sun::star::i18n::FormatElement >(0);
}
@@ -231,13 +207,7 @@ void LocaleDataWrapper::invalidateData()
}
catch (const Exception& e)
{
-#ifdef DBG_UTIL
- rtl::OStringBuffer aMsg("getCollatorImplementations: Exception caught\n");
- aMsg.append(rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8));
- DBG_ERRORFILE(aMsg.getStr());
-#else
- (void)e;
-#endif
+ SAL_INFO( "unotools.l18n", "getCollatorImplementations: Exception caught " << e.Message );
}
return ::com::sun::star::uno::Sequence< ::com::sun::star::i18n::Implementation >(0);
}
@@ -252,13 +222,7 @@ void LocaleDataWrapper::invalidateData()
}
catch (const Exception& e)
{
-#ifdef DBG_UTIL
- rtl::OStringBuffer aMsg("getTransliterations: Exception caught\n");
- aMsg.append(rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8));
- DBG_ERRORFILE(aMsg.getStr());
-#else
- (void)e;
-#endif
+ SAL_INFO( "unotools.l18n", "getTransliterations: Exception caught " << e.Message );
}
return ::com::sun::star::uno::Sequence< ::rtl::OUString >(0);
}
@@ -273,13 +237,7 @@ void LocaleDataWrapper::invalidateData()
}
catch (const Exception& e)
{
-#ifdef DBG_UTIL
- rtl::OStringBuffer aMsg("getForbiddenCharacters: Exception caught\n");
- aMsg.append(rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8));
- DBG_ERRORFILE(aMsg.getStr());
-#else
- (void)e;
-#endif
+ SAL_INFO( "unotools.l18n", "getForbiddenCharacters: Exception caught " << e.Message );
}
return ::com::sun::star::i18n::ForbiddenCharacters();
}
@@ -294,13 +252,7 @@ void LocaleDataWrapper::invalidateData()
}
catch ( const Exception& e )
{
-#ifdef DBG_UTIL
- rtl::OStringBuffer aMsg("getReservedWord: Exception caught\n");
- aMsg.append(rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8));
- DBG_ERRORFILE(aMsg.getStr());
-#else
- (void)e;
-#endif
+ SAL_INFO( "unotools.l18n", "getReservedWord: Exception caught " << e.Message );
}
return ::com::sun::star::uno::Sequence< ::rtl::OUString >(0);
}
@@ -320,13 +272,7 @@ void LocaleDataWrapper::invalidateData()
}
catch ( const Exception& e )
{
-#ifdef DBG_UTIL
- rtl::OStringBuffer aMsg("getAllInstalledLocaleNames: Exception caught\n");
- aMsg.append(rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8));
- DBG_ERRORFILE(aMsg.getStr());
-#else
- (void)e;
-#endif
+ SAL_INFO( "unotools.l18n", "getAllInstalledLocaleNames: Exception caught " << e.Message );
}
return rInstalledLocales;
}
@@ -458,7 +404,7 @@ const String& LocaleDataWrapper::getOneLocaleItem( sal_Int16 nItem ) const
::utl::ReadWriteGuard aGuard( aMutex );
if ( nItem >= LocaleItem::COUNT )
{
- DBG_ERRORFILE( "getOneLocaleItem: bounds" );
+ SAL_INFO( "unotools", "getOneLocaleItem: bounds" );
return aLocaleItem[0];
}
if ( aLocaleItem[nItem].Len() == 0 )
@@ -531,7 +477,7 @@ void LocaleDataWrapper::getOneLocaleItemImpl( sal_Int16 nItem )
aLocaleItem[nItem] = aLocaleDataItem.LongDateYearSeparator;
break;
default:
- DBG_ERRORFILE( "getOneLocaleItemImpl: which one?" );
+ SAL_INFO( "unotools", "getOneLocaleItemImpl: which one?" );
}
}
@@ -554,7 +500,7 @@ const String& LocaleDataWrapper::getOneReservedWord( sal_Int16 nWord ) const
::utl::ReadWriteGuard aGuard( aMutex );
if ( nWord < 0 || nWord >= reservedWords::COUNT )
{
- DBG_ERRORFILE( "getOneReservedWord: bounds" );
+ SAL_INFO( "unotools", "getOneReservedWord: bounds" );
nWord = reservedWords::FALSE_WORD;
}
if ( aReservedWord[nWord].Len() == 0 )
@@ -1939,13 +1885,7 @@ void LocaleDataWrapper::evaluateLocaleDataChecking()
}
catch (const Exception& e)
{
-#ifdef DBG_UTIL
- rtl::OStringBuffer aMsg("getAllCalendars: Exception caught\n");
- aMsg.append(rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8));
- DBG_ERRORFILE(aMsg.getStr());
-#else
- (void)e;
-#endif
+ SAL_INFO( "unotools.l18n", "getAllCalendars: Exception caught " << e.Message );
}
return ::com::sun::star::uno::Sequence< ::com::sun::star::i18n::Calendar2 >(0);
}
diff --git a/unotools/source/i18n/nativenumberwrapper.cxx
b/unotools/source/i18n/nativenumberwrapper.cxx
index 9f831fd..ac76f2d 100644
--- a/unotools/source/i18n/nativenumberwrapper.cxx
+++ b/unotools/source/i18n/nativenumberwrapper.cxx
@@ -64,7 +64,7 @@ NativeNumberWrapper::getNativeNumberString(
}
catch ( const uno::Exception& )
{
- DBG_ERRORFILE( "getNativeNumberString: Exception caught!" );
+ SAL_INFO( "unotools", "getNativeNumberString: Exception caught!" );
}
return ::rtl::OUString();
}
@@ -82,7 +82,7 @@ NativeNumberWrapper::isValidNatNum(
}
catch ( const uno::Exception& )
{
- DBG_ERRORFILE( "isValidNatNum: Exception caught!" );
+ SAL_INFO( "unotools", "isValidNatNum: Exception caught!" );
}
return sal_False;
}
@@ -100,7 +100,7 @@ NativeNumberWrapper::convertToXmlAttributes(
}
catch ( const uno::Exception& )
{
- DBG_ERRORFILE( "convertToXmlAttributes: Exception caught!" );
+ SAL_INFO( "unotools", "convertToXmlAttributes: Exception caught!" );
}
return i18n::NativeNumberXmlAttributes();
}
@@ -117,7 +117,7 @@ NativeNumberWrapper::convertFromXmlAttributes(
}
catch ( const uno::Exception& )
{
- DBG_ERRORFILE( "convertFromXmlAttributes: Exception caught!" );
+ SAL_INFO( "unotools", "convertFromXmlAttributes: Exception caught!" );
}
return 0;
}
diff --git a/unotools/source/i18n/numberformatcodewrapper.cxx
b/unotools/source/i18n/numberformatcodewrapper.cxx
index 418337e..a67a7aa 100644
--- a/unotools/source/i18n/numberformatcodewrapper.cxx
+++ b/unotools/source/i18n/numberformatcodewrapper.cxx
@@ -72,7 +72,7 @@ NumberFormatCodeWrapper::getDefault( sal_Int16 formatType, sal_Int16 formatUsage
}
catch ( const Exception& e )
{
- DBG_ERRORFILE( "getDefault: Exception caught!" );
+ SAL_INFO( "unotools", "getDefault: Exception caught!" );
}
return ::com::sun::star::i18n::NumberFormatCode();
}
@@ -88,7 +88,7 @@ NumberFormatCodeWrapper::getFormatCode( sal_Int16 formatIndex ) const
}
catch ( const Exception& e )
{
- DBG_ERRORFILE( "getFormatCode: Exception caught!" );
+ SAL_INFO( "unotools", "getFormatCode: Exception caught!" );
}
return ::com::sun::star::i18n::NumberFormatCode();
}
@@ -104,7 +104,7 @@ NumberFormatCodeWrapper::getAllFormatCode( sal_Int16 formatUsage ) const
}
catch ( const Exception& e )
{
- DBG_ERRORFILE( "getAllFormatCode: Exception caught!" );
+ SAL_INFO( "unotools", "getAllFormatCode: Exception caught!" );
}
return ::com::sun::star::uno::Sequence< ::com::sun::star::i18n::NumberFormatCode > (0);
}
@@ -120,7 +120,7 @@ NumberFormatCodeWrapper::getAllFormatCodes() const
}
catch ( const Exception& e )
{
- DBG_ERRORFILE( "getAllFormatCodes: Exception caught!" );
+ SAL_INFO( "unotools", "getAllFormatCodes: Exception caught!" );
}
return ::com::sun::star::uno::Sequence< ::com::sun::star::i18n::NumberFormatCode > (0);
}
diff --git a/unotools/source/i18n/textsearch.cxx b/unotools/source/i18n/textsearch.cxx
index 8b9b5f3..19fe451 100644
--- a/unotools/source/i18n/textsearch.cxx
+++ b/unotools/source/i18n/textsearch.cxx
@@ -27,7 +27,6 @@
************************************************************************/
#include <i18npool/mslangid.hxx>
-#include <tools/debug.hxx>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/util/SearchFlags.hdl>
#include <com/sun/star/i18n/TransliterationModules.hpp>
@@ -133,7 +132,7 @@ Reference<XTextSearch> TextSearch::getXTextSearch( const SearchOptions& rPara )
}
catch ( Exception& )
{
- DBG_ERRORFILE( "TextSearch ctor: Exception caught!" );
+ SAL_INFO( "unotools", "TextSearch ctor: Exception caught!" );
}
return rCache.xTextSearch;
}
@@ -253,7 +252,7 @@ int TextSearch::SearchFrwrd( const String & rStr, xub_StrLen* pStart,
}
catch ( Exception& )
{
- DBG_ERRORFILE( "SearchForward: Exception caught!" );
+ SAL_INFO( "unotools", "SearchForward: Exception caught!" );
}
return nRet;
}
@@ -284,7 +283,7 @@ int TextSearch::SearchBkwrd( const String & rStr, xub_StrLen* pStart,
}
catch ( Exception& )
{
- DBG_ERRORFILE( "SearchBackward: Exception caught!" );
+ SAL_INFO( "unotools", "SearchBackward: Exception caught!" );
}
return nRet;
}
diff --git a/unotools/source/i18n/transliterationwrapper.cxx
b/unotools/source/i18n/transliterationwrapper.cxx
index 06030ce..5e3d84c 100644
--- a/unotools/source/i18n/transliterationwrapper.cxx
+++ b/unotools/source/i18n/transliterationwrapper.cxx
@@ -75,7 +75,7 @@ String TransliterationWrapper::transliterate(
}
catch( Exception& )
{
- DBG_ERRORFILE( "transliterate: Exception caught!" );
+ SAL_INFO( "unotools", "transliterate: Exception caught!" );
}
}
return sRet;
@@ -99,7 +99,7 @@ String TransliterationWrapper::transliterate(
}
catch( Exception& )
{
- DBG_ERRORFILE( "transliterate: Exception caught!" );
+ SAL_INFO( "unotools", "transliterate: Exception caught!" );
}
}
return sRet;
@@ -171,13 +171,7 @@ void TransliterationWrapper::loadModuleImpl() const
}
catch ( const Exception& e )
{
-#ifdef DBG_UTIL
- rtl::OStringBuffer aMsg("loadModuleImpl: Exception caught\n");
- aMsg.append(rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8));
- DBG_ERRORFILE(aMsg.getStr());
-#else
- (void)e;
-#endif
+ SAL_INFO( "unotools.i18n", "loadModuleImpl: Exception caught " << e.Message );
}
bFirstCall = sal_False;
@@ -198,13 +192,7 @@ void TransliterationWrapper::loadModuleByImplName(
}
catch ( const Exception& e )
{
-#ifdef DBG_UTIL
- rtl::OStringBuffer aMsg("loadModuleByImplName: Exception caught\n");
- aMsg.append(rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8));
- DBG_ERRORFILE(aMsg.getStr());
-#else
- (void)e;
-#endif
+ SAL_INFO( "unotools.i18n", "loadModuleByImplName: Exception caught " << e.Message );
}
bFirstCall = sal_False;
@@ -224,13 +212,7 @@ sal_Bool TransliterationWrapper::equals(
}
catch ( const Exception& e )
{
-#ifdef DBG_UTIL
- rtl::OStringBuffer aMsg("equals: Exception caught\n");
- aMsg.append(rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8));
- DBG_ERRORFILE(aMsg.getStr());
-#else
- (void)e;
-#endif
+ SAL_INFO( "unotools.i18n", "equals: Exception caught " << e.Message );
}
return sal_False;
}
@@ -249,13 +231,7 @@ sal_Int32 TransliterationWrapper::compareSubstring(
}
catch (const Exception& e)
{
-#ifdef DBG_UTIL
- rtl::OStringBuffer aMsg("compareSubstring: Exception caught\n");
- aMsg.append(rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8));
- DBG_ERRORFILE(aMsg.getStr());
-#else
- (void)e;
-#endif
+ SAL_INFO( "unotools.i18n", "compareSubstring: Exception caught " << e.Message );
}
return 0;
}
@@ -272,13 +248,7 @@ sal_Int32 TransliterationWrapper::compareString( const String& rStr1, const
Stri
}
catch (const Exception& e)
{
-#ifdef DBG_UTIL
- rtl::OStringBuffer aMsg("compareString: Exception caught\n");
- aMsg.append(rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8));
- DBG_ERRORFILE(aMsg.getStr());
-#else
- (void)e;
-#endif
+ SAL_INFO( "unotools.i18n", "compareString: Exception caught " << e.Message );
}
return 0;
}
--------------true--
From c1570af41fce0b439ffdeda3754ab3b0219789d7 Mon Sep 17 00:00:00 2001
Message-Id: <c1570af41fce0b439ffdeda3754ab3b0219789d7.1326618396.git.mmetz@adrian-broher.net>
In-Reply-To: <b89c66bd936b49f652dffe7895818068c5587386.1326618396.git.mmetz@adrian-broher.net>
References: <b89c66bd936b49f652dffe7895818068c5587386.1326618396.git.mmetz@adrian-broher.net>
From: Marcel Metz <mmetz@adrian-broher.net>
Date: Wed, 11 Jan 2012 10:11:50 +0100
Subject: [PATCH 2/4] Replaced DBG_ERRORFILE with SAL_INFO.
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/framelinkarray.cxx | 2 -
svx/source/dialog/frmsel.cxx | 6 +-
svx/source/dialog/txencbox.cxx | 8 +--
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 +-
11 files changed, 80 insertions(+), 88 deletions(-)
--------------true
Content-Type: text/x-patch; name="0002-Replaced-DBG_ERRORFILE-with-SAL_INFO.patch"
Content-Transfer-Encoding: 8bit
Content-Disposition: attachment; filename="0002-Replaced-DBG_ERRORFILE-with-SAL_INFO.patch"
diff --git a/svx/source/dialog/dlgutil.cxx b/svx/source/dialog/dlgutil.cxx
index dcb2b93..8e14e6ec 100644
--- a/svx/source/dialog/dlgutil.cxx
+++ b/svx/source/dialog/dlgutil.cxx
@@ -79,7 +79,7 @@ bool GetApplyCharUnit( const SfxItemSet& rSet )
}
else
{
- DBG_ERRORFILE( "GetApplyCharUnit(): no module found" );
+ SAL_INFO( "svx", "GetApplyCharUnit(): no module found" );
}
}
}
diff --git a/svx/source/dialog/framelink.cxx b/svx/source/dialog/framelink.cxx
index cfe80fb..6ef4903 100644
--- a/svx/source/dialog/framelink.cxx
+++ b/svx/source/dialog/framelink.cxx
@@ -560,7 +560,7 @@ void lclLinkLeftEnd(
}
else
{
- DBG_ERRORFILE( "lclLinkLeftEnd - called for invisible frame style" );
+ SAL_INFO( "svx", "lclLinkLeftEnd - called for invisible frame style" );
}
}
diff --git a/svx/source/dialog/framelinkarray.cxx b/svx/source/dialog/framelinkarray.cxx
index 3f2db93..e5767b5 100644
--- a/svx/source/dialog/framelinkarray.cxx
+++ b/svx/source/dialog/framelinkarray.cxx
@@ -310,7 +310,6 @@ MergedCellIterator& MergedCellIterator::operator++()
// ============================================================================
-#define DBG_FRAME_ERROR( funcname, error ) DBG_ERRORFILE( "svx::frame::Array::"
funcname " - " error )
#define DBG_FRAME_CHECK( cond, funcname, error ) DBG_ASSERT( cond, "svx::frame::Array::"
funcname " - " error )
#define DBG_FRAME_CHECK_COL( col, funcname ) DBG_FRAME_CHECK( (col) < GetColCount(),
funcname, "invalid column index" )
#define DBG_FRAME_CHECK_ROW( row, funcname ) DBG_FRAME_CHECK( (row) < GetRowCount(),
funcname, "invalid row index" )
@@ -1284,7 +1283,6 @@ void Array::DrawArray( OutputDevice& rDev, const Color* pForceColor ) const
#undef DBG_FRAME_CHECK_ROW
#undef DBG_FRAME_CHECK_COL
#undef DBG_FRAME_CHECK
-#undef DBG_FRAME_ERROR
// ============================================================================
diff --git a/svx/source/dialog/frmsel.cxx b/svx/source/dialog/frmsel.cxx
index 37c6623..a2daa27 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:
- DBG_ERRORFILE( "svx::FrameBorder::SetState - use SetCoreStyle to make border visible"
);
+ SAL_INFO( "svx", "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: DBG_ERRORFILE( "svx::FrameBorder::GetKeyboardNeighbor - unknown key code"
);
+ default: SAL_INFO( "svx", "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 ];
- DBG_ERRORFILE( "svx::FrameSelectorImpl::GetBorder - unknown border type" );
+ SAL_INFO( "svx", "svx::FrameSelectorImpl::GetBorder - unknown border type" );
return maTop;
}
diff --git a/svx/source/dialog/txencbox.cxx b/svx/source/dialog/txencbox.cxx
index 9286b39..4834c08 100644
--- a/svx/source/dialog/txencbox.cxx
+++ b/svx/source/dialog/txencbox.cxx
@@ -199,13 +199,7 @@ void SvxTextEncodingBox::InsertTextEncoding( const rtl_TextEncoding nEnc,
sal_uI
if ( rEntry.Len() )
InsertTextEncoding( nEnc, rEntry, nPos );
else
- {
-#ifdef DBG_UTIL
- rtl::OStringBuffer
aMsg(RTL_CONSTASCII_STRINGPARAM("SvxTextEncodingBox::InsertTextEncoding: no resource string for
text encoding: "));
- aMsg.append(static_cast<sal_Int32>(nEnc));
- DBG_ERRORFILE(aMsg.getStr());
-#endif
- }
+ SAL_INFO( "svx", "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 cfd3a0c..d4311e7 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)
{
- DBG_ERRORFILE( "disposing" );
+ SAL_INFO( "svx", "disposing" );
}
//............................................................................
diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx
index 6ea99e1..73d5b54 100644
--- a/svx/source/form/datanavi.cxx
+++ b/svx/source/form/datanavi.cxx
@@ -473,7 +473,7 @@ namespace svxform
}
catch ( Exception& )
{
- DBG_ERRORFILE( "XFormsPage::DoToolBoxAction(): exception while adding
submission" );
+ SAL_INFO( "svx", "XFormsPage::DoToolBoxAction(): exception while adding
submission" );
}
}
}
@@ -509,7 +509,7 @@ namespace svxform
}
catch ( Exception& )
{
- DBG_ERRORFILE( "XFormsPage::DoToolBoxAction(): exception while create
element" );
+ SAL_INFO( "svx", "XFormsPage::DoToolBoxAction(): exception while
create element" );
}
}
else
@@ -523,7 +523,7 @@ namespace svxform
}
catch ( Exception& )
{
- DBG_ERRORFILE( "XFormsPage::DoToolBoxAction(): exception while create
attribute" );
+ SAL_INFO( "svx", "XFormsPage::DoToolBoxAction(): exception while
create attribute" );
}
}
@@ -535,13 +535,13 @@ namespace svxform
{
if ( e.Code == css::xml::dom::DOMExceptionType_DOMSTRING_SIZE_ERR )
{
- DBG_ERRORFILE( "XFormsPage::DoToolBoxAction(): domexception: size
error" );
+ SAL_INFO( "svx", "XFormsPage::DoToolBoxAction(): domexception: size
error" );
}
- DBG_ERRORFILE( "XFormsPage::DoToolBoxAction(): domexception while append
child" );
+ SAL_INFO( "svx", "XFormsPage::DoToolBoxAction(): domexception while append
child" );
}
catch ( Exception& )
{
- DBG_ERRORFILE( "XFormsPage::DoToolBoxAction(): exception while append
child" );
+ SAL_INFO( "svx", "XFormsPage::DoToolBoxAction(): exception while append
child" );
}
try
@@ -555,7 +555,7 @@ namespace svxform
}
catch ( Exception& )
{
- DBG_ERRORFILE( "XFormsPage::DoToolboxAction(): exception caught" );
+ SAL_INFO( "svx", "XFormsPage::DoToolboxAction(): exception caught" );
}
try
@@ -564,7 +564,7 @@ namespace svxform
}
catch ( Exception& )
{
- DBG_ERRORFILE( "XFormsPage::DoToolBoxAction(): exception while get binding
for node" );
+ SAL_INFO( "svx", "XFormsPage::DoToolBoxAction(): exception while get
binding for node" );
}
pNode = new ItemNode( xNewNode );
}
@@ -581,7 +581,7 @@ namespace svxform
}
catch ( Exception& )
{
- DBG_ERRORFILE( "XFormsPage::DoToolBoxAction(): exception while adding
binding" );
+ SAL_INFO( "svx", "XFormsPage::DoToolBoxAction(): exception while adding
binding" );
}
}
@@ -612,7 +612,7 @@ namespace svxform
}
catch ( Exception& )
{
- DBG_ERRORFILE( "XFormsPage::DoToolboxAction(): exception caught" );
+ SAL_INFO( "svx", "XFormsPage::DoToolboxAction(): exception caught" );
}
}
}
@@ -633,7 +633,7 @@ namespace svxform
}
catch ( Exception& )
{
- DBG_ERRORFILE( "XFormsPage::DoToolboxAction(): exception caught" );
+ SAL_INFO( "svx", "XFormsPage::DoToolboxAction(): exception caught" );
}
}
delete pNode;
@@ -676,7 +676,7 @@ namespace svxform
}
catch ( Exception& )
{
- DBG_ERRORFILE( "XFormsPage::DoToolboxAction(): exception caught" );
+ SAL_INFO( "svx", "XFormsPage::DoToolboxAction(): exception caught" );
}
}
else if ( DGTBinding == m_eGroup )
@@ -699,7 +699,7 @@ namespace svxform
}
catch ( Exception& )
{
- DBG_ERRORFILE( "XFormsPage::DoToolboxAction(): exception caught" );
+ SAL_INFO( "svx", "XFormsPage::DoToolboxAction(): exception caught"
);
}
}
else
@@ -716,7 +716,7 @@ namespace svxform
}
catch ( Exception& )
{
- DBG_ERRORFILE( "XFormsPage::DoToolboxAction(): exception caught" );
+ SAL_INFO( "svx", "XFormsPage::DoToolboxAction(): exception caught"
);
}
}
@@ -1020,7 +1020,7 @@ namespace svxform
}
catch ( Exception& )
{
- DBG_ERRORFILE( "XFormsPage::AddEntry(Ref): exception caught" );
+ SAL_INFO( "svx", "XFormsPage::AddEntry(Ref): exception caught" );
}
}
else // then Binding Page
@@ -1039,7 +1039,7 @@ namespace svxform
}
catch ( Exception& )
{
- DBG_ERRORFILE( "XFormsPage::AddEntry(Ref): exception caught" );
+ SAL_INFO( "svx", "XFormsPage::AddEntry(Ref): exception caught" );
}
}
@@ -1098,7 +1098,7 @@ namespace svxform
}
catch ( Exception& )
{
- DBG_ERRORFILE( "XFormsPage::EditEntry(): exception caught" );
+ SAL_INFO( "svx", "XFormsPage::EditEntry(): exception caught" );
}
}
}
@@ -1148,7 +1148,7 @@ namespace svxform
}
catch ( Exception& )
{
- DBG_ERRORFILE( "XFormsPage::RemoveEntry(): exception caught" );
+ SAL_INFO( "svx", "XFormsPage::RemoveEntry(): exception caught" );
}
}
else
@@ -1165,7 +1165,7 @@ namespace svxform
}
catch ( Exception& )
{
- DBG_ERRORFILE( "XFormsPage::RemoveEntry(): exception caught" );
+ SAL_INFO( "svx", "XFormsPage::RemoveEntry(): exception caught" );
}
QueryBox aQBox( this, SVX_RES( nResId ) );
String sMessText = aQBox.GetMessText();
@@ -1183,7 +1183,7 @@ namespace svxform
}
catch ( Exception& )
{
- DBG_ERRORFILE( "XFormsPage::RemoveEntry(): exception caught" );
+ SAL_INFO( "svx", "XFormsPage::RemoveEntry(): exception caught" );
}
}
}
@@ -1263,7 +1263,7 @@ namespace svxform
sRet = LoadInstance( xPropSeq, rImageList );
else
{
- DBG_ERRORFILE( "XFormsPage::SetModel(): invalid instance"
);
+ SAL_INFO( "svx", "XFormsPage::SetModel(): invalid
instance" );
}
break;
}
@@ -1278,7 +1278,7 @@ namespace svxform
}
catch( Exception& )
{
- DBG_ERRORFILE( "XFormsPage::SetModel(): exception caught" );
+ SAL_INFO( "svx", "XFormsPage::SetModel(): exception caught" );
}
break;
}
@@ -1310,7 +1310,7 @@ namespace svxform
}
catch( Exception& )
{
- DBG_ERRORFILE( "XFormsPage::SetModel(): exception caught" );
+ SAL_INFO( "svx", "XFormsPage::SetModel(): exception caught" );
}
break;
}
@@ -1357,7 +1357,7 @@ namespace svxform
}
catch( Exception& )
{
- DBG_ERRORFILE( "XFormsPage::SetModel(): exception caught" );
+ SAL_INFO( "svx", "XFormsPage::SetModel(): exception caught" );
}
break;
}
@@ -1412,7 +1412,7 @@ namespace svxform
}
catch ( Exception& )
{
- DBG_ERRORFILE( "XFormsPage::LoadInstance(): exception caught" );
+ SAL_INFO( "svx", "XFormsPage::LoadInstance(): exception caught" );
}
}
}
@@ -1468,7 +1468,7 @@ namespace svxform
}
catch ( Exception& )
{
- DBG_ERRORFILE( "XFormsPage::EnableMenuItems(): exception caught" );
+ SAL_INFO( "svx", "XFormsPage::EnableMenuItems(): exception caught" );
}
}
}
@@ -1510,7 +1510,7 @@ namespace svxform
}
catch ( Exception& )
{
- DBG_ERRORFILE( "XFormsPage::EnableMenuItems(): exception caught" );
+ SAL_INFO( "svx", "XFormsPage::EnableMenuItems(): exception caught" );
}
}
}
@@ -1662,7 +1662,7 @@ namespace svxform
}
catch ( Exception& )
{
- DBG_ERRORFILE( "DataNavigatorWindow::MenuSelectHdl(): exception caught" );
+ SAL_INFO( "svx", "DataNavigatorWindow::MenuSelectHdl(): exception caught" );
}
DBG_ASSERT( xUIHelper.is(), "DataNavigatorWindow::MenuSelectHdl(): no UIHelper" );
@@ -1714,7 +1714,7 @@ namespace svxform
}
catch ( Exception& )
{
- DBG_ERRORFILE( "DataNavigatorWindow::MenuSelectHdl():
exception caught" );
+ SAL_INFO( "svx", "DataNavigatorWindow::MenuSelectHdl():
exception caught" );
}
}
}
@@ -1778,7 +1778,7 @@ namespace svxform
}
catch ( Exception& )
{
- DBG_ERRORFILE( "DataNavigatorWindow::MenuSelectHdl(): exception
caught" );
+ SAL_INFO( "svx", "DataNavigatorWindow::MenuSelectHdl(): exception
caught" );
}
}
}
@@ -1798,7 +1798,7 @@ namespace svxform
}
catch ( Exception& )
{
- DBG_ERRORFILE( "DataNavigatorWindow::MenuSelectHdl(): exception
caught" );
+ SAL_INFO( "svx", "DataNavigatorWindow::MenuSelectHdl(): exception
caught" );
}
m_aModelsBox.RemoveEntry( nSelectedPos );
if ( m_aModelsBox.GetEntryCount() <= nSelectedPos )
@@ -1811,7 +1811,7 @@ namespace svxform
}
default:
{
- DBG_ERRORFILE( "DataNavigatorWindow::MenuSelectHdl(): wrong menu item" );
+ SAL_INFO( "svx", "DataNavigatorWindow::MenuSelectHdl(): wrong menu item" );
}
}
}
@@ -1835,7 +1835,7 @@ namespace svxform
}
catch ( Exception& )
{
- DBG_ERRORFILE( "DataNavigatorWindow::MenuSelectHdl(): exception
caught" );
+ SAL_INFO( "svx", "DataNavigatorWindow::MenuSelectHdl(): exception
caught" );
}
ModelSelectHdl( NULL );
m_aTabCtrl.SetCurPageId( nInst );
@@ -1873,7 +1873,7 @@ namespace svxform
}
catch ( Exception& )
{
- DBG_ERRORFILE( "DataNavigatorWindow::MenuSelectHdl(): exception
caught" );
+ SAL_INFO( "svx", "DataNavigatorWindow::MenuSelectHdl(): exception
caught" );
}
pPage->SetInstanceName(sNewName);
pPage->SetInstanceURL(sURL);
@@ -1925,7 +1925,7 @@ namespace svxform
}
catch ( Exception& )
{
- DBG_ERRORFILE( "DataNavigatorWindow::MenuSelectHdl():
exception caught" );
+ SAL_INFO( "svx", "DataNavigatorWindow::MenuSelectHdl():
exception caught" );
}
m_aTabCtrl.RemovePage( nId );
m_aTabCtrl.SetCurPageId( TID_INSTANCE );
@@ -1945,13 +1945,13 @@ namespace svxform
}
default:
{
- DBG_ERRORFILE( "DataNavigatorWindow::MenuSelectHdl(): wrong menu item" );
+ SAL_INFO( "svx", "DataNavigatorWindow::MenuSelectHdl(): wrong menu item" );
}
}
}
else
{
- DBG_ERRORFILE( "DataNavigatorWindow::MenuSelectHdl(): wrong button" );
+ SAL_INFO( "svx", "DataNavigatorWindow::MenuSelectHdl(): wrong button" );
}
m_bIsNotifyDisabled = false;
@@ -1980,7 +1980,7 @@ namespace svxform
}
else
{
- DBG_ERRORFILE( "DataNavigatorWindow::MenuActivateHdl(): wrong button" );
+ SAL_INFO( "svx", "DataNavigatorWindow::MenuActivateHdl(): wrong button" );
}
return 0;
}
@@ -2067,7 +2067,7 @@ namespace svxform
}
catch ( Exception& )
{
- DBG_ERRORFILE( "DataNavigatorWindow::LoadModels(): exception caught" );
+ SAL_INFO( "svx", "DataNavigatorWindow::LoadModels(): exception caught" );
}
}
}
@@ -2099,7 +2099,7 @@ namespace svxform
}
catch( Exception& )
{
- DBG_ERRORFILE( "DataNavigatorWindow::LoadModels(): exception caught" );
+ SAL_INFO( "svx", "DataNavigatorWindow::LoadModels(): exception caught" );
}
}
@@ -2135,11 +2135,11 @@ namespace svxform
}
catch ( NoSuchElementException& )
{
- DBG_ERRORFILE( "DataNavigatorWindow::SetPageModel(): no such element" );
+ SAL_INFO( "svx", "DataNavigatorWindow::SetPageModel(): no such element" );
}
catch( Exception& )
{
- DBG_ERRORFILE( "DataNavigatorWindow::SetPageModel(): unexpected exception" );
+ SAL_INFO( "svx", "DataNavigatorWindow::SetPageModel(): unexpected exception" );
}
}
// -----------------------------------------------------------------------
@@ -2171,7 +2171,7 @@ namespace svxform
CreateInstancePage( xPropSeq );
else
{
- DBG_ERRORFILE( "DataNavigator::InitPages(): invalid instance"
);
+ SAL_INFO( "svx", "DataNavigator::InitPages(): invalid
instance" );
}
}
else
@@ -2184,11 +2184,11 @@ namespace svxform
}
catch ( NoSuchElementException& )
{
- DBG_ERRORFILE( "DataNavigatorWindow::SetPageModel(): no such element" );
+ SAL_INFO( "svx", "DataNavigatorWindow::SetPageModel(): no such element" );
}
catch( Exception& )
{
- DBG_ERRORFILE( "DataNavigatorWindow::SetPageModel(): unexpected exception" );
+ SAL_INFO( "svx", "DataNavigatorWindow::SetPageModel(): unexpected exception" );
}
}
// -----------------------------------------------------------------------
@@ -2236,7 +2236,7 @@ namespace svxform
sal_uInt16 nPageId = GetNewPageId();
if ( sInstName.isEmpty() )
{
- DBG_ERRORFILE( "DataNavigatorWindow::CreateInstancePage(): instance without name" );
+ SAL_INFO( "svx", "DataNavigatorWindow::CreateInstancePage(): instance without name" );
String sTemp = String::CreateFromAscii( "untitled" );
sTemp += String::CreateFromInt32( nPageId );
sInstName = sTemp;
@@ -2555,7 +2555,7 @@ namespace svxform
}
catch ( Exception& )
{
- DBG_ERRORFILE( "AddDataItemDialog::Dtor(): exception caught" );
+ SAL_INFO( "svx", "AddDataItemDialog::Dtor(): exception caught" );
}
}
}
@@ -2676,7 +2676,7 @@ namespace svxform
}
catch ( Exception& )
{
- DBG_ERRORFILE( "copyPropSet(): exception caught" );
+ SAL_INFO( "svx", "copyPropSet(): exception caught" );
}
}
@@ -2715,7 +2715,7 @@ namespace svxform
}
catch ( Exception& )
{
- DBG_ERRORFILE( "AddDataDialog::OKHdl(): exception caught" );
+ SAL_INFO( "svx", "AddDataDialog::OKHdl(): exception caught" );
}
}
else
@@ -2736,7 +2736,7 @@ namespace svxform
}
catch ( Exception& )
{
- DBG_ERRORFILE( "AddDataDialog::OKHdl(): exception caught" );
+ SAL_INFO( "svx", "AddDataDialog::OKHdl(): exception caught" );
}
}
// then close the dialog
@@ -2822,7 +2822,7 @@ namespace svxform
}
catch( Exception& )
{
- DBG_ERRORFILE( "AddDataItemDialog::InitFromNode(): exception caught" );
+ SAL_INFO( "svx", "AddDataItemDialog::InitFromNode(): exception caught" );
}
}
else if ( m_pItemNode->m_xPropSet.is() )
@@ -2840,7 +2840,7 @@ namespace svxform
}
catch ( Exception& )
{
- DBG_ERRORFILE( "AddDataItemDialog::InitFromNode(): exception caught" );
+ SAL_INFO( "svx", "AddDataItemDialog::InitFromNode(): exception caught" );
}
}
rtl::OUString sTemp;
@@ -2862,7 +2862,7 @@ namespace svxform
}
catch( Exception& )
{
- DBG_ERRORFILE( "AddDataItemDialog::InitFromNode(): exception caught" );
+ SAL_INFO( "svx", "AddDataItemDialog::InitFromNode(): exception caught" );
}
Size a3and1Sz = LogicToPixel( Size( 3, 1 ), MAP_APPFONT );
@@ -2897,7 +2897,7 @@ namespace svxform
}
catch ( Exception& )
{
- DBG_ERRORFILE( "AddDataItemDialog::InitFromNode(): exception caught" );
+ SAL_INFO( "svx", "AddDataItemDialog::InitFromNode(): exception caught" );
}
}
}
@@ -2972,7 +2972,7 @@ namespace svxform
}
catch ( Exception& )
{
- DBG_ERRORFILE( "AddDataItemDialog::InitDataTypeBox(): exception caught" );
+ SAL_INFO( "svx", "AddDataItemDialog::InitDataTypeBox(): exception caught" );
}
}
}
@@ -3063,7 +3063,7 @@ namespace svxform
}
catch ( Exception& )
{
- DBG_ERRORFILE( "AddConditionDialog::Ctor(): exception caught" );
+ SAL_INFO( "svx", "AddConditionDialog::Ctor(): exception caught" );
}
}
@@ -3086,7 +3086,7 @@ namespace svxform
}
catch ( Exception& )
{
- DBG_ERRORFILE( "AddDataItemDialog::EditHdl(): exception caught" );
+ SAL_INFO( "svx", "AddDataItemDialog::EditHdl(): exception caught" );
}
NamespaceItemDialog aDlg( this, xNameContnr );
aDlg.Execute();
@@ -3096,7 +3096,7 @@ namespace svxform
}
catch ( Exception& )
{
- DBG_ERRORFILE( "AddDataItemDialog::EditHdl(): exception caught" );
+ SAL_INFO( "svx", "AddDataItemDialog::EditHdl(): exception caught" );
}
return 0;
}
@@ -3112,7 +3112,7 @@ namespace svxform
}
catch( const Exception& )
{
- DBG_ERRORFILE( "AddConditionDialog, OKHdl: caught an exception!" );
+ SAL_INFO( "svx", "AddConditionDialog, OKHdl: caught an exception!" );
}
*/
EndDialog( RET_OK );
@@ -3139,7 +3139,7 @@ namespace svxform
}
catch ( Exception& )
{
- DBG_ERRORFILE( "AddConditionDialog::ResultHdl(): exception caught" );
+ SAL_INFO( "svx", "AddConditionDialog::ResultHdl(): exception caught" );
}
}
m_aResultWin.SetText( sResult );
@@ -3249,7 +3249,7 @@ namespace svxform
}
else
{
- DBG_ERRORFILE( "NamespaceItemDialog::ClickHdl(): invalid button" );
+ SAL_INFO( "svx", "NamespaceItemDialog::ClickHdl(): invalid button" );
}
SelectHdl( &m_aNamespacesList );
@@ -3281,7 +3281,7 @@ namespace svxform
}
catch ( Exception& )
{
- DBG_ERRORFILE( "NamespaceItemDialog::OKHdl(): exception caught" );
+ SAL_INFO( "svx", "NamespaceItemDialog::OKHdl(): exception caught" );
}
// and close the dialog
EndDialog( RET_OK );
@@ -3316,7 +3316,7 @@ namespace svxform
}
catch ( Exception& )
{
- DBG_ERRORFILE( "NamespaceItemDialog::LoadNamespaces(): exception caught" );
+ SAL_INFO( "svx", "NamespaceItemDialog::LoadNamespaces(): exception caught" );
}
}
@@ -3373,7 +3373,7 @@ namespace svxform
}
catch ( Exception& )
{
- DBG_ERRORFILE( "ManageNamespacesDialog::OKHdl(): exception caught" );
+ SAL_INFO( "svx", "ManageNamespacesDialog::OKHdl(): exception caught" );
}
// no error so close the dialog
@@ -3470,7 +3470,7 @@ namespace svxform
}
catch ( Exception& )
{
- DBG_ERRORFILE( "AddSubmissionDialog::OKHdl(): exception caught" );
+ SAL_INFO( "svx", "AddSubmissionDialog::OKHdl(): exception caught" );
}
}
}
@@ -3496,7 +3496,7 @@ namespace svxform
}
catch ( Exception& )
{
- DBG_ERRORFILE( "AddSubmissionDialog::OKHdl(): exception caught" );
+ SAL_INFO( "svx", "AddSubmissionDialog::OKHdl(): exception caught" );
}
}
@@ -3550,7 +3550,7 @@ namespace svxform
}
catch ( Exception& )
{
- DBG_ERRORFILE( "AddSubmissionDialog::FillAllBoxes(): exception caught" );
+ SAL_INFO( "svx", "AddSubmissionDialog::FillAllBoxes(): exception caught" );
}
}
@@ -3610,7 +3610,7 @@ namespace svxform
}
catch ( Exception& )
{
- DBG_ERRORFILE( "AddSubmissionDialog::FillAllBoxes(): exception caught" );
+ SAL_INFO( "svx", "AddSubmissionDialog::FillAllBoxes(): exception caught" );
}
}
diff --git a/svx/source/stbctrls/pszctrl.cxx b/svx/source/stbctrls/pszctrl.cxx
index 30ffcdc..31fb428 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
{
- DBG_ERRORFILE("unknown slot id");
+ SAL_INFO( "svx","unknown slot id");
}
}
else if ( pState->ISA( SfxPointItem ) )
@@ -293,7 +293,7 @@ void SvxPosSizeStatusBarControl::StateChanged( sal_uInt16 nSID, SfxItemState eSt
}
else
{
- DBG_ERRORFILE( "invalid item type" );
+ SAL_INFO( "svx", "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 014df6d..bc5df40 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
{
- DBG_ERRORFILE( "+XmlSecStatusBarControl::StateChanged(): invalid item type" );
+ SAL_INFO( "svx", "+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 da15cc3..a908595 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:
- DBG_ERRORFILE("unknown ImportInfo.eState");
+ SAL_INFO( "svx","unknown ImportInfo.eState");
}
return 0;
}
diff --git a/svx/source/tbxctrls/tbxcolor.cxx b/svx/source/tbxctrls/tbxcolor.cxx
index 697f6dd..4961e75 100644
--- a/svx/source/tbxctrls/tbxcolor.cxx
+++ b/svx/source/tbxctrls/tbxcolor.cxx
@@ -68,7 +68,7 @@ namespace svx
}
catch ( Exception& )
{
- DBG_ERRORFILE( "ToolboxAccess::Ctor(): exception" );
+ SAL_INFO( "svx", "ToolboxAccess::Ctor(): exception" );
}
}
}
--------------true--
From 8e916d868e7cfaa77692491f02d31ce1632a57c4 Mon Sep 17 00:00:00 2001
Message-Id: <8e916d868e7cfaa77692491f02d31ce1632a57c4.1326618396.git.mmetz@adrian-broher.net>
In-Reply-To: <b89c66bd936b49f652dffe7895818068c5587386.1326618396.git.mmetz@adrian-broher.net>
References: <b89c66bd936b49f652dffe7895818068c5587386.1326618396.git.mmetz@adrian-broher.net>
From: Marcel Metz <mmetz@adrian-broher.net>
Date: Wed, 11 Jan 2012 10:12:28 +0100
Subject: [PATCH 3/4] Replaced DBG_ERRORFILE with SAL_INFO.
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 | 2 +-
sfx2/source/appl/newhelp.cxx | 12 ++++++------
sfx2/source/appl/sfxhelp.cxx | 14 +++++++-------
sfx2/source/bastyp/helper.cxx | 25 +++++++++----------------
sfx2/source/config/evntconf.cxx | 6 +++---
sfx2/source/dialog/dinfdlg.cxx | 8 ++++----
sfx2/source/dialog/filedlghelper.cxx | 27 ++++++++++++---------------
sfx2/source/dialog/filtergrouping.cxx | 33 +++++----------------------------
sfx2/source/dialog/mailmodel.cxx | 2 +-
sfx2/source/dialog/tabdlg.cxx | 4 ++--
sfx2/source/doc/doctempl.cxx | 8 ++++----
sfx2/source/doc/doctemplates.cxx | 14 +++++++-------
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, 75 insertions(+), 108 deletions(-)
--------------true
Content-Type: text/x-patch; name="0003-Replaced-DBG_ERRORFILE-with-SAL_INFO.patch"
Content-Transfer-Encoding: 8bit
Content-Disposition: attachment; filename="0003-Replaced-DBG_ERRORFILE-with-SAL_INFO.patch"
diff --git a/sfx2/source/appl/appcfg.cxx b/sfx2/source/appl/appcfg.cxx
index 2a17778..500d60f 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: DBG_ERRORFILE("SfxApplication::SetOptions_Impl()\nInvalid path number
found for set directories!");
+ default: SAL_INFO( "sfx2", "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 659c816..067747c 100644
--- a/sfx2/source/appl/appdde.cxx
+++ b/sfx2/source/appl/appdde.cxx
@@ -113,7 +113,7 @@ namespace
}
catch( const uno::Exception& )
{
- DBG_ERRORFILE( "Any other exception" );
+ SAL_INFO( "sfx2", "Any other exception" );
}
return bRet;
diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index 9fe9a83..ab6b930 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& )
{
- DBG_ERRORFILE( "SfxApplication::OfaExec_Impl(SID_MORE_DICTIONARIES): caught an
exception!" );
+ SAL_INFO( "sfx2", "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 deb135a..bbf9cb6 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
{
- DBG_ERRORFILE( "SvFileObject::DialogClosedHdl(): wrong file type" );
+ SAL_INFO( "sfx2", "SvFileObject::DialogClosedHdl(): wrong file type" );
}
if ( aEndEditLink.IsSet() )
diff --git a/sfx2/source/appl/module.cxx b/sfx2/source/appl/module.cxx
index daca880..e486eb4 100644
--- a/sfx2/source/appl/module.cxx
+++ b/sfx2/source/appl/module.cxx
@@ -411,7 +411,7 @@ FieldUnit SfxModule::GetCurrentFieldUnit()
eUnit = (FieldUnit)( (SfxUInt16Item*)pItem )->GetValue();
}
else
- DBG_ERRORFILE( "GetModuleFieldUnit(): no module found" );
+ SAL_INFO( "sfx2", "GetModuleFieldUnit(): no module found" );
return eUnit;
}
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx
index 53253d1..37d3918 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& )
{
- DBG_ERRORFILE( "SfxHelpTextWindow_Impl::InitOnStartupBox(): unexpected exception"
);
+ SAL_INFO( "sfx2", "SfxHelpTextWindow_Impl::InitOnStartupBox(): unexpected
exception" );
}
sModuleName = String( sTemp );
}
@@ -2515,7 +2515,7 @@ IMPL_LINK( SfxHelpTextWindow_Impl, CheckHdl, CheckBox*, pBox )
}
catch( Exception& )
{
- DBG_ERRORFILE( "SfxHelpTextWindow_Impl::CheckHdl(): unexpected exception" );
+ SAL_INFO( "sfx2", "SfxHelpTextWindow_Impl::CheckHdl(): unexpected exception" );
}
}
@@ -2678,7 +2678,7 @@ void SfxHelpTextWindow_Impl::GetFocus()
}
catch( Exception& )
{
- DBG_ERRORFILE( "SfxHelpTextWindow_Impl::GetFocus(): unexpected exception" );
+ SAL_INFO( "sfx2", "SfxHelpTextWindow_Impl::GetFocus(): unexpected exception" );
}
}
}
@@ -2775,13 +2775,13 @@ void SfxHelpTextWindow_Impl::SetPageStyleHeaderOff() const
}
catch( Exception& )
{
- DBG_ERRORFILE( "SfxHelpTextWindow_Impl::SetPageStyleHeaderOff(): unexpected exception" );
+ SAL_INFO( "sfx2", "SfxHelpTextWindow_Impl::SetPageStyleHeaderOff(): unexpected exception"
);
}
#ifdef DBG_UTIL
if ( !bSetOff )
{
- DBG_ERRORFILE( "SfxHelpTextWindow_Impl::SetPageStyleHeaderOff(): set off failed" );
+ SAL_INFO( "sfx2", "SfxHelpTextWindow_Impl::SetPageStyleHeaderOff(): set off failed" );
}
#endif
}
@@ -3402,7 +3402,7 @@ void SfxHelpWindow_Impl::CloseWindow()
}
catch( Exception& )
{
- DBG_ERRORFILE( "SfxHelpWindow_Impl::CloseWindow(): caught an exception" );
+ SAL_INFO( "sfx2", "SfxHelpWindow_Impl::CloseWindow(): caught an exception" );
}
}
diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx
index 0dd391c..ca6e482 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
{
- DBG_ERRORFILE( "Property 'AnchorName' is missing" );
+ SAL_INFO( "sfx2", "Property 'AnchorName' is missing" );
}
}
catch (const ::com::sun::star::uno::Exception&)
@@ -279,14 +279,14 @@ SfxHelpOptions_Impl::SfxHelpOptions_Impl()
while ( nIndex >= 0 );
}
else {
- DBG_ERRORFILE( "Wrong property type!" );
+ SAL_INFO( "sfx2", "Wrong property type!" );
}
break;
}
default:
- DBG_ERRORFILE( "Wrong property!" );
+ SAL_INFO( "sfx2", "Wrong property!" );
break;
}
}
@@ -420,7 +420,7 @@ SfxHelp::~SfxHelp()
sDefaultModule = DEFINE_CONST_UNICODE("sdatabase");
else
{
- DBG_ERRORFILE( "getDefaultModule_Impl(): no module installed" );
+ SAL_INFO( "sfx2", "getDefaultModule_Impl(): no module installed" );
}
return sDefaultModule;
}
@@ -448,7 +448,7 @@ SfxHelp::~SfxHelp()
}
catch (const Exception&)
{
- DBG_ERRORFILE( "SfxHelp::getCurrentModuleIdentifier_Impl(): exception of
XModuleManager::identify()" );
+ SAL_INFO( "sfx2", "SfxHelp::getCurrentModuleIdentifier_Impl(): exception of
XModuleManager::identify()" );
}
}
@@ -483,7 +483,7 @@ String SfxHelp::GetHelpModuleName_Impl()
}
catch (const Exception&)
{
- DBG_ERRORFILE( "SfxHelp::GetHelpModuleName_Impl(): exception of
XNameAccess::getByName()" );
+ SAL_INFO( "sfx2", "SfxHelp::GetHelpModuleName_Impl(): exception of
XNameAccess::getByName()" );
}
}
@@ -865,7 +865,7 @@ void SfxHelp::OpenHelpAgent( const rtl::OString& sHelpId )
}
catch (const Exception&)
{
- DBG_ERRORFILE( "OpenHelpAgent: caught an exception while executing the dispatch!"
);
+ SAL_INFO( "sfx2", "OpenHelpAgent: caught an exception while executing the
dispatch!" );
}
}
}
diff --git a/sfx2/source/bastyp/helper.cxx b/sfx2/source/bastyp/helper.cxx
index d369db7..c60d9a0 100644
--- a/sfx2/source/bastyp/helper.cxx
+++ b/sfx2/source/bastyp/helper.cxx
@@ -44,6 +44,7 @@
#include <com/sun/star/util/DateTime.hpp>
#include <com/sun/star/io/XInputStream.hpp>
#include <unotools/localedatawrapper.hxx>
+#include <rtl/oustringostreaminserter.hxx>
#include <rtl/strbuf.hxx>
#include <tools/debug.hxx>
@@ -107,11 +108,11 @@ uno::Sequence < OUString > SfxContentHelper::GetResultSet( const String& rURL
)
}
catch( const ucb::CommandAbortedException& )
{
- DBG_ERRORFILE( "createCursor: CommandAbortedException" );
+ SAL_INFO( "sfx2", "createCursor: CommandAbortedException" );
}
catch( const uno::Exception& )
{
- DBG_ERRORFILE( "createCursor: Any other exception" );
+ SAL_INFO( "sfx2", "createCursor: Any other exception" );
}
if ( xResultSet.is() )
@@ -137,25 +138,17 @@ uno::Sequence < OUString > SfxContentHelper::GetResultSet( const String& rURL
)
}
catch( const ucb::CommandAbortedException& )
{
- DBG_ERRORFILE( "XContentAccess::next(): CommandAbortedException" );
+ SAL_INFO( "sfx2", "XContentAccess::next(): CommandAbortedException" );
}
catch( const uno::Exception& )
{
- DBG_ERRORFILE( "XContentAccess::next(): Any other exception" );
+ SAL_INFO( "sfx2", "XContentAccess::next(): Any other exception" );
}
}
}
catch( const uno::Exception& e )
{
- (void) e;
- DBG_ERRORFILE(
- rtl::OUStringToOString(
- (rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "GetResultSet: Any other exception: ")) +
- e.Message),
- RTL_TEXTENCODING_UTF8).
- getStr());
+ SAL_INFO( "sfx2", "GetResultSet: Any other exception: " << e.Message );
}
if ( pList )
@@ -306,7 +299,7 @@ sal_Bool SfxContentHelper::IsHelpErrorDocument( const String& rURL )
uno::Reference< ucb::XCommandEnvironment > () );
if ( !( aCnt.getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("IsErrorDocument")) )
= bRet ) )
{
- DBG_ERRORFILE( "Property 'IsErrorDocument' is missing" );
+ SAL_INFO( "sfx2", "Property 'IsErrorDocument' is missing" );
}
}
catch( const uno::Exception& )
@@ -331,11 +324,11 @@ sal_uIntPtr SfxContentHelper::GetSize( const String& rContent )
}
catch( const ucb::CommandAbortedException& )
{
- DBG_ERRORFILE( "CommandAbortedException" );
+ SAL_INFO( "sfx2", "CommandAbortedException" );
}
catch( const uno::Exception& )
{
- DBG_ERRORFILE( "Any other exception" );
+ SAL_INFO( "sfx2", "Any other exception" );
}
nSize = (sal_uInt32)nTemp;
return nSize;
diff --git a/sfx2/source/config/evntconf.cxx b/sfx2/source/config/evntconf.cxx
index a284383..1c18d3f 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
{
- DBG_ERRORFILE( "CreateEventData_Impl(): ScriptType not supported!");
+ SAL_INFO( "sfx2", "CreateEventData_Impl(): ScriptType not supported!");
}
}
else
@@ -256,9 +256,9 @@ void PropagateEvent_Impl( SfxObjectShell *pDoc, rtl::OUString aEventName, const
xEvents->replaceByName( aEventName, aEventData );
}
catch( const ::com::sun::star::lang::IllegalArgumentException& )
- { DBG_ERRORFILE( "PropagateEvents_Impl: caught IllegalArgumentException" ); }
+ { SAL_INFO( "sfx2", "PropagateEvents_Impl: caught IllegalArgumentException" ); }
catch( const ::com::sun::star::container::NoSuchElementException& )
- { DBG_ERRORFILE( "PropagateEvents_Impl: caught NoSuchElementException" ); }
+ { SAL_INFO( "sfx2", "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 2020bd9..66b2474 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -451,13 +451,13 @@ void SfxDocumentInfoItem::UpdateDocumentInfo(
}
catch ( Exception& )
{
- DBG_ERRORFILE( "SfxDocumentInfoItem::updateDocumentInfo(): exception while adding
custom properties" );
+ SAL_INFO( "sfx2", "SfxDocumentInfoItem::updateDocumentInfo(): exception while
adding custom properties" );
}
}
}
catch ( Exception& )
{
- DBG_ERRORFILE( "SfxDocumentInfoItem::updateDocumentInfo(): exception while removing custom
properties" );
+ SAL_INFO( "sfx2", "SfxDocumentInfoItem::updateDocumentInfo(): exception while removing
custom properties" );
}
}
@@ -696,7 +696,7 @@ sal_Bool SfxDocumentDescPage::FillItemSet(SfxItemSet &rSet)
if ( !pInfo )
{
- DBG_ERRORFILE( "SfxDocumentDescPage::FillItemSet(): no item found" );
+ SAL_INFO( "sfx2", "SfxDocumentDescPage::FillItemSet(): no item found" );
return sal_False;
}
@@ -1413,7 +1413,7 @@ sal_Bool SfxInternetPage::FillItemSet( SfxItemSet& rSet )
if ( !pInfo )
{
- DBG_ERRORFILE( "SfxInternetPage::FillItemSet(): no item found" );
+ SAL_INFO( "sfx2", "SfxInternetPage::FillItemSet(): no item found" );
return sal_False;
}
diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx
index f09ad4d..7500a7a 100644
--- a/sfx2/source/dialog/filedlghelper.cxx
+++ b/sfx2/source/dialog/filedlghelper.cxx
@@ -99,6 +99,7 @@
#include "filedlgimpl.hxx"
#include <helpid.hrc>
#include <sfxlocal.hrc>
+#include <rtl/oustringostreaminserter.hxx>
#include <rtl/strbuf.hxx>
//-----------------------------------------------------------------------------
@@ -273,7 +274,7 @@ OUString FileDialogHelper_Impl::handleHelpRequested( const FilePickerEvent& aEve
break;
default:
- DBG_ERRORFILE( "invalid element id" );
+ SAL_INFO( "sfx2", "invalid element id" );
}
OUString aHelpText;
@@ -510,7 +511,7 @@ void FileDialogHelper_Impl::updateExportButton()
}
catch( const IllegalArgumentException& )
{
- DBG_ERRORFILE( "FileDialogHelper_Impl::updateExportButton: caught an exception!" );
+ SAL_INFO( "sfx2", "FileDialogHelper_Impl::updateExportButton: caught an
exception!" );
}
}
}
@@ -620,7 +621,7 @@ void FileDialogHelper_Impl::updatePreviewState( sal_Bool _bUpdatePreviewWindow )
}
catch( const Exception& )
{
- DBG_ERRORFILE( "FileDialogHelper_Impl::updatePreviewState: caught an exception!" );
+ SAL_INFO( "sfx2", "FileDialogHelper_Impl::updatePreviewState: caught an
exception!" );
}
}
}
@@ -1047,7 +1048,7 @@ FileDialogHelper_Impl::FileDialogHelper_Impl(
break;
default:
- DBG_ERRORFILE( "FileDialogHelper::ctor with unknown type" );
+ SAL_INFO( "sfx2", "FileDialogHelper::ctor with unknown type" );
break;
}
@@ -1187,7 +1188,7 @@ void SAL_CALL PickerThread_Impl::run()
catch( const RuntimeException& )
{
SetReturnValue( ExecutableDialogResults::CANCEL );
- DBG_ERRORFILE( "RuntimeException caught" );
+ SAL_INFO( "sfx2", "RuntimeException caught" );
}
}
@@ -1331,7 +1332,7 @@ sal_Int16 FileDialogHelper_Impl::implDoExecute()
}
catch( const Exception& )
{
- DBG_ERRORFILE( "FileDialogHelper_Impl::implDoExecute: caught an exception!" );
+ SAL_INFO( "sfx2", "FileDialogHelper_Impl::implDoExecute: caught an exception!" );
}
}
@@ -1360,7 +1361,7 @@ void FileDialogHelper_Impl::implStartExecute()
}
catch( const Exception& )
{
- DBG_ERRORFILE( "FileDialogHelper_Impl::implDoExecute: caught an exception!" );
+ SAL_INFO( "sfx2", "FileDialogHelper_Impl::implDoExecute: caught an exception!" );
}
}
}
@@ -1756,7 +1757,7 @@ void FileDialogHelper_Impl::addFilters( const String& rFactory,
}
catch( const uno::Exception& )
{
- DBG_ERRORFILE( "Could not get filters from the configuration!" );
+ SAL_INFO( "sfx2", "Could not get filters from the configuration!" );
}
TSortedFilterList aIter (xResult);
@@ -1796,11 +1797,7 @@ void FileDialogHelper_Impl::addFilter( const OUString& rFilterName,
}
catch( const IllegalArgumentException& )
{
-#ifdef DBG_UTIL
- rtl::OStringBuffer aMsg(RTL_CONSTASCII_STRINGPARAM("Could not append Filter"));
- aMsg.append(rtl::OUStringToOString(rFilterName, RTL_TEXTENCODING_UTF8));
- DBG_ERRORFILE( aMsg.getStr() );
-#endif
+ SAL_INFO( "sfx2", "Could not append Filter" << rFilterName );
}
}
@@ -1853,7 +1850,7 @@ void FileDialogHelper_Impl::addGraphicFilter()
}
catch( const IllegalArgumentException& )
{
- DBG_ERRORFILE( "Could not append Filter" );
+ SAL_INFO( "sfx2", "Could not append Filter" );
}
// Now add the filter
@@ -1882,7 +1879,7 @@ void FileDialogHelper_Impl::addGraphicFilter()
}
catch( const IllegalArgumentException& )
{
- DBG_ERRORFILE( "Could not append Filter" );
+ SAL_INFO( "sfx2", "Could not append Filter" );
}
}
}
diff --git a/sfx2/source/dialog/filtergrouping.cxx b/sfx2/source/dialog/filtergrouping.cxx
index b32342e..4eaf796 100644
--- a/sfx2/source/dialog/filtergrouping.cxx
+++ b/sfx2/source/dialog/filtergrouping.cxx
@@ -33,6 +33,7 @@
#include <sfx2/docfac.hxx>
#include "sfx2/sfxresid.hxx"
#include <osl/thread.h>
+#include <rtl/oustringostreaminserter.hxx>
#include <rtl/strbuf.hxx>
#include <com/sun/star/ui/dialogs/XFilterGroupManager.hpp>
#include <com/sun/star/beans/StringPair.hpp>
@@ -976,13 +977,7 @@ namespace sfx2
}
catch( const IllegalArgumentException& )
{
-#ifdef DBG_UTIL
- rtl::OStringBuffer aMsg(RTL_CONSTASCII_STRINGPARAM(
- "Could not append DefaultFilter"));
- aMsg.append(rtl::OUStringToOString(sUIName,
- osl_getThreadTextEncoding()));
- DBG_ERRORFILE(aMsg.getStr());
-#endif
+ SAL_INFO( "sfx2", "Could not append DefaultFilter" << sUIName );
}
for ( const SfxFilter* pFilter = _rFilterMatcher.First(); pFilter; pFilter =
_rFilterMatcher.Next() )
@@ -1002,13 +997,7 @@ namespace sfx2
}
catch( const IllegalArgumentException& )
{
- #ifdef DBG_UTIL
- rtl::OStringBuffer aMsg(RTL_CONSTASCII_STRINGPARAM(
- "Could not append Filter"));
- aMsg.append(rtl::OUStringToOString(sUIName,
- osl_getThreadTextEncoding()));
- DBG_ERRORFILE( aMsg.getStr() );
- #endif
+ SAL_INFO( "sfx2", "Could not append Filter" << sUIName );
}
}
}
@@ -1158,13 +1147,7 @@ namespace sfx2
}
catch( const IllegalArgumentException& )
{
- #ifdef DBG_UTIL
- rtl::OStringBuffer aMsg(RTL_CONSTASCII_STRINGPARAM(
- "Could not append Filter"));
- aMsg.append(rtl::OUStringToOString(sUIName,
- osl_getThreadTextEncoding()));
- DBG_ERRORFILE( aMsg.getStr() );
- #endif
+ SAL_INFO( "sfx2", "Could not append Filter" << sUIName );
}
}
@@ -1182,13 +1165,7 @@ namespace sfx2
}
catch( const IllegalArgumentException& )
{
- #ifdef DBG_UTIL
- rtl::OStringBuffer aMsg(RTL_CONSTASCII_STRINGPARAM(
- "Could not append Filter"));
- aMsg.append(rtl::OUStringToOString(sUIName,
- osl_getThreadTextEncoding()));
- DBG_ERRORFILE( aMsg.getStr() );
- #endif
+ SAL_INFO( "sfx2", "Could not append Filter" << sUIName );
}
}
}
diff --git a/sfx2/source/dialog/mailmodel.cxx b/sfx2/source/dialog/mailmodel.cxx
index 18340c1..5e0c2bf 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
{
- DBG_ERRORFILE( "invalid address role" );
+ SAL_INFO( "sfx2", "invalid address role" );
}
if ( pList )
diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx
index cb12153..decc637 100644
--- a/sfx2/source/dialog/tabdlg.cxx
+++ b/sfx2/source/dialog/tabdlg.cxx
@@ -989,7 +989,7 @@ const SfxItemSet* SfxTabDialog::GetRefreshedSet()
*/
{
- DBG_ERRORFILE( "GetRefreshedSet not implemented" );
+ SAL_INFO ( "sfx2", "GetRefreshedSet not implemented" );
return 0;
}
@@ -1395,7 +1395,7 @@ const sal_uInt16* SfxTabDialog::GetInputRanges( const SfxItemPool& rPool )
{
if ( pSet )
{
- DBG_ERRORFILE( "Set already exists!" );
+ SAL_INFO( "sfx2", "Set already exists!" );
return pSet->GetRanges();
}
diff --git a/sfx2/source/doc/doctempl.cxx b/sfx2/source/doc/doctempl.cxx
index d3878d9..61ca3f6 100644
--- a/sfx2/source/doc/doctempl.cxx
+++ b/sfx2/source/doc/doctempl.cxx
@@ -664,7 +664,7 @@ sal_Bool SfxDocumentTemplates::CopyOrMove
if ( nSourceRegion == nTargetRegion )
{
- DBG_ERRORFILE( "Don't know, what to do!" );
+ SAL_INFO( "sfx2", "Don't know, what to do!" );
return sal_False;
}
@@ -1694,7 +1694,7 @@ const OUString& DocTempl_EntryData_Impl::GetTargetURL()
}
else
{
- DBG_ERRORFILE( "GetTargetURL(): Could not create hierarchy content!" );
+ SAL_INFO( "sfx2", "GetTargetURL(): Could not create hierarchy content!" );
}
}
@@ -1857,7 +1857,7 @@ const OUString& RegionData_Impl::GetTargetURL()
}
else
{
- DBG_ERRORFILE( "GetTargetURL(): Could not create hierarchy content!" );
+ SAL_INFO( "sfx2", "GetTargetURL(): Could not create hierarchy content!" );
}
}
@@ -2171,7 +2171,7 @@ void SfxDocTemplate_Impl::Rescan()
}
catch( const Exception& )
{
- DBG_ERRORFILE( "SfxDocTemplate_Impl::Rescan: caught an exception while doing the update!"
);
+ SAL_INFO( "sfx2", "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 fce978c..923c18c 100644
--- a/sfx2/source/doc/doctemplates.cxx
+++ b/sfx2/source/doc/doctemplates.cxx
@@ -489,7 +489,7 @@ void SfxDocTplService_Impl::init_Impl()
}
else
{
- DBG_ERRORFILE( "init_Impl(): Could not create root" );
+ SAL_INFO( "sfx2", "init_Impl(): Could not create root" );
}
mbIsInitialized = bIsInitialized;
@@ -839,11 +839,11 @@ sal_Bool SfxDocTplService_Impl::createFolder( const OUString& rNewFolderURL,
}
catch( RuntimeException& )
{
- DBG_ERRORFILE( "createFolder(): got runtime exception" );
+ SAL_INFO( "sfx2", "createFolder(): got runtime exception" );
}
catch( Exception& )
{
- DBG_ERRORFILE( "createFolder(): Could not create new folder" );
+ SAL_INFO( "sfx2", "createFolder(): Could not create new folder" );
}
}
else if ( bCreateParent )
@@ -1042,8 +1042,8 @@ sal_Bool SfxDocTplService_Impl::setProperty( Content& rContent,
xProperties->addProperty( rPropName, PropertyAttribute::MAYBEVOID, rPropValue
);
}
catch( PropertyExistException& ) {}
- catch( IllegalTypeException& ) { DBG_ERRORFILE( "IllegalTypeException" ); }
- catch( IllegalArgumentException& ) { DBG_ERRORFILE( "IllegalArgumentException" ); }
+ catch( IllegalTypeException& ) { SAL_INFO( "sfx2", "IllegalTypeException" ); }
+ catch( IllegalArgumentException& ) { SAL_INFO( "sfx2", "IllegalArgumentException"
); }
}
}
@@ -2466,7 +2466,7 @@ void SfxDocTplService_Impl::addHierGroup( GroupList_Impl& rList,
}
catch ( ContentCreationException& )
{
- DBG_ERRORFILE( "addHierGroup: ContentCreationException" );
+ SAL_INFO( "sfx2", "addHierGroup: ContentCreationException" );
}
catch ( Exception& ) {}
@@ -2499,7 +2499,7 @@ void SfxDocTplService_Impl::addHierGroup( GroupList_Impl& rList,
sal_Bool bDocHasTitle = sal_False;
if( !getTitleFromURL( aTargetDir, aTmpTitle, aType, bDocHasTitle ) )
{
- DBG_ERRORFILE( "addHierGroup(): template of alien format" );
+ SAL_INFO( "sfx2", "addHierGroup(): template of alien format" );
continue;
}
diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx
index 74bf267..7003c0d 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:
{
- DBG_ERRORFILE( "SfxObjectShell::DetectHiddenInformation(): what fact?" );
+ SAL_INFO( "sfx2", "SfxObjectShell::DetectHiddenInformation(): what fact?" );
}
}
diff --git a/sfx2/source/doc/oleprops.cxx b/sfx2/source/doc/oleprops.cxx
index f42ed87..42250f8 100644
--- a/sfx2/source/doc/oleprops.cxx
+++ b/sfx2/source/doc/oleprops.cxx
@@ -687,7 +687,7 @@ SfxOleThumbnailProperty::SfxOleThumbnailProperty(
void SfxOleThumbnailProperty::ImplLoad( SvStream& )
{
- DBG_ERRORFILE( "SfxOleThumbnailProperty::ImplLoad - not implemented" );
+ SAL_INFO( "sfx2", "SfxOleThumbnailProperty::ImplLoad - not implemented" );
SetError( SVSTREAM_INVALID_ACCESS );
}
@@ -721,7 +721,7 @@ void SfxOleThumbnailProperty::ImplSave( SvStream& rStrm )
}
else
{
- DBG_ERRORFILE( "SfxOleThumbnailProperty::ImplSave - invalid thumbnail property" );
+ SAL_INFO( "sfx2", "SfxOleThumbnailProperty::ImplSave - invalid thumbnail property" );
SetError( SVSTREAM_INVALID_ACCESS );
}
}
@@ -737,7 +737,7 @@ SfxOleBlobProperty::SfxOleBlobProperty( sal_Int32 nPropId,
void SfxOleBlobProperty::ImplLoad( SvStream& )
{
- DBG_ERRORFILE( "SfxOleBlobProperty::ImplLoad - not implemented" );
+ SAL_INFO( "sfx2", "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 {
- DBG_ERRORFILE( "SfxOleBlobProperty::ImplSave - invalid BLOB property" );
+ SAL_INFO( "sfx2", "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: DBG_ERRORFILE( "SfxOlePropertySet::GetSectionGuid - unknown section type" );
+ default: SAL_INFO( "sfx2", "SfxOlePropertySet::GetSectionGuid - unknown section type" );
}
return saEmptyGuid;
}
diff --git a/sfx2/source/notify/eventsupplier.cxx b/sfx2/source/notify/eventsupplier.cxx
index 474a921..18276e7 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
{
- DBG_ERRORFILE( "notifyEvent(): Unsupported event type" );
+ SAL_INFO( "sfx2", "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 {
- DBG_ERRORFILE( "ConvertToMacro: Unknown macro type" );
+ SAL_INFO( "sfx2", "ConvertToMacro: Unknown macro type" );
}
if ( !aMacroName.isEmpty() )
@@ -479,7 +479,7 @@ void SfxEvents_Impl::NormalizeMacro( const ::comphelper::NamedValueCollection& i
}
else
{
- DBG_ERRORFILE( "ConvertToMacro: Unknown macro url format" );
+ SAL_INFO( "sfx2", "ConvertToMacro: Unknown macro url format" );
}
}
}
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index 9bfb4e6..b226f48 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())
{
- DBG_ERRORFILE("couldn't get access to the basic lib container. Adding of macro isn't
possible.");
+ SAL_INFO( "sfx2", "couldn't get access to the basic lib container. Adding of macro
isn't possible." );
return;
}
--------------true--
From 91a10c4ecc1f1fcd910f28c86bdbf72c4f4bafed Mon Sep 17 00:00:00 2001
Message-Id: <91a10c4ecc1f1fcd910f28c86bdbf72c4f4bafed.1326618396.git.mmetz@adrian-broher.net>
In-Reply-To: <b89c66bd936b49f652dffe7895818068c5587386.1326618396.git.mmetz@adrian-broher.net>
References: <b89c66bd936b49f652dffe7895818068c5587386.1326618396.git.mmetz@adrian-broher.net>
From: Marcel Metz <mmetz@adrian-broher.net>
Date: Wed, 11 Jan 2012 10:14:13 +0100
Subject: [PATCH 4/4] Replaced DBG_ERRORFILE with SAL_INFO.
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 +-
cui/source/customize/cfg.cxx | 4 +-
cui/source/dialogs/iconcdlg.cxx | 4 +-
cui/source/dialogs/srchxtra.cxx | 7 +----
cui/source/factory/dlgfact.cxx | 2 +-
cui/source/options/cfgchart.cxx | 4 +-
cui/source/options/optctl.cxx | 2 +-
cui/source/options/optgdlg.cxx | 4 +--
cui/source/options/optjava.cxx | 8 +----
cui/source/options/optlingu.cxx | 4 +-
cui/source/options/optpath.cxx | 4 +-
cui/source/options/treeopt.cxx | 10 +++---
cui/source/tabpages/chardlg.cxx | 4 +-
cui/source/tabpages/paragrph.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 | 3 +-
fpicker/source/office/iodlg.cxx | 4 +-
framework/source/classes/fwktabwindow.cxx | 6 ++--
linguistic/source/convdiclist.cxx | 4 +-
sc/inc/formularesult.hxx | 4 +-
sc/source/core/data/dptabsrc.cxx | 2 +-
sc/source/core/tool/lookupcache.cxx | 2 +-
sc/source/ui/docshell/dbdocimp.cxx | 2 +-
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 +++---
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 | 19 +++++--------
svtools/source/control/ruler.cxx | 4 +--
svtools/source/dialogs/prnsetup.cxx | 3 +-
svtools/source/filter/filter.cxx | 10 +++---
svtools/source/misc/ehdl.cxx | 7 ++---
svtools/source/misc/templatefoldercache.cxx | 4 +-
tools/source/datetime/tdate.cxx | 4 +-
tools/source/inet/inetstrm.cxx | 3 +-
vcl/source/app/settings.cxx | 2 +-
vcl/source/control/field2.cxx | 4 +--
vcl/source/gdi/outdev.cxx | 4 +-
vcl/source/gdi/outmap.cxx | 4 +-
vcl/source/gdi/print3.cxx | 2 +-
vcl/source/window/btndlg.cxx | 3 +-
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 +-
63 files changed, 136 insertions(+), 159 deletions(-)
--------------true
Content-Type: text/x-patch; name="0004-Replaced-DBG_ERRORFILE-with-SAL_INFO.patch"
Content-Transfer-Encoding: 8bit
Content-Disposition: attachment; filename="0004-Replaced-DBG_ERRORFILE-with-SAL_INFO.patch"
diff --git a/accessibility/source/extended/AccessibleBrowseBoxBase.cxx
b/accessibility/source/extended/AccessibleBrowseBoxBase.cxx
index 842f65a..8f15672 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() )
{
- DBG_ERRORFILE( "shit" );
+ SAL_INFO( "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() )
{
- DBG_ERRORFILE( "shit" );
+ SAL_INFO( "accessibility", "rectangle doesn't exist" );
}
return aRect;
}
diff --git a/accessibility/source/extended/AccessibleGridControlBase.cxx
b/accessibility/source/extended/AccessibleGridControlBase.cxx
index cfd6587..147aaee 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() )
{
- DBG_ERRORFILE( "rectangle doesn't exist" );
+ SAL_INFO( "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() )
{
- DBG_ERRORFILE( "rectangle doesn't exist" );
+ SAL_INFO( "accessibility", "rectangle doesn't exist" );
}
return aRect;
}
diff --git a/accessibility/source/standard/vclxaccessibletoolboxitem.cxx
b/accessibility/source/standard/vclxaccessibletoolboxitem.cxx
index e8fc1fd..c8a3c1b 100644
--- a/accessibility/source/standard/vclxaccessibletoolboxitem.cxx
+++ b/accessibility/source/standard/vclxaccessibletoolboxitem.cxx
@@ -116,7 +116,7 @@ VCLXAccessibleToolBoxItem::VCLXAccessibleToolBoxItem( ToolBox* _pToolBox, sal_In
default:
{
- DBG_ERRORFILE( "unsupported toolbox itemtype" );
+ SAL_INFO( "accessibility", "unsupported toolbox itemtype" );
}
}
}
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index 35de842..f744d3b 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() )
{
- DBG_ERRORFILE( "SvxConfigPage::GetFrameWithDefaultAndIdentify(): no frame found!" );
+ SAL_INFO( "cui", "SvxConfigPage::GetFrameWithDefaultAndIdentify(): no frame found!" );
return sModuleID;
}
@@ -3293,7 +3293,7 @@ void SvxToolbarConfigPage::MoveEntry( bool bMoveUp )
((ToolbarSaveInData*)GetSaveInData())->ApplyToolbar( pToolbar );
else
{
- DBG_ERRORFILE( "SvxToolbarConfigPage::MoveEntry(): no entry" );
+ SAL_INFO( "cui", "SvxToolbarConfigPage::MoveEntry(): no entry" );
UpdateButtonStates();
}
}
diff --git a/cui/source/dialogs/iconcdlg.cxx b/cui/source/dialogs/iconcdlg.cxx
index 73921d7..1c16293 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 )
{
- DBG_ERRORFILE( "Set bereits vorhanden!" );
+ SAL_INFO( "cui", "Set does already exist!" );
return pSet->GetRanges();
}
@@ -1041,7 +1041,7 @@ void IconChoiceDialog::Start_Impl()
const SfxItemSet* IconChoiceDialog::GetRefreshedSet()
{
- DBG_ERRORFILE( "GetRefreshedSet nicht implementiert" );
+ SAL_INFO( "cui", "GetRefreshedSet not implemented" );
return 0;
}
diff --git a/cui/source/dialogs/srchxtra.cxx b/cui/source/dialogs/srchxtra.cxx
index 2e36a52..34aaf9e 100644
--- a/cui/source/dialogs/srchxtra.cxx
+++ b/cui/source/dialogs/srchxtra.cxx
@@ -186,12 +186,7 @@ SvxSearchAttributeDialog::SvxSearchAttributeDialog( Window* pParent,
if ( RESARRAY_INDEX_NOTFOUND != nId )
pEntry = aAttrLB.SvTreeListBox::InsertEntry( aAttrNames.GetString(nId) );
else
- {
- rtl::OStringBuffer sError(
- RTL_CONSTASCII_STRINGPARAM("no resource for slot id\nslot = "));
- sError.append(static_cast<sal_Int32>(nSlot));
- DBG_ERRORFILE(sError.getStr());
- }
+ SAL_INFO( "cui", "no resource for slot id\nslot = " <<
static_cast<sal_Int32>(nSlot) );
if ( pEntry )
{
diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx
index 55b2b72..8425b80 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 )
{
- DBG_ERRORFILE( "VclAbstractDialog2_Impl::EndDialogHdl(): wrong dialog" );
+ SAL_INFO( "cui", "VclAbstractDialog2_Impl::EndDialogHdl(): wrong dialog" );
}
m_aEndDlgHdl.Call( this );
diff --git a/cui/source/options/cfgchart.cxx b/cui/source/options/cfgchart.cxx
index bac4fb4..edef3a1 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() )
{
- DBG_ERRORFILE( "SvxChartColorTable::[] invalid index" );
+ SAL_INFO( "cui", "SvxChartColorTable::[] invalid index" );
return m_aColorEntries[ 0 ];
}
@@ -68,7 +68,7 @@ ColorData SvxChartColorTable::getColorData( size_t _nIndex ) const
{
if ( _nIndex >= m_aColorEntries.size() )
{
- DBG_ERRORFILE( "SvxChartColorTable::getColorData invalid index" );
+ SAL_INFO( "cui", "SvxChartColorTable::getColorData invalid index" );
return COL_BLACK;
}
diff --git a/cui/source/options/optctl.cxx b/cui/source/options/optctl.cxx
index 2589874..51bf7ad 100644
--- a/cui/source/options/optctl.cxx
+++ b/cui/source/options/optctl.cxx
@@ -148,7 +148,7 @@ void SvxCTLOptionsPage::Reset( const SfxItemSet& )
break;
default:
- DBG_ERRORFILE( "SvxCTLOptionsPage::Reset(): invalid movement enum" );
+ SAL_INFO( "cui", "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 bc86de6..c55e8e4 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -1857,9 +1857,7 @@ IMPL_LINK( OfaLanguagesTabPage, SupportHdl, CheckBox*, pBox )
m_bOldCtl = bCheck;
}
else
- {
- DBG_ERRORFILE( "OfaLanguagesTabPage::SupportHdl(): wrong pBox" );
- }
+ SAL_INFO( "cui", "OfaLanguagesTabPage::SupportHdl(): wrong pBox" );
return 0;
}
diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx
index a32869e..43f2373 100644
--- a/cui/source/options/optjava.cxx
+++ b/cui/source/options/optjava.cxx
@@ -259,9 +259,7 @@ IMPL_LINK( SvxJavaOptionsPage, AddHdl_Impl, PushButton *, EMPTYARG )
}
catch ( Exception& )
{
-#ifdef DBG_UTIL
- DBG_ERRORFILE( "SvxJavaOptionsPage::AddHdl_Impl(): caught exception" );
-#endif
+ SAL_INFO( "cui", "SvxJavaOptionsPage::AddHdl_Impl(): caught exception" );
}
return 0;
@@ -381,9 +379,7 @@ IMPL_LINK( SvxJavaOptionsPage, StartFolderPickerHdl, void*, EMPTYARG )
}
catch ( Exception& )
{
-#ifdef DBG_UTIL
- DBG_ERRORFILE( "SvxJavaOptionsPage::StartFolderPickerHdl(): caught exception" );
-#endif
+ SAL_INFO( "cui", "SvxJavaOptionsPage::StartFolderPickerHdl(): caught exception" );
}
return 0L;
diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx
index 736bfe0..8a800d3 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& )
{
- DBG_ERRORFILE( "KillFile: CommandAbortedException" );
+ SAL_INFO( "cui", "KillFile: CommandAbortedException" );
bRet = sal_False;
}
catch( ... )
{
- DBG_ERRORFILE( "KillFile: Any other exception" );
+ SAL_INFO( "cui", "KillFile: Any other exception" );
bRet = sal_False;
}
diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx
index c6f6b73..7abc6ff 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 )
{
- DBG_ERRORFILE( "SvxPathTabPage::ChangeCurrentEntry(): no entry" );
+ SAL_INFO( "cui", "SvxPathTabPage::ChangeCurrentEntry(): no entry" );
return;
}
@@ -646,7 +646,7 @@ IMPL_LINK( SvxPathTabPage, PathHdl_Impl, PushButton *, EMPTYARG )
}
catch( Exception& )
{
- DBG_ERRORFILE( "SvxPathTabPage::PathHdl_Impl: exception from folder picker" );
+ SAL_INFO( "cui", "SvxPathTabPage::PathHdl_Impl: exception from folder picker" );
}
}
return 0;
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index 9d02f0f..64fe2c5 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -1637,7 +1637,7 @@ rtl::OUString getCurrentFactory_Impl( const Reference< XFrame >& _xFrame )
}
catch ( Exception& )
{
- DBG_ERRORFILE( "getActiveModule_Impl(): exception of XModuleManager::identify()" );
+ SAL_INFO( "cui", "getActiveModule_Impl(): exception of XModuleManager::identify()" );
}
}
@@ -2095,7 +2095,7 @@ rtl::OUString OfaTreeOptionsDialog::GetModuleIdentifier(
}
catch ( Exception& )
{
- DBG_ERRORFILE( "OfaTreeOptionsDialog::GetModuleIdentifier(): exception of
XModuleManager::identify()" );
+ SAL_INFO( "cui", "OfaTreeOptionsDialog::GetModuleIdentifier(): exception of
XModuleManager::identify()" );
}
}
return sModule;
@@ -2474,11 +2474,11 @@ void ExtensionsTabPage::CreateDialogWithHandler()
}
catch ( ::com::sun::star::lang::IllegalArgumentException& )
{
- DBG_ERRORFILE( "ExtensionsTabPage::CreateDialogWithHandler(): illegal argument" );
+ SAL_INFO( "cui", "ExtensionsTabPage::CreateDialogWithHandler(): illegal argument" );
}
catch ( Exception& )
{
- DBG_ERRORFILE( "ExtensionsTabPage::CreateDialogWithHandler(): exception of
XDialogProvider2::createDialogWithHandler()" );
+ SAL_INFO( "cui", "ExtensionsTabPage::CreateDialogWithHandler(): exception of
XDialogProvider2::createDialogWithHandler()" );
}
}
@@ -2495,7 +2495,7 @@ sal_Bool ExtensionsTabPage::DispatchAction( const rtl::OUString& rAction )
}
catch ( Exception& )
{
- DBG_ERRORFILE( "ExtensionsTabPage::DispatchAction(): exception of
XDialogEventHandler::callHandlerMethod()" );
+ SAL_INFO( "cui", "ExtensionsTabPage::DispatchAction(): exception of
XDialogEventHandler::callHandlerMethod()" );
}
}
return bRet;
diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx
index 9d320b4..adb6597 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
{
- DBG_ERRORFILE( "invalid font name box" );
+ SAL_INFO( "cui", "invalid font name box" );
return;
}
@@ -704,7 +704,7 @@ void SvxCharNamePage::FillSizeBox_Impl( const FontNameBox* pNameBox )
}
else
{
- DBG_ERRORFILE( "invalid font name box" );
+ SAL_INFO( "cui", "invalid font name box" );
return;
}
diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx
index d874c32..2bdebeb 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:
{
- DBG_ERRORFILE( "SvxParaAlignTabPage::TextDirectionHdl_Impl(): other directions not
supported" );
+ SAL_INFO( "cui", "SvxParaAlignTabPage::TextDirectionHdl_Impl(): other directions not
supported" );
}
}
diff --git a/dbaccess/source/ui/misc/UITools.cxx b/dbaccess/source/ui/misc/UITools.cxx
index b3e6540..d77c9da 100644
--- a/dbaccess/source/ui/misc/UITools.cxx
+++ b/dbaccess/source/ui/misc/UITools.cxx
@@ -1281,7 +1281,7 @@ namespace
}
else
{
- DBG_ERRORFILE( "Property 'AnchorName' is missing" );
+ SAL_INFO( "dbaccess", "Property 'AnchorName' is missing" );
}
}
catch( Exception& )
diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx
index a196a1e..08b8379 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:
- DBG_ERRORFILE( "not implemented" );
+ SAL_INFO( "editeng", "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:
- DBG_ERRORFILE( "not implemented" );
+ SAL_INFO( "editeng", "not implemented" );
break;
case MID_GRAPHIC_TRANSPARENT:
diff --git a/editeng/source/items/paraitem.cxx b/editeng/source/items/paraitem.cxx
index 3f7ace0..283b1bd 100644
--- a/editeng/source/items/paraitem.cxx
+++ b/editeng/source/items/paraitem.cxx
@@ -601,7 +601,7 @@ SfxItemPresentation SvxWidowsItem::GetPresentation
default:
{
- DBG_ERRORFILE( "SvxWidowsItem::GetPresentation(): unknown SfxItemPresentation" );
+ SAL_INFO( "editeng", "SvxWidowsItem::GetPresentation(): unknown SfxItemPresentation" );
}
}
@@ -673,7 +673,7 @@ SfxItemPresentation SvxOrphansItem::GetPresentation
default:
{
- DBG_ERRORFILE( "SvxOrphansItem::GetPresentation(): unknown SfxItemPresentation" );
+ SAL_INFO( "editeng", "SvxOrphansItem::GetPresentation(): unknown SfxItemPresentation"
);
}
}
diff --git a/editeng/source/items/textitem.cxx b/editeng/source/items/textitem.cxx
index e0117a5..2a1dfee 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
- DBG_ERRORFILE("SvxLanguageItem::GetValueCount: supposed to return a count of what?");
+ SAL_INFO( "editeng", "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 ee6530c..9242415 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
{
- DBG_ERRORFILE( "FormulaCompiler::CreateOpCodeMap: no Token.Data external name");
+ SAL_INFO( "xmlsecurity", "FormulaCompiler::CreateOpCodeMap: no Token.Data external
name");
}
}
}
@@ -1661,7 +1661,7 @@ FormulaToken* FormulaCompiler::CreateStringFromToken( rtl::OUStringBuffer&
rBuff
rBuffer.append(mxSymbols->getSymbol(eOp));
else
{
- DBG_ERRORFILE("unknown OpCode");
+ SAL_INFO( "xmlsecurity","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 d0e8bb8..c8bd3ab 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 )
{
- DBG_ERRORFILE( "FormulaToken::SetByte: virtual dummy called" );
+ SAL_INFO( "formula", "FormulaToken::SetByte: virtual dummy called" );
}
bool FormulaToken::HasForceArray() const
@@ -176,80 +176,80 @@ bool FormulaToken::HasForceArray() const
void FormulaToken::SetForceArray( bool )
{
- DBG_ERRORFILE( "FormulaToken::SetForceArray: virtual dummy called" );
+ SAL_INFO( "formula", "FormulaToken::SetForceArray: virtual dummy called" );
}
double FormulaToken::GetDouble() const
{
- DBG_ERRORFILE( "FormulaToken::GetDouble: virtual dummy called" );
+ SAL_INFO( "formula", "FormulaToken::GetDouble: virtual dummy called" );
return 0.0;
}
double & FormulaToken::GetDoubleAsReference()
{
- DBG_ERRORFILE( "FormulaToken::GetDouble: virtual dummy called" );
+ SAL_INFO( "formula", "FormulaToken::GetDouble: virtual dummy called" );
static double fVal = 0.0;
return fVal;
}
const String& FormulaToken::GetString() const
{
- DBG_ERRORFILE( "FormulaToken::GetString: virtual dummy called" );
+ SAL_INFO( "formula", "FormulaToken::GetString: virtual dummy called" );
static String aDummyString;
return aDummyString;
}
sal_uInt16 FormulaToken::GetIndex() const
{
- DBG_ERRORFILE( "FormulaToken::GetIndex: virtual dummy called" );
+ SAL_INFO( "formula", "FormulaToken::GetIndex: virtual dummy called" );
return 0;
}
void FormulaToken::SetIndex( sal_uInt16 )
{
- DBG_ERRORFILE( "FormulaToken::SetIndex: virtual dummy called" );
+ SAL_INFO( "formula", "FormulaToken::SetIndex: virtual dummy called" );
}
bool FormulaToken::IsGlobal() const
{
- DBG_ERRORFILE( "FormulaToken::IsGlobal: virtual dummy called" );
+ SAL_INFO( "formula", "FormulaToken::IsGlobal: virtual dummy called" );
return true;
}
void FormulaToken::SetGlobal( bool )
{
- DBG_ERRORFILE( "FormulaToken::SetGlobal: virtual dummy called" );
+ SAL_INFO( "formula", "FormulaToken::SetGlobal: virtual dummy called" );
}
short* FormulaToken::GetJump() const
{
- DBG_ERRORFILE( "FormulaToken::GetJump: virtual dummy called" );
+ SAL_INFO( "formula", "FormulaToken::GetJump: virtual dummy called" );
return NULL;
}
const String& FormulaToken::GetExternal() const
{
- DBG_ERRORFILE( "FormulaToken::GetExternal: virtual dummy called" );
+ SAL_INFO( "formula", "FormulaToken::GetExternal: virtual dummy called" );
static String aDummyString;
return aDummyString;
}
FormulaToken* FormulaToken::GetFAPOrigToken() const
{
- DBG_ERRORFILE( "FormulaToken::GetFAPOrigToken: virtual dummy called" );
+ SAL_INFO( "formula", "FormulaToken::GetFAPOrigToken: virtual dummy called" );
return NULL;
}
sal_uInt16 FormulaToken::GetError() const
{
- DBG_ERRORFILE( "FormulaToken::GetError: virtual dummy called" );
+ SAL_INFO( "formula", "FormulaToken::GetError: virtual dummy called" );
return 0;
}
void FormulaToken::SetError( sal_uInt16 )
{
- DBG_ERRORFILE( "FormulaToken::SetError: virtual dummy called" );
+ SAL_INFO( "formula", "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 8b8288d..45a3e33 100644
--- a/fpicker/source/office/OfficeControlAccess.cxx
+++ b/fpicker/source/office/OfficeControlAccess.cxx
@@ -386,7 +386,7 @@ namespace svt
break;
case LISTBOX_FILTER:
- DBG_ERRORFILE( "Use the XFilterManager to access the filter listbox" );
+ SAL_INFO( "fpicker", "Use the XFilterManager to access the filter listbox"
);
break;
case LISTBOX_VERSION:
@@ -445,7 +445,7 @@ namespace svt
}
else
{
- DBG_ERRORFILE( "Use the XFilterManager to access the filter listbox" );
+ SAL_INFO( "fpicker", "Use the XFilterManager to access the filter
listbox" );
}
break;
@@ -464,7 +464,7 @@ namespace svt
nPropertyId = PROPERTY_FLAG_LISTITEMS;
break;
default:
- DBG_ERRORFILE( "OControlAccess::GetValue: invalid control action
for the listbox!" );
+ SAL_INFO( "fpicker", "OControlAccess::GetValue: invalid control
action for the listbox!" );
break;
}
break;
@@ -546,7 +546,7 @@ namespace svt
break;
default:
- DBG_ERRORFILE( "Wrong ControlAction for implDoListboxAction()" );
+ SAL_INFO( "fpicker", "Wrong ControlAction for implDoListboxAction()" );
}
}
diff --git a/fpicker/source/office/OfficeFilePicker.cxx b/fpicker/source/office/OfficeFilePicker.cxx
index c5f1a56..f789f4b 100644
--- a/fpicker/source/office/OfficeFilePicker.cxx
+++ b/fpicker/source/office/OfficeFilePicker.cxx
@@ -40,7 +40,6 @@
#include <algorithm>
#endif
#include <tools/urlobj.hxx>
-#include <tools/debug.hxx>
#include "svl/svstdarr.hxx"
#include <com/sun/star/uno/Any.hxx>
#include <com/sun/star/ui/dialogs/FilePickerEvent.hpp>
@@ -350,7 +349,7 @@ void SvtFilePicker::notify( sal_Int16 _nEventId, sal_Int16 _nControlId )
m_xListener->dialogSizeChanged();
break;
default:
- DBG_ERRORFILE( "SvtFilePicker::notify(): Unknown event id!" );
+ SAL_INFO( "fpicker", "SvtFilePicker::notify(): Unknown event id!" );
break;
}
}
diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx
index ac2b0a6..0ab97df 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 )
{
- DBG_ERRORFILE( "SvtFileDialog::EnableControl: invalid control!" );
+ SAL_INFO( "fpicker", "SvtFileDialog::EnableControl: invalid control!" );
return;
}
@@ -2871,7 +2871,7 @@ Control* SvtFileDialog::getControl( sal_Int16 _nControlId, sal_Bool
_bLabelContr
break;
default:
- DBG_ERRORFILE( "SvtFileDialog::getControl: invalid id!" );
+ SAL_INFO( "fpicker", "SvtFileDialog::getControl: invalid id!" );
}
return pReturn;
}
diff --git a/framework/source/classes/fwktabwindow.cxx b/framework/source/classes/fwktabwindow.cxx
index 3497e78..b43895e 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
{
- DBG_ERRORFILE( "FwkTabControl::BroadcastEvent(): illegal event" );
+ SAL_INFO( "sfx2", "FwkTabControl::BroadcastEvent(): illegal event" );
}
}
@@ -135,11 +135,11 @@ void FwkTabPage::CreateDialog()
}
catch ( const lang::IllegalArgumentException& )
{
- DBG_ERRORFILE( "FwkTabPage::CreateDialog(): illegal argument" );
+ SAL_INFO( "sfx2", "FwkTabPage::CreateDialog(): illegal argument" );
}
catch ( const uno::Exception& )
{
- DBG_ERRORFILE( "FwkTabPage::CreateDialog(): exception of
XDialogProvider2::createContainerWindow()" );
+ SAL_INFO( "sfx2", "FwkTabPage::CreateDialog(): exception of
XDialogProvider2::createContainerWindow()" );
}
}
diff --git a/linguistic/source/convdiclist.cxx b/linguistic/source/convdiclist.cxx
index 2c1dd49..93af0f0 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& )
{
- DBG_ERRORFILE( "HangulHanjaOptionsDialog::OkHdl(): CommandAbortedException" );
+ SAL_INFO( "linguistic", "HangulHanjaOptionsDialog::OkHdl(): CommandAbortedException" );
}
catch( ... )
{
- DBG_ERRORFILE( "HangulHanjaOptionsDialog::OkHdl(): Any other exception" );
+ SAL_INFO( "linguistic", "HangulHanjaOptionsDialog::OkHdl(): Any other exception" );
}
}
diff --git a/sc/inc/formularesult.hxx b/sc/inc/formularesult.hxx
index 2aa674c..7a34de8 100644
--- a/sc/inc/formularesult.hxx
+++ b/sc/inc/formularesult.hxx
@@ -30,7 +30,7 @@
#define SC_FORMULARESULT_HXX
#include "token.hxx"
-
+#include <sal/log.hxx>
/** Store a variable formula cell result, balancing between runtime performance
and memory consumption. */
@@ -324,7 +324,7 @@ inline void ScFormulaResult::SetToken( const formula::FormulaToken* p )
dynamic_cast<const ScMatrixFormulaCellToken*>(pMatResult);
if (pNewMatFormula)
{
- DBG_ERRORFILE( "ScFormulaResult::SetToken: pNewMatFormula and pMatFormula,
overriding matrix formula dimension; intended?");
+ SAL_INFO( "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 e537c18..5dc0d2e 100644
--- a/sc/source/core/data/dptabsrc.cxx
+++ b/sc/source/core/data/dptabsrc.cxx
@@ -735,7 +735,7 @@ void ScDPSource::FilterCacheTableByPageDimensions()
if (bPageFiltered)
{
- DBG_ERRORFILE("tried to apply page field filters several times");
+ SAL_INFO( "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 6d9b78e..a9b42ca 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;
- DBG_ERRORFILE( "ScLookupCache::QueryCriteria not prepared for this ScQueryOp");
+ SAL_INFO( "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 829d36e..09f4b71 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() )
{
- DBG_ERRORFILE("can't get XRowLocate");
+ SAL_INFO( "sc.ui","can't get XRowLocate");
bDoSelection = bRealSelection = bBookmarkSelection = sal_False;
}
}
diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx
index 4c16804..50e3486 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 )
{
- DBG_ERRORFILE( "SdPageObjsTLB::AcceptDrop(): no target" );
+ SAL_INFO( "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 d4c05c0..776fc9f 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:
- DBG_ERRORFILE( "SvxSearchItem::QueryValue(): Unknown MemberId" );
+ SAL_INFO( "svl", "SvxSearchItem::QueryValue(): Unknown MemberId" );
return false;
}
diff --git a/svl/source/numbers/zforfind.cxx b/svl/source/numbers/zforfind.cxx
index 7d6f99e..d944a11 100644
--- a/svl/source/numbers/zforfind.cxx
+++ b/svl/source/numbers/zforfind.cxx
@@ -892,7 +892,7 @@ void ImpSvNumberInputScan::GetTimeRef(
else
{
nHour = 0;
- DBG_ERRORFILE( "ImpSvNumberInputScan::GetTimeRef: bad number index");
+ SAL_INFO( "svl", "ImpSvNumberInputScan::GetTimeRef: bad number index");
}
if (nDecPos == 2 && nAnz == 2) // 45.5
nMinute = 0;
@@ -3148,7 +3148,7 @@ bool ImpSvNumberInputScan::IsNumberFormat(
break;
default:
- DBG_ERRORFILE( "Some number recognized but what's it?" );
+ SAL_INFO( "svl", "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 30bd5a7..e2de447 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)
{
- DBG_ERRORFILE("SvNumberFormatter::GetIndexPuttingAndConverting: bad format code
string for current locale");
+ SAL_INFO( "svl", "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)
{
- DBG_ERRORFILE("SvNumberFormatter::GetIndexPuttingAndConverting: bad format code
string for specified locale");
+ SAL_INFO( "svl", "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 )
{
- DBG_ERRORFILE( "ImpGenerateAdditionalFormats: no GENERAL format" );
+ SAL_INFO( "svl", "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 )
{
- DBG_ERRORFILE( "ImpGenerateAdditionalFormats: too many formats" );
+ SAL_INFO( "svl", "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 )
{
- DBG_ERRORFILE( "ImpGenerateAdditionalFormats: too many formats" );
+ SAL_INFO( "svl", "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 1976ec9..0317ddb 100644
--- a/svl/source/numbers/zformat.cxx
+++ b/svl/source/numbers/zformat.cxx
@@ -1675,7 +1675,7 @@ NfHackConversion SvNumberformat::Load( SvStream& rStream,
}
break;
default:
- DBG_ERRORFILE( "SvNumberformat::Load: unknown header bytes left nId" );
+ SAL_INFO( "svl", "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:
- DBG_ERRORFILE( "SvNumberformat::Load: eHackConversion unknown" );
+ SAL_INFO( "svl", "SvNumberformat::Load: eHackConversion unknown" );
}
}
return eHackConversion;
diff --git a/svl/source/numbers/zforscan.cxx b/svl/source/numbers/zforscan.cxx
index e1f1ac1..7f14297 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() )
{
- DBG_ERRORFILE( "InitSpecialKeyword: TRUE_WORD?" );
+ SAL_INFO( "svl", "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() )
{
- DBG_ERRORFILE( "InitSpecialKeyword: FALSE_WORD?" );
+ SAL_INFO( "svl", "InitSpecialKeyword: FALSE_WORD?" );
((ImpSvNumberformatScan*)this)->sKeyword[NF_KEY_FALSE].AssignAscii(
RTL_CONSTASCII_STRINGPARAM( "FALSE" ) );
}
break;
default:
- DBG_ERRORFILE( "InitSpecialKeyword: unknown request" );
+ SAL_INFO( "svl", "InitSpecialKeyword: unknown request" );
}
}
@@ -2010,7 +2010,7 @@ xub_StrLen ImpSvNumberformatScan::FinalScan( String& rString )
} // of else Del
else
{
- DBG_ERRORFILE( "unknown NF_SYMBOLTYPE_..." );
+ SAL_INFO( "svl", "unknown NF_SYMBOLTYPE_..." );
nPos = nPos + sStrArray[i].Len();
i++;
}
diff --git a/svtools/source/config/helpopt.cxx b/svtools/source/config/helpopt.cxx
index a72926e..aeac457 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:
- DBG_ERRORFILE( "Wrong Member!" );
+ SAL_INFO( "svtools", "Wrong Member!" );
break;
}
}
@@ -233,7 +233,7 @@ void SvtHelpOptions_Impl::Load(const uno::Sequence< ::rtl::OUString>& rProperty
sHelpStyleSheet = aTmpStr;
break;
default:
- DBG_ERRORFILE( "Wrong Member!" );
+ SAL_INFO( "svtools", "Wrong Member!" );
break;
}
}
@@ -250,13 +250,13 @@ void SvtHelpOptions_Impl::Load(const uno::Sequence< ::rtl::OUString>&
rProperty
break;
default:
- DBG_ERRORFILE( "Wrong Member!" );
+ SAL_INFO( "svtools", "Wrong Member!" );
break;
}
}
else
{
- DBG_ERRORFILE( "Wrong Type!" );
+ SAL_INFO( "svtools", "Wrong Type!" );
}
}
}
@@ -431,7 +431,7 @@ void SvtHelpOptions_Impl::implSaveURLCounters()
sNewNodeName = sNodeNameBase;
if (!getUniqueSetElementName(sIgnoreListNodePath, sNewNodeName))
{
- DBG_ERRORFILE( "SvtHelpOptions_Impl::implSaveURLCounters: could not get a free
name!" );
+ SAL_INFO( "svtools", "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 8f20827..94fd227 100644
--- a/svtools/source/contnr/contentenumeration.cxx
+++ b/svtools/source/contnr/contentenumeration.cxx
@@ -230,7 +230,7 @@ namespace svt
}
catch( CommandAbortedException& )
{
- DBG_ERRORFILE( "createCursor: CommandAbortedException" );
+ SAL_INFO( "svtools", "createCursor: CommandAbortedException" );
}
catch( Exception& )
{
@@ -353,21 +353,21 @@ namespace svt
}
catch( CommandAbortedException& )
{
- DBG_ERRORFILE( "FileViewContentEnumerator::enumerateFolderContent: caught an
CommandAbortedException while enumerating!" );
+ SAL_INFO( "svtools", "FileViewContentEnumerator::enumerateFolderContent:
caught an CommandAbortedException while enumerating!" );
}
catch( Exception& )
{
- DBG_ERRORFILE( "FileViewContentEnumerator::enumerateFolderContent: caught an
exception other than CommandAbortedException while enumerating!" );
+ SAL_INFO( "svtools", "FileViewContentEnumerator::enumerateFolderContent:
caught an exception other than CommandAbortedException while enumerating!" );
}
}
}
catch( CommandAbortedException& )
{
- DBG_ERRORFILE( "FileViewContentEnumerator::enumerateFolderContent: caught an
CommandAbortedException!" );
+ SAL_INFO( "svtools", "FileViewContentEnumerator::enumerateFolderContent: caught an
CommandAbortedException!" );
}
catch( Exception& )
{
- DBG_ERRORFILE( "FileViewContentEnumerator::enumerateFolderContent: caught an exception
other than CommandAbortedException!" );
+ SAL_INFO( "svtools", "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 b2edf1a..83449fe 100644
--- a/svtools/source/contnr/fileview.cxx
+++ b/svtools/source/contnr/fileview.cxx
@@ -1942,7 +1942,7 @@ FileViewResult SvtFileView_Impl::GetFolderContent_Impl(
return eStillRunning;
}
- DBG_ERRORFILE( "SvtFileView_Impl::GetFolderContent_Impl: unreachable!" );
+ SAL_INFO( "svtools", "SvtFileView_Impl::GetFolderContent_Impl: unreachable!" );
return eFailure;
}
@@ -2303,7 +2303,7 @@ void SvtFileView_Impl::CreateVector_Impl( const Sequence < OUString > &rList )
if ( !aDate.isEmpty() )
{
- DBG_ERRORFILE( "Don't know, how to convert date" );
+ SAL_INFO( "svtools", "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 623b5fb..d86468a 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 )
{
- DBG_ERRORFILE( "SvLBox::QueryDrop(): no target" );
+ SAL_INFO( "svtools", "SvLBox::QueryDrop(): no target" );
}
else
{
SvLBoxEntry* pEntry = GetDropTarget( rEvt.maPosPixel );
if( !IsDropFormatSupported( SOT_FORMATSTR_ID_TREELISTBOX ) )
{
- DBG_ERRORFILE( "SvLBox::QueryDrop(): no format" );
+ SAL_INFO( "svtools", "SvLBox::QueryDrop(): no format" );
}
else
{
diff --git a/svtools/source/contnr/svtabbx.cxx b/svtools/source/contnr/svtabbx.cxx
index d9d9309..f68dce2 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
{
- DBG_ERRORFILE( "SvHeaderTabListBox::IsCellCheckBox(): column out of range" );
+ SAL_INFO( "svtools", "SvHeaderTabListBox::IsCellCheckBox(): column out of range" );
}
}
return bRet;
diff --git a/svtools/source/control/calendar.cxx b/svtools/source/control/calendar.cxx
index 20dce27..0cf3041 100644
--- a/svtools/source/control/calendar.cxx
+++ b/svtools/source/control/calendar.cxx
@@ -27,6 +27,7 @@
************************************************************************/
+#include <rtl/oustringostreaminserter.hxx>
#include <rtl/strbuf.hxx>
#include <vcl/svapp.hxx>
#include <tools/table.hxx>
@@ -214,17 +215,13 @@ void Calendar::ImplInit( WinBits nWinStyle )
Application::GetAppLocaleDataWrapper().getLocale());
if (maCalendarWrapper.getUniqueID() != aGregorian)
{
-#ifdef DBG_UTIL
- rtl::OStringBuffer aMsg( "Calendar::ImplInit: No ``gregorian'' calendar available for
locale ``");
- lang::Locale aLoc( Application::GetAppLocaleDataWrapper().getLocale());
- aMsg.append(rtl::OUStringToOString(aLoc.Language,
- RTL_TEXTENCODING_UTF8));
- aMsg.append('-');
- aMsg.append(rtl::OUStringToOString(aLoc.Country,
- RTL_TEXTENCODING_UTF8));
- aMsg.append("'' and other calendars aren't supported. Using en-US fallback.");
- DBG_ERRORFILE(aMsg.getStr());
+#ifdef SAL_LOG_INFO
+ lang::Locale aLoc( Application::GetAppLocaleDataWrapper().getLocale() );
#endif
+ SAL_INFO( "svtools", "Calendar::ImplInit: No ``gregorian'' calendar available for locale
``"
+ << aLoc.Language << "-" << aLoc.Country
+ << "'' and other calendars aren't supported. Using en-US fallback." );
+
/* If we ever wanted to support other calendars than Gregorian a lot of
* rewrite would be necessary to internally replace use of class Date
* with proper class CalendarWrapper methods, get rid of fixed 12
@@ -330,7 +327,7 @@ DayOfWeek Calendar::ImplGetWeekStart() const
eDay = SATURDAY;
break;
default:
- DBG_ERRORFILE("Calendar::ImplGetWeekStart: broken i18n Gregorian calendar
(getFirstDayOfWeek())");
+ SAL_INFO( "svtools", "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 00fc759..95e4371 100644
--- a/svtools/source/control/ruler.cxx
+++ b/svtools/source/control/ruler.cxx
@@ -2728,9 +2728,7 @@ void Ruler::SetUnit( FieldUnit eNewUnit )
mnUnitIndex = RULER_UNIT_LINE;
break;
default:
-#ifdef DBG_UTIL
- DBG_ERRORFILE( "Ruler::SetUnit() - Wrong Unit" );
-#endif
+ SAL_INFO( "svtools", "Ruler::SetUnit() - Wrong Unit" );
break;
}
diff --git a/svtools/source/dialogs/prnsetup.cxx b/svtools/source/dialogs/prnsetup.cxx
index 3f526a9..3e0a140 100644
--- a/svtools/source/dialogs/prnsetup.cxx
+++ b/svtools/source/dialogs/prnsetup.cxx
@@ -26,7 +26,6 @@
*
************************************************************************/
-#include <tools/debug.hxx>
#include <vcl/print.hxx>
#include <svtools/svtdata.hxx>
@@ -366,7 +365,7 @@ short PrinterSetupDialog::Execute()
{
if ( !mpPrinter || mpPrinter->IsPrinting() || mpPrinter->IsJobActive() )
{
- DBG_ERRORFILE( "PrinterSetupDialog::Execute() - No Printer or printer is printing" );
+ SAL_INFO( "svtools", "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 fd9ae22..318383a 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&)
{
- DBG_ERRORFILE( "CommandAbortedException" );
+ SAL_INFO( "svtools", "CommandAbortedException" );
}
catch(const ::com::sun::star::ucb::ContentCreationException&)
{
- DBG_ERRORFILE( "ContentCreationException" );
+ SAL_INFO( "svtools", "ContentCreationException" );
}
catch( ... )
{
-// DBG_ERRORFILE( "Any other exception" );
+ SAL_INFO( "svtools", "Any other exception" );
}
return bExists;
}
@@ -160,11 +160,11 @@ void ImplDirEntryHelper::Kill( const String& rMainUrl )
}
catch(const ::com::sun::star::ucb::CommandAbortedException&)
{
- DBG_ERRORFILE( "CommandAbortedException" );
+ SAL_INFO( "svtools", "CommandAbortedException" );
}
catch( ... )
{
- DBG_ERRORFILE( "Any other exception" );
+ SAL_INFO( "svtools", "Any other exception" );
}
}
diff --git a/svtools/source/misc/ehdl.cxx b/svtools/source/misc/ehdl.cxx
index 950cdcc..d6ee5eb 100644
--- a/svtools/source/misc/ehdl.cxx
+++ b/svtools/source/misc/ehdl.cxx
@@ -27,7 +27,6 @@
************************************************************************/
#include <osl/mutex.hxx>
-#include <tools/debug.hxx>
#include <tools/rcid.h>
#include <tools/wintypes.hxx>
#include <vcl/msgbox.hxx>
@@ -119,7 +118,7 @@ static sal_uInt16 aWndFunc(
default:
{
- DBG_ERRORFILE( "no MessBox type");
+ SAL_INFO( "svtools", "no MessBox type");
pBox = NULL;
return ERRCODE_BUTTON_OK;
}
@@ -144,7 +143,7 @@ static sal_uInt16 aWndFunc(
nRet = ERRCODE_BUTTON_NO;
break;
default:
- DBG_ERRORFILE( "Unknown MessBox return value" );
+ SAL_INFO( "svtools", "Unknown MessBox return value" );
break;
}
delete pBox;
@@ -459,7 +458,7 @@ sal_Bool SfxErrorContext::GetString(sal_uLong nErrId, String &rStr)
}
else
{
- DBG_ERRORFILE( "ErrorContext cannot find the resource" );
+ SAL_INFO( "svtools", "ErrorContext cannot find the resource" );
bRet = false;
}
diff --git a/svtools/source/misc/templatefoldercache.cxx
b/svtools/source/misc/templatefoldercache.cxx
index c64aa8b..8962946 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
{
- DBG_ERRORFILE( "This method must not be used, the whole URL must be stored!" );
+ SAL_INFO( "svtools", "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& )
{
- DBG_ERRORFILE( "TemplateFolderCacheImpl::implReadFolder: caught a
CommandAbortedException!" );
+ SAL_INFO( "svtools", "TemplateFolderCacheImpl::implReadFolder: caught a
CommandAbortedException!" );
return sal_False;
}
catch( ::com::sun::star::uno::Exception& )
diff --git a/tools/source/datetime/tdate.cxx b/tools/source/datetime/tdate.cxx
index c9614d2..d7eb401 100644
--- a/tools/source/datetime/tdate.cxx
+++ b/tools/source/datetime/tdate.cxx
@@ -33,8 +33,8 @@
#include <time.h>
#endif
-#include <tools/debug.hxx>
#include <tools/date.hxx>
+#include <sal/log.hxx>
#ifdef MACOSX
extern "C" {
struct tm *localtime_r(const time_t *timep, struct tm *buffer);
@@ -233,7 +233,7 @@ sal_uInt16 Date::GetWeekOfYear( DayOfWeek eStartDay,
if (nMinimumNumberOfDaysInWeek < 1 || 7 < nMinimumNumberOfDaysInWeek)
{
- DBG_ERRORFILE("Date::GetWeekOfYear: invalid nMinimumNumberOfDaysInWeek");
+ SAL_INFO( "tools", "Date::GetWeekOfYear: invalid nMinimumNumberOfDaysInWeek" );
nMinimumNumberOfDaysInWeek = 4;
}
diff --git a/tools/source/inet/inetstrm.cxx b/tools/source/inet/inetstrm.cxx
index aae2fe7..a525b57 100644
--- a/tools/source/inet/inetstrm.cxx
+++ b/tools/source/inet/inetstrm.cxx
@@ -31,7 +31,6 @@
#include <rtl/memory.h>
#include <rtl/strbuf.hxx>
#include <tools/cachestr.hxx>
-#include <tools/debug.hxx>
#include <tools/inetmsg.hxx>
#include <tools/inetstrm.hxx>
@@ -1672,7 +1671,7 @@ int INetMIMEMessageStream::PutMsgLine (const sal_Char *pData, sal_uIntPtr
nSize)
return status;
}
else {
- DBG_ERRORFILE( "Die Boundary nicht gefunden" );
+ SAL_INFO( "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 e3c7f27..00137a2 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.
- DBG_ERRORFILE("AllSettings::Update: who calls with SETTINGS_INTERNATIONAL and why? You're
flogging a dead horse.");
+ SAL_INFO( "vcl","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 6dda5e8..e93b78e 100644
--- a/vcl/source/control/field2.cxx
+++ b/vcl/source/control/field2.cxx
@@ -26,8 +26,6 @@
*
************************************************************************/
-#include <tools/debug.hxx>
-
#include <tools/rc.h>
#include <vcl/svapp.hxx>
#include <vcl/sound.hxx>
@@ -170,7 +168,7 @@ static int ImplIsPatternChar( xub_Unicode cChar, sal_Char cEditMask )
}
catch ( ::com::sun::star::uno::Exception& )
{
- DBG_ERRORFILE( "ImplIsPatternChar: Exception caught!" );
+ SAL_INFO( "vcl", "ImplIsPatternChar: Exception caught!" );
return sal_False;
}
diff --git a/vcl/source/gdi/outdev.cxx b/vcl/source/gdi/outdev.cxx
index 45887a9..44b2758 100644
--- a/vcl/source/gdi/outdev.cxx
+++ b/vcl/source/gdi/outdev.cxx
@@ -436,7 +436,7 @@ OutputDevice::~OutputDevice()
ImplObjStack* pData = mpObjStack;
if ( pData )
{
- DBG_ERRORFILE( "OutputDevice::~OutputDevice(): OutputDevice::Push() calls !=
OutputDevice::Pop() calls" );
+ SAL_INFO( "vcl", "OutputDevice::~OutputDevice(): OutputDevice::Push() calls !=
OutputDevice::Pop() calls" );
while ( pData )
{
ImplObjStack* pTemp = pData;
@@ -2461,7 +2461,7 @@ void OutputDevice::Pop()
if ( !pData )
{
- DBG_ERRORFILE( "OutputDevice::Pop() without OutputDevice::Push()" );
+ SAL_INFO( "vcl", "OutputDevice::Pop() without OutputDevice::Push()" );
return;
}
diff --git a/vcl/source/gdi/outmap.cxx b/vcl/source/gdi/outmap.cxx
index 6fca015..abda8cb 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 )
{
- DBG_ERRORFILE( "Not implemented MapUnit" );
+ SAL_INFO( "vcl", "Not implemented MapUnit" );
}
else if ( eNew > MAP_PIXEL )
{
- DBG_ERRORFILE( "Not implemented MapUnit" );
+ SAL_INFO( "vcl", "Not implemented MapUnit" );
}
else
{
diff --git a/vcl/source/gdi/print3.cxx b/vcl/source/gdi/print3.cxx
index d85321b..0c484c5 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&)
{
- DBG_ERRORFILE( "caught IllegalArgumentException when registering filter\n" );
+ SAL_INFO( "vcl", "caught IllegalArgumentException when registering filter\n" );
}
if( xFilePicker->execute() == ui::dialogs::ExecutableDialogResults::OK )
diff --git a/vcl/source/window/btndlg.cxx b/vcl/source/window/btndlg.cxx
index d97cabb..d19196f 100644
--- a/vcl/source/window/btndlg.cxx
+++ b/vcl/source/window/btndlg.cxx
@@ -27,7 +27,6 @@
************************************************************************/
-#include <tools/debug.hxx>
#include <tools/rc.h>
#include <svdata.hxx>
@@ -345,7 +344,7 @@ void ButtonDialog::RemoveButton( sal_uInt16 nId )
}
if (it == maItemList.end())
- DBG_ERRORFILE( "ButtonDialog::RemoveButton(): ButtonId invalid" );
+ SAL_INFO( "vcl", "ButtonDialog::RemoveButton(): ButtonId invalid" );
}
void ButtonDialog::Clear()
diff --git a/xmloff/source/chart/SchXMLExport.cxx b/xmloff/source/chart/SchXMLExport.cxx
index f739153..48d0b69 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 & )
{
- DBG_ERRORFILE( "Properties missing" );
+ SAL_INFO( "vcl", "Properties missing" );
}
}
}
diff --git a/xmloff/source/chart/SchXMLPlotAreaContext.cxx
b/xmloff/source/chart/SchXMLPlotAreaContext.cxx
index 4c6969d..3b0e4c2 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 & )
{
- DBG_ERRORFILE( "Properties missing" );
+ SAL_INFO( "vcl", "Properties missing" );
}
}
}
diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx
index 8576dae..f80a0ed 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 {
- DBG_ERRORFILE("why is it no boolean?");
+ SAL_INFO( "xmloff","why is it no boolean?");
}
}
}
diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx
index 7799c38..4440b05 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 {
- DBG_ERRORFILE("why is it no boolean?");
+ SAL_INFO( "xmloff","why is it no boolean?");
}
}
}
diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
index 153e022..142d209 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() )
{
- DBG_ERRORFILE( "no certificate selected" );
+ SAL_INFO( "xmloff", "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 69ac219..078fc88 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& )
{
- DBG_ERRORFILE( "MacroSecurityTrustedSourcesTP::AddLocPBHdl(): exception from folder
picker" );
+ SAL_INFO( "xmlsecurity", "MacroSecurityTrustedSourcesTP::AddLocPBHdl(): exception from
folder picker" );
}
return 0;
diff --git a/xmlsecurity/source/dialogs/stbcontrl.cxx b/xmlsecurity/source/dialogs/stbcontrl.cxx
index e3a988a..863b418 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
{
- DBG_ERRORFILE( "+XmlSecStatusBarControl::StateChanged(): invalid item type" );
+ SAL_INFO( "xmlsecurity", "+XmlSecStatusBarControl::StateChanged(): invalid item type" );
mpImpl->mbSigned = false;
}
--------------true--
Context
- [Libreoffice] [PATCH] Replaced DBG_ERRORFILE with SAL_INFO. · Marcel Metz
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.