Replaced DBG_ERRORFILE with SAL_INFO.

5 files changed, 24 insertions, 50 deletions

diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index 2020bd9cf6c2..66b2474c17a4 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 f09ad4de2d66..7500a7a51748 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 b32342eda485..4eaf796cd113 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 18340c1ce9ce..5e0c2bf611e9 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 cb12153f9c2b..decc6372f56c 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();
     }