Replaced DBG_ERRORFILE with SAL_INFO.

11 files changed, 35 insertions, 42 deletions

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& )