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

They were set either all, or none anyway.

Change-Id: I4893ff5fef7c1a472ee8889ad36db2c3d3734be6

24 files changed, 129 insertions, 145 deletions

diff --git a/writerfilter/Library_writerfilter.mk b/writerfilter/Library_writerfilter.mk
index e70214b8db65..a1f13304245c 100644
--- a/writerfilter/Library_writerfilter.mk
+++ b/writerfilter/Library_writerfilter.mk
@@ -35,20 +35,6 @@ $(eval $(call gb_Library_add_defs,writerfilter,\
 	-DWRITERFILTER_WRITERFILTER_DLLIMPLEMENTATION \
 	$(if $(filter-out 0 1,$(gb_DEBUGLEVEL)), \
 		-DDEBUG_DOMAINMAPPER \
-		-DDEBUG_ELEMENT \
-		-DDEBUG_RESOLVE \
-		-DDEBUG_CONTEXT_STACK \
-		-DDEBUG_ATTRIBUTES \
-		-DDEBUG_PROPERTIES \
-		-DDEBUG_CONTEXT_HANDLER \
-		-DDEBUG_IMPORT \
-		-DDEBUG_LOGGING \
-		-DDEBUG_DMAPPER_PROPERTY_MAP \
-		-DDEBUG_DMAPPER_TABLE_HANDLER \
-		-DDEBUG_TABLE \
-		-DDEBUG_DMAPPER_SETTINGS_TABLE \
-		-DDEBUG_FACTORY \
-		-DDEBUG_DMAPPER_GRAPHIC_IMPORT \
 	) \
 ))
 
diff --git a/writerfilter/inc/resourcemodel/LoggedResources.hxx b/writerfilter/inc/resourcemodel/LoggedResources.hxx
index 89c2a341c428..378138857c99 100644
--- a/writerfilter/inc/resourcemodel/LoggedResources.hxx
+++ b/writerfilter/inc/resourcemodel/LoggedResources.hxx
@@ -27,7 +27,7 @@
 namespace writerfilter
 {
 
-#ifdef DEBUG_LOGGING
+#ifdef DEBUG_DOMAINMAPPER
 class LoggedResourcesHelper
 {
 public:
@@ -86,7 +86,7 @@ protected:
     virtual void lcl_substream(Id name, writerfilter::Reference<Stream>::Pointer_t ref) = 0;
     virtual void lcl_info(const std::string & info) = 0;
 
-#ifdef DEBUG_LOGGING
+#ifdef DEBUG_DOMAINMAPPER
     LoggedResourcesHelper mHelper;
 #endif
 };
@@ -104,7 +104,7 @@ protected:
     virtual void lcl_attribute(Id name, Value & val) = 0;
     virtual void lcl_sprm(Sprm & sprm) = 0;
 
-#ifdef DEBUG_LOGGING
+#ifdef DEBUG_DOMAINMAPPER
     LoggedResourcesHelper mHelper;
 #endif
 };
@@ -120,7 +120,7 @@ public:
 protected:
     virtual void lcl_entry(int pos, writerfilter::Reference<Properties>::Pointer_t ref) = 0;
 
-#ifdef DEBUG_LOGGING
+#ifdef DEBUG_DOMAINMAPPER
     LoggedResourcesHelper mHelper;
 #endif
 };
diff --git a/writerfilter/inc/resourcemodel/QNameToString.hxx b/writerfilter/inc/resourcemodel/QNameToString.hxx
index c5d18dfc4533..03706b14d522 100644
--- a/writerfilter/inc/resourcemodel/QNameToString.hxx
+++ b/writerfilter/inc/resourcemodel/QNameToString.hxx
@@ -68,7 +68,7 @@ protected:
 
 public:
     static Pointer_t Instance();
-#ifdef DEBUG_LOGGING
+#ifdef DEBUG_DOMAINMAPPER
     std::string operator()(sal_uInt32 nId);
 #endif
 };
