fdo#63690 - replace RTL_CONTEXT_ macros with SAL_INFO

Change-Id: I26ca00f345b4f8b47dc35cd22652ef55f6d99536
Reviewed-on: https://gerrit.libreoffice.org/5218
Reviewed-by: Ioan Radu <ioan.radu.g@gmail.com>
Reviewed-by: Luboš Luňák <l.lunak@suse.cz>
Tested-by: Luboš Luňák <l.lunak@suse.cz>

5 files changed, 7 insertions, 33 deletions

diff --git a/sw/source/ui/app/docsh.cxx b/sw/source/ui/app/docsh.cxx
index e4045107a16c..cdc1d26c18d8 100644
--- a/sw/source/ui/app/docsh.cxx
+++ b/sw/source/ui/app/docsh.cxx
@@ -19,7 +19,6 @@
 
 
 #include <hintids.hxx>
-#include <rtl/logfile.hxx>
 #include <vcl/msgbox.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/wrkwin.hxx>
@@ -216,8 +215,6 @@ Reader* SwDocShell::StartConvertFrom(SfxMedium& rMedium, SwReader** ppRdr,
 // Loading
 sal_Bool SwDocShell::ConvertFrom( SfxMedium& rMedium )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLog, "SW", "JP93722",  "SwDocShell::ConvertFrom" );
-
     SwReader* pRdr;
     SwRead pRead = StartConvertFrom(rMedium, &pRdr);
     if (!pRead)
@@ -273,7 +270,6 @@ sal_Bool SwDocShell::ConvertFrom( SfxMedium& rMedium )
 // Saving the Default-Format, Stg present
 sal_Bool SwDocShell::Save()
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLog, "SW", "JP93722",  "SwDocShell::Save" );
     //#i3370# remove quick help to prevent saving of autocorrection suggestions
     if(pView)
         pView->GetEditWin().StopQuickHelp();
@@ -362,8 +358,6 @@ sal_Bool SwDocShell::Save()
 // Save using the Defaultformat
 sal_Bool SwDocShell::SaveAs( SfxMedium& rMedium )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLog, "SW", "JP93722",  "SwDocShell::SaveAs" );
-
     SwWait aWait( *this, sal_True );
     //#i3370# remove quick help to prevent saving of autocorrection suggestions
     if(pView)
@@ -498,7 +492,6 @@ static SwSrcView* lcl_GetSourceView( SwDocShell* pSh )
 
 sal_Bool SwDocShell::ConvertTo( SfxMedium& rMedium )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLog, "SW", "JP93722",  "SwDocShell::ConvertTo" );
     const SfxFilter* pFlt = rMedium.GetFilter();
     if( !pFlt )
         return sal_False;
@@ -734,7 +727,6 @@ sal_Bool SwDocShell::ConvertTo( SfxMedium& rMedium )
 // do not yet activate, must deliver TRUE
 sal_Bool SwDocShell::SaveCompleted( const uno::Reference < embed::XStorage >& xStor  )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLog, "SW", "JP93722",  "SwDocShell::SaveCompleted" );
     sal_Bool bRet = SfxObjectShell::SaveCompleted( xStor );
     if( bRet )
     {
diff --git a/sw/source/ui/app/docshini.cxx b/sw/source/ui/app/docshini.cxx
index 5b373892e7d9..7910a1a5c3d1 100644
--- a/sw/source/ui/app/docshini.cxx
+++ b/sw/source/ui/app/docshini.cxx
@@ -40,7 +40,6 @@
 #include <linguistic/lngprops.hxx>
 #include <com/sun/star/document/UpdateDocMode.hpp>
 #include <com/sun/star/i18n/ScriptType.hpp>
-#include <rtl/logfile.hxx>
 #include <sfx2/docfilt.hxx>
 #include <svx/xtable.hxx>
 #include <svx/drawitem.hxx>
@@ -92,8 +91,6 @@ using namespace ::com::sun::star;
 // Load Document
 sal_Bool SwDocShell::InitNew( const uno::Reference < embed::XStorage >& xStor )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLog, "SW", "JP93722",  "SwDocShell::InitNew" );
