diff options
author | Marcel Metz <mmetz@adrian-broher.net> | 2012-01-11 10:02:26 +0100 |
---|---|---|
committer | David Tardon <dtardon@redhat.com> | 2012-01-16 12:51:29 +0100 |
commit | 157d414977a6b80d2654767419fe2e406024ea04 (patch) | |
tree | a3af6d6af0aa082765c2635d75cba4079e287bed /unotools/source/config | |
parent | aad000dcef7b5c9a6fe4bad6abd4245e357b850f (diff) |
Replaced DBG_ERRORFILE with SAL_INFO.
Diffstat (limited to 'unotools/source/config')
-rw-r--r-- | unotools/source/config/defaultoptions.cxx | 8 | ||||
-rw-r--r-- | unotools/source/config/extendedsecurityoptions.cxx | 2 | ||||
-rw-r--r-- | unotools/source/config/pathoptions.cxx | 3 | ||||
-rw-r--r-- | unotools/source/config/saveopt.cxx | 8 | ||||
-rw-r--r-- | unotools/source/config/sourceviewconfig.cxx | 2 | ||||
-rw-r--r-- | unotools/source/config/syslocaleoptions.cxx | 12 | ||||
-rw-r--r-- | unotools/source/config/undoopt.cxx | 2 | ||||
-rw-r--r-- | unotools/source/config/useroptions.cxx | 6 |
8 files changed, 21 insertions, 22 deletions
diff --git a/unotools/source/config/defaultoptions.cxx b/unotools/source/config/defaultoptions.cxx index 1b9d386c1bc1..735dc35ce0c5 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 1608cdc02c44..f29a305fc93f 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 3be2d1ccea02..e8538ddde84e 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 e0846d8ceaf2..24d764388dc9 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 843e7559ba21..2c611ea92877 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 d0ca93131bcc..a88d54a9ef8c 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 ad01ca4d829a..1240fed8ba2d 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 cec823ebfc9d..503b5451de42 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; } |