sdext/source/pdfimport/filterdet.cxx | 2 +-
sdext/source/pdfimport/pdfparse/pdfentries.cxx | 6 +++---
sdext/source/pdfimport/pdfparse/pdfparse.cxx | 16 ++++++++--------
sdext/source/pdfimport/sax/emitcontext.cxx | 12 ++++++------
sdext/source/pdfimport/tree/genericelements.cxx | 4 ++--
sdext/source/pdfimport/tree/genericelements.hxx | 4 ++--
sdext/source/pdfimport/tree/pdfiprocessor.cxx | 4 ++--
sdext/source/presenter/PresenterAccessibility.cxx | 2 +-
8 files changed, 25 insertions(+), 25 deletions(-)
New commits:
commit ea3151acb4915e56c702e4edfa92a9b571c3d104
Author: Rohan Kumar <rohankanojia...@gmail.com>
Date: Tue Mar 8 00:05:29 2016 +0530
tdf#91794 remove OSL_DEBUG_LEVEL > 1 conditionals
I replaced OSL_DEBUG_LEVEL > 1 to OSL_DEBUG_LEVEL > 0 in most of
the files as suggested in easy hack
Change-Id: I2c46dfd9de2ae965680494146120ea3c7530cc98
Reviewed-on: https://gerrit.libreoffice.org/23012
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Björn Michaelsen <bjoern.michael...@canonical.com>
diff --git a/sdext/source/pdfimport/filterdet.cxx
b/sdext/source/pdfimport/filterdet.cxx
index a1016de..5e5485f 100644
--- a/sdext/source/pdfimport/filterdet.cxx
+++ b/sdext/source/pdfimport/filterdet.cxx
@@ -468,7 +468,7 @@ bool checkDocChecksum( const OUString& rInPDFFileURL,
// compare the contents
bRet = (0 == memcmp( nActualChecksum, nTestChecksum, sizeof(
nActualChecksum ) ));
-#if OSL_DEBUG_LEVEL > 1
+#if OSL_DEBUG_LEVEL > 0
OSL_TRACE( "test checksum: " );
for( unsigned int i = 0; i < sizeof(nTestChecksum); i++ )
OSL_TRACE( "%.2X", int(nTestChecksum[i]) );
diff --git a/sdext/source/pdfimport/pdfparse/pdfentries.cxx
b/sdext/source/pdfimport/pdfparse/pdfentries.cxx
index b39fb25..ab5f2e8 100644
--- a/sdext/source/pdfimport/pdfparse/pdfentries.cxx
+++ b/sdext/source/pdfimport/pdfparse/pdfentries.cxx
@@ -1302,7 +1302,7 @@ PDFFileImplData* PDFFile::impl_getData() const
PDFString* pStr =
dynamic_cast<PDFString*>(pArr->m_aSubElements[0]);
if( pStr )
m_pData->m_aDocID = pStr->getFilteredString();
-#if OSL_DEBUG_LEVEL > 1
+#if OSL_DEBUG_LEVEL > 0
OUString aTmp;
for( int i = 0; i < m_pData->m_aDocID.getLength(); i++ )
aTmp += OUString::number((unsigned
int)sal_uInt8(m_pData->m_aDocID[i]), 16);
@@ -1364,7 +1364,7 @@ PDFFileImplData* PDFFile::impl_getData() const
OString aEnt = pString->getFilteredString();
if( aEnt.getLength() == 32 )
memcpy( m_pData->m_aOEntry, aEnt.getStr(),
32 );
-#if OSL_DEBUG_LEVEL > 1
+#if OSL_DEBUG_LEVEL > 0
else
{
OUString aTmp;
@@ -1384,7 +1384,7 @@ PDFFileImplData* PDFFile::impl_getData() const
OString aEnt = pString->getFilteredString();
if( aEnt.getLength() == 32 )
memcpy( m_pData->m_aUEntry, aEnt.getStr(),
32 );
-#if OSL_DEBUG_LEVEL > 1
+#if OSL_DEBUG_LEVEL > 0
else
{
OUString aTmp;
diff --git a/sdext/source/pdfimport/pdfparse/pdfparse.cxx
b/sdext/source/pdfimport/pdfparse/pdfparse.cxx
index f4304b4..2d73ffd 100644
--- a/sdext/source/pdfimport/pdfparse/pdfparse.cxx
+++ b/sdext/source/pdfimport/pdfparse/pdfparse.cxx
@@ -547,20 +547,20 @@ PDFEntry* PDFReader::read( const char* pBuffer, unsigned
int nLen )
try
{
-#if OSL_DEBUG_LEVEL > 1
+#if OSL_DEBUG_LEVEL > 0
boost::spirit::parse_info<const char*> aInfo =
#endif
boost::spirit::parse( pBuffer,
pBuffer+nLen,
aGrammar,
boost::spirit::space_p );
-#if OSL_DEBUG_LEVEL > 1
+#if OSL_DEBUG_LEVEL > 0
SAL_INFO("sdext.pdfimport.pdfparse", "parseinfo: stop = " <<
aInfo.stop << " (buff=" << pBuffer << ", offset = " << aInfo.stop - pBuffer <<
"), hit = " << (aInfo.hit ? OUString("true") : OUString("false")) << ", full =
" << (aInfo.full ? OUString("true") : OUString("false")) << ", length = " <<
(int)aInfo.length );
#endif
}
catch( const parser_error<const char*, const char*>& rError )
{
-#if OSL_DEBUG_LEVEL > 1
+#if OSL_DEBUG_LEVEL > 0
OString aTmp;
unsigned int nElem = aGrammar.m_aObjectStack.size();
for( unsigned int i = 0; i < nElem; i++ )
@@ -577,7 +577,7 @@ PDFEntry* PDFReader::read( const char* pBuffer, unsigned
int nLen )
pRet = aGrammar.m_aObjectStack.back();
aGrammar.m_aObjectStack.pop_back();
}
-#if OSL_DEBUG_LEVEL > 1
+#if OSL_DEBUG_LEVEL > 0
else if( nEntries > 1 )
SAL_WARN("sdext.pdfimport.pdfparse", "error got " << nEntries << "
stack objects in parse" );
#endif
@@ -623,21 +623,21 @@ PDFEntry* PDFReader::read( const char* pFileName )
try
{
-#if OSL_DEBUG_LEVEL > 1
+#if OSL_DEBUG_LEVEL > 0
boost::spirit::parse_info< file_iterator<> > aInfo =
#endif
boost::spirit::parse( file_start,
file_end,
aGrammar,
boost::spirit::space_p );
-#if OSL_DEBUG_LEVEL > 1
+#if OSL_DEBUG_LEVEL > 0
SAL_INFO("sdext.pdfimport.pdfparse", "parseinfo: stop at offset = " <<
aInfo.stop - file_start << ", hit = " << (aInfo.hit ? "true" : "false") << ",
full = " << (aInfo.full ? "true" : "false") << ", length = " << aInfo.length);
#endif
}
catch( const parser_error< const char*, file_iterator<> >& rError )
{
SAL_WARN("sdext.pdfimport.pdfparse", "parse error: " <<
rError.descriptor << " at buffer pos " << rError.where - file_start);
-#if OSL_DEBUG_LEVEL > 1
+#if OSL_DEBUG_LEVEL > 0
OUString aTmp;
unsigned int nElem = aGrammar.m_aObjectStack.size();
for( unsigned int i = 0; i < nElem; i++ )
@@ -658,7 +658,7 @@ PDFEntry* PDFReader::read( const char* pFileName )
pRet = aGrammar.m_aObjectStack.back();
aGrammar.m_aObjectStack.pop_back();
}
-#if OSL_DEBUG_LEVEL > 1
+#if OSL_DEBUG_LEVEL > 0
else if( nEntries > 1 )
{
SAL_WARN("sdext.pdfimport.pdfparse", "error got " << nEntries << "
stack objects in parse");
diff --git a/sdext/source/pdfimport/sax/emitcontext.cxx
b/sdext/source/pdfimport/sax/emitcontext.cxx
index bae84b6..f816510 100644
--- a/sdext/source/pdfimport/sax/emitcontext.cxx
+++ b/sdext/source/pdfimport/sax/emitcontext.cxx
@@ -27,7 +27,7 @@
#include <cppuhelper/exc_hlp.hxx>
#include <com/sun/star/xml/sax/XDocumentHandler.hpp>
-#if OSL_DEBUG_LEVEL > 1
+#if OSL_DEBUG_LEVEL > 0
#include <osl/file.hxx>
static osl::File* pStream = NULL;
static int nIndent = 0;
@@ -49,7 +49,7 @@ SaxEmitter::SaxEmitter( const uno::Reference<
xml::sax::XDocumentHandler >& xDoc
catch( xml::sax::SAXException& )
{
}
-#if OSL_DEBUG_LEVEL > 1
+#if OSL_DEBUG_LEVEL > 0
static const char* pDir = getenv( "DBG_PDFIMPORT_DIR" );
if( pDir )
{
@@ -80,7 +80,7 @@ SaxEmitter::~SaxEmitter()
catch( xml::sax::SAXException& )
{
}
-#if OSL_DEBUG_LEVEL > 1
+#if OSL_DEBUG_LEVEL > 0
if( pStream )
{
pStream->close();
@@ -102,7 +102,7 @@ void SaxEmitter::beginTag( const char* pTag, const
PropertyMap& rProperties )
catch( xml::sax::SAXException& )
{
}
-#if OSL_DEBUG_LEVEL > 1
+#if OSL_DEBUG_LEVEL > 0
if( pStream )
{
sal_uInt64 nWritten = 0;
@@ -136,7 +136,7 @@ void SaxEmitter::write( const OUString& rText )
catch( xml::sax::SAXException& )
{
}
-#if OSL_DEBUG_LEVEL > 1
+#if OSL_DEBUG_LEVEL > 0
if( pStream )
{
OString aStr( OUStringToOString( rText, RTL_TEXTENCODING_UTF8 ) );
@@ -156,7 +156,7 @@ void SaxEmitter::endTag( const char* pTag )
catch( xml::sax::SAXException& )
{
}
-#if OSL_DEBUG_LEVEL > 1
+#if OSL_DEBUG_LEVEL > 0
if( pStream )
{
sal_uInt64 nWritten = 0;
diff --git a/sdext/source/pdfimport/tree/genericelements.cxx
b/sdext/source/pdfimport/tree/genericelements.cxx
index afab9a3..12a52dc 100644
--- a/sdext/source/pdfimport/tree/genericelements.cxx
+++ b/sdext/source/pdfimport/tree/genericelements.cxx
@@ -90,7 +90,7 @@ void Element::updateGeometryWith( const Element* pMergeFrom )
}
-#if OSL_DEBUG_LEVEL > 1
+#if OSL_DEBUG_LEVEL > 0
#include <typeinfo>
void Element::emitStructure( int nLevel)
{
@@ -166,7 +166,7 @@ void PolyPolyElement::visitedBy( ElementTreeVisitor&
rV
rVisitor.visit( *this, rParentIt);
}
-#if OSL_DEBUG_LEVEL > 1
+#if OSL_DEBUG_LEVEL > 0
void PolyPolyElement::emitStructure( int nLevel)
{
OSL_TRACE( "%*s<%s %p>", nLevel, "", typeid( *this ).name(), this );
diff --git a/sdext/source/pdfimport/tree/genericelements.hxx
b/sdext/source/pdfimport/tree/genericelements.hxx
index 9fefbc4..6fac290 100644
--- a/sdext/source/pdfimport/tree/genericelements.hxx
+++ b/sdext/source/pdfimport/tree/genericelements.hxx
@@ -93,7 +93,7 @@ namespace pdfi
/// Union element geometry with given element
void updateGeometryWith( const Element* pMergeFrom );
-#if OSL_DEBUG_LEVEL > 1
+#if OSL_DEBUG_LEVEL > 0
// xxx refac TODO: move code to visitor
virtual void emitStructure( int nLevel );
#endif
@@ -217,7 +217,7 @@ namespace pdfi
void updateGeometry();
-#if OSL_DEBUG_LEVEL > 1
+#if OSL_DEBUG_LEVEL > 0
virtual void emitStructure( int nLevel );
#endif
diff --git a/sdext/source/pdfimport/tree/pdfiprocessor.cxx
b/sdext/source/pdfimport/tree/pdfiprocessor.cxx
index 3f8fcc7..c48a2e3 100644
--- a/sdext/source/pdfimport/tree/pdfiprocessor.cxx
+++ b/sdext/source/pdfimport/tree/pdfiprocessor.cxx
@@ -542,7 +542,7 @@ void PDFIProcessor::startPage( const geometry::RealSize2D&
rSize )
void PDFIProcessor::emit( XmlEmitter& rEmitter,
const TreeVisitorFactory& rVisitorFactory )
{
-#if OSL_DEBUG_LEVEL > 1
+#if OSL_DEBUG_LEVEL > 0
m_pDocument->emitStructure( 0 );
#endif
@@ -552,7 +552,7 @@ void PDFIProcessor::emit( XmlEmitter&
rEmitter,
startIndicator( " " );
m_pDocument->visitedBy( *optimizingVisitor,
std::list<Element*>::const_iterator());
-#if OSL_DEBUG_LEVEL > 1
+#if OSL_DEBUG_LEVEL > 0
m_pDocument->emitStructure( 0 );
#endif
diff --git a/sdext/source/presenter/PresenterAccessibility.cxx
b/sdext/source/presenter/PresenterAccessibility.cxx
index f1b4c5a..8736dc7 100644
--- a/sdext/source/presenter/PresenterAccessibility.cxx
+++ b/sdext/source/presenter/PresenterAccessibility.cxx
@@ -1568,7 +1568,7 @@ Sequence<css::beans::PropertyValue> SAL_CALL
{
ThrowIfDisposed();
-#if OSL_DEBUG_LEVEL > 1
+#if OSL_DEBUG_LEVEL > 0
OSL_TRACE("PresenterAccessible::AccessibleParagraph::getCharacterAttributes at
%p,%d returns empty set\r",
this,nIndex);
for (sal_Int32
nAttributeIndex(0),nAttributeCount(rRequestedAttributes.getLength());
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