diff --git a/writerfilter/inc/resourcemodel/TableManager.hxx b/writerfilter/inc/resourcemodel/TableManager.hxx
index ca2f85b62780..bdb65040238c 100644
--- a/writerfilter/inc/resourcemodel/TableManager.hxx
+++ b/writerfilter/inc/resourcemodel/TableManager.hxx
@@ -106,7 +106,7 @@ template <typename T, typename PropertiesPointer>
  */
 class TableManager
 {
-#ifdef DEBUG_TABLE
+#ifdef DEBUG_DOMAINMAPPER
     TagLogger::Pointer_t mpTableLogger;
 #endif
 
@@ -624,7 +624,7 @@ public:
     virtual bool isIgnore() const;
 
 
-#ifdef DEBUG_TABLE
+#ifdef DEBUG_DOMAINMAPPER
     void setTagLogger(TagLogger::Pointer_t _tagLogger)
     {
         mpTableLogger = _tagLogger;
@@ -644,7 +644,7 @@ TableManager<T, PropertiesPointer>::TableManager()
 template <typename T, typename PropertiesPointer>
 void TableManager<T, PropertiesPointer>::cellDepth(sal_uInt32 nDepth)
 {
-#ifdef DEBUG_TABLE
+#ifdef DEBUG_DOMAINMAPPER
     if (mpTableLogger != NULL)
     {
         mpTableLogger->startElement("tablemanager.cellDepth");
@@ -659,7 +659,7 @@ void TableManager<T, PropertiesPointer>::cellDepth(sal_uInt32 nDepth)
 template <typename T, typename PropertiesPointer>
 void TableManager<T, PropertiesPointer>::inCell()
 {
-#ifdef DEBUG_TABLE
+#ifdef DEBUG_DOMAINMAPPER
     if (mpTableLogger != NULL)
         mpTableLogger->element("tablemanager.inCell");
 #endif
@@ -672,7 +672,7 @@ void TableManager<T, PropertiesPointer>::inCell()
 template <typename T, typename PropertiesPointer>
 void TableManager<T, PropertiesPointer>::endCell()
 {
-#ifdef DEBUG_TABLE
+#ifdef DEBUG_DOMAINMAPPER
     if (mpTableLogger != NULL)
         mpTableLogger->element("tablemanager.endCell");
 #endif
@@ -683,7 +683,7 @@ void TableManager<T, PropertiesPointer>::endCell()
 template <typename T, typename PropertiesPointer>
 void TableManager<T, PropertiesPointer>::endRow()
 {
-#ifdef DEBUG_TABLE
+#ifdef DEBUG_DOMAINMAPPER
     if (mpTableLogger != NULL)
         mpTableLogger->element("tablemanager.endRow");
 #endif
@@ -701,7 +701,7 @@ void TableManager<T, PropertiesPointer>::setHandler
 template <typename T, typename PropertiesPointer>
 void TableManager<T, PropertiesPointer>::handle(const T & rHandle)
 {
-#ifdef DEBUG_TABLE
+#ifdef DEBUG_DOMAINMAPPER
     if (mpTableLogger)
     {
         mpTableLogger->startElement("tablemanager.handle");
@@ -725,7 +725,7 @@ bool TableManager<T, PropertiesPointer>::isInTable()
 template <typename T, typename PropertiesPointer>
 void TableManager<T, PropertiesPointer>::startLevel()
 {
-#ifdef DEBUG_TABLE
+#ifdef DEBUG_DOMAINMAPPER
     if (mpTableLogger != NULL)
     {
         typename TableData<T, PropertiesPointer>::Pointer_t pTableData;
@@ -775,7 +775,7 @@ void TableManager<T, PropertiesPointer>::endLevel()
     mState.endLevel();
     mTableDataStack.pop();
 
-#ifdef DEBUG_TABLE
+#ifdef DEBUG_DOMAINMAPPER
     if (mpTableLogger != NULL)
     {
         typename TableData<T, PropertiesPointer>::Pointer_t pTableData;
@@ -887,7 +887,7 @@ void TableManager<T, PropertiesPointer>::props(PropertiesPointer pProps)
 template <typename T, typename PropertiesPointer>
 void TableManager<T, PropertiesPointer>::handle0x7()
 {
-#ifdef DEBUG_TABLE
+#ifdef DEBUG_DOMAINMAPPER
     if (mpTableLogger != NULL)
         mpTableLogger->startElement("tablemanager.handle0x7");
 #endif
@@ -900,7 +900,7 @@ void TableManager<T, PropertiesPointer>::handle0x7()
     else
         endRow();
 
-#ifdef DEBUG_TABLE
+#ifdef DEBUG_DOMAINMAPPER
     if (mpTableLogger != NULL)
         mpTableLogger->endElement();
 #endif
@@ -933,7 +933,7 @@ void TableManager<T, PropertiesPointer>::utext(const sal_uInt8 * data, size_t le
 template <typename T, typename PropertiesPointer>
 void TableManager<T, PropertiesPointer>::cellProps(PropertiesPointer pProps)
 {
-#ifdef DEBUG_TABLE
+#ifdef DEBUG_DOMAINMAPPER
     if (mpTableLogger != NULL)
         mpTableLogger->startElement("tablemanager.cellProps");
 #endif
@@ -943,7 +943,7 @@ void TableManager<T, PropertiesPointer>::cellProps(PropertiesPointer pProps)
     else
         setCellProps(pProps);
 
-#ifdef DEBUG_TABLE
+#ifdef DEBUG_DOMAINMAPPER
     if (mpTableLogger != NULL)
         mpTableLogger->endElement();
 #endif
@@ -953,14 +953,14 @@ template <typename T, typename PropertiesPointer>
 void TableManager<T, PropertiesPointer>::cellPropsByCell
 (unsigned int i, PropertiesPointer pProps)
 {
-#ifdef DEBUG_TABLE
+#ifdef DEBUG_DOMAINMAPPER
     if (mpTableLogger != NULL)
         mpTableLogger->startElement("tablemanager.cellPropsByCell");
 #endif
 
     mTableDataStack.top()->insertCellProperties(i, pProps);
 
-#ifdef DEBUG_TABLE
+#ifdef DEBUG_DOMAINMAPPER
     if (mpTableLogger != NULL)
         mpTableLogger->endElement();
 #endif
@@ -969,7 +969,7 @@ void TableManager<T, PropertiesPointer>::cellPropsByCell
 template <typename T, typename PropertiesPointer>
 void TableManager<T, PropertiesPointer>::insertRowProps(PropertiesPointer pProps)
 {
-#ifdef DEBUG_TABLE
+#ifdef DEBUG_DOMAINMAPPER
     if (mpTableLogger != NULL)
         mpTableLogger->startElement("tablemanager.insertRowProps");
 #endif
@@ -979,7 +979,7 @@ void TableManager<T, PropertiesPointer>::insertRowProps(PropertiesPointer pProps
     else
         setRowProps(pProps);
 
-#ifdef DEBUG_TABLE
+#ifdef DEBUG_DOMAINMAPPER
     if (mpTableLogger != NULL)
         mpTableLogger->endElement();
 #endif
@@ -988,7 +988,7 @@ void TableManager<T, PropertiesPointer>::insertRowProps(PropertiesPointer pProps
 template <typename T, typename PropertiesPointer>
 void TableManager<T, PropertiesPointer>::insertTableProps(PropertiesPointer pProps)
 {
-#ifdef DEBUG_TABLE
+#ifdef DEBUG_DOMAINMAPPER
     if (mpTableLogger != NULL)
         mpTableLogger->startElement("tablemanager.insertTableProps");
 #endif
@@ -998,7 +998,7 @@ void TableManager<T, PropertiesPointer>::insertTableProps(PropertiesPointer pPro
     else
         setTableProps(pProps);
 
-#ifdef DEBUG_TABLE
+#ifdef DEBUG_DOMAINMAPPER
     if (mpTableLogger != NULL)
         mpTableLogger->endElement();
 #endif
@@ -1007,7 +1007,7 @@ void TableManager<T, PropertiesPointer>::insertTableProps(PropertiesPointer pPro
 template <typename T, typename PropertiesPointer>
 void TableManager<T, PropertiesPointer>::resolveCurrentTable()
 {
-#ifdef DEBUG_TABLE
+#ifdef DEBUG_DOMAINMAPPER
     if (mpTableLogger != NULL)
         mpTableLogger->startElement("tablemanager.resolveCurrentTable");
 #endif
@@ -1056,7 +1056,7 @@ void TableManager<T, PropertiesPointer>::resolveCurrentTable()
     resetTableProps();
     clearData();
 
-#ifdef DEBUG_TABLE
+#ifdef DEBUG_DOMAINMAPPER
     if (mpTableLogger != NULL)
         mpTableLogger->endElement();
 #endif
@@ -1087,7 +1087,7 @@ template <typename T, typename PropertiesPointer>
 void  TableManager<T, PropertiesPointer>::openCell
 (const T & rHandle, PropertiesPointer pProps)
 {
-#ifdef DEBUG_TABLE
+#ifdef DEBUG_DOMAINMAPPER
     mpTableLogger->startElement("tablemanager.openCell");
     mpTableLogger->chars(toString(rHandle));
     mpTableLogger->endElement();
@@ -1106,7 +1106,7 @@ template <typename T, typename PropertiesPointer>
 void  TableManager<T, PropertiesPointer>::closeCell
 (const T & rHandle)
 {
-#ifdef DEBUG_TABLE
+#ifdef DEBUG_DOMAINMAPPER
     mpTableLogger->startElement("tablemanager.closeCell");
     mpTableLogger->chars(toString(rHandle));
     mpTableLogger->endElement();
@@ -1124,7 +1124,7 @@ void  TableManager<T, PropertiesPointer>::closeCell
 template <typename T, typename PropertiesPointer>
 void  TableManager<T, PropertiesPointer>::ensureOpenCell(PropertiesPointer pProps)
 {
-#ifdef DEBUG_TABLE
+#ifdef DEBUG_DOMAINMAPPER
     mpTableLogger->startElement("tablemanager.ensureOpenCell");
 #endif
 
@@ -1141,7 +1141,7 @@ void  TableManager<T, PropertiesPointer>::ensureOpenCell(PropertiesPointer pProp
                 pTableData->insertCellProperties(pProps);
         }
     }
-#ifdef DEBUG_TABLE
+#ifdef DEBUG_DOMAINMAPPER
     mpTableLogger->endElement();
 #endif
 }
diff --git a/writerfilter/inc/resourcemodel/TagLogger.hxx b/writerfilter/inc/resourcemodel/TagLogger.hxx
index 24b8ac1f1548..c75af7b3ac25 100644
--- a/writerfilter/inc/resourcemodel/TagLogger.hxx
+++ b/writerfilter/inc/resourcemodel/TagLogger.hxx
@@ -56,7 +56,7 @@ namespace writerfilter
 
         static Pointer_t getInstance(const char * name);
 
-#ifdef DEBUG_IMPORT
+#ifdef DEBUG_DOMAINMAPPER
         void setFileName(const std::string & filename);
         void startDocument();
         void endDocument();
@@ -79,7 +79,7 @@ namespace writerfilter
         void endElement();
 #endif
 
-#ifdef DEBUG_CONTEXT_HANDLER
+#ifdef DEBUG_DOMAINMAPPER
         void propertySet(writerfilter::Reference<Properties>::Pointer_t props,
                 IdToString::Pointer_t pIdToString);
 #endif
diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
index 57bbd32388f9..16b367cceda7 100644
--- a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
@@ -31,7 +31,7 @@
 #include <dmapperLoggers.hxx>
 #include <TablePositionHandler.hxx>
 
-#ifdef DEBUG_DMAPPER_TABLE_HANDLER
+#ifdef DEBUG_DOMAINMAPPER
 #include <PropertyMapHelper.hxx>
 #include <rtl/ustring.hxx>
 #endif
@@ -44,7 +44,7 @@ using namespace ::std;
 
 #define DEF_BORDER_DIST 190  //0,19cm
 
-#ifdef DEBUG_DMAPPER_TABLE_HANDLER
+#ifdef DEBUG_DOMAINMAPPER
 static void  lcl_printProperties( PropertyMapPtr pProps )
 {
     if( pProps.get() )
@@ -101,7 +101,7 @@ void DomainMapperTableHandler::startTable(unsigned int nRows,
     m_pTableSeq = TableSequencePointer_t(new TableSequence_t(nRows));
     m_nRowIndex = 0;
 
-#ifdef DEBUG_DMAPPER_TABLE_HANDLER
+#ifdef DEBUG_DOMAINMAPPER
     dmapper_logger->startElement("tablehandler.table");
     dmapper_logger->attribute("rows", nRows);
 
@@ -224,7 +224,7 @@ void lcl_computeCellBorders( PropertyMapPtr pTableBorders, PropertyMapPtr pCellP
     }
 }
 
-#ifdef DEBUG_DMAPPER_TABLE_HANDLER
+#ifdef DEBUG_DOMAINMAPPER
 
 void lcl_debug_BorderLine(table::BorderLine & rLine)
 {
@@ -450,7 +450,7 @@ TableStyleSheetEntry * DomainMapperTableHandler::endTableGetTableStyle(TableInfo
                     nGrabBagSize++;
                 }
 
-#ifdef DEBUG_DMAPPER_TABLE_HANDLER
+#ifdef DEBUG_DOMAINMAPPER
                 dmapper_logger->startElement("mergedProps");
                 pMergedProperties->dumpXml( dmapper_logger );
                 dmapper_logger->endElement();
@@ -459,7 +459,7 @@ TableStyleSheetEntry * DomainMapperTableHandler::endTableGetTableStyle(TableInfo
                 m_aTableProperties->InsertProps(pMergedProperties);
                 m_aTableProperties->InsertProps(pTableProps);
 
-#ifdef DEBUG_DMAPPER_TABLE_HANDLER
+#ifdef DEBUG_DOMAINMAPPER
                 dmapper_logger->startElement("TableProperties");
                 m_aTableProperties->dumpXml( dmapper_logger );
                 dmapper_logger->endElement();
@@ -478,7 +478,7 @@ TableStyleSheetEntry * DomainMapperTableHandler::endTableGetTableStyle(TableInfo
         // Set the table default attributes for the cells
         rInfo.pTableDefaults->InsertProps(m_aTableProperties);
 
-#ifdef DEBUG_DMAPPER_TABLE_HANDLER
+#ifdef DEBUG_DOMAINMAPPER
         dmapper_logger->startElement("TableDefaults");
         rInfo.pTableDefaults->dumpXml( dmapper_logger );
         dmapper_logger->endElement();
@@ -569,7 +569,7 @@ TableStyleSheetEntry * DomainMapperTableHandler::endTableGetTableStyle(TableInfo
 
         m_aTableProperties->Insert( PROP_TABLE_BORDER, uno::makeAny( aTableBorder ) );
 
-#ifdef DEBUG_DMAPPER_TABLE_HANDLER
+#ifdef DEBUG_DOMAINMAPPER
         lcl_debug_TableBorder(aTableBorder);
 #endif
 
@@ -612,7 +612,7 @@ TableStyleSheetEntry * DomainMapperTableHandler::endTableGetTableStyle(TableInfo
 
         rInfo.aTableProperties = m_aTableProperties->GetPropertyValues();
 
-#ifdef DEBUG_DMAPPER_TABLE_HANDLER
+#ifdef DEBUG_DOMAINMAPPER
         dmapper_logger->startElement("debug.tableprops");
         m_aTableProperties->dumpXml( dmapper_logger );
         dmapper_logger->endElement();
@@ -638,7 +638,7 @@ TableStyleSheetEntry * DomainMapperTableHandler::endTableGetTableStyle(TableInfo
 
 CellPropertyValuesSeq_t DomainMapperTableHandler::endTableGetCellProperties(TableInfo & rInfo, std::vector<HorizontallyMergedCell>& rMerges)
 {
-#ifdef DEBUG_DMAPPER_TABLE_HANDLER
+#ifdef DEBUG_DOMAINMAPPER
     dmapper_logger->startElement("getCellProperties");
 #endif
 
@@ -775,7 +775,7 @@ CellPropertyValuesSeq_t DomainMapperTableHandler::endTableGetCellProperties(Tabl
                 pAllCellProps->InsertProps(*aCellIterator);
                 aCellIterator->get( )->swap( *pAllCellProps.get( ) );
 
-#ifdef DEBUG_DMAPPER_TABLE_HANDLER
+#ifdef DEBUG_DOMAINMAPPER
                 dmapper_logger->startElement("cell");
                 dmapper_logger->attribute("cell", nCell);
                 dmapper_logger->attribute("row", nRow);
@@ -827,14 +827,14 @@ CellPropertyValuesSeq_t DomainMapperTableHandler::endTableGetCellProperties(Tabl
                     aCellIterator->get()->erase(PROP_HORIZONTAL_MERGE);
                 }
                 pSingleCellProperties[nCell] = aCellIterator->get()->GetPropertyValues();
-#ifdef DEBUG_DMAPPER_TABLE_HANDLER
+#ifdef DEBUG_DOMAINMAPPER
                 dmapper_logger->endElement();
 #endif
             }
             ++nCell;
             ++aCellIterator;
         }
-#ifdef DEBUG_DMAPPER_TABLE_HANDLER
+#ifdef DEBUG_DOMAINMAPPER
         //-->debug cell properties
         {
             OUString sNames;
@@ -862,7 +862,7 @@ CellPropertyValuesSeq_t DomainMapperTableHandler::endTableGetCellProperties(Tabl
         ++aRowIter;
     }
 
-#ifdef DEBUG_DMAPPER_TABLE_HANDLER
+#ifdef DEBUG_DOMAINMAPPER
     dmapper_logger->endElement();
 #endif
 
@@ -871,7 +871,7 @@ CellPropertyValuesSeq_t DomainMapperTableHandler::endTableGetCellProperties(Tabl
 
 RowPropertyValuesSeq_t DomainMapperTableHandler::endTableGetRowProperties()
 {
-#ifdef DEBUG_DMAPPER_TABLE_HANDLER
+#ifdef DEBUG_DOMAINMAPPER
     dmapper_logger->startElement("getRowProperties");
 #endif
 
@@ -881,7 +881,7 @@ RowPropertyValuesSeq_t DomainMapperTableHandler::endTableGetRowProperties()
     sal_Int32 nRow = 0;
     while( aRowIter != aRowIterEnd )
     {
-#ifdef DEBUG_DMAPPER_TABLE_HANDLER
+#ifdef DEBUG_DOMAINMAPPER
         dmapper_logger->startElement("rowProps.row");
 #endif
         if( aRowIter->get() )
@@ -895,19 +895,19 @@ RowPropertyValuesSeq_t DomainMapperTableHandler::endTableGetRowProperties()
                 aRowIter->get()->erase(aIter);
 
             aRowProperties[nRow] = (*aRowIter)->GetPropertyValues();
-#ifdef DEBUG_DMAPPER_TABLE_HANDLER
+#ifdef DEBUG_DOMAINMAPPER
             ((*aRowIter)->dumpXml( dmapper_logger ));
             lcl_DumpPropertyValues(dmapper_logger, aRowProperties[nRow]);
 #endif
         }
         ++nRow;
         ++aRowIter;
-#ifdef DEBUG_DMAPPER_TABLE_HANDLER
+#ifdef DEBUG_DOMAINMAPPER
         dmapper_logger->endElement();
 #endif
     }
 
-#ifdef DEBUG_DMAPPER_TABLE_HANDLER
+#ifdef DEBUG_DOMAINMAPPER
     dmapper_logger->endElement();
 #endif
 
@@ -932,7 +932,7 @@ static void lcl_ApplyCellParaProps(uno::Reference<table::XCell> xCell, uno::Any
 
 void DomainMapperTableHandler::endTable(unsigned int nestedTableLevel)
 {
-#ifdef DEBUG_DMAPPER_TABLE_HANDLER
+#ifdef DEBUG_DOMAINMAPPER
     dmapper_logger->startElement("tablehandler.endTable");
 #endif
 
@@ -948,7 +948,7 @@ void DomainMapperTableHandler::endTable(unsigned int nestedTableLevel)
 
     RowPropertyValuesSeq_t aRowProperties = endTableGetRowProperties();
 
-#ifdef DEBUG_DMAPPER_TABLE_HANDLER
+#ifdef DEBUG_DOMAINMAPPER
     lcl_DumpPropertyValueSeq(dmapper_logger, aRowProperties);
 #endif
 
@@ -1022,7 +1022,7 @@ void DomainMapperTableHandler::endTable(unsigned int nestedTableLevel)
         {
             SAL_INFO("writerfilter.dmapper",
                     "Conversion to table error: " << e.Message);
-#ifdef DEBUG_DMAPPER_TABLE_HANDLER
+#ifdef DEBUG_DOMAINMAPPER
             dmapper_logger->chars(std::string("failed to import table!"));
 #endif
         }
@@ -1077,7 +1077,7 @@ void DomainMapperTableHandler::endTable(unsigned int nestedTableLevel)
     m_aCellProperties.clear();
     m_aRowProperties.clear();
 
-#ifdef DEBUG_DMAPPER_TABLE_HANDLER
+#ifdef DEBUG_DOMAINMAPPER
     dmapper_logger->endElement();
     dmapper_logger->endElement();
 #endif
@@ -1089,7 +1089,7 @@ void DomainMapperTableHandler::startRow(unsigned int nCells,
     m_aRowProperties.push_back( pProps );
     m_aCellProperties.push_back( PropertyMapVector1() );
 
-#ifdef DEBUG_DMAPPER_TABLE_HANDLER
+#ifdef DEBUG_DOMAINMAPPER
     dmapper_logger->startElement("table.row");
     dmapper_logger->attribute("cells", nCells);
     if (pProps != NULL)
@@ -1105,7 +1105,7 @@ void DomainMapperTableHandler::endRow()
     (*m_pTableSeq)[m_nRowIndex] = *m_pRowSeq;
     ++m_nRowIndex;
     m_nCellIndex = 0;
-#ifdef DEBUG_DMAPPER_TABLE_HANDLER
+#ifdef DEBUG_DOMAINMAPPER
     dmapper_logger->endElement();
 #endif
 }
@@ -1124,7 +1124,7 @@ void DomainMapperTableHandler::startCell(const Handle_t & start,
         m_aCellProperties[nRow - 1].push_back( pEmptyProps );
     }
 
-#ifdef DEBUG_DMAPPER_TABLE_HANDLER
+#ifdef DEBUG_DOMAINMAPPER
     dmapper_logger->startElement("table.cell");
     dmapper_logger->startElement("table.cell.start");
     dmapper_logger->chars(toString(start));
@@ -1141,7 +1141,7 @@ void DomainMapperTableHandler::startCell(const Handle_t & start,
 
 void DomainMapperTableHandler::endCell(const Handle_t & end)
 {
-#ifdef DEBUG_DMAPPER_TABLE_HANDLER
+#ifdef DEBUG_DOMAINMAPPER
     dmapper_logger->startElement("table.cell.end");
     dmapper_logger->chars(toString(end));
     dmapper_logger->endElement();
diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.cxx b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
index 98fa11aca93a..7502a84b0ec0 100644
--- a/writerfilter/source/dmapper/DomainMapperTableManager.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
@@ -63,10 +63,8 @@ DomainMapperTableManager::DomainMapperTableManager(bool bOOXML) :
     m_pTablePropsHandler->SetTableManager( this );
 
 #ifdef DEBUG_DOMAINMAPPER
-#ifdef DEBUG_TABLE
     setTagLogger(dmapper_logger);
 #endif
-#endif
 }
 
 
diff --git a/writerfilter/source/dmapper/GraphicImport.cxx b/writerfilter/source/dmapper/GraphicImport.cxx
index e796d217fc87..cf3da2af2224 100644
--- a/writerfilter/source/dmapper/GraphicImport.cxx
+++ b/writerfilter/source/dmapper/GraphicImport.cxx
@@ -864,7 +864,7 @@ void GraphicImport::lcl_attribute(Id nName, Value& rValue)
             }
             break;
         default:
-#ifdef DEBUG_DMAPPER_GRAPHIC_IMPORT
+#ifdef DEBUG_DOMAINMAPPER
             dmapper_logger->element("unhandled");
 #endif
             break;
diff --git a/writerfilter/source/dmapper/PropertyMap.cxx b/writerfilter/source/dmapper/PropertyMap.cxx
index 8e2b4786acfd..13a72885142c 100644
--- a/writerfilter/source/dmapper/PropertyMap.cxx
+++ b/writerfilter/source/dmapper/PropertyMap.cxx
@@ -159,7 +159,7 @@ uno::Sequence< beans::PropertyValue > PropertyMap::GetPropertyValues(bool bCharG
     return m_aValues;
 }
 
-#ifdef DEBUG_DMAPPER_PROPERTY_MAP
+#ifdef DEBUG_DOMAINMAPPER
 static void lcl_AnyToTag(const uno::Any & rAny)
 {
     try {
@@ -186,7 +186,7 @@ static void lcl_AnyToTag(const uno::Any & rAny)
 
 void PropertyMap::Insert( PropertyIds eId, const uno::Any& rAny, bool bOverwrite, GrabBagType rGrabBagType )
 {
-#ifdef DEBUG_DMAPPER_PROPERTY_MAP
+#ifdef DEBUG_DOMAINMAPPER
     const OUString& rInsert = PropertyNameSupplier::
         GetPropertyNameSupplier().GetName(eId);
 
diff --git a/writerfilter/source/dmapper/SettingsTable.cxx b/writerfilter/source/dmapper/SettingsTable.cxx
index 24544a413348..16b054ddfa36 100644
--- a/writerfilter/source/dmapper/SettingsTable.cxx
+++ b/writerfilter/source/dmapper/SettingsTable.cxx
@@ -165,7 +165,7 @@ void SettingsTable::lcl_attribute(Id nName, Value & val)
         break;
     default:
     {
-#ifdef DEBUG_DMAPPER_SETTINGS_TABLE
+#ifdef DEBUG_DOMAINMAPPER
         dmapper_logger->element("unhandled");
 #endif
     }
@@ -278,7 +278,7 @@ void SettingsTable::lcl_sprm(Sprm& rSprm)
     break;
     default:
     {
-#ifdef DEBUG_DMAPPER_SETTINGS_TABLE
+#ifdef DEBUG_DOMAINMAPPER
         dmapper_logger->element("unhandled");
 #endif
     }
diff --git a/writerfilter/source/filter/ImportFilter.cxx b/writerfilter/source/filter/ImportFilter.cxx
index 2f2290df2c74..c1496485ee35 100644
--- a/writerfilter/source/filter/ImportFilter.cxx
+++ b/writerfilter/source/filter/ImportFilter.cxx
@@ -29,7 +29,7 @@
 #include <dmapper/DomainMapper.hxx>
 #include <WriterFilter.hxx>
 #include <ooxml/OOXMLDocument.hxx>
-#ifdef DEBUG_IMPORT
+#ifdef DEBUG_DOMAINMAPPER
 #include <iostream>
 #include <osl/process.h>
 #endif
@@ -77,7 +77,7 @@ sal_Bool WriterFilter::filter( const uno::Sequence< beans::PropertyValue >& aDes
         if ( !xInputStream.is() )
             return sal_False;
 
-#ifdef DEBUG_IMPORT
+#ifdef DEBUG_DOMAINMAPPER
         OUString sURL = aMediaDesc.getUnpackedValueOrDefault( utl::MediaDescriptor::PROP_URL(), OUString() );
         ::std::string sURLc = OUStringToOString(sURL, RTL_TEXTENCODING_ASCII_US).getStr();
 
@@ -180,7 +180,7 @@ sal_Bool WriterFilter::filter( const uno::Sequence< beans::PropertyValue >& aDes
 
     pStream.reset();
 
-#ifdef DEBUG_IMPORT
+#ifdef DEBUG_DOMAINMAPPER
     dmapper_logger->endDocument();
 #endif
 
diff --git a/writerfilter/source/filter/RtfFilter.cxx b/writerfilter/source/filter/RtfFilter.cxx
index e9cef427037a..3a7e6c49380b 100644
--- a/writerfilter/source/filter/RtfFilter.cxx
+++ b/writerfilter/source/filter/RtfFilter.cxx
@@ -72,7 +72,7 @@ sal_Bool RtfFilter::filter(const uno::Sequence< beans::PropertyValue >& aDescrip
         bool bRepairStorage = aMediaDesc.getUnpackedValueOrDefault("RepairPackage", false);
         bool bIsNewDoc = !aMediaDesc.getUnpackedValueOrDefault("InsertMode", false);
         uno::Reference<text::XTextRange> xInsertTextRange = aMediaDesc.getUnpackedValueOrDefault("TextInsertModeRange", uno::Reference<text::XTextRange>());
-#ifdef DEBUG_IMPORT
+#ifdef DEBUG_DOMAINMAPPER
         OUString sURL = aMediaDesc.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_URL(), OUString());
         std::string sURLc = OUStringToOString(sURL, RTL_TEXTENCODING_ASCII_US).getStr();
 
@@ -121,7 +121,7 @@ sal_Bool RtfFilter::filter(const uno::Sequence< beans::PropertyValue >& aDescrip
             writerfilter::rtftok::RTFDocumentFactory::createDocument(m_xContext, xInputStream, m_xDstDoc, xFrame, xStatusIndicator));
         pDocument->resolve(*pStream);
         bResult = true;
-#ifdef DEBUG_IMPORT
+#ifdef DEBUG_DOMAINMAPPER
         dmapper_logger->endDocument();
 #endif
         sal_uInt32 nEndTime = osl_getGlobalTimer();
diff --git a/writerfilter/source/ooxml/OOXMLFactory.cxx b/writerfilter/source/ooxml/OOXMLFactory.cxx
index 834d7a686dd8..597631b1e2bf 100644
--- a/writerfilter/source/ooxml/OOXMLFactory.cxx
+++ b/writerfilter/source/ooxml/OOXMLFactory.cxx
@@ -85,7 +85,7 @@ TokenToIdMapPointer OOXMLFactory_ns::getTokenToIdMap(Id nId)
     return m_TokenToIdsMap[nId];
 }
 
-#ifdef DEBUG_FACTORY
+#ifdef DEBUG_DOMAINMAPPER
 string OOXMLFactory_ns::getDefineName(Id /*nId*/) const
 {
     return "";
@@ -279,7 +279,7 @@ void OOXMLFactory_ns::attributeAction(OOXMLFastContextHandler *, Token_t, OOXMLV
 {
 }
 
-#ifdef DEBUG_FACTORY
+#ifdef DEBUG_DOMAINMAPPER
 string OOXMLFactory_ns::getName() const
 {
     return "noname";
diff --git a/writerfilter/source/ooxml/OOXMLFactory.hxx b/writerfilter/source/ooxml/OOXMLFactory.hxx
index dc626795df68..ac021add2233 100644
--- a/writerfilter/source/ooxml/OOXMLFactory.hxx
+++ b/writerfilter/source/ooxml/OOXMLFactory.hxx
@@ -100,7 +100,7 @@ public:
     virtual void charactersAction(OOXMLFastContextHandler * pHandler, const OUString & rString);
     virtual void endAction(OOXMLFastContextHandler * pHandler);
     virtual void attributeAction(OOXMLFastContextHandler * pHandler, Token_t nToken, OOXMLValue::Pointer_t pValue);
-#ifdef DEBUG_FACTORY
+#ifdef DEBUG_DOMAINMAPPER
     virtual string getDefineName(Id nId) const;
     virtual string getName() const;
 #endif
diff --git a/writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx b/writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx
index d714c8d5b30d..14b1e33709c0 100644
--- a/writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx
+++ b/writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx
@@ -38,7 +38,7 @@ OOXMLFastDocumentHandler::OOXMLFastDocumentHandler(
     sal_Int32 nXNoteId )
     : m_xContext(context)
     , mpStream( pStream )
-#ifdef DEBUG_ELEMENT
+#ifdef DEBUG_DOMAINMAPPER
     , mpTmpStream()
 #endif
     , mpDocument( pDocument )
@@ -50,13 +50,13 @@ OOXMLFastDocumentHandler::OOXMLFastDocumentHandler(
 // ::com::sun::star::xml::sax::XFastContextHandler:
 void SAL_CALL OOXMLFastDocumentHandler::startFastElement
 (::sal_Int32
-#ifdef DEBUG_CONTEXT_STACK
+#ifdef DEBUG_DOMAINMAPPER
 Element
 #endif
 , const uno::Reference< xml::sax::XFastAttributeList > & /*Attribs*/)
     throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
 {
-#ifdef DEBUG_CONTEXT_STACK
+#ifdef DEBUG_DOMAINMAPPER
     clog << this << ":start element:"
          << fastTokenToId(Element)
          << endl;
@@ -65,18 +65,18 @@ Element
 
 void SAL_CALL OOXMLFastDocumentHandler::startUnknownElement
 (const OUString &
-#ifdef DEBUG_CONTEXT_STACK
+#ifdef DEBUG_DOMAINMAPPER
 Namespace
 #endif
 , const OUString &
-#ifdef DEBUG_CONTEXT_STACK
+#ifdef DEBUG_DOMAINMAPPER
 Name
 #endif
 ,
  const uno::Reference< xml::sax::XFastAttributeList > & /*Attribs*/)
 throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
 {
-#ifdef DEBUG_CONTEXT_STACK
+#ifdef DEBUG_DOMAINMAPPER
     clog << this << ":start unknown element:"
          << OUStringToOString(Namespace, RTL_TEXTENCODING_ASCII_US).getStr()
          << ":"
@@ -86,13 +86,13 @@ throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
 }
 
 void SAL_CALL OOXMLFastDocumentHandler::endFastElement(::sal_Int32
-#ifdef DEBUG_CONTEXT_STACK
+#ifdef DEBUG_DOMAINMAPPER
 Element
 #endif
 )
 throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
 {
-#ifdef DEBUG_CONTEXT_STACK
+#ifdef DEBUG_DOMAINMAPPER
     clog << this << ":end element:"
          << fastTokenToId(Element)
          << endl;
@@ -101,17 +101,17 @@ throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
 
 void SAL_CALL OOXMLFastDocumentHandler::endUnknownElement
 (const OUString &
-#ifdef DEBUG_CONTEXT_STACK
+#ifdef DEBUG_DOMAINMAPPER
 Namespace
 #endif
 , const OUString &
-#ifdef DEBUG_CONTEXT_STACK
+#ifdef DEBUG_DOMAINMAPPER
 Name
 #endif
 )
 throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
 {
-#ifdef DEBUG_CONTEXT_STACK
+#ifdef DEBUG_DOMAINMAPPER
     clog << this << ":end unknown element:"
          << OUStringToOString(Namespace, RTL_TEXTENCODING_ASCII_US).getStr()
          << ":"
@@ -142,7 +142,7 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL
  const uno::Reference< xml::sax::XFastAttributeList > & /*Attribs*/)
     throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
 {
-#ifdef DEBUG_CONTEXT_STACK
+#ifdef DEBUG_DOMAINMAPPER
     clog << this << ":createFastChildContext:"
          << fastTokenToId(Element)
          << endl;
@@ -161,18 +161,18 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL
 uno::Reference< xml::sax::XFastContextHandler > SAL_CALL
 OOXMLFastDocumentHandler::createUnknownChildContext
 (const OUString &
-#ifdef DEBUG_CONTEXT_STACK
+#ifdef DEBUG_DOMAINMAPPER
 Namespace
 #endif
 ,
  const OUString &
-#ifdef DEBUG_CONTEXT_STACK
+#ifdef DEBUG_DOMAINMAPPER
 Name
 #endif
 , const uno::Reference< xml::sax::XFastAttributeList > & /*Attribs*/)
     throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
 {
-#ifdef DEBUG_CONTEXT_STACK
+#ifdef DEBUG_DOMAINMAPPER
     clog << this << ":createUnknownChildContext:"
          << OUStringToOString(Namespace, RTL_TEXTENCODING_ASCII_US).getStr()
          << ":"
diff --git a/writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx b/writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx
index 847dcd577b47..4036a3e5efb7 100644
--- a/writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx
+++ b/writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx
@@ -94,7 +94,7 @@ private:
     css::uno::Reference< css::uno::XComponentContext > m_xContext;
 
     Stream * mpStream;
-#ifdef DEBUG_ELEMENT
+#ifdef DEBUG_DOMAINMAPPER
     Stream::Pointer_t mpTmpStream;
 #endif
     OOXMLDocumentImpl* mpDocument;
diff --git a/writerfilter/source/ooxml/OOXMLPropertySetImpl.cxx b/writerfilter/source/ooxml/OOXMLPropertySetImpl.cxx
index a7c8883fb977..b058522ba58b 100644
--- a/writerfilter/source/ooxml/OOXMLPropertySetImpl.cxx
+++ b/writerfilter/source/ooxml/OOXMLPropertySetImpl.cxx
@@ -108,7 +108,7 @@ string OOXMLPropertyImpl::getName() const
 {
     string sResult;
 
-#ifdef DEBUG_LOGGING
+#ifdef DEBUG_DOMAINMAPPER
     sResult = (*QNameToString::Instance())(mId);
 #endif
 
diff --git a/writerfilter/source/ooxml/factory_ns.xsl b/writerfilter/source/ooxml/factory_ns.xsl
index a657215d1c68..59a29405df46 100644
--- a/writerfilter/source/ooxml/factory_ns.xsl
+++ b/writerfilter/source/ooxml/factory_ns.xsl
@@ -86,13 +86,13 @@ public:
     virtual ListValueMapPointer createListValueMap(Id nId);
     virtual CreateElementMapPointer createCreateElementMap(Id nId);
     virtual TokenToIdMapPointer createTokenToIdMap(Id nId);
-#ifdef DEBUG_FACTORY
+#ifdef DEBUG_DOMAINMAPPER
     virtual string getDefineName(Id nId) const;</xsl:text>
 #endif
     <xsl:call-template name="factoryactiondecls"/>
     virtual void attributeAction(OOXMLFastContextHandler * pHandler, Token_t nToken, OOXMLValue::Pointer_t pValue);
 
-#ifdef DEBUG_FACTORY
+#ifdef DEBUG_DOMAINMAPPER
     virtual string getName() const;
 #endif
     <xsl:text>
diff --git a/writerfilter/source/ooxml/factoryimpl_ns.xsl b/writerfilter/source/ooxml/factoryimpl_ns.xsl
index d932008eb5c8..4adaed4e9731 100644
--- a/writerfilter/source/ooxml/factoryimpl_ns.xsl
+++ b/writerfilter/source/ooxml/factoryimpl_ns.xsl
@@ -680,7 +680,7 @@ CreateElementMapPointer </xsl:text>
 
 <xsl:template name="factorygetdefinename">
     <xsl:text>
-#ifdef DEBUG_FACTORY
+#ifdef DEBUG_DOMAINMAPPER
 string </xsl:text>
     <xsl:call-template name="factoryclassname"/>
     <xsl:text>::getDefineName(Id nId) const
@@ -888,7 +888,7 @@ void </xsl:text>
 <xsl:template name="factorygetname">
   <xsl:param name="ns"/>
   <xsl:text>
-#ifdef DEBUG_FACTORY
+#ifdef DEBUG_DOMAINMAPPER
 string </xsl:text>
 <xsl:call-template name="factoryclassname"/>
 <xsl:text>::getName() const
diff --git a/writerfilter/source/ooxml/qnametostr.xsl b/writerfilter/source/ooxml/qnametostr.xsl
index cfcbad037f14..8aec26db6790 100644
--- a/writerfilter/source/ooxml/qnametostr.xsl
+++ b/writerfilter/source/ooxml/qnametostr.xsl
@@ -60,7 +60,7 @@
     <xsl:text>
 void QNameToString::init_ooxml()
 {
-#ifdef DEBUG_LOGGING
+#ifdef DEBUG_DOMAINMAPPER
     /* ooxml */
     </xsl:text>
     <xsl:for-each select="//@tokenid">
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);
diff --git a/writerfilter/source/rtftok/rtfsprm.cxx b/writerfilter/source/rtftok/rtfsprm.cxx
index 1b0df46c0257..752cd283c013 100644
--- a/writerfilter/source/rtftok/rtfsprm.cxx
+++ b/writerfilter/source/rtftok/rtfsprm.cxx
@@ -67,7 +67,7 @@ std::string RTFSprm::toString() const
 
     std::string sResult;
 
-#ifdef DEBUG_LOGGING
+#ifdef DEBUG_DOMAINMAPPER
     sResult = (*QNameToString::Instance())(m_nKeyword);
 #endif