[Libreoffice-commits] core.git: sw/inc sw/qa sw/source
Jelle van der Waa
jelle at vdwaa.nl
Thu Aug 1 10:00:43 PDT 2013
sw/inc/pch/precompiled_sw.hxx | 1 -
sw/qa/core/Test-BigPtrArray.cxx | 30 ++++++++++++------------------
sw/source/core/doc/docdraw.cxx | 13 ++++---------
sw/source/core/doc/docfmt.cxx | 3 ---
sw/source/core/doc/doclay.cxx | 1 -
sw/source/core/doc/docnew.cxx | 3 ---
sw/source/core/view/vnew.cxx | 13 ++-----------
sw/source/filter/xml/swxml.cxx | 12 +++---------
sw/source/filter/xml/wrtxml.cxx | 17 ++++-------------
sw/source/ui/app/docsh.cxx | 8 --------
sw/source/ui/app/docshini.cxx | 17 ++++-------------
sw/source/ui/app/swdll.cxx | 6 +-----
sw/source/ui/uiview/view.cxx | 8 ++------
sw/source/ui/uno/swdetect.cxx | 1 -
14 files changed, 32 insertions(+), 101 deletions(-)
New commits:
commit a1e10f8b468d5f0b2ddb2d3dc1be2cdfdd9b2409
Author: Jelle van der Waa <jelle at vdwaa.nl>
Date: Wed Jul 31 16:49:21 2013 +0200
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 at gmail.com>
Reviewed-by: Luboš Luňák <l.lunak at suse.cz>
Tested-by: Luboš Luňák <l.lunak at suse.cz>
diff --git a/sw/inc/pch/precompiled_sw.hxx b/sw/inc/pch/precompiled_sw.hxx
index 22707f2..f665f784 100644
--- a/sw/inc/pch/precompiled_sw.hxx
+++ b/sw/inc/pch/precompiled_sw.hxx
@@ -620,7 +620,6 @@
#include <rsc/rscsfx.hxx>
#include <rtl/bootstrap.hxx>
#include <rtl/instance.hxx>
-#include <rtl/logfile.hxx>
#include <rtl/math.hxx>
#include <rtl/random.h>
#include <rtl/ref.hxx>
diff --git a/sw/qa/core/Test-BigPtrArray.cxx b/sw/qa/core/Test-BigPtrArray.cxx
index bc177cc..9c5956f 100644
--- a/sw/qa/core/Test-BigPtrArray.cxx
+++ b/sw/qa/core/Test-BigPtrArray.cxx
@@ -28,8 +28,6 @@
#include <string.h>
#include <stdlib.h>
-#include <rtl/logfile.hxx>
-
#include <bparr.hxx>
using namespace std;
@@ -107,10 +105,6 @@ namespace /* private */
for (sal_uLong i = 0; i < bparr.Count(); i++)
delete bparr[i];
}
-
-#ifdef TIMELOG
- RTL_LOGFILE_CONTEXT(logFile, "BigPtrArray performance measures" );
-#endif
}
class BigPtrArrayUnittest : public CppUnit::TestFixture
@@ -144,7 +138,7 @@ public:
printMethodName("test_insert_entries_at_front\n");
#ifdef TIMELOG
- RTL_LOGFILE_CONTEXT_TRACE(logFile, "START: test_insert_entries_at_front");
+ SAL_INFO( "sw.core", "START: test_insert_entries_at_front" );
#endif
BigPtrArray bparr;
@@ -161,7 +155,7 @@ public:
}
#ifdef TIMELOG
- RTL_LOGFILE_CONTEXT_TRACE(logFile, "END: test_insert_entries_at_front");
+ SAL_INFO( "sw.core", "END: test_insert_entries_at_front" );
#endif
for (sal_uLong i = 0, j = NUM_ENTRIES - 1; i < NUM_ENTRIES; i++, j--)
@@ -188,7 +182,7 @@ public:
printMethodName("test_insert_entries_in_the_middle\n");
#ifdef TIMELOG
- RTL_LOGFILE_CONTEXT_TRACE(logFile, "START: test_insert_entries_in_the_middle");
+ SAL_INFO( "sw.core", "START: test_insert_entries_in_the_middle" );
#endif
BigPtrArray bparr;
@@ -201,7 +195,7 @@ public:
bparr.Insert(new BigPtrEntryMock(NUM_ENTRIES), bparr.Count() / 2);
#ifdef TIMELOG
- RTL_LOGFILE_CONTEXT_TRACE(logFile, "END: test_insert_entries_in_the_middle");
+ SAL_INFO( "sw.core", "END: test_insert_entries_in_the_middle" );
#endif
CPPUNIT_ASSERT_MESSAGE
@@ -225,7 +219,7 @@ public:
printMethodName("test_insert_at_already_used_index\n");
#ifdef TIMELOG
- RTL_LOGFILE_CONTEXT_TRACE(logFile, "START: test_insert_at_already_used_index");
+ SAL_INFO( "sw.core", "START: test_insert_at_already_used_index" );
#endif
BigPtrArray bparr;
@@ -239,7 +233,7 @@ public:
bparr.Insert(new BigPtrEntryMock(j), i);
#ifdef TIMELOG
- RTL_LOGFILE_CONTEXT_TRACE(logFile, "END: test_insert_at_already_used_index");
+ SAL_INFO( "sw.core", "END: test_insert_at_already_used_index" );
#endif
CPPUNIT_ASSERT_MESSAGE
@@ -300,7 +294,7 @@ public:
printMethodName("test_remove_at_front\n");
#ifdef TIMELOG
- RTL_LOGFILE_CONTEXT_TRACE(logFile, "START: test_remove_at_front");
+ SAL_INFO( "sw.core", "START: test_remove_at_front" );
#endif
BigPtrArray bparr;
@@ -340,7 +334,7 @@ public:
}
#ifdef TIMELOG
- RTL_LOGFILE_CONTEXT_TRACE(logFile, "END: test_remove_at_front");
+ SAL_INFO( "sw.core", "END: test_remove_at_front" );
#endif
}
@@ -389,7 +383,7 @@ public:
printMethodName("test_remove_in_the_middle\n");
#ifdef TIMELOG
- RTL_LOGFILE_CONTEXT_TRACE(logFile, "START: test_remove_in_the_middle");
+ SAL_INFO( "sw.core", "START: test_remove_in_the_middle" );
#endif
BigPtrArray bparr;
@@ -429,7 +423,7 @@ public:
dumpBigPtrArray(bparr);
}
#ifdef TIMELOG
- RTL_LOGFILE_CONTEXT_TRACE(logFile, "END: test_remove_in_the_middle");
+ SAL_INFO( "sw.core", "END: test_remove_in_the_middle" );
#endif
}
@@ -790,14 +784,14 @@ public:
startString_ += methodName;
endString_ += methodName;
#ifdef TIMELOG
- RTL_LOGFILE_CONTEXT_TRACE(logFile, startString_.c_str());
+ SAL_INFO( "sw.core", "END: test_remove_in_the_middle" );
#endif
}
~PerformanceTracer()
{
#ifdef TIMELOG
- RTL_LOGFILE_CONTEXT_TRACE(logFile, endString_.c_str());
+ SAL_INFO( "sw.core", "END: test_remove_in_the_middle" );
#endif
}
diff --git a/sw/source/core/doc/docdraw.cxx b/sw/source/core/doc/docdraw.cxx
index 4ee34a6..7b69fe0 100644
--- a/sw/source/core/doc/docdraw.cxx
+++ b/sw/source/core/doc/docdraw.cxx
@@ -19,7 +19,6 @@
#include <hintids.hxx>
-#include <rtl/logfile.hxx>
#include <vcl/outdev.hxx>
#include <sfx2/printer.hxx>
#include <editeng/eeitem.hxx>
@@ -519,8 +518,6 @@ _ZSortFly::_ZSortFly( const SwFrmFmt* pFrmFmt, const SwFmtAnchor* pFlyAn,
// from scratch.
void SwDoc::InitDrawModel()
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLog, "SW", "JP93722", "SwDoc::InitDrawModel" );
-
// !! Attention: there is similar code in the Sw3 Reader (sw3imp.cxx) that
// also has to be maintained!!
if ( mpDrawModel )
@@ -555,7 +552,7 @@ void SwDoc::InitDrawModel()
// set FontHeight pool defaults without changing static SdrEngineDefaults
GetAttrPool().SetPoolDefaultItem(SvxFontHeightItem( 240, 100, EE_CHAR_FONTHEIGHT ));
- RTL_LOGFILE_CONTEXT_TRACE( aLog, "before create DrawDocument" );
+ SAL_INFO( "sw.doc", "before create DrawDocument" );
// The document owns the SdrModel. We always have two layers and one page.
mpDrawModel = new SwDrawDocument( this );
@@ -585,16 +582,14 @@ void SwDoc::InitDrawModel()
SdrPage* pMasterPage = mpDrawModel->AllocPage( sal_False );
mpDrawModel->InsertPage( pMasterPage );
- RTL_LOGFILE_CONTEXT_TRACE( aLog, "after create DrawDocument" );
-
- RTL_LOGFILE_CONTEXT_TRACE( aLog, "before create Spellchecker/Hyphenator" );
+ SAL_INFO( "sw.doc", "after create DrawDocument" );
+ SAL_INFO( "sw.doc", "before create Spellchecker/Hyphenator" );
SdrOutliner& rOutliner = mpDrawModel->GetDrawOutliner();
uno::Reference< XSpellChecker1 > xSpell = ::GetSpellChecker();
rOutliner.SetSpeller( xSpell );
uno::Reference<XHyphenator> xHyphenator( ::GetHyphenator() );
rOutliner.SetHyphenator( xHyphenator );
- RTL_LOGFILE_CONTEXT_TRACE( aLog, "after create Spellchecker/Hyphenator" );
-
+ SAL_INFO( "sw.doc", "after create Spellchecker/Hyphenator" );
SetCalcFieldValueHdl(&rOutliner);
SetCalcFieldValueHdl(&mpDrawModel->GetHitTestOutliner());
diff --git a/sw/source/core/doc/docfmt.cxx b/sw/source/core/doc/docfmt.cxx
index 8c3f4ea..974c54c 100644
--- a/sw/source/core/doc/docfmt.cxx
+++ b/sw/source/core/doc/docfmt.cxx
@@ -18,7 +18,6 @@
*/
#include <hintids.hxx>
-#include <rtl/logfile.hxx>
#include <svl/itemiter.hxx>
#include <sfx2/app.hxx>
#include <editeng/tstpitem.hxx>
@@ -2373,8 +2372,6 @@ SwTableLineFmt* SwDoc::MakeTableLineFmt()
void SwDoc::_CreateNumberFormatter()
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLog, "SW", "JP93722", "SwDoc::_CreateNumberFormatter" );
-
OSL_ENSURE( !mpNumberFormatter, "is already there" );
diff --git a/sw/source/core/doc/doclay.cxx b/sw/source/core/doc/doclay.cxx
index 926a8c70..65f5bee 100644
--- a/sw/source/core/doc/doclay.cxx
+++ b/sw/source/core/doc/doclay.cxx
@@ -42,7 +42,6 @@
#include <swmodule.hxx>
#include <modcfg.hxx>
#include <com/sun/star/beans/XPropertySet.hpp>
-#include <rtl/logfile.hxx>
#include <SwStyleNameMapper.hxx>
#include <fchrfmt.hxx>
#include <frmatr.hxx>
diff --git a/sw/source/core/doc/docnew.cxx b/sw/source/core/doc/docnew.cxx
index e2ace8c..03aaf1c 100644
--- a/sw/source/core/doc/docnew.cxx
+++ b/sw/source/core/doc/docnew.cxx
@@ -28,7 +28,6 @@
#include <comphelper/processfactory.hxx>
#include <vcl/svapp.hxx>
#include <vcl/virdev.hxx>
-#include <rtl/logfile.hxx>
#include <rtl/random.h>
#include <sfx2/printer.hxx>
#include <sfx2/docfile.hxx>
@@ -321,8 +320,6 @@ SwDoc::SwDoc()
mbStartIdleTimer(false)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLog, "SW", "JP93722", "SwDoc::SwDoc" );
-
// COMPATIBILITY FLAGS START
// Note: Any non-hidden compatibility flag should obtain its default
diff --git a/sw/source/core/view/vnew.cxx b/sw/source/core/view/vnew.cxx
index 2c3053a..78c5caa 100644
--- a/sw/source/core/view/vnew.cxx
+++ b/sw/source/core/view/vnew.cxx
@@ -18,7 +18,6 @@
*/
#include <sfx2/printer.hxx>
-#include <rtl/logfile.hxx>
#include <doc.hxx>
#include <IDocumentUndoRedo.hxx>
#include <docsh.hxx>
@@ -39,8 +38,6 @@
void ViewShell::Init( const SwViewOption *pNewOpt )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLog, "SW", "JP93722", "ViewShell::Init" );
-
mbDocSizeChgd = sal_False;
// We play it save: Remove old font information whenever the printer
@@ -79,8 +76,7 @@ void ViewShell::Init( const SwViewOption *pNewOpt )
if( pDShell && pDShell->IsReadOnly() )
mpOpt->SetReadonly( sal_True );
- RTL_LOGFILE_CONTEXT_TRACE( aLog, "View::Init - before InitPrt" );
-
+ SAL_INFO( "sw.core", "View::Init - before InitPrt" );
// --> FME 2007-11-06 #i82967#
OutputDevice* pPDFOut = 0;
@@ -103,8 +99,7 @@ void ViewShell::Init( const SwViewOption *pNewOpt )
}
// <--
- RTL_LOGFILE_CONTEXT_TRACE( aLog, "View::Init - after InitPrt" );
-
+ SAL_INFO( "sw.core", "View::Init - after InitPrt" );
if( GetWin() )
{
mpOpt->Init( GetWin() );
@@ -170,8 +165,6 @@ ViewShell::ViewShell( SwDoc& rDocument, Window *pWindow,
mpPrePostOutDev(0), // #i72754#
maPrePostMapMode()
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLog, "SW", "JP93722", "ViewShell::SwViewShell" );
-
// OD 2004-06-01 #i26791# - in order to suppress event handling in
// <SwDrawContact::Changed> during contruction of <ViewShell> instance
mbInConstructor = true;
@@ -246,8 +239,6 @@ ViewShell::ViewShell( ViewShell& rShell, Window *pWindow,
mpPrePostOutDev(0), // #i72754#
maPrePostMapMode()
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLog, "SW", "JP93722", "ViewShell::SwViewShell" );
-
// OD 2004-06-01 #i26791# - in order to suppress event handling in
// <SwDrawContact::Changed> during contruction of <ViewShell> instance
mbInConstructor = true;
diff --git a/sw/source/filter/xml/swxml.cxx b/sw/source/filter/xml/swxml.cxx
index dd2495d..d3ba12a 100644
--- a/sw/source/filter/xml/swxml.cxx
+++ b/sw/source/filter/xml/swxml.cxx
@@ -44,7 +44,6 @@
#include <svx/xmlgrhlp.hxx>
#include <svx/xmleohlp.hxx>
#include <comphelper/genericpropertyset.hxx>
-#include <rtl/logfile.hxx>
#include <rtl/strbuf.hxx>
#include <sfx2/frame.hxx>
#include <unotools/ucbstreamhelper.hxx>
@@ -139,8 +138,6 @@ sal_Int32 ReadThroughComponent(
OSL_ENSURE(rxContext.is(), "factory missing");
OSL_ENSURE(NULL != pFilterName,"I need a service name for the component!");
- RTL_LOGFILE_CONTEXT_AUTHOR( aLog, "sw", "mb93740", "ReadThroughComponent" );
-
// prepare ParserInputSrouce
xml::sax::InputSource aParserInput;
aParserInput.sSystemId = rName;
@@ -148,8 +145,7 @@ sal_Int32 ReadThroughComponent(
// get parser
uno::Reference< xml::sax::XParser > xParser = xml::sax::Parser::create(rxContext);
- RTL_LOGFILE_CONTEXT_TRACE( aLog, "parser created" );
-
+ SAL_INFO( "sw.filter", "parser created" );
// get filter
OUString aFilterName(OUString::createFromAscii(pFilterName));
uno::Reference< xml::sax::XDocumentHandler > xFilter(
@@ -158,8 +154,7 @@ sal_Int32 ReadThroughComponent(
SAL_WARN_IF(!xFilter.is(), "sw", "Can't instantiate filter component: " << aFilterName);
if( !xFilter.is() )
return ERR_SWG_READ_ERROR;
- RTL_LOGFILE_CONTEXT_TRACE1( aLog, "%s created", pFilterName );
-
+ SAL_INFO( "sw.filter", "" << pFilterName << " created" );
// connect parser and filter
xParser->setDocumentHandler( xFilter );
@@ -172,8 +167,7 @@ sal_Int32 ReadThroughComponent(
// if we do profiling, we want to know the stream
OString aString(OUStringToOString(rStreamName,
RTL_TEXTENCODING_ASCII_US));
- RTL_LOGFILE_TRACE_AUTHOR1( "sw", "mb93740",
- "ReadThroughComponent : parsing \"%s\"", aString.getStr() );
+ SAL_INFO( "sw.filter", "ReadThroughComponent : parsing \"" << aString.getStr() << "\"" );
#endif
// finally, parser the stream
diff --git a/sw/source/filter/xml/wrtxml.cxx b/sw/source/filter/xml/wrtxml.cxx
index c628862..6c1e193 100644
--- a/sw/source/filter/xml/wrtxml.cxx
+++ b/sw/source/filter/xml/wrtxml.cxx
@@ -46,7 +46,6 @@
#include <swerror.h>
#include <wrtxml.hxx>
#include <statstr.hrc>
-#include <rtl/logfile.hxx>
#include <comphelper/documentconstants.hxx>
#include <comphelper/makesequence.hxx>
@@ -502,10 +501,7 @@ bool SwXMLWriter::WriteThroughComponent(
OSL_ENSURE( NULL != pStreamName, "Need stream name!" );
OSL_ENSURE( NULL != pServiceName, "Need service name!" );
- RTL_LOGFILE_TRACE_AUTHOR1( "sw", "mb93740",
- "SwXMLWriter::WriteThroughComponent : stream %s",
- pStreamName );
-
+ SAL_INFO( "sw.filter", "SwXMLWriter::WriteThroughComponent : stream " << pStreamName );
// open stream
bool bRet = false;
try
@@ -570,13 +566,9 @@ bool SwXMLWriter::WriteThroughComponent(
OSL_ENSURE( xComponent.is(), "Need component!" );
OSL_ENSURE( NULL != pServiceName, "Need component name!" );
- RTL_LOGFILE_CONTEXT_AUTHOR( aFilterLog, "sw", "mb93740",
- "SwXMLWriter::WriteThroughComponent" );
-
// get component
uno::Reference< xml::sax::XWriter > xSaxWriter = xml::sax::Writer::create(rxContext);
- RTL_LOGFILE_CONTEXT_TRACE( aFilterLog, "SAX-Writer created" );
-
+ SAL_INFO( "sw.filter", "SAX-Writer created" );
// connect XML writer to output stream
xSaxWriter->setOutputStream( xOutputStream );
@@ -595,13 +587,12 @@ bool SwXMLWriter::WriteThroughComponent(
"can't instantiate export filter component" );
if( !xExporter.is() )
return false;
- RTL_LOGFILE_CONTEXT_TRACE1( aFilterLog, "%s instantiated.", pServiceName );
-
+ SAL_INFO( "sw.filter", pServiceName << " instantiated." );
// connect model and filter
xExporter->setSourceDocument( xComponent );
// filter!
- RTL_LOGFILE_CONTEXT_TRACE( aFilterLog, "call filter()" );
+ SAL_INFO( "sw.filter", "call filter()" );
uno::Reference<XFilter> xFilter( xExporter, UNO_QUERY );
return xFilter->filter( rMediaDesc );
}
diff --git a/sw/source/ui/app/docsh.cxx b/sw/source/ui/app/docsh.cxx
index e404510..cdc1d26 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 5b37389..7910a1a 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 7946fd5..a8a7dd2 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 1789197..aeff407 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 5c3d987..6100721 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>
More information about the Libreoffice-commits
mailing list