Replaced DBG_ERRORFILE with SAL_INFO.

20 files changed, 75 insertions, 108 deletions

diff --git a/sfx2/source/appl/appcfg.cxx b/sfx2/source/appl/appcfg.cxx
index 2a17778d7039..500d60ffd022 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 659c81696554..067747c3a2d4 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 9fe9a833d6d6..ab6b930a3660 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 deb135a4f2e0..bbf9cb6e94e1 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 daca88081cfc..e486eb4c64af 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 53253d109fff..37d3918362cf 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 0dd391c55fa4..ca6e48236a8d 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 d369db799fe7..c60d9a0ba7b2 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 a28438310472..1c18d3f8fcf6 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 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();
     }
 
diff --git a/sfx2/source/doc/doctempl.cxx b/sfx2/source/doc/doctempl.cxx
index d3878d9c7011..61ca3f6bacac 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 fce978ccdc64..923c18c5e15f 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 74bf26724936..7003c0dfe92a 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 f42ed879124a..42250f87ccc9 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 474a9219cebd..18276e76094f 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 9bfb4e67695d..b226f484b517 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;
         }