-
     sal_Bool bRet = SfxObjectShell::InitNew( xStor );
     OSL_ENSURE( GetMapUnit() == MAP_TWIP, "map unit is not twip!" );
     sal_Bool bHTMLTemplSet = sal_False;
@@ -326,7 +323,6 @@ SwDocShell::SwDocShell( SfxObjectCreateMode eMode ) :
     nUpdateDocMode(document::UpdateDocMode::ACCORDING_TO_CONFIG),
     bInUpdateFontList(false)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLog, "SW", "JP93722",  "SwDocShell::SwDocShell" );
     Init_Impl();
 }
 
@@ -341,7 +337,6 @@ SwDocShell::SwDocShell( const sal_uInt64 i_nSfxCreationFlags ) :
     nUpdateDocMode(document::UpdateDocMode::ACCORDING_TO_CONFIG),
     bInUpdateFontList(false)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLog, "SW", "JP93722",  "SwDocShell::SwDocShell" );
     Init_Impl();
 }
 
@@ -356,7 +351,6 @@ SwDocShell::SwDocShell( SwDoc *pD, SfxObjectCreateMode eMode ):
     nUpdateDocMode(document::UpdateDocMode::ACCORDING_TO_CONFIG),
     bInUpdateFontList(false)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLog, "SW", "JP93722",  "SwDocShell::SwDocShell" );
     Init_Impl();
 }
 
@@ -473,11 +467,10 @@ void SwDocShell::ReactivateModel()
 // Load, Default-Format
 sal_Bool  SwDocShell::Load( SfxMedium& rMedium )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLog, "SW", "JP93722",  "SwDocShell::Load" );
     sal_Bool bRet = sal_False;
     if( SfxObjectShell::Load( rMedium ))
     {
-        RTL_LOGFILE_CONTEXT_TRACE( aLog, "after SfxInPlaceObject::Load" );
+        SAL_INFO( "sw.ui", "after SfxInPlaceObject::Load" );
         if( pDoc )              // for last version!!
             RemoveLink();       // release the existing
 
@@ -526,12 +519,11 @@ sal_Bool  SwDocShell::Load( SfxMedium& rMedium )
                     if( pReader )
                     {
                         // set Doc's DocInfo at DocShell-Medium
-                        RTL_LOGFILE_CONTEXT_TRACE( aLog, "before ReadDocInfo" );
+                        SAL_INFO( "sw.ui", "before ReadDocInfo" );
                         SwReader aRdr( rMedium, aEmptyStr, pDoc );
-                        RTL_LOGFILE_CONTEXT_TRACE( aLog, "before Read" );
+                        SAL_INFO( "sw.ui", "before Read" );
                         nErr = aRdr.Read( *pReader );
-                        RTL_LOGFILE_CONTEXT_TRACE( aLog, "after Read" );
-
+                        SAL_INFO( "sw.ui", "after Read" );
                         // If a XML document is loaded, the global doc/web doc
                         // flags have to be set, because they aren't loaded
                         // by this formats.
@@ -574,7 +566,6 @@ sal_Bool  SwDocShell::Load( SfxMedium& rMedium )
 
 sal_Bool  SwDocShell::LoadFrom( SfxMedium& rMedium )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLog, "SW", "JP93722",  "SwDocShell::LoadFrom" );
     sal_Bool bRet = sal_False;
     if( pDoc )
         RemoveLink();
diff --git a/sw/source/ui/app/swdll.cxx b/sw/source/ui/app/swdll.cxx
index 7946fd5a127d..a8a7dd2245ea 100644
--- a/sw/source/ui/app/swdll.cxx
+++ b/sw/source/ui/app/swdll.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <svx/svdobj.hxx>
-#include <rtl/logfile.hxx>
 
 #include "globdoc.hrc"
 
@@ -77,8 +76,6 @@ namespace SwGlobals
 
 SwDLL::SwDLL()
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLog, "SW", "JP93722",  "SwDLL" );
-
     // the SdModule must be created
     SwModule** ppShlPtr = (SwModule**) GetAppData(SHL_WRITER);
     if ( *ppShlPtr )
@@ -117,8 +114,7 @@ SwDLL::SwDLL()
 
     SdrObjFactory::InsertMakeObjectHdl( LINK( &aSwObjectFactory, SwObjectFactory, MakeObject ) );
 
-    RTL_LOGFILE_CONTEXT_TRACE( aLog, "Init Core/UI/Filter" );
-
+    SAL_INFO( "sw.ui", "Init Core/UI/Filter" );
     // Initialisation of Statics
     ::_InitCore();
     filters_.reset(new sw::Filters);
diff --git a/sw/source/ui/uiview/view.cxx b/sw/source/ui/uiview/view.cxx
index 178919720955..aeff407a3546 100644
--- a/sw/source/ui/uiview/view.cxx
+++ b/sw/source/ui/uiview/view.cxx
@@ -24,7 +24,6 @@
 #include <hintids.hxx>
 #include <comphelper/string.hxx>
 #include <officecfg/Office/Common.hxx>
-#include <rtl/logfile.hxx>
 #include <vcl/graph.hxx>
 #include <vcl/inputctx.hxx>
 #include <basic/sbxobj.hxx>
@@ -739,8 +738,6 @@ SwView::SwView( SfxViewFrame *_pFrame, SfxViewShell* pOldSh )
     // If the view is switch from one to another, the 'old' view is given by
     // parameter <pOldSh>.
 
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLog, "SW", "JP93722",  "SwView::SwView" );
-
     m_bCenterCrsr = m_bTopCrsr = m_bAlwaysShowSel = m_bTabColFromDoc = m_bTabRowFromDoc =
     m_bSetTabColFromDoc = m_bSetTabRowFromDoc = m_bAttrChgNotified = m_bAttrChgNotifiedWithRegistrations =
     m_bVerbsActive = m_bDrawRotate = m_bInOuterResizePixel = m_bInInnerResizePixel =
@@ -799,7 +796,7 @@ SwView::SwView( SfxViewFrame *_pFrame, SfxViewShell* pOldSh )
             bOldShellWasSrcView = sal_True;
     }
 
-    RTL_LOGFILE_CONTEXT_TRACE( aLog, "before create WrtShell" );
+    SAL_INFO( "sw.ui", "before create WrtShell" );
     if(PTR_CAST( SwView, pExistingSh))
     {
         m_pWrtShell = new SwWrtShell( *((SwView*)pExistingSh)->m_pWrtShell,
@@ -855,8 +852,7 @@ SwView::SwView( SfxViewFrame *_pFrame, SfxViewShell* pOldSh )
             }
         }
     }
-    RTL_LOGFILE_CONTEXT_TRACE( aLog, "after create WrtShell" );
-
+    SAL_INFO( "sw.ui", "after create WrtShell" );
     m_pHRuler = new SwCommentRuler(m_pWrtShell, &GetViewFrame()->GetWindow(), m_pEditWin,
                 SVXRULER_SUPPORT_TABS |
                 SVXRULER_SUPPORT_PARAGRAPH_MARGINS |
diff --git a/sw/source/ui/uno/swdetect.cxx b/sw/source/ui/uno/swdetect.cxx
index 5c3d987ba782..61007216fc9f 100644
--- a/sw/source/ui/uno/swdetect.cxx
+++ b/sw/source/ui/uno/swdetect.cxx
@@ -35,7 +35,6 @@
 #include <toolkit/helper/vclunohelper.hxx>
 #include <ucbhelper/simpleinteractionrequest.hxx>
 #include <rtl/ustring.h>
-#include <rtl/logfile.hxx>
 #include <svl/itemset.hxx>
 #include <vcl/window.hxx>
 #include <svl/eitem.hxx>