writerfilter: Fold all the various DEBUG_* macros into DEBUG_DOMAINMAPPER.

They were set either all, or none anyway.

Change-Id: I4893ff5fef7c1a472ee8889ad36db2c3d3734be6

3 files changed, 34 insertions, 34 deletions

diff --git a/writerfilter/source/resourcemodel/LoggedResources.cxx b/writerfilter/source/resourcemodel/LoggedResources.cxx
index bdff38ae1ebc..6c4aa9796a63 100644
--- a/writerfilter/source/resourcemodel/LoggedResources.cxx
+++ b/writerfilter/source/resourcemodel/LoggedResources.cxx
@@ -24,7 +24,7 @@
 namespace writerfilter
 {
 
-#ifdef DEBUG_LOGGING
+#ifdef DEBUG_DOMAINMAPPER
 // class: LoggedResourcesHelper
 
 LoggedResourcesHelper::LoggedResourcesHelper(TagLogger::Pointer_t pLogger, const std::string & sPrefix)
@@ -71,7 +71,7 @@ void LoggedResourcesHelper::attribute(const std::string & rName, sal_uInt32 nVal
 // class: LoggedStream
 
 LoggedStream::LoggedStream(
-#ifdef DEBUG_LOGGING
+#ifdef DEBUG_DOMAINMAPPER
     TagLogger::Pointer_t pLogger,
     const std::string & sPrefix
 ) : mHelper(pLogger, sPrefix)
@@ -89,7 +89,7 @@ LoggedStream::~LoggedStream()
 
 void LoggedStream::startSectionGroup()
 {
-#ifdef DEBUG_LOGGING
+#ifdef DEBUG_DOMAINMAPPER
     mHelper.startElement("section");
 #endif
 
@@ -100,14 +100,14 @@ void LoggedStream::endSectionGroup()
 {
     lcl_endSectionGroup();
 
-#ifdef DEBUG_LOGGING
+#ifdef DEBUG_DOMAINMAPPER
     mHelper.endElement("section");
 #endif
 }
 
 void LoggedStream::startParagraphGroup()
 {
-#ifdef DEBUG_LOGGING
+#ifdef DEBUG_DOMAINMAPPER
     mHelper.startElement("paragraph");
 #endif
 
@@ -118,7 +118,7 @@ void LoggedStream::endParagraphGroup()
 {
     lcl_endParagraphGroup();
 
-#ifdef DEBUG_LOGGING
+#ifdef DEBUG_DOMAINMAPPER
     mHelper.endElement("paragraph");
 #endif
 }
@@ -126,7 +126,7 @@ void LoggedStream::endParagraphGroup()
 
 void LoggedStream::startCharacterGroup()
 {
-#ifdef DEBUG_LOGGING
+#ifdef DEBUG_DOMAINMAPPER
     mHelper.startElement("charactergroup");
 #endif
 
@@ -137,14 +137,14 @@ void LoggedStream::endCharacterGroup()
 {
     lcl_endCharacterGroup();
 
-#ifdef DEBUG_LOGGING
+#ifdef DEBUG_DOMAINMAPPER
     mHelper.endElement("charactergroup");
 #endif
 }
 
 void LoggedStream::startShape( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape )
 {
-#ifdef DEBUG_LOGGING
+#ifdef DEBUG_DOMAINMAPPER
     mHelper.startElement("shape");
 #endif
 
@@ -155,14 +155,14 @@ void LoggedStream::endShape()
 {
     lcl_endShape();
 
-#ifdef DEBUG_LOGGING
+#ifdef DEBUG_DOMAINMAPPER
     mHelper.endElement("shape");
 #endif
 }
 
 void LoggedStream::text(const sal_uInt8 * data, size_t len)
 {
-#ifdef DEBUG_LOGGING
+#ifdef DEBUG_DOMAINMAPPER
     mHelper.startElement("text");
 
     OUString sText( (const sal_Char*) data, len, RTL_TEXTENCODING_MS_1252 );
@@ -174,14 +174,14 @@ void LoggedStream::text(const sal_uInt8 * data, size_t len)
 
     lcl_text(data, len);
 
-#ifdef DEBUG_LOGGING
+#ifdef DEBUG_DOMAINMAPPER
     mHelper.endElement("text");
 #endif
 }
 
 void LoggedStream::utext(const sal_uInt8 * data, size_t len)
 {
-#ifdef DEBUG_LOGGING
+#ifdef DEBUG_DOMAINMAPPER
     mHelper.startElement("utext");
     mHelper.startElement("data");
 
@@ -197,83 +197,83 @@ void LoggedStream::utext(const sal_uInt8 * data, size_t len)
 
     lcl_utext(data, len);
 
-#ifdef DEBUG_LOGGING
+#ifdef DEBUG_DOMAINMAPPER
     mHelper.endElement("utext");
 #endif
 }
 
 void LoggedStream::positivePercentage(const OUString& rText)
 {
-#ifdef DEBUG_LOGGING
+#ifdef DEBUG_DOMAINMAPPER
     mHelper.startElement("positivePercentage");
     mHelper.chars(rText);
 #endif
 
     lcl_positivePercentage(rText);
 
-#ifdef DEBUG_LOGGING
+#ifdef DEBUG_DOMAINMAPPER
     mHelper.endElement("positivePercentage");
 #endif
 }
 
 void LoggedStream::props(writerfilter::Reference<Properties>::Pointer_t ref)
 {
-#ifdef DEBUG_LOGGING
+#ifdef DEBUG_DOMAINMAPPER
     mHelper.startElement("props");
 #endif
 
     lcl_props(ref);
 
-#ifdef DEBUG_LOGGING
+#ifdef DEBUG_DOMAINMAPPER
     mHelper.endElement("props");
 #endif
 }
 
 void LoggedStream::table(Id name, writerfilter::Reference<Table>::Pointer_t ref)
 {
-#ifdef DEBUG_LOGGING
+#ifdef DEBUG_DOMAINMAPPER
     mHelper.startElement("table");
     mHelper.attribute("name", (*QNameToString::Instance())(name));
 #endif
 
     lcl_table(name, ref);
 
-#ifdef DEBUG_LOGGING
+#ifdef DEBUG_DOMAINMAPPER
     mHelper.endElement("table");
 #endif
 }
 
 void LoggedStream::substream(Id name, writerfilter::Reference<Stream>::Pointer_t ref)
 {
-#ifdef DEBUG_LOGGING
+#ifdef DEBUG_DOMAINMAPPER
     mHelper.startElement("substream");
     mHelper.attribute("name", (*QNameToString::Instance())(name));
 #endif
 
     lcl_substream(name, ref);
 
-#ifdef DEBUG_LOGGING
+#ifdef DEBUG_DOMAINMAPPER
     mHelper.endElement("substream");
 #endif
 }
 
 void LoggedStream::info(const std::string & _info)
 {
-#ifdef DEBUG_LOGGING
+#ifdef DEBUG_DOMAINMAPPER
     mHelper.startElement("info");
     mHelper.attribute("text", _info);
 #endif
 
     lcl_info(_info);
 
-#ifdef DEBUG_LOGGING
+#ifdef DEBUG_DOMAINMAPPER
     mHelper.endElement("info");
 #endif
 }
 
 // class LoggedProperties
 LoggedProperties::LoggedProperties(
-#ifdef DEBUG_LOGGING
+#ifdef DEBUG_DOMAINMAPPER
     TagLogger::Pointer_t pLogger,
     const std::string & sPrefix
 ) : mHelper(pLogger, sPrefix)
@@ -291,7 +291,7 @@ LoggedProperties::~LoggedProperties()
 
 void LoggedProperties::attribute(Id name, Value & val)
 {
-#ifdef DEBUG_LOGGING
+#ifdef DEBUG_DOMAINMAPPER
     mHelper.startElement("attribute");
     mHelper.attribute("name", (*QNameToString::Instance())(name));
     mHelper.attribute("value", val.toString());
@@ -303,7 +303,7 @@ void LoggedProperties::attribute(Id name, Value & val)
 
 void LoggedProperties::sprm(Sprm & rSprm)
 {
-#ifdef DEBUG_LOGGING
+#ifdef DEBUG_DOMAINMAPPER
     mHelper.startElement("sprm");
     mHelper.attribute("name", (*QNameToString::Instance())(rSprm.getId()));
     mHelper.chars(rSprm.toString());
@@ -311,13 +311,13 @@ void LoggedProperties::sprm(Sprm & rSprm)
 
     lcl_sprm(rSprm);
 
-#ifdef DEBUG_LOGGING
+#ifdef DEBUG_DOMAINMAPPER
     mHelper.endElement("sprm");
 #endif
 }
 
 LoggedTable::LoggedTable(
-#ifdef DEBUG_LOGGING
+#ifdef DEBUG_DOMAINMAPPER
     TagLogger::Pointer_t pLogger,
     const std::string & sPrefix
 ) : mHelper(pLogger, sPrefix)
@@ -335,14 +335,14 @@ LoggedTable::~LoggedTable()
 
 void LoggedTable::entry(int pos, writerfilter::Reference<Properties>::Pointer_t ref)
 {
-#ifdef DEBUG_LOGGING
+#ifdef DEBUG_DOMAINMAPPER
     mHelper.startElement("entry");
     mHelper.attribute("pos", pos);
 #endif
 
     lcl_entry(pos, ref);
 
-#ifdef DEBUG_LOGGING
+#ifdef DEBUG_DOMAINMAPPER
     mHelper.endElement("entry");
 #endif
 }
diff --git a/writerfilter/source/resourcemodel/TagLogger.cxx b/writerfilter/source/resourcemodel/TagLogger.cxx
index 3d5bf472423e..cd3cc655a736 100644
--- a/writerfilter/source/resourcemodel/TagLogger.cxx
+++ b/writerfilter/source/resourcemodel/TagLogger.cxx
@@ -39,7 +39,7 @@ namespace writerfilter
         pName = NULL;
     }
 
-#ifdef DEBUG_IMPORT
+#ifdef DEBUG_DOMAINMAPPER
     void TagLogger::setFileName( const std::string & filename )
     {
         if ( pWriter )
@@ -228,7 +228,7 @@ namespace writerfilter
     }
 #endif
 
-#ifdef DEBUG_CONTEXT_HANDLER
+#ifdef DEBUG_DOMAINMAPPER
     class PropertySetDumpHandler : public Properties
     {
         IdToString::Pointer_t mpIdToString;
diff --git a/writerfilter/source/resourcemodel/qnametostrcore.cxx b/writerfilter/source/resourcemodel/qnametostrcore.cxx
index f4b45bc00357..7f1b0ef36acf 100644
--- a/writerfilter/source/resourcemodel/qnametostrcore.cxx
+++ b/writerfilter/source/resourcemodel/qnametostrcore.cxx
@@ -32,7 +32,7 @@ QNameToString::Pointer_t QNameToString::Instance()
     return pInstance;
 }
 
-#ifdef DEBUG_LOGGING
+#ifdef DEBUG_DOMAINMAPPER
 std::string QNameToString::operator()(Id qName)
 {
     Map::const_iterator aIt = mMap.find(qName);