summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--accessibility/source/extended/AccessibleBrowseBoxBase.cxx4
-rw-r--r--accessibility/source/extended/AccessibleGridControlBase.cxx4
-rw-r--r--accessibility/source/standard/vclxaccessibletoolboxitem.cxx2
-rw-r--r--cui/source/customize/cfg.cxx4
-rw-r--r--cui/source/dialogs/iconcdlg.cxx4
-rw-r--r--cui/source/dialogs/srchxtra.cxx7
-rw-r--r--cui/source/factory/dlgfact.cxx2
-rw-r--r--cui/source/options/cfgchart.cxx4
-rw-r--r--cui/source/options/optctl.cxx2
-rw-r--r--cui/source/options/optgdlg.cxx4
-rw-r--r--cui/source/options/optjava.cxx8
-rw-r--r--cui/source/options/optlingu.cxx4
-rw-r--r--cui/source/options/optpath.cxx4
-rw-r--r--cui/source/options/treeopt.cxx10
-rw-r--r--cui/source/tabpages/chardlg.cxx4
-rw-r--r--cui/source/tabpages/paragrph.cxx2
-rw-r--r--dbaccess/source/ui/misc/UITools.cxx2
-rw-r--r--editeng/source/items/frmitems.cxx4
-rw-r--r--editeng/source/items/paraitem.cxx4
-rw-r--r--editeng/source/items/textitem.cxx2
-rw-r--r--formula/source/core/api/FormulaCompiler.cxx4
-rw-r--r--formula/source/core/api/token.cxx28
-rw-r--r--fpicker/source/office/OfficeControlAccess.cxx8
-rw-r--r--fpicker/source/office/OfficeFilePicker.cxx3
-rw-r--r--fpicker/source/office/iodlg.cxx4
-rw-r--r--framework/source/classes/fwktabwindow.cxx6
-rw-r--r--linguistic/source/convdiclist.cxx4
-rw-r--r--sc/inc/formularesult.hxx4
-rw-r--r--sc/source/core/data/dptabsrc.cxx2
-rw-r--r--sc/source/core/tool/lookupcache.cxx2
-rw-r--r--sc/source/ui/docshell/dbdocimp.cxx2
-rw-r--r--sd/source/ui/dlg/sdtreelb.cxx2
-rw-r--r--svl/source/items/srchitem.cxx2
-rw-r--r--svl/source/numbers/zforfind.cxx4
-rw-r--r--svl/source/numbers/zforlist.cxx10
-rw-r--r--svl/source/numbers/zformat.cxx4
-rw-r--r--svl/source/numbers/zforscan.cxx8
-rw-r--r--svtools/source/config/helpopt.cxx10
-rw-r--r--svtools/source/contnr/contentenumeration.cxx10
-rw-r--r--svtools/source/contnr/fileview.cxx4
-rw-r--r--svtools/source/contnr/svlbox.cxx4
-rw-r--r--svtools/source/contnr/svtabbx.cxx2
-rw-r--r--svtools/source/control/calendar.cxx19
-rw-r--r--svtools/source/control/ruler.cxx4
-rw-r--r--svtools/source/dialogs/prnsetup.cxx3
-rw-r--r--svtools/source/filter/filter.cxx10
-rw-r--r--svtools/source/misc/ehdl.cxx7
-rw-r--r--svtools/source/misc/templatefoldercache.cxx4
-rw-r--r--tools/source/datetime/tdate.cxx4
-rw-r--r--tools/source/inet/inetstrm.cxx3
-rw-r--r--vcl/source/app/settings.cxx2
-rw-r--r--vcl/source/control/field2.cxx4
-rw-r--r--vcl/source/gdi/outdev.cxx4
-rw-r--r--vcl/source/gdi/outmap.cxx4
-rw-r--r--vcl/source/gdi/print3.cxx2
-rw-r--r--vcl/source/window/btndlg.cxx3
-rw-r--r--xmloff/source/chart/SchXMLExport.cxx2
-rw-r--r--xmloff/source/chart/SchXMLPlotAreaContext.cxx2
-rw-r--r--xmloff/source/core/xmlexp.cxx2
-rw-r--r--xmloff/source/core/xmlimp.cxx2
-rw-r--r--xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx2
-rw-r--r--xmlsecurity/source/dialogs/macrosecurity.cxx2
-rw-r--r--xmlsecurity/source/dialogs/stbcontrl.cxx2
63 files changed, 136 insertions, 159 deletions
diff --git a/accessibility/source/extended/AccessibleBrowseBoxBase.cxx b/accessibility/source/extended/AccessibleBrowseBoxBase.cxx
index 842f65a4e0f0..8f156721881a 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 cfd65874b6ff..147aaee15cde 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 e8fc1fdfe918..c8a3c1b9d900 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 35de8426617a..f744d3b00a08 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 73921d70cfd5..1c162932e48a 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 2e36a529f5f8..34aaf9e48c79 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 55b2b727fbe5..8425b809cb1c 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 bac4fb45bfc8..edef3a1fdcc5 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 2589874d1270..51bf7ad39ccc 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 bc86de6241df..c55e8e4489a4 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 a32869e42652..43f2373ffb8c 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 736bfe0b5936..8a800d381af1 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 c6f6b7341780..7abc6fffa102 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 9d02f0fe4d84..64fe2c50680f 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 9d320b4410a1..adb659740f3f 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 d874c326c57a..2bdebeb25836 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 b3e654097527..d77c9dabcfdb 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 a196a1e53a54..08b8379fcd44 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 3f7ace02048e..283b1bd266a7 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 e0117a59e908..2a1dfee2678b 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 ee6530c2ac32..92424152325c 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 d0e8bb8d52a5..c8bd3ab5c895 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 8b8288db36c1..45a3e33f2a22 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 c5f1a56dbfe2..f789f4b569b7 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 ac2b0a62e877..0ab97df93d7b 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 3497e78cfbab..b43895e16723 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 2c1dd4908851..93af0f049ba0 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 2aa674c359f2..7a34de8bf218 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 e537c1826cfa..5dc0d2eb35c5 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 6d9b78e5cf4c..a9b42ca5df9f 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 829d36e5beb3..09f4b7162aeb 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 4c16804ac19f..50e3486ada6e 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 d4c05c0892a4..776fc9f83601 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 7d6f99e4e913..d944a119a6cd 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 30bd5a756e0c..e2de4475a582 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 1976ec90afca..0317ddb029d9 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 e1f1ac18c200..7f142973ca17 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 a72926e6ce41..aeac4571b2d4 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 8f20827a898a..94fd22745307 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 b2edf1ab33ca..83449fe42b90 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 623b5fbebadf..d86468a587f2 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 d9d93092b087..f68dce2fc413 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 20dce27f1469..0cf3041ad2bd 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 00fc75935108..95e43711e931 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 3f526a9be57c..3e0a140b56d0 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 fd9ae223f7f3..318383a4b955 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 950cdcc8ab58..d6ee5eb20947 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 c64aa8b3c30f..8962946fbb60 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 c9614d2de759..d7eb40114044 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 aae2fe7cc945..a525b57993fb 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 e3c7f2732e8c..00137a2961a6 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 6dda5e8c528e..e93b78e8188d 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 45887a9f5d91..44b2758b1ed7 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 6fca015a7066..abda8cbdfbee 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 d85321bea28b..0c484c5c4a0a 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 d97cabb124bf..d19196fd6165 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 f739153512af..48d0b69ea69e 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 4c6969d81486..3b0e4c24b30e 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 8576daed90ed..f80a0ed0c479 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 7799c38c7bb1..4440b05b2441 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 153e0228294d..142d2092fd56 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 69ac219bbc5c..078fc88f565e 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 e3a988a52f83..863b41844504 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;
}