summaryrefslogtreecommitdiff
path: root/sc/source/filter
diff options
context:
space:
mode:
authorRohan Kumar <rohankanojia420@gmail.com>2016-03-05 00:23:12 +0530
committerEike Rathke <erack@redhat.com>2016-03-04 20:10:56 +0000
commit5f164b6e01496655ee0616e16d251e066d99ea73 (patch)
treecc4bf7cc772f14a208030804ea4fc5f7ccb26d90 /sc/source/filter
parent6381d26d73c614681601fda4a49c96e11a0e6f06 (diff)
tdf#91794 remove OSL_DEBUG_LEVEL > 1 conditionals
I made small changes to disable some test code conditionally by adding a few new debug macros. Change-Id: Ieaf6f1b29343fb896cc64163a116c629165e8db3 Reviewed-on: https://gerrit.libreoffice.org/22711 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com>
Diffstat (limited to 'sc/source/filter')
-rw-r--r--sc/source/filter/excel/excimp8.cxx2
-rw-r--r--sc/source/filter/excel/xltoolbar.cxx10
-rw-r--r--sc/source/filter/excel/xltoolbar.hxx10
-rw-r--r--sc/source/filter/qpro/biff.cxx2
-rw-r--r--sc/source/filter/xml/XMLStylesExportHelper.cxx3
-rw-r--r--sc/source/filter/xml/xmlbodyi.cxx5
6 files changed, 13 insertions, 19 deletions
diff --git a/sc/source/filter/excel/excimp8.cxx b/sc/source/filter/excel/excimp8.cxx
index 0f59686d62b5..a848a464919e 100644
--- a/sc/source/filter/excel/excimp8.cxx
+++ b/sc/source/filter/excel/excimp8.cxx
@@ -381,7 +381,7 @@ void ImportExcel8::ReadBasic()
ScCTBWrapper wrapper;
if ( wrapper.Read( *xXCB ) )
{
-#if OSL_DEBUG_LEVEL > 1
+#ifdef DEBUG_SC_EXCEL
wrapper.Print( stderr );
#endif
wrapper.ImportCustomToolBar( *pShell );
diff --git a/sc/source/filter/excel/xltoolbar.cxx b/sc/source/filter/excel/xltoolbar.cxx
index 607eb0c9829c..8d7fc32c63ad 100644
--- a/sc/source/filter/excel/xltoolbar.cxx
+++ b/sc/source/filter/excel/xltoolbar.cxx
@@ -99,7 +99,7 @@ bool ScCTB::Read( SvStream &rS )
return true;
}
-#if OSL_DEBUG_LEVEL > 1
+#ifdef DEBUG_SC_EXCEL
void ScCTB::Print( FILE* fp )
{
Indent a;
@@ -196,7 +196,7 @@ bool CTBS::Read( SvStream &rS )
return true;
}
-#if OSL_DEBUG_LEVEL > 1
+#ifdef DEBUG_SC_EXCEL
void CTBS::Print( FILE* fp )
{
Indent a;
@@ -243,7 +243,7 @@ ScTBC::Read(SvStream &rS)
return true;
}
-#if OSL_DEBUG_LEVEL > 1
+#ifdef DEBUG_SC_EXCEL
void
ScTBC::Print(FILE* fp)
{
@@ -308,7 +308,7 @@ bool ScTBC::ImportToolBarControl( ScCTBWrapper& rWrapper, const css::uno::Refere
return true;
}
-#if OSL_DEBUG_LEVEL > 1
+#ifdef DEBUG_SC_EXCEL
void
TBCCmd::Print(FILE* fp)
{
@@ -372,7 +372,7 @@ ScCTBWrapper::Read( SvStream &rS)
return true;
}
-#if OSL_DEBUG_LEVEL > 1
+#ifdef DEBUG_SC_EXCEL
void
ScCTBWrapper::Print( FILE* fp )
{
diff --git a/sc/source/filter/excel/xltoolbar.hxx b/sc/source/filter/excel/xltoolbar.hxx
index 5f03ef06a2e3..1ee3d544ef05 100644
--- a/sc/source/filter/excel/xltoolbar.hxx
+++ b/sc/source/filter/excel/xltoolbar.hxx
@@ -26,7 +26,7 @@ public:
bool C:1;
sal_uInt16 reserved3:8;
bool Read( SvStream& rS ) override;
-#if OSL_DEBUG_LEVEL > 1
+#ifdef DEBUG_SC_EXCEL
virtual void Print(FILE* fp) override;
#endif
};
@@ -39,7 +39,7 @@ class ScTBC : public TBBase
public:
ScTBC();
virtual ~ScTBC(){}
-#if OSL_DEBUG_LEVEL > 1
+#ifdef DEBUG_SC_EXCEL
virtual void Print( FILE* ) override;
#endif
bool Read(SvStream &rS) override;
@@ -56,7 +56,7 @@ class ScCTB : public TBBase
public:
explicit ScCTB(sal_uInt16);
virtual ~ScCTB(){}
-#if OSL_DEBUG_LEVEL > 1
+#ifdef DEBUG_SC_EXCEL
virtual void Print( FILE* ) override;
#endif
bool Read(SvStream &rS) override;
@@ -82,7 +82,7 @@ public:
CTBS& operator = ( const CTBS&);
CTBS();
virtual ~CTBS(){}
-#if OSL_DEBUG_LEVEL > 1
+#ifdef DEBUG_SC_EXCEL
virtual void Print( FILE* ) override;
#endif
bool Read(SvStream &rS) override;
@@ -98,7 +98,7 @@ public:
ScCTBWrapper();
virtual ~ScCTBWrapper();
bool Read(SvStream &rS) override;
-#if OSL_DEBUG_LEVEL > 1
+#ifdef DEBUG_SC_EXCEL
virtual void Print( FILE* ) override;
#endif
void ImportCustomToolBar( SfxObjectShell& rDocSh );
diff --git a/sc/source/filter/qpro/biff.cxx b/sc/source/filter/qpro/biff.cxx
index a23f578f4c9b..0e871a0e303a 100644
--- a/sc/source/filter/qpro/biff.cxx
+++ b/sc/source/filter/qpro/biff.cxx
@@ -66,7 +66,7 @@ bool ScBiffReader::nextRecord()
mpStream->ReadUInt16( mnId ).ReadUInt16( mnLength );
mnOffset = mpStream->Tell();
-#if OSL_DEBUG_LEVEL > 1
+#ifdef DEBUG_SC_QPRO
fprintf( stderr, "Read record 0x%x length 0x%x at offset 0x%x\n",
(unsigned)mnId, (unsigned)mnLength, (unsigned)mnOffset );
diff --git a/sc/source/filter/xml/XMLStylesExportHelper.cxx b/sc/source/filter/xml/XMLStylesExportHelper.cxx
index b6ea827c3548..2bc0389c9e02 100644
--- a/sc/source/filter/xml/XMLStylesExportHelper.cxx
+++ b/sc/source/filter/xml/XMLStylesExportHelper.cxx
@@ -894,9 +894,6 @@ void ScFormatRangeStyles::GetFormatRanges(const sal_Int32 nStartColumn, const sa
sal_Int32 nColumns = 0;
while (aItr != aEndItr && nColumns < nTotalColumns)
{
-#if OSL_DEBUG_LEVEL > 1
- table::CellRangeAddress aTempRangeAddress((*aItr).aRangeAddress);
-#endif
if (((*aItr).aRangeAddress.StartRow <= nRow) &&
((*aItr).aRangeAddress.EndRow >= nRow))
{
diff --git a/sc/source/filter/xml/xmlbodyi.cxx b/sc/source/filter/xml/xmlbodyi.cxx
index c04c287974fe..88b4a34449ad 100644
--- a/sc/source/filter/xml/xmlbodyi.cxx
+++ b/sc/source/filter/xml/xmlbodyi.cxx
@@ -76,10 +76,7 @@ ScXMLBodyContext::ScXMLBodyContext( ScXMLImport& rImport,
formula::FormulaGrammar::Grammar eGrammar = formula::FormulaGrammar::GRAM_ODFF;
OUString aVer( rImport.GetODFVersion());
sal_Int32 nLen = aVer.getLength();
-#if OSL_DEBUG_LEVEL > 1
- fprintf( stderr, "\n ScXMLBodyContext ODFVersion: nLen: %d, str: %s\n",
- (int)nLen, OUStringToOString( aVer, RTL_TEXTENCODING_UTF8).getStr());
-#endif
+ SAL_INFO("sc.filter", "ScXMLBodyContext ODFVersion: nLen: " << nLen << " str : " << aVer);
if (!nLen)
eGrammar = formula::FormulaGrammar::GRAM_PODF;
else