[Libreoffice-commits] core.git: dbaccess/source reportdesign/source sd/source svx/source sw/qa sw/source xmloff/source
Stephan Bergmann
sbergman at redhat.com
Wed Nov 6 20:56:36 CET 2013
dbaccess/source/filter/xml/xmlfilter.cxx | 5 --
dbaccess/source/ui/browser/genericcontroller.cxx | 8 ----
reportdesign/source/filter/xml/xmlfilter.cxx | 6 ---
sd/source/filter/xml/sdxmlwrp.cxx | 12 ------
svx/source/svdraw/svdmodel.cxx | 24 ------------
sw/qa/core/Test-BigPtrArray.cxx | 45 -----------------------
sw/source/filter/xml/swxml.cxx | 7 ---
xmloff/source/core/xmlexp.cxx | 14 -------
xmloff/source/core/xmlimp.cxx | 9 ----
9 files changed, 130 deletions(-)
New commits:
commit 107c2c7c7bb7eacba4045159ac40fe3b6737d4f3
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Nov 6 20:54:44 2013 +0100
Remove #ifdef TIMELOG'ed SAL_INFOs
...the code doesn't make much sense that way.
Change-Id: I506e37b44924701255431f6d20d4610f7f52287d
diff --git a/dbaccess/source/filter/xml/xmlfilter.cxx b/dbaccess/source/filter/xml/xmlfilter.cxx
index 8ead508..b94e0ce 100644
--- a/dbaccess/source/filter/xml/xmlfilter.cxx
+++ b/dbaccess/source/filter/xml/xmlfilter.cxx
@@ -331,11 +331,6 @@ sal_Int32 ReadThroughComponent(
return 1; // TODO/LATER: error handling
}
-#ifdef TIMELOG
- // if we do profiling, we want to know the stream
- SAL_INFO("dbaccess", "dbaxml ReadThroughComponent : parsing \"" << pStreamName << "\"" );
-#endif
-
uno::Reference< XInputStream > xInputStream = xDocStream->getInputStream();
// read from the stream
return ReadThroughComponent( xInputStream
diff --git a/dbaccess/source/ui/browser/genericcontroller.cxx b/dbaccess/source/ui/browser/genericcontroller.cxx
index 5ea4421..064670c 100644
--- a/dbaccess/source/ui/browser/genericcontroller.cxx
+++ b/dbaccess/source/ui/browser/genericcontroller.cxx
@@ -728,14 +728,6 @@ void OGenericUnoController::dispatch(const URL& _aURL, const Sequence< PropertyV
// for locking in the proper order (SolarMutex and m_aMutex), and b) this would be too many places
// for the time frame of the fix.
// #i52602#
-
-#ifdef TIMELOG
- OString sLog( "OGenericUnoController::dispatch( '" );
- sLog += OString( _aURL.Main.getStr(), _aURL.Main.getLength(), osl_getThreadTextEncoding() );
- sLog += OString( "' )" );
- SAL_INFO("dbaccess.ui", "dbaccess frank.schoenheit at sun.com" << sLog.getStr() );
-#endif
-
executeChecked(_aURL,aArgs);
}
diff --git a/reportdesign/source/filter/xml/xmlfilter.cxx b/reportdesign/source/filter/xml/xmlfilter.cxx
index a7109c2..1cdc9c4 100644
--- a/reportdesign/source/filter/xml/xmlfilter.cxx
+++ b/reportdesign/source/filter/xml/xmlfilter.cxx
@@ -152,12 +152,6 @@ sal_Int32 ReadThroughComponent(
uno::Reference < XImporter > xImporter( _xFilter, UNO_QUERY );
xImporter->setTargetDocument( xModelComponent );
-
-#ifdef TIMELOG
- // if we do profiling, we want to know the stream
- SAL_INFO( "reportdesign", "rptxml ReadThroughComponent : parsing \"" << pStreamName << "\"" );
-#endif
-
// finally, parser the stream
try
{
diff --git a/sd/source/filter/xml/sdxmlwrp.cxx b/sd/source/filter/xml/sdxmlwrp.cxx
index 50aba6f..9c102da 100644
--- a/sd/source/filter/xml/sdxmlwrp.cxx
+++ b/sd/source/filter/xml/sdxmlwrp.cxx
@@ -432,12 +432,6 @@ sal_Int32 ReadThroughComponent(
sal_Bool SdXMLFilter::Import( ErrCode& nError )
{
- SAL_INFO( "sd.filter", "sd cl93746 SdXMLFilter::Import" );
-#ifdef TIMELOG
- OString aFile(OUStringToOString(mrMedium.GetName(), RTL_TEXTENCODING_ASCII_US));
- SAL_INFO( "sd.filter", "importing " << aFile.getStr() );
-#endif
-
sal_uInt32 nRet = 0;
// Get service factory
@@ -809,12 +803,6 @@ sal_Bool SdXMLFilter::Import( ErrCode& nError )
sal_Bool SdXMLFilter::Export()
{
-#ifdef TIMELOG
- SAL_INFO( "sd.filter", "sd cl93746 SdXMLFilter::Export" );
- OString aFile(OUStringToOString(mrMedium.GetName(), RTL_TEXTENCODING_ASCII_US));
- SAL_INFO( "sd.filter", "exporting " << aFile.getStr() );
-#endif
-
SvXMLEmbeddedObjectHelper* pObjectHelper = NULL;
SvXMLGraphicHelper* pGraphicHelper = NULL;
sal_Bool bDocRet = sal_False;
diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx
index 1693d49..f0ab176 100644
--- a/svx/source/svdraw/svdmodel.cxx
+++ b/svx/source/svdraw/svdmodel.cxx
@@ -218,10 +218,6 @@ SdrModel::SdrModel(SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* pPers, sal
maMaPag(),
maPages()
{
-#ifdef TIMELOG
- SAL_INFO( "svx.svdraw", "SdrModel::SdrModel(...)" );
-#endif
-
DBG_CTOR(SdrModel,NULL);
ImpCtor(pPool, pPers, false, (bool)bLoadRefCounts);
}
@@ -232,10 +228,6 @@ SdrModel::SdrModel(const OUString& rPath, SfxItemPool* pPool, ::comphelper::IEmb
maPages(),
aTablePath(rPath)
{
-#ifdef TIMELOG
- SAL_INFO( "svx.svdraw", "SdrModel::SdrModel(...)" );
-#endif
-
DBG_CTOR(SdrModel,NULL);
ImpCtor(pPool, pPers, false, (bool)bLoadRefCounts);
}
@@ -245,10 +237,6 @@ SdrModel::SdrModel(SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* pPers, boo
maMaPag(),
maPages()
{
-#ifdef TIMELOG
- SAL_INFO( "svx.svdraw", "SdrModel::SdrModel(...)" );
-#endif
-
DBG_CTOR(SdrModel,NULL);
ImpCtor(pPool,pPers,bUseExtColorTable, (bool)bLoadRefCounts);
}
@@ -259,10 +247,6 @@ SdrModel::SdrModel(const OUString& rPath, SfxItemPool* pPool, ::comphelper::IEmb
maPages(),
aTablePath(rPath)
{
-#ifdef TIMELOG
- SAL_INFO( "svx.svdraw", "SdrModel::SdrModel(...)" );
-#endif
-
DBG_CTOR(SdrModel,NULL);
ImpCtor(pPool,pPers,bUseExtColorTable, (bool)bLoadRefCounts);
}
@@ -274,20 +258,12 @@ SdrModel::SdrModel(const SdrModel& /*rSrcModel*/):
maMaPag(),
maPages()
{
-#ifdef TIMELOG
- SAL_INFO( "svx.svdraw", "SdrModel::SdrModel(...)" );
-#endif
-
// not yet implemented
OSL_FAIL("SdrModel::CopyCtor() is not yet implemented.");
}
SdrModel::~SdrModel()
{
-#ifdef TIMELOG
- SAL_INFO( "svx.svdraw", "SdrModel::~SdrModel(...)" );
-#endif
-
DBG_DTOR(SdrModel,NULL);
mbInDestruction = true;
diff --git a/sw/qa/core/Test-BigPtrArray.cxx b/sw/qa/core/Test-BigPtrArray.cxx
index 9c5956f..9ba0b2e 100644
--- a/sw/qa/core/Test-BigPtrArray.cxx
+++ b/sw/qa/core/Test-BigPtrArray.cxx
@@ -137,10 +137,6 @@ public:
{
printMethodName("test_insert_entries_at_front\n");
-#ifdef TIMELOG
- SAL_INFO( "sw.core", "START: test_insert_entries_at_front" );
-#endif
-
BigPtrArray bparr;
for (sal_uLong i = 0; i < NUM_ENTRIES; i++)
@@ -154,10 +150,6 @@ public:
);
}
-#ifdef TIMELOG
- 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--)
{
CPPUNIT_ASSERT_MESSAGE
@@ -181,10 +173,6 @@ public:
{
printMethodName("test_insert_entries_in_the_middle\n");
-#ifdef TIMELOG
- SAL_INFO( "sw.core", "START: test_insert_entries_in_the_middle" );
-#endif
-
BigPtrArray bparr;
fillBigPtrArray(bparr, NUM_ENTRIES);
@@ -194,10 +182,6 @@ public:
bparr.Insert(new BigPtrEntryMock(NUM_ENTRIES), bparr.Count() / 2);
-#ifdef TIMELOG
- SAL_INFO( "sw.core", "END: test_insert_entries_in_the_middle" );
-#endif
-
CPPUNIT_ASSERT_MESSAGE
(
"test_insert_entries_in_the_middle failed",
@@ -218,10 +202,6 @@ public:
{
printMethodName("test_insert_at_already_used_index\n");
-#ifdef TIMELOG
- SAL_INFO( "sw.core", "START: test_insert_at_already_used_index" );
-#endif
-
BigPtrArray bparr;
fillBigPtrArray(bparr, NUM_ENTRIES);
@@ -232,10 +212,6 @@ public:
for (sal_uLong i = 0, j = -5; i < 5; i++, j++)
bparr.Insert(new BigPtrEntryMock(j), i);
-#ifdef TIMELOG
- SAL_INFO( "sw.core", "END: test_insert_at_already_used_index" );
-#endif
-
CPPUNIT_ASSERT_MESSAGE
(
"test_insert_at_already_used_index failed",
@@ -293,10 +269,6 @@ public:
{
printMethodName("test_remove_at_front\n");
-#ifdef TIMELOG
- SAL_INFO( "sw.core", "START: test_remove_at_front" );
-#endif
-
BigPtrArray bparr;
fillBigPtrArray(bparr, NUM_ENTRIES);
@@ -332,10 +304,6 @@ public:
dumpBigPtrArray(bparr);
}
-
-#ifdef TIMELOG
- SAL_INFO( "sw.core", "END: test_remove_at_front" );
-#endif
}
void test_remove_at_back()
@@ -382,10 +350,6 @@ public:
{
printMethodName("test_remove_in_the_middle\n");
-#ifdef TIMELOG
- SAL_INFO( "sw.core", "START: test_remove_in_the_middle" );
-#endif
-
BigPtrArray bparr;
fillBigPtrArray(bparr, NUM_ENTRIES);
@@ -422,9 +386,6 @@ public:
dumpBigPtrArray(bparr);
}
-#ifdef TIMELOG
- SAL_INFO( "sw.core", "END: test_remove_in_the_middle" );
-#endif
}
void test_remove_multiple_elements_at_once()
@@ -783,16 +744,10 @@ public:
{
startString_ += methodName;
endString_ += methodName;
-#ifdef TIMELOG
- SAL_INFO( "sw.core", "END: test_remove_in_the_middle" );
-#endif
}
~PerformanceTracer()
{
-#ifdef TIMELOG
- SAL_INFO( "sw.core", "END: test_remove_in_the_middle" );
-#endif
}
private:
diff --git a/sw/source/filter/xml/swxml.cxx b/sw/source/filter/xml/swxml.cxx
index 5fdc03a..3a11d2c 100644
--- a/sw/source/filter/xml/swxml.cxx
+++ b/sw/source/filter/xml/swxml.cxx
@@ -159,13 +159,6 @@ sal_Int32 ReadThroughComponent(
uno::Reference < XImporter > xImporter( xFilter, UNO_QUERY );
xImporter->setTargetDocument( xModelComponent );
-#ifdef TIMELOG
- // if we do profiling, we want to know the stream
- OString aString(OUStringToOString(rStreamName,
- RTL_TEXTENCODING_ASCII_US));
- SAL_INFO( "sw.filter", "ReadThroughComponent : parsing \"" << aString.getStr() << "\"" );
-#endif
-
// finally, parser the stream
try
{
diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx
index 5d4fc0d..0c28b7c 100644
--- a/xmloff/source/core/xmlexp.cxx
+++ b/xmloff/source/core/xmlexp.cxx
@@ -821,20 +821,6 @@ sal_Bool SAL_CALL SvXMLExport::filter( const uno::Sequence< beans::PropertyValue
}
}
-#ifdef TIMELOG
- if (GetModel().is())
- {
- // print a trace message with the URL
- OString aUrl(OUStringToOString(GetModel()->getURL(),
- RTL_TEXTENCODING_ASCII_US));
- SAL_INFO( "xmloff.core", aUrl.getStr() );
- // we also want a trace message with the document class
- OString aClass(OUStringToOString(GetXMLToken(meClass),
- RTL_TEXTENCODING_ASCII_US));
- SAL_INFO( "xmloff.core", "class=\"" << aClass.getStr() << "\"" );
- }
-#endif
-
exportDoc( meClass );
}
catch(const uno::Exception& e)
diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx
index e733ed7..6bc4827 100644
--- a/xmloff/source/core/xmlimp.cxx
+++ b/xmloff/source/core/xmlimp.cxx
@@ -672,15 +672,6 @@ void SAL_CALL SvXMLImport::startElement( const OUString& rName,
}
else
{
-#ifdef TIMELOG
- // If we do profiling, we want a trace message for the first element
- // in order to identify the stream.
- OString aString(OUStringToOString(rName, RTL_TEXTENCODING_ASCII_US));
- SAL_INFO( "xmloff.core", "xmloff" );
- "SvXMLImport::StartElement( \"%s\", ... )",
- aString.getStr() );
-#endif
-
pContext = CreateContext( nPrefix, aLocalName, xAttrList );
if( (nPrefix & XML_NAMESPACE_UNKNOWN_FLAG) != 0 &&
IS_TYPE( SvXMLImportContext, pContext ) )
More information about the Libreoffice-commits
mailing list