summaryrefslogtreecommitdiff
path: root/xmlscript
diff options
context:
space:
mode:
authorRohan Kumar <rohankanojia420@gmail.com>2016-03-09 11:32:40 +0530
committerStephan Bergmann <sbergman@redhat.com>2016-03-09 07:55:48 +0000
commit0a8c9fde3ba59a278c9ee4d18f099cfeec71fbef (patch)
treec3d9dab1dfb62da047bbd0aa910ff6fe474ecf72 /xmlscript
parentadfa77254927dcb3f2a87eb0d23c71ad7282948b (diff)
tdf#91794 remove OSL_DEBUG_LEVEL > 1 conditionals
I removed OSL_DEBUG_LEVEL > 1 conditionals and left SAL_INFO()s statements alone. I also removed OUStringToOString(..) calls that were used by SAL_INFO(..) Change-Id: I01cce00265531d7f0ad0a6f564fef6262d3d1205 Reviewed-on: https://gerrit.libreoffice.org/23036 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'xmlscript')
-rw-r--r--xmlscript/source/xml_helper/xml_impctx.cxx18
-rw-r--r--xmlscript/source/xmldlg_imexp/xmldlg_import.cxx8
-rw-r--r--xmlscript/source/xmllib_imexp/xmllib_import.cxx7
-rw-r--r--xmlscript/source/xmlmod_imexp/xmlmod_import.cxx7
4 files changed, 6 insertions, 34 deletions
diff --git a/xmlscript/source/xml_helper/xml_impctx.cxx b/xmlscript/source/xml_helper/xml_impctx.cxx
index 02ae45c29692..493c333d279a 100644
--- a/xmlscript/source/xml_helper/xml_impctx.cxx
+++ b/xmlscript/source/xml_helper/xml_impctx.cxx
@@ -497,11 +497,7 @@ void DocumentHandlerImpl::startElement(
if (m_nSkipElements > 0)
{
++m_nSkipElements; // wait for another end tag
-#if OSL_DEBUG_LEVEL > 1
- OString aQName(
- OUStringToOString( rQElementName, RTL_TEXTENCODING_ASCII_US ) );
- SAL_INFO("xmlscript.xmlhelper", "### no context given on createChildElement() => ignoring element \"" << aQName.getStr() << "\" ...");
-#endif
+ SAL_INFO("xmlscript.xmlhelper", " no context given on createChildElement() => ignoring element \"" << rQElementName << "\" ...");
return;
}
@@ -608,11 +604,7 @@ void DocumentHandlerImpl::startElement(
else
{
++m_nSkipElements;
-#if OSL_DEBUG_LEVEL > 1
- OString aQName(
- OUStringToOString( rQElementName, RTL_TEXTENCODING_ASCII_US ) );
- SAL_INFO("xmlscript.xmlhelper", "### no context given on createChildElement() => ignoring element \"" << aQName.getStr() << "\" ...");
-#endif
+ SAL_INFO("xmlscript.xmlhelper", " no context given on createChildElement() => ignoring element \"" << rQElementName << "\" ...");
}
}
}
@@ -627,11 +619,7 @@ void DocumentHandlerImpl::endElement(
if (m_nSkipElements)
{
--m_nSkipElements;
-#if OSL_DEBUG_LEVEL > 1
- OString aQName(
- OUStringToOString( rQElementName, RTL_TEXTENCODING_ASCII_US ) );
- SAL_INFO("xmlscript.xmlhelper", "### received endElement() for \"" << aQName.getStr() << "\".");
-#endif
+ SAL_INFO("xmlscript.xmlhelper", "### received endElement() for \"" << rQElementName << "\".");
static_cast<void>(rQElementName);
return;
}
diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx b/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx
index 89069cb6a95b..c82d306b9ab1 100644
--- a/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx
+++ b/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx
@@ -1702,11 +1702,7 @@ ElementBase::~ElementBase()
_pParent->release();
}
-#if OSL_DEBUG_LEVEL > 1
- OString aStr( OUStringToOString(
- _aLocalName, RTL_TEXTENCODING_ASCII_US ) );
- SAL_INFO("xmlscript.xmldlg", "ElementBase::~ElementBase(): " << aStr.getStr() );
-#endif
+ SAL_INFO("xmlscript.xmldlg", "ElementBase::~ElementBase(): " << _aLocalName );
}
// XRoot
@@ -1761,9 +1757,7 @@ Reference< xml::input::XElement > DialogImport::startRootElement(
DialogImport::~DialogImport()
{
-#if OSL_DEBUG_LEVEL > 1
SAL_INFO("xmlscript.xmldlg", "DialogImport::~DialogImport()." );
-#endif
}
Reference< util::XNumberFormatsSupplier > const & DialogImport::getNumberFormatsSupplier()
diff --git a/xmlscript/source/xmllib_imexp/xmllib_import.cxx b/xmlscript/source/xmllib_imexp/xmllib_import.cxx
index 0b0e6b19b4ff..891919228d08 100644
--- a/xmlscript/source/xmllib_imexp/xmllib_import.cxx
+++ b/xmlscript/source/xmllib_imexp/xmllib_import.cxx
@@ -110,10 +110,7 @@ LibElementBase::~LibElementBase()
_pParent->release();
}
-#if OSL_DEBUG_LEVEL > 1
- OString aStr( OUStringToOString( _aLocalName, RTL_TEXTENCODING_ASCII_US ) );
- SAL_INFO("xmlscript.xmllib", "LibElementBase::~LibElementBase(): " << aStr.getStr() );
-#endif
+ SAL_INFO("xmlscript.xmllib", "LibElementBase::~LibElementBase(): " << _aLocalName );
}
// XRoot
@@ -176,9 +173,7 @@ Reference< xml::input::XElement > LibraryImport::startRootElement(
LibraryImport::~LibraryImport()
{
-#if OSL_DEBUG_LEVEL > 1
SAL_INFO("xmlscript.xmllib", "LibraryImport::~LibraryImport()." );
-#endif
}
// libraries
diff --git a/xmlscript/source/xmlmod_imexp/xmlmod_import.cxx b/xmlscript/source/xmlmod_imexp/xmlmod_import.cxx
index 23bd93b4704a..965f1bbc5a0d 100644
--- a/xmlscript/source/xmlmod_imexp/xmlmod_import.cxx
+++ b/xmlscript/source/xmlmod_imexp/xmlmod_import.cxx
@@ -110,10 +110,7 @@ ModuleElement::~ModuleElement()
_pParent->release();
}
-#if OSL_DEBUG_LEVEL > 1
- OString aStr( OUStringToOString( _aLocalName, RTL_TEXTENCODING_ASCII_US ) );
- SAL_INFO("xmlscript.xmlmod", "ModuleElement::~ModuleElement(): " << aStr.getStr() );
-#endif
+ SAL_INFO("xmlscript.xmlmod", "ModuleElement::~ModuleElement(): " << _aLocalName );
}
// XRoot
@@ -171,9 +168,7 @@ Reference< xml::input::XElement > ModuleImport::startRootElement(
ModuleImport::~ModuleImport()
{
-#if OSL_DEBUG_LEVEL > 1
SAL_INFO("xmlscript.xmlmod", "ModuleImport::~ModuleImport()." );
-#endif
}
Reference< xml::sax::XDocumentHandler >