We can simply use DBG_UTIL now after efc29fbb6d458f5fd3660a36e2ff1592608fcbac

Change-Id: I74cce2d3fb4661ea9a44d0b166ca98dfade53056
Reviewed-on: https://gerrit.libreoffice.org/69604
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>

38 files changed, 219 insertions, 225 deletions

diff --git a/writerfilter/Library_writerfilter.mk b/writerfilter/Library_writerfilter.mk
index d79bce50f763..bf1393e2778f 100644
--- a/writerfilter/Library_writerfilter.mk
+++ b/writerfilter/Library_writerfilter.mk
@@ -27,12 +27,6 @@ $(eval $(call gb_Library_use_sdk_api,writerfilter))
 
 $(eval $(call gb_Library_set_componentfile,writerfilter,writerfilter/util/writerfilter))
 
-$(eval $(call gb_Library_add_defs,writerfilter,\
-	$(if $(ENABLE_DBGUTIL), \
-		-DDEBUG_WRITERFILTER \
-	) \
-))
-
 $(eval $(call gb_Library_use_libraries,writerfilter,\
     basegfx \
     comphelper \
diff --git a/writerfilter/inc/dmapper/resourcemodel.hxx b/writerfilter/inc/dmapper/resourcemodel.hxx
index 8e2ffc546682..cb6cae6cd4d5 100644
--- a/writerfilter/inc/dmapper/resourcemodel.hxx
+++ b/writerfilter/inc/dmapper/resourcemodel.hxx
@@ -352,7 +352,7 @@ public:
     /**
        Returns string representation of this value.
      */
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
     virtual std::string toString() const = 0;
 #endif
 };
@@ -385,14 +385,14 @@ public:
     /**
        Returns name of sprm.
     */
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
     virtual std::string getName() const = 0;
 #endif
 
     /**
        Returns string representation of sprm.
      */
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
     virtual std::string toString() const = 0;
 #endif
 
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx
index 020861e663d6..41cc8afdd6a7 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -235,7 +235,7 @@ DomainMapper::~DomainMapper()
     }
     catch( const uno::Exception& ) {}
 
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
     TagLogger::getInstance().endDocument();
 #endif
 }
@@ -2756,7 +2756,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const PropertyMapPtr& rContext )
     break;
     default:
         {
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
             TagLogger::getInstance().startElement("unhandled");
             TagLogger::getInstance().attribute("id", nSprmId);
             TagLogger::getInstance().attribute("name", rSprm.getName());
@@ -3048,7 +3048,7 @@ void DomainMapper::lcl_text(const sal_uInt8 * data_, size_t len)
 {
     //TODO: Determine the right text encoding (FIB?)
     OUString sText( reinterpret_cast<const char*>(data_), len, RTL_TEXTENCODING_MS_1252 );
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
     TagLogger::getInstance().startElement("text");
     TagLogger::getInstance().chars(sText);
     TagLogger::getInstance().endElement();
diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
index 01c7f59fc314..15a7c558820a 100644
--- a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
@@ -39,7 +39,7 @@
 #include <sal/log.hxx>
 #include <comphelper/sequence.hxx>
 
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
 #include "PropertyMapHelper.hxx"
 #include <rtl/ustring.hxx>
 #endif
@@ -70,7 +70,7 @@ void DomainMapperTableHandler::startTable(const TablePropertyMapPtr& pProps)
     m_aTableProperties = pProps;
     m_aTableRanges.clear();
 
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
     TagLogger::getInstance().startElement("tablehandler.table");
 
     if (pProps.get() != nullptr)
@@ -168,7 +168,7 @@ static void lcl_computeCellBorders( const PropertyMapPtr& pTableBorders, const P
     }
 }
 
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
 
 static void lcl_debug_BorderLine(table::BorderLine const & rLine)
 {
@@ -413,7 +413,7 @@ TableStyleSheetEntry * DomainMapperTableHandler::endTableGetTableStyle(TableInfo
                     aGrabBag["TableStyleRightBorder"] <<= aBorderLine;
                 }
 
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
                 TagLogger::getInstance().startElement("mergedProps");
                 if (pMergedProperties)
                     pMergedProperties->dumpXml();
@@ -423,7 +423,7 @@ TableStyleSheetEntry * DomainMapperTableHandler::endTableGetTableStyle(TableInfo
                 m_aTableProperties->InsertProps(pMergedProperties);
                 m_aTableProperties->InsertProps(pTableProps);
 
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
                 TagLogger::getInstance().startElement("TableProperties");
                 m_aTableProperties->dumpXml();
                 TagLogger::getInstance().endElement();
@@ -450,7 +450,7 @@ TableStyleSheetEntry * DomainMapperTableHandler::endTableGetTableStyle(TableInfo
         // Set the table default attributes for the cells
         rInfo.pTableDefaults->InsertProps(m_aTableProperties.get());
 
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
         TagLogger::getInstance().startElement("TableDefaults");
         rInfo.pTableDefaults->dumpXml();
         TagLogger::getInstance().endElement();
@@ -533,7 +533,7 @@ TableStyleSheetEntry * DomainMapperTableHandler::endTableGetTableStyle(TableInfo
 
         m_aTableProperties->Insert( PROP_TABLE_BORDER, uno::makeAny( aTableBorder ) );
 
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
         lcl_debug_TableBorder(aTableBorder);
 #endif
 
@@ -620,7 +620,7 @@ TableStyleSheetEntry * DomainMapperTableHandler::endTableGetTableStyle(TableInfo
 
         rInfo.aTableProperties = m_aTableProperties->GetPropertyValues();
 
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
         TagLogger::getInstance().startElement("debug.tableprops");
         m_aTableProperties->dumpXml();
         TagLogger::getInstance().endElement();
@@ -646,7 +646,7 @@ TableStyleSheetEntry * DomainMapperTableHandler::endTableGetTableStyle(TableInfo
 
 CellPropertyValuesSeq_t DomainMapperTableHandler::endTableGetCellProperties(TableInfo & rInfo, std::vector<HorizontallyMergedCell>& rMerges)
 {
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
     TagLogger::getInstance().startElement("getCellProperties");
 #endif
 
@@ -654,7 +654,7 @@ CellPropertyValuesSeq_t DomainMapperTableHandler::endTableGetCellProperties(Tabl
 
     if ( m_aCellProperties.empty() )
     {
-        #ifdef DEBUG_WRITERFILTER
+        #ifdef DBG_UTIL
         TagLogger::getInstance().endElement();
         #endif
         return aCellProperties;
@@ -811,7 +811,7 @@ CellPropertyValuesSeq_t DomainMapperTableHandler::endTableGetCellProperties(Tabl
                 pAllCellProps->InsertProps(*aCellIterator);
                 std::swap(*(*aCellIterator), *pAllCellProps );
 
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
                 TagLogger::getInstance().startElement("cell");
                 TagLogger::getInstance().attribute("cell", nCell);
                 TagLogger::getInstance().attribute("row", nRow);
@@ -864,7 +864,7 @@ CellPropertyValuesSeq_t DomainMapperTableHandler::endTableGetCellProperties(Tabl
                 }
 
                 pSingleCellProperties[nCell] = (*aCellIterator)->GetPropertyValues();
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
                 TagLogger::getInstance().endElement();
 #endif
             }
@@ -876,7 +876,7 @@ CellPropertyValuesSeq_t DomainMapperTableHandler::endTableGetCellProperties(Tabl
         ++aRowIter;
     }
 
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
     TagLogger::getInstance().endElement();
 #endif
 
@@ -940,7 +940,7 @@ static bool lcl_emptyRow(std::vector<RowSequence_t>& rTableRanges, sal_Int32 nRo
 
 css::uno::Sequence<css::beans::PropertyValues> DomainMapperTableHandler::endTableGetRowProperties()
 {
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
     TagLogger::getInstance().startElement("getRowProperties");
 #endif
 
@@ -948,7 +948,7 @@ css::uno::Sequence<css::beans::PropertyValues> DomainMapperTableHandler::endTabl
     sal_Int32 nRow = 0;
     for( const auto& rRow : m_aRowProperties )
     {
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
         TagLogger::getInstance().startElement("rowProps.row");
 #endif
         if (rRow)
@@ -966,18 +966,18 @@ css::uno::Sequence<css::beans::PropertyValues> DomainMapperTableHandler::endTabl
             }
 
             aRowProperties[nRow] = rRow->GetPropertyValues();
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
             rRow->dumpXml();
             lcl_DumpPropertyValues(aRowProperties[nRow]);
 #endif
         }
         ++nRow;
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
         TagLogger::getInstance().endElement();
 #endif
     }
 
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
     TagLogger::getInstance().endElement();
 #endif
 
@@ -1003,7 +1003,7 @@ static void lcl_ApplyCellParaProps(uno::Reference<table::XCell> const& xCell,
 
 void DomainMapperTableHandler::endTable(unsigned int nestedTableLevel, bool bTableStartsAtCellStart)
 {
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
     TagLogger::getInstance().startElement("tablehandler.endTable");
 #endif
 
@@ -1020,7 +1020,7 @@ void DomainMapperTableHandler::endTable(unsigned int nestedTableLevel, bool bTab
 
     css::uno::Sequence<css::beans::PropertyValues> aRowProperties = endTableGetRowProperties();
 
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
     lcl_DumpPropertyValueSeq(aRowProperties);
 #endif
 
@@ -1123,7 +1123,7 @@ void DomainMapperTableHandler::endTable(unsigned int nestedTableLevel, bool bTab
         {
             SAL_INFO("writerfilter.dmapper",
                     "Conversion to table error: " << e);
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
             TagLogger::getInstance().chars(std::string("failed to import table!"));
 #endif
         }
@@ -1197,7 +1197,7 @@ void DomainMapperTableHandler::endTable(unsigned int nestedTableLevel, bool bTab
     m_aRowProperties.clear();
     m_bHadFootOrEndnote = false;
 
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
     TagLogger::getInstance().endElement();
     TagLogger::getInstance().endElement();
 #endif
@@ -1208,7 +1208,7 @@ void DomainMapperTableHandler::startRow(const TablePropertyMapPtr& pProps)
     m_aRowProperties.push_back( pProps.get() );
     m_aCellProperties.emplace_back( );
 
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
     TagLogger::getInstance().startElement("table.row");
     if (pProps != nullptr)
         pProps->dumpXml();
@@ -1220,7 +1220,7 @@ void DomainMapperTableHandler::startRow(const TablePropertyMapPtr& pProps)
 void DomainMapperTableHandler::endRow()
 {
     m_aTableRanges.push_back(comphelper::containerToSequence(m_aRowRanges));
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
     TagLogger::getInstance().endElement();
 #endif
 }
@@ -1239,7 +1239,7 @@ void DomainMapperTableHandler::startCell(const css::uno::Reference< css::text::X
         m_aCellProperties[nRow - 1].push_back( pEmptyProps.get() );
     }
 
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
     TagLogger::getInstance().startElement("table.cell");
     TagLogger::getInstance().startElement("table.cell.start");
     TagLogger::getInstance().chars(XTextRangeToString(start));
@@ -1258,7 +1258,7 @@ void DomainMapperTableHandler::startCell(const css::uno::Reference< css::text::X
 
 void DomainMapperTableHandler::endCell(const css::uno::Reference< css::text::XTextRange > & end)
 {
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
     TagLogger::getInstance().startElement("table.cell.end");
     TagLogger::getInstance().chars(XTextRangeToString(end));
     TagLogger::getInstance().endElement();
diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.cxx b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
index ffee824e6973..df7db6e93f26 100644
--- a/writerfilter/source/dmapper/DomainMapperTableManager.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
@@ -116,7 +116,7 @@ void DomainMapperTableManager::finishTableLook()
 
 bool DomainMapperTableManager::sprm(Sprm & rSprm)
 {
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
     TagLogger::getInstance().startElement("tablemanager.sprm");
     string sSprm = rSprm.toString();
     TagLogger::getInstance().chars(sSprm);
@@ -189,7 +189,7 @@ bool DomainMapperTableManager::sprm(Sprm & rSprm)
                             }
                         }
                     }
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
                     pPropMap->dumpXml();
 #endif
                     insertTableProps(pPropMap);
@@ -268,7 +268,7 @@ bool DomainMapperTableManager::sprm(Sprm & rSprm)
             break;
             case NS_ooxml::LN_CT_TcPrBase_gridSpan: //number of grid positions spanned by this cell
             {
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
                 TagLogger::getInstance().startElement("tablemanager.GridSpan");
                 TagLogger::getInstance().attribute("gridSpan", nIntValue);
                 TagLogger::getInstance().endElement();
@@ -379,7 +379,7 @@ bool DomainMapperTableManager::sprm(Sprm & rSprm)
             default:
                 bRet = false;
 
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
                 TagLogger::getInstance().element("unhandled");
 #endif
         }
@@ -490,7 +490,7 @@ void DomainMapperTableManager::endLevel( )
     m_aTmpTableProperties.pop_back( );
 
     TableManager::endLevel( );
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
     TagLogger::getInstance().startElement("dmappertablemanager.endLevel");
     PropertyMapPtr pProps = getTableProps().get();
     if (pProps.get() != nullptr)
@@ -506,7 +506,7 @@ void DomainMapperTableManager::endLevel( )
 
 void DomainMapperTableManager::endOfCellAction()
 {
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
     TagLogger::getInstance().element("endOFCellAction");
 #endif
 
@@ -519,7 +519,7 @@ void DomainMapperTableManager::endOfCellAction()
 
 void DomainMapperTableManager::endOfRowAction()
 {
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
     TagLogger::getInstance().startElement("endOfRowAction");
 #endif
 
@@ -566,13 +566,13 @@ void DomainMapperTableManager::endOfRowAction()
     IntVectorPtr pCellWidths = getCurrentCellWidths( );
     if(!m_nTableWidth && !pTableGrid->empty())
     {
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
         TagLogger::getInstance().startElement("tableWidth");
 #endif
 
         for( const auto& rCell : *pTableGrid )
         {
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
             TagLogger::getInstance().startElement("col");
             TagLogger::getInstance().attribute("width", rCell);
             TagLogger::getInstance().endElement();
@@ -588,7 +588,7 @@ void DomainMapperTableManager::endOfRowAction()
             insertTableProps(pPropMap);
         }
 
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
         TagLogger::getInstance().endElement();
 #endif
     }
@@ -600,7 +600,7 @@ void DomainMapperTableManager::endOfRowAction()
         pCurrentSpans->insert( pCurrentSpans->end( ), m_nCell.back( ) - pCurrentSpans->size(), 1 );
     }
 
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
     TagLogger::getInstance().startElement("gridSpans");
     {
         for (const auto& rGridSpan : *pCurrentSpans)
@@ -676,7 +676,7 @@ void DomainMapperTableManager::endOfRowAction()
         TablePropertyMapPtr pPropMap( new TablePropertyMap );
         pPropMap->Insert( PROP_TABLE_COLUMN_SEPARATORS, uno::makeAny( aSeparators ) );
 
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
         TagLogger::getInstance().startElement("rowProperties");
         pPropMap->dumpXml();
         TagLogger::getInstance().endElement();
@@ -722,7 +722,7 @@ void DomainMapperTableManager::endOfRowAction()
 
         TablePropertyMapPtr pPropMap( new TablePropertyMap );
         pPropMap->Insert( PROP_TABLE_COLUMN_SEPARATORS, uno::makeAny( aSeparators ) );
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
         TagLogger::getInstance().startElement("rowProperties");
         pPropMap->dumpXml();
         TagLogger::getInstance().endElement();
@@ -746,7 +746,7 @@ void DomainMapperTableManager::endOfRowAction()
     m_nGridBefore = m_nGridAfter = 0;
     m_bTableSizeTypeInserted = false;
 
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
     TagLogger::getInstance().endElement();
 #endif
 }
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 57ff25205490..be4c43385cd8 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -1178,7 +1178,7 @@ void DomainMapper_Impl::finishParagraph( const PropertyMapPtr& pPropertyMap, con
 {
     if (m_bDiscardHeaderFooter)
         return;
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
     TagLogger::getInstance().startElement("finishParagraph");
 #endif
 
@@ -1188,7 +1188,7 @@ void DomainMapper_Impl::finishParagraph( const PropertyMapPtr& pPropertyMap, con
         return;
     TextAppendContext& rAppendContext = m_aTextAppendStack.top();
     uno::Reference< text::XTextAppend > xTextAppend(rAppendContext.xTextAppend);
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
     TagLogger::getInstance().attribute("isTextAppend", sal_uInt32(xTextAppend.is()));
 #endif
 
@@ -1602,7 +1602,7 @@ void DomainMapper_Impl::finishParagraph( const PropertyMapPtr& pPropertyMap, con
 
     m_bParaAutoBefore = false;
 
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
     TagLogger::getInstance().endElement();
 #endif
 
@@ -2304,7 +2304,7 @@ void DomainMapper_Impl::PushShapeContext( const uno::Reference< drawing::XShape
             m_aAnchoredStack.push( AnchoredContext(xTxtContent) );
 
             uno::Reference< beans::XPropertySet > xProps( xShape, uno::UNO_QUERY_THROW );
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
             TagLogger::getInstance().unoPropertySet(xProps);
 #endif
             text::TextContentAnchorType nAnchorType(text::TextContentAnchorType_AT_PARAGRAPH);
@@ -3107,7 +3107,7 @@ void DomainMapper_Impl::PushFieldContext()
     m_bParaHadField = true;
     if(m_bDiscardHeaderFooter)
         return;
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
     TagLogger::getInstance().element("pushFieldContext");
 #endif
 
@@ -3231,7 +3231,7 @@ void FieldContext::AppendCommand(const OUString& rPart)
   -----------------------------------------------------------------------*/
 void DomainMapper_Impl::AppendFieldCommand(OUString const & rPartOfCommand)
 {
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
     TagLogger::getInstance().startElement("appendFieldCommand");
     TagLogger::getInstance().chars(rPartOfCommand);
     TagLogger::getInstance().endElement();
@@ -4111,7 +4111,7 @@ void DomainMapper_Impl::CloseFieldCommand()
 {
     if(m_bDiscardHeaderFooter)
         return;
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
     TagLogger::getInstance().element("closeFieldCommand");
 #endif
 
@@ -4202,7 +4202,7 @@ void DomainMapper_Impl::CloseFieldCommand()
                         sServiceName += OUString::createFromAscii(aIt->second.cFieldServiceName );
                     }
 
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
                     TagLogger::getInstance().startElement("fieldService");
                     TagLogger::getInstance().chars(sServiceName);
                     TagLogger::getInstance().endElement();
@@ -4921,7 +4921,7 @@ static util::DateTime lcl_dateTimeFromSerial(const double& dSerial)
 
 void DomainMapper_Impl::SetFieldResult(OUString const& rResult)
 {
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
     TagLogger::getInstance().startElement("setFieldResult");
     TagLogger::getInstance().chars(rResult);
 #endif
@@ -5043,7 +5043,7 @@ void DomainMapper_Impl::SetFieldResult(OUString const& rResult)
 
 void DomainMapper_Impl::SetFieldFFData(const FFDataHandler::Pointer_t& pFFDataHandler)
 {
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
     TagLogger::getInstance().startElement("setFieldFFData");
 #endif
 
@@ -5056,7 +5056,7 @@ void DomainMapper_Impl::SetFieldFFData(const FFDataHandler::Pointer_t& pFFDataHa
         }
     }
 
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
     TagLogger::getInstance().endElement();
 #endif
 }
@@ -5065,7 +5065,7 @@ void DomainMapper_Impl::PopFieldContext()
 {
     if(m_bDiscardHeaderFooter)
         return;
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
     TagLogger::getInstance().element("popFieldContext");
 #endif
 
diff --git a/writerfilter/source/dmapper/FFDataHandler.cxx b/writerfilter/source/dmapper/FFDataHandler.cxx
index 2429a77c8f99..65ac1fa7f604 100644
--- a/writerfilter/source/dmapper/FFDataHandler.cxx
+++ b/writerfilter/source/dmapper/FFDataHandler.cxx
@@ -149,7 +149,7 @@ void FFDataHandler::lcl_sprm(Sprm & r_Sprm)
         }
         break;
     default:
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
         TagLogger::getInstance().element("unhandled");
 #endif
         break;
@@ -178,7 +178,7 @@ void FFDataHandler::lcl_attribute(Id name, Value & val)
         }
         break;
     default:
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
         TagLogger::getInstance().element("unhandled");
 #endif
         break;
diff --git a/writerfilter/source/dmapper/GraphicHelpers.cxx b/writerfilter/source/dmapper/GraphicHelpers.cxx
index 4a4c73eed580..5c4fdaf1bc32 100644
--- a/writerfilter/source/dmapper/GraphicHelpers.cxx
+++ b/writerfilter/source/dmapper/GraphicHelpers.cxx
@@ -125,7 +125,7 @@ void PositionHandler::lcl_attribute( Id aName, Value& rVal )
             }
             break;
         default:
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
             TagLogger::getInstance().element("unhandled");
 #endif
             break;
diff --git a/writerfilter/source/dmapper/GraphicImport.cxx b/writerfilter/source/dmapper/GraphicImport.cxx
index ea0058752f74..6c04c10dacbb 100644
--- a/writerfilter/source/dmapper/GraphicImport.cxx
+++ b/writerfilter/source/dmapper/GraphicImport.cxx
@@ -924,7 +924,7 @@ void GraphicImport::lcl_attribute(Id nName, Value& rValue)
             }
             break;
         default:
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
             TagLogger::getInstance().element("unhandled");
 #endif
             break;
diff --git a/writerfilter/source/dmapper/LatentStyleHandler.cxx b/writerfilter/source/dmapper/LatentStyleHandler.cxx
index db42aab7e76b..66c383eb7233 100644
--- a/writerfilter/source/dmapper/LatentStyleHandler.cxx
+++ b/writerfilter/source/dmapper/LatentStyleHandler.cxx
@@ -49,7 +49,7 @@ void LatentStyleHandler::lcl_attribute(Id nId, Value& rVal)
         break;
     default:
         bFound = false;
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
         TagLogger::getInstance().element("unhandled");
 #endif
         break;
diff --git a/writerfilter/source/dmapper/LoggedResources.cxx b/writerfilter/source/dmapper/LoggedResources.cxx
index c58c8e37411c..fa11d8430e12 100644
--- a/writerfilter/source/dmapper/LoggedResources.cxx
+++ b/writerfilter/source/dmapper/LoggedResources.cxx
@@ -26,7 +26,7 @@ using namespace ::com::sun::star;
 namespace writerfilter
 {
 
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
 // class: LoggedResourcesHelper
 
 LoggedResourcesHelper::LoggedResourcesHelper(const std::string & sPrefix)
@@ -73,7 +73,7 @@ void LoggedResourcesHelper::attribute(const std::string & rName, sal_uInt32 nVal
 // class: LoggedStream
 
 LoggedStream::LoggedStream(
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
     const std::string & sPrefix
 ) : mHelper(sPrefix)
 #else
@@ -89,7 +89,7 @@ LoggedStream::~LoggedStream()
 
 void LoggedStream::startSectionGroup()
 {
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
     mHelper.startElement("section");
 #endif
 
@@ -100,14 +100,14 @@ void LoggedStream::endSectionGroup()
 {
     lcl_endSectionGroup();
 
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
     LoggedResourcesHelper::endElement();
 #endif
 }
 
 void LoggedStream::startParagraphGroup()
 {
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
     mHelper.startElement("paragraph");
 #endif
 
@@ -118,7 +118,7 @@ void LoggedStream::endParagraphGroup()
 {
     lcl_endParagraphGroup();
 
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
     LoggedResourcesHelper::endElement();
 #endif
 }
@@ -126,7 +126,7 @@ void LoggedStream::endParagraphGroup()
 
 void LoggedStream::startCharacterGroup()
 {
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
     mHelper.startElement("charactergroup");
 #endif
 
@@ -137,14 +137,14 @@ void LoggedStream::endCharacterGroup()
 {
     lcl_endCharacterGroup();
 
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
     LoggedResourcesHelper::endElement();
 #endif
 }
 
 void LoggedStream::startShape(uno::Reference<drawing::XShape> const& xShape)
 {
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
     mHelper.startElement("shape");
 #endif
 
@@ -155,14 +155,14 @@ void LoggedStream::endShape()
 {
     lcl_endShape();
 
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
     LoggedResourcesHelper::endElement();
 #endif
 }
 
 void LoggedStream::text(const sal_uInt8 * data, size_t len)
 {
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
     mHelper.startElement("text");
 
     OUString sText( reinterpret_cast<const 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_WRITERFILTER
+#ifdef DBG_UTIL
     LoggedResourcesHelper::endElement();
 #endif
 }
 
 void LoggedStream::utext(const sal_uInt8 * data, size_t len)
 {
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
     mHelper.startElement("utext");
     mHelper.startElement("data");
 
@@ -197,14 +197,14 @@ void LoggedStream::utext(const sal_uInt8 * data, size_t len)
 
     lcl_utext(data, len);
 
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
     LoggedResourcesHelper::endElement();
 #endif
 }
 
 void LoggedStream::positionOffset(const OUString& rText, bool bVertical)
 {
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
     mHelper.startElement("positionOffset");
     LoggedResourcesHelper::attribute("vertical", static_cast<int>(bVertical));
     LoggedResourcesHelper::chars(rText);
@@ -212,14 +212,14 @@ void LoggedStream::positionOffset(const OUString& rText, bool bVertical)
 
     lcl_positionOffset(rText, bVertical);
 
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
     LoggedResourcesHelper::endElement();
 #endif
 }
 
 void LoggedStream::align(const OUString& rText, bool bVertical)
 {
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
     mHelper.startElement("align");
     LoggedResourcesHelper::attribute("vertical", static_cast<int>(bVertical));
     LoggedResourcesHelper::chars(rText);
@@ -227,109 +227,109 @@ void LoggedStream::align(const OUString& rText, bool bVertical)
 
     lcl_align(rText, bVertical);
 
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
     LoggedResourcesHelper::endElement();
 #endif
 }
 
 void LoggedStream::positivePercentage(const OUString& rText)
 {
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
     mHelper.startElement("positivePercentage");
     LoggedResourcesHelper::chars(rText);
 #endif
 
     lcl_positivePercentage(rText);
 
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
     LoggedResourcesHelper::endElement();
 #endif
 }
 
 void LoggedStream::props(writerfilter::Reference<Properties>::Pointer_t ref)
 {
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
     mHelper.startElement("props");
 #endif
 
     lcl_props(ref);
 
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
     LoggedResourcesHelper::endElement();
 #endif
 }
 
 void LoggedStream::table(Id name, writerfilter::Reference<Table>::Pointer_t ref)
 {
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
     mHelper.startElement("table");
     LoggedResourcesHelper::attribute("name", (*QNameToString::Instance())(name));
 #endif
 
     lcl_table(name, ref);
 
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
     LoggedResourcesHelper::endElement();
 #endif
 }
 
 void LoggedStream::substream(Id name, writerfilter::Reference<Stream>::Pointer_t ref)
 {
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
     mHelper.startElement("substream");
     LoggedResourcesHelper::attribute("name", (*QNameToString::Instance())(name));
 #endif
 
     lcl_substream(name, ref);
 
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
     LoggedResourcesHelper::endElement();
 #endif
 }
 
 void LoggedStream::info(const std::string & _info)
 {
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
     mHelper.startElement("info");
     LoggedResourcesHelper::attribute("text", _info);
 #endif
 
     lcl_info(_info);
 
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
     LoggedResourcesHelper::endElement();
 #endif
 }
 
 void LoggedStream::startGlossaryEntry()
 {
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
     mHelper.startElement("startGlossaryEntry");
 #endif
 
     lcl_startGlossaryEntry();
 
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
     LoggedResourcesHelper::endElement();
 #endif
 }
 
 void LoggedStream::endGlossaryEntry()
 {
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
     mHelper.startElement("endGlossaryEntry");
 #endif
 
     lcl_endGlossaryEntry();
 
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
     LoggedResourcesHelper::endElement();
 #endif
 }
 
 // class LoggedProperties
 LoggedProperties::LoggedProperties(
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
     const std::string & sPrefix
 ) : mHelper(sPrefix)
 #else
@@ -345,7 +345,7 @@ LoggedProperties::~LoggedProperties()
 
 void LoggedProperties::attribute(Id name, Value & val)
 {
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
     mHelper.startElement("attribute");
     LoggedResourcesHelper::attribute("name", (*QNameToString::Instance())(name));
     LoggedResourcesHelper::attribute("value", val.toString());
@@ -357,7 +357,7 @@ void LoggedProperties::attribute(Id name, Value & val)
 
 void LoggedProperties::sprm(Sprm & rSprm)
 {
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
     mHelper.startElement("sprm");
     LoggedResourcesHelper::attribute("name", (*QNameToString::Instance())(rSprm.getId()));
     LoggedResourcesHelper::chars(rSprm.toString());
@@ -365,13 +365,13 @@ void LoggedProperties::sprm(Sprm & rSprm)
 
     lcl_sprm(rSprm);
 
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
     LoggedResourcesHelper::endElement();
 #endif
 }
 
 LoggedTable::LoggedTable(
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
     const std::string & sPrefix
 ) : mHelper(sPrefix)
 #else
@@ -387,14 +387,14 @@ LoggedTable::~LoggedTable()
 
 void LoggedTable::entry(int pos, writerfilter::Reference<Properties>::Pointer_t ref)
 {
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
     mHelper.startElement("entry");
     LoggedResourcesHelper::attribute("pos", pos);
 #endif
 
     lcl_entry(pos, ref);
 
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
     LoggedResourcesHelper::endElement();
 #endif
 }
diff --git a/writerfilter/source/dmapper/LoggedResources.hxx b/writerfilter/source/dmapper/LoggedResources.hxx
index 397fe099c09e..e0c693c765f7 100644
--- a/writerfilter/source/dmapper/LoggedResources.hxx
+++ b/writerfilter/source/dmapper/LoggedResources.hxx
@@ -27,7 +27,7 @@
 namespace writerfilter
 {
 
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
 class LoggedResourcesHelper final
 {
 public:
@@ -94,7 +94,7 @@ protected:
     virtual void lcl_startGlossaryEntry() { }
     virtual void lcl_endGlossaryEntry() { }
 
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
     LoggedResourcesHelper mHelper;
 #endif
 };
@@ -112,7 +112,7 @@ protected:
     virtual void lcl_attribute(Id name, Value & val) = 0;
     virtual void lcl_sprm(Sprm & sprm) = 0;
 
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
     LoggedResourcesHelper mHelper;
 #endif
 };
@@ -128,7 +128,7 @@ public:
 protected:
     virtual void lcl_entry(int pos, writerfilter::Reference<Properties>::Pointer_t ref) = 0;
 
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
     LoggedResourcesHelper mHelper;
 #endif
 };
diff --git a/writerfilter/source/dmapper/PropertyMap.cxx b/writerfilter/source/dmapper/PropertyMap.cxx
index 09e82725fd98..de14f1066a43 100644
--- a/writerfilter/source/dmapper/PropertyMap.cxx
+++ b/writerfilter/source/dmapper/PropertyMap.cxx
@@ -189,7 +189,7 @@ uno::Sequence< beans::PropertyValue > PropertyMap::GetPropertyValues( bool bChar
     return comphelper::containerToSequence( m_aValues );
 }
 
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
 static void lcl_AnyToTag( const uno::Any& rAny )
 {
     try {
@@ -229,7 +229,7 @@ static void lcl_AnyToTag( const uno::Any& rAny )
 
 void PropertyMap::Insert( PropertyIds eId, const uno::Any& rAny, bool bOverwrite, GrabBagType i_GrabBagType )
 {
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
     const OUString& rInsert = getPropertyName(eId);
 
     TagLogger::getInstance().startElement("propertyMap.insert");
@@ -268,7 +268,7 @@ bool PropertyMap::isSet( PropertyIds eId) const
     return m_vMap.find( eId ) != m_vMap.end();
 }
 
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
 void PropertyMap::dumpXml() const
 {
     TagLogger::getInstance().startElement( "PropertyMap" );
@@ -335,14 +335,14 @@ void PropertyMap::InsertProps( const PropertyMapPtr& rMap, const bool bOverwrite
 
 void PropertyMap::insertTableProperties( const PropertyMap*, const bool )
 {
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
     TagLogger::getInstance().element( "PropertyMap.insertTableProperties" );
 #endif
 }
 
 void PropertyMap::printProperties()
 {
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
     TagLogger::getInstance().startElement( "properties" );
 
     for ( const auto& rPropPair : m_vMap )
@@ -406,7 +406,7 @@ SectionPropertyMap::SectionPropertyMap( bool bIsFirstSection )
     , m_bEvenPageFooterLinkToPrevious( true )
     , m_bFirstPageFooterLinkToPrevious( true )
 {
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
     static sal_Int32 nNumber = 0;
     m_nDebugSectionNumber = nNumber++;
 #endif
@@ -1920,7 +1920,7 @@ void TablePropertyMap::setValue( TablePropertyMapTarget eWhich, sal_Int32 nSet )
 
 void TablePropertyMap::insertTableProperties( const PropertyMap* pMap, const bool bOverwrite )
 {
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
     TagLogger::getInstance().startElement( "TablePropertyMap.insertTableProperties" );
     pMap->dumpXml();
 #endif
@@ -1939,7 +1939,7 @@ void TablePropertyMap::insertTableProperties( const PropertyMap* pMap, const boo
         }
     }
 
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
     dumpXml();
     TagLogger::getInstance().endElement();
 #endif
diff --git a/writerfilter/source/dmapper/PropertyMap.hxx b/writerfilter/source/dmapper/PropertyMap.hxx
index 4d2a9cd2047a..7d994f024a83 100644
--- a/writerfilter/source/dmapper/PropertyMap.hxx
+++ b/writerfilter/source/dmapper/PropertyMap.hxx
@@ -165,7 +165,7 @@ public:
 
     void printProperties();
 
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
     void dumpXml() const;
 #endif
 
@@ -194,7 +194,7 @@ public:
         Edge = 1,
     };
 private:
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
     sal_Int32                                       m_nDebugSectionNumber;
 #endif
 
diff --git a/writerfilter/source/dmapper/PropertyMapHelper.cxx b/writerfilter/source/dmapper/PropertyMapHelper.cxx
index d4735d9c7b1e..77fc5d89407c 100644
--- a/writerfilter/source/dmapper/PropertyMapHelper.cxx
+++ b/writerfilter/source/dmapper/PropertyMapHelper.cxx
@@ -30,7 +30,7 @@ using namespace ::com::sun::star;
 
 void lcl_DumpTableColumnSeparators(const uno::Any & rTableColumnSeparators)
 {
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
     uno::Sequence<text::TableColumnSeparator> aSeq;
     rTableColumnSeparators >>= aSeq;
 
@@ -50,10 +50,10 @@ void lcl_DumpTableColumnSeparators(const uno::Any & rTableColumnSeparators)
     TagLogger::getInstance().endElement();
 #else
     (void) rTableColumnSeparators;
-#endif // DEBUG_WRITERFILTER
+#endif // DBG_UTIL
 }
 
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
 void lcl_DumpPropertyValues(beans::PropertyValues const & rValues)
 {
     TagLogger::getInstance().startElement("propertyValues");
@@ -95,7 +95,7 @@ void lcl_DumpPropertyValueSeq(css::uno::Sequence<css::beans::PropertyValues> con
 
     TagLogger::getInstance().endElement();
 }
-#endif // DEBUG_WRITERFILTER
+#endif // DBG_UTIL
 
 }
 }
diff --git a/writerfilter/source/dmapper/PropertyMapHelper.hxx b/writerfilter/source/dmapper/PropertyMapHelper.hxx
index 84ad696c619d..1e1c37611b70 100644
--- a/writerfilter/source/dmapper/PropertyMapHelper.hxx
+++ b/writerfilter/source/dmapper/PropertyMapHelper.hxx
@@ -29,11 +29,11 @@ namespace dmapper
 {
 
 void lcl_DumpTableColumnSeparators(const css::uno::Any & rTableColumnSeparators);
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
 void lcl_DumpPropertyValues(css::beans::PropertyValues const & rValues);
 
 void lcl_DumpPropertyValueSeq(css::uno::Sequence<css::beans::PropertyValues> const & rPropValSeq);
-#endif // DEBUG_WRITERFILTER
+#endif // DBG_UTIL
 }
 }
 
diff --git a/writerfilter/source/dmapper/SettingsTable.cxx b/writerfilter/source/dmapper/SettingsTable.cxx
index 734c5f1cd382..beae5a4942bd 100644
--- a/writerfilter/source/dmapper/SettingsTable.cxx
+++ b/writerfilter/source/dmapper/SettingsTable.cxx
@@ -139,7 +139,7 @@ namespace dmapper
                 case NS_ooxml::LN_Value_doc_ST_DocProtect_forms:            aValue.Value <<= OUString("forms"); break;
                 default:
                 {
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
                     TagLogger::getInstance().element("unhandled");
 #endif
                 }
@@ -374,7 +374,7 @@ void SettingsTable::lcl_attribute(Id nName, Value & val)
         break;
     default:
     {
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
         TagLogger::getInstance().element("unhandled");
 #endif
     }
@@ -491,7 +491,7 @@ void SettingsTable::lcl_sprm(Sprm& rSprm)
         break;
     default:
     {
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
         TagLogger::getInstance().element("unhandled");
 #endif
     }
diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx b/writerfilter/source/dmapper/StyleSheetTable.cxx
index a8304c088f92..eef56e7db718 100644
--- a/writerfilter/source/dmapper/StyleSheetTable.cxx
+++ b/writerfilter/source/dmapper/StyleSheetTable.cxx
@@ -520,7 +520,7 @@ void StyleSheetTable::lcl_attribute(Id Name, Value & val)
         break;
         default:
         {
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
             TagLogger::getInstance().element("unhandled");
 #endif
         }
@@ -1121,7 +1121,7 @@ void StyleSheetTable::ApplyStyleSheets( const FontTablePtr& rFontTable )
                         }
                         catch( const lang::WrappedTargetException& rWrapped)
                         {
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
                             OUString aMessage("StyleSheetTable::ApplyStyleSheets: Some style properties could not be set");
                             beans::UnknownPropertyException aUnknownPropertyException;
 
diff --git a/writerfilter/source/dmapper/TableManager.cxx b/writerfilter/source/dmapper/TableManager.cxx
index 5ff7f26af824..8377d356668e 100644
--- a/writerfilter/source/dmapper/TableManager.cxx
+++ b/writerfilter/source/dmapper/TableManager.cxx
@@ -35,7 +35,7 @@ void TableManager::clearData()
 
 void TableManager::openCell(const css::uno::Reference<css::text::XTextRange>& rHandle, const TablePropertyMapPtr& pProps)
 {
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
     TagLogger::getInstance().startElement("tablemanager.openCell");
     TagLogger::getInstance().chars(XTextRangeToString(rHandle));
     TagLogger::getInstance().endElement();
@@ -64,7 +64,7 @@ void TableManager::endOfCellAction()
 
 void TableManager::insertTableProps(const TablePropertyMapPtr& pProps)
 {
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
     TagLogger::getInstance().startElement("tablemanager.insertTableProps");
 #endif
 
@@ -73,14 +73,14 @@ void TableManager::insertTableProps(const TablePropertyMapPtr& pProps)
     else
         mState.setTableProps(pProps);
 
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
     TagLogger::getInstance().endElement();
 #endif
 }
 
 void TableManager::insertRowProps(const TablePropertyMapPtr& pProps)
 {
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
     TagLogger::getInstance().startElement("tablemanager.insertRowProps");
 #endif
 
@@ -89,14 +89,14 @@ void TableManager::insertRowProps(const TablePropertyMapPtr& pProps)
     else
         mState.setRowProps(pProps);
 
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
     TagLogger::getInstance().endElement();
 #endif
 }
 
 void TableManager::cellProps(const TablePropertyMapPtr& pProps)
 {
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
     TagLogger::getInstance().startElement("tablemanager.cellProps");
 #endif
 
@@ -105,7 +105,7 @@ void TableManager::cellProps(const TablePropertyMapPtr& pProps)
     else
         mState.setCellProps(pProps);
 
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
     TagLogger::getInstance().endElement();
 #endif
 }
@@ -131,7 +131,7 @@ void TableManager::text(const sal_uInt8* data, std::size_t len)
 
 void TableManager::handle0x7()
 {
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
     TagLogger::getInstance().startElement("tablemanager.handle0x7");
 #endif
 
@@ -143,7 +143,7 @@ void TableManager::handle0x7()
     else
         endRow();
 
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
     TagLogger::getInstance().endElement();
 #endif
 }
@@ -177,7 +177,7 @@ bool TableManager::sprm(Sprm& rSprm)
 
 void TableManager::closeCell(const css::uno::Reference<css::text::XTextRange>& rHandle)
 {
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
     TagLogger::getInstance().startElement("tablemanager.closeCell");
     TagLogger::getInstance().chars(XTextRangeToString(rHandle));
     TagLogger::getInstance().endElement();
@@ -196,7 +196,7 @@ void TableManager::closeCell(const css::uno::Reference<css::text::XTextRange>& r
 
 void TableManager::ensureOpenCell(const TablePropertyMapPtr& pProps)
 {
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
     TagLogger::getInstance().startElement("tablemanager.ensureOpenCell");
 #endif
 
@@ -212,7 +212,7 @@ void TableManager::ensureOpenCell(const TablePropertyMapPtr& pProps)
                 pTableData->insertCellProperties(pProps);
         }
     }
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
     TagLogger::getInstance().endElement();
 #endif
 }
@@ -270,7 +270,7 @@ void TableManager::startParagraphGroup()
 
 void TableManager::resolveCurrentTable()
 {
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
     TagLogger::getInstance().startElement("tablemanager.resolveCurrentTable");
 #endif
 
@@ -312,7 +312,7 @@ void TableManager::resolveCurrentTable()
     mState.resetTableProps();
     clearData();
 
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
     TagLogger::getInstance().endElement();
 #endif
 }
@@ -328,7 +328,7 @@ void TableManager::endLevel()
     mState.endLevel();
     mTableDataStack.pop();
 
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
     TableData::Pointer_t pTableData;
 
     if (!mTableDataStack.empty())
@@ -346,7 +346,7 @@ void TableManager::endLevel()
 
 void TableManager::startLevel()
 {
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
     TableData::Pointer_t pTableData;
 
     if (!mTableDataStack.empty())
@@ -388,7 +388,7 @@ bool TableManager::isInTable()
 
 void TableManager::handle(const css::uno::Reference<css::text::XTextRange>& rHandle)
 {
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
     TagLogger::getInstance().startElement("tablemanager.handle");
     TagLogger::getInstance().chars(XTextRangeToString(rHandle));
     TagLogger::getInstance().endElement();
@@ -404,7 +404,7 @@ void TableManager::setHandler(const tools::SvRef<DomainMapperTableHandler>& pTab
 
 void TableManager::endRow()
 {
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
     TagLogger::getInstance().element("tablemanager.endRow");
 #endif
 
@@ -413,7 +413,7 @@ void TableManager::endRow()
 
 void TableManager::endCell()
 {
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
     TagLogger::getInstance().element("tablemanager.endCell");
 #endif
 
@@ -422,7 +422,7 @@ void TableManager::endCell()
 
 void TableManager::inCell()
 {
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
     TagLogger::getInstance().element("tablemanager.inCell");
 #endif
     setInCell(true);
@@ -433,7 +433,7 @@ void TableManager::inCell()
 
 void TableManager::cellDepth(sal_uInt32 nDepth)
 {
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
     TagLogger::getInstance().startElement("tablemanager.cellDepth");
     TagLogger::getInstance().attribute("depth", nDepth);
     TagLogger::getInstance().endElement();
diff --git a/writerfilter/source/dmapper/TablePositionHandler.cxx b/writerfilter/source/dmapper/TablePositionHandler.cxx
index 151c7fd50071..8cb8a312edfa 100644
--- a/writerfilter/source/dmapper/TablePositionHandler.cxx
+++ b/writerfilter/source/dmapper/TablePositionHandler.cxx
@@ -66,7 +66,7 @@ void TablePositionHandler::lcl_attribute(Id nId, Value& rVal)
         m_nBottomFromText = rVal.getInt();
         break;
     default:
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
         TagLogger::getInstance().element("unhandled");
 #endif
         break;
diff --git a/writerfilter/source/dmapper/TablePropertiesHandler.cxx b/writerfilter/source/dmapper/TablePropertiesHandler.cxx
index cd29d01c0598..837b0b101b8c 100644
--- a/writerfilter/source/dmapper/TablePropertiesHandler.cxx
+++ b/writerfilter/source/dmapper/TablePropertiesHandler.cxx
@@ -48,7 +48,7 @@ namespace dmapper {
 
     bool TablePropertiesHandler::sprm(Sprm & rSprm)
     {
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
         TagLogger::getInstance().startElement("TablePropertiesHandler.sprm");
         TagLogger::getInstance().attribute("sprm", rSprm.toString());
 #endif
@@ -199,7 +199,7 @@ namespace dmapper {
                     TablePropertyMapPtr pTablePropMap( new TablePropertyMap );
                     pTablePropMap->InsertProps(pBorderHandler->getProperties());
 
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
                     pTablePropMap->dumpXml();
 #endif
                     insertTableProps( pTablePropMap );
@@ -363,7 +363,7 @@ namespace dmapper {
             break;
         }
 
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
         TagLogger::getInstance().endElement();
 #endif
 
diff --git a/writerfilter/source/dmapper/TagLogger.cxx b/writerfilter/source/dmapper/TagLogger.cxx
index 326c81cb97a0..943fc34eae58 100644
--- a/writerfilter/source/dmapper/TagLogger.cxx
+++ b/writerfilter/source/dmapper/TagLogger.cxx
@@ -21,7 +21,7 @@
 #include "TagLogger.hxx"
 #include <ooxml/QNameToString.hxx>
 #include <unordered_map>
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
 #include <unotools/pathoptions.hxx>
 #endif
 
@@ -40,7 +40,7 @@ namespace writerfilter
         pName = nullptr;
     }
 
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
     void TagLogger::setFileName( const std::string & filename )
     {
         if ( pWriter )
@@ -103,7 +103,7 @@ struct TheTagLogger:
         return TheTagLogger::get();
     }
 
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
     void TagLogger::element(const std::string & name)
     {
         startElement(name);
@@ -164,7 +164,7 @@ struct TheTagLogger:
         xmlFree( xmlName );
     }
 
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
     void TagLogger::attribute(const std::string & name, const OUString & value)
     {
         attribute( name, OUStringToOString( value, RTL_TEXTENCODING_ASCII_US ).getStr() );
diff --git a/writerfilter/source/dmapper/TagLogger.hxx b/writerfilter/source/dmapper/TagLogger.hxx
index eb9bdc616e28..c6332a25b372 100644
--- a/writerfilter/source/dmapper/TagLogger.hxx
+++ b/writerfilter/source/dmapper/TagLogger.hxx
@@ -44,7 +44,7 @@ namespace writerfilter
 
         static TagLogger& getInstance();
 
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
         void setFileName(const std::string & filename);
         void startDocument();
         void endDocument();
@@ -54,7 +54,7 @@ namespace writerfilter
         void startElement(const std::string & name);
 #endif
         void attribute(const std::string & name, const std::string & value);
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
         void attribute(const std::string & name, const OUString & value);
         void attribute(const std::string & name, sal_uInt32 value);
         void attribute(const std::string & name, const css::uno::Any& aAny);
diff --git a/writerfilter/source/dmapper/TblStylePrHandler.cxx b/writerfilter/source/dmapper/TblStylePrHandler.cxx
index d2e5bb2054ce..f7b1c901119c 100644
--- a/writerfilter/source/dmapper/TblStylePrHandler.cxx
+++ b/writerfilter/source/dmapper/TblStylePrHandler.cxx
@@ -119,7 +119,7 @@ void TblStylePrHandler::lcl_attribute(Id rName, Value & rVal)
 
 void TblStylePrHandler::lcl_sprm(Sprm & rSprm)
 {
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
     TagLogger::getInstance().startElement("TblStylePrHandler.sprm");
     TagLogger::getInstance().attribute("sprm", rSprm.toString());
 #endif
@@ -177,7 +177,7 @@ void TblStylePrHandler::lcl_sprm(Sprm & rSprm)
             }
     }
 
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
     TagLogger::getInstance().endElement();
 #endif
 }
diff --git a/writerfilter/source/dmapper/ThemeTable.cxx b/writerfilter/source/dmapper/ThemeTable.cxx
index c967f8f63e92..2eac8d818112 100644
--- a/writerfilter/source/dmapper/ThemeTable.cxx
+++ b/writerfilter/source/dmapper/ThemeTable.cxx
@@ -79,7 +79,7 @@ void ThemeTable::lcl_attribute(Id Name, Value & val)
             break;
         default:
         {
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
             TagLogger::getInstance().element("unhandled");
 #endif
         }
@@ -94,7 +94,7 @@ void ThemeTable::lcl_attribute(Id Name, Value & val)
 
 void ThemeTable::lcl_sprm(Sprm& rSprm)
 {
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
     TagLogger::getInstance().startElement("ThemeTable.sprm");
     TagLogger::getInstance().chars(rSprm.toString());
 #endif
@@ -141,25 +141,25 @@ void ThemeTable::lcl_sprm(Sprm& rSprm)
     break;
     default:
         {
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
             TagLogger::getInstance().element("unhandled");
 #endif
         }
     }
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
     TagLogger::getInstance().endElement();
 #endif
 }
 
 void ThemeTable::lcl_entry(int /*pos*/, writerfilter::Reference<Properties>::Pointer_t ref)
 {
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
     TagLogger::getInstance().startElement("ThemeTable.entry");
 #endif
 
     ref->resolve(*this);
 
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
     TagLogger::getInstance().endElement();
 #endif
 }
diff --git a/writerfilter/source/dmapper/domainmapperfactory.cxx b/writerfilter/source/dmapper/domainmapperfactory.cxx
index 1d3ee6039c61..3ba69bec8f68 100644
--- a/writerfilter/source/dmapper/domainmapperfactory.cxx
+++ b/writerfilter/source/dmapper/domainmapperfactory.cxx
@@ -22,7 +22,7 @@ Stream::Pointer_t DomainMapperFactory::createMapper(css::uno::Reference<css::uno
         SourceDocumentType eDocumentType,
         utl::MediaDescriptor const& rMediaDesc)
 {
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
     OUString sURL = rMediaDesc.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_URL(), OUString());
     ::std::string sURLc = OUStringToOString(sURL, RTL_TEXTENCODING_ASCII_US).getStr();
 
diff --git a/writerfilter/source/dmapper/util.cxx b/writerfilter/source/dmapper/util.cxx
index 378e30b08a9d..c400a47089d0 100644
--- a/writerfilter/source/dmapper/util.cxx
+++ b/writerfilter/source/dmapper/util.cxx
@@ -31,7 +31,7 @@ std::string XTextRangeToString(uno::Reference< text::XTextRange > const & textRa
 {
     std::string result;
 
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
     if (textRange.get())
     {
         OUString aOUStr;
diff --git a/writerfilter/source/filter/WriterFilter.cxx b/writerfilter/source/filter/WriterFilter.cxx
index 88d70d2132c2..04151f5308dc 100644
--- a/writerfilter/source/filter/WriterFilter.cxx
+++ b/writerfilter/source/filter/WriterFilter.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
 #include <iostream>
 #endif
 
diff --git a/writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx b/writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx
index 19e6656f128f..d2aa979e5f2f 100644
--- a/writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx
+++ b/writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx
@@ -47,12 +47,12 @@ OOXMLFastDocumentHandler::~OOXMLFastDocumentHandler() {}
 // css::xml::sax::XFastContextHandler:
 void SAL_CALL OOXMLFastDocumentHandler::startFastElement
 (::sal_Int32
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
 Element
 #endif
 , const uno::Reference< xml::sax::XFastAttributeList > & /*Attribs*/)
 {
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
     clog << this << ":start element:"
          << fastTokenToId(Element)
          << endl;
@@ -61,29 +61,29 @@ Element
 
 void SAL_CALL OOXMLFastDocumentHandler::startUnknownElement
 (const OUString &
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
 Namespace
 #endif
 , const OUString &
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
 Name
 #endif
 ,
  const uno::Reference< xml::sax::XFastAttributeList > & /*Attribs*/)
 {
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
     clog << this << ":start unknown element:"
          << Namespace  << ":" << Name << endl;
 #endif
 }
 
 void SAL_CALL OOXMLFastDocumentHandler::endFastElement(::sal_Int32
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
 Element
 #endif
 )
 {
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
     clog << this << ":end element:"
          << fastTokenToId(Element)
          << endl;
@@ -92,16 +92,16 @@ Element
 
 void SAL_CALL OOXMLFastDocumentHandler::endUnknownElement
 (const OUString &
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
 Namespace
 #endif
 , const OUString &
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
 Name
 #endif
 )
 {
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
     clog << this << ":end unknown element:"
          << Namespace << ":" << Name
          << endl;
@@ -141,17 +141,17 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL
 uno::Reference< xml::sax::XFastContextHandler > SAL_CALL
 OOXMLFastDocumentHandler::createUnknownChildContext
 (const OUString &
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
 Namespace
 #endif
 ,
  const OUString &
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
 Name
 #endif
 , const uno::Reference< xml::sax::XFastAttributeList > & /*Attribs*/)
 {
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
     clog << this << ":createUnknownChildContext:"
          << Namespace << ":"<< Name
          << endl;
diff --git a/writerfilter/source/ooxml/OOXMLPropertySet.cxx b/writerfilter/source/ooxml/OOXMLPropertySet.cxx
index c4ca1de9f6d1..2165524954a2 100644
--- a/writerfilter/source/ooxml/OOXMLPropertySet.cxx
+++ b/writerfilter/source/ooxml/OOXMLPropertySet.cxx
@@ -69,7 +69,7 @@ writerfilter::Reference<Properties>::Pointer_t OOXMLProperty::getProps()
     return pResult;
 }
 
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
 string OOXMLProperty::getName() const
 {
     string sResult((*QNameToString::Instance())(mId));
@@ -89,7 +89,7 @@ string OOXMLProperty::getName() const
 }
 #endif
 
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
 string OOXMLProperty::toString() const
 {
     string sResult = "(";
@@ -157,7 +157,7 @@ writerfilter::Reference<BinaryObj>::Pointer_t OOXMLValue::getBinary()
     return writerfilter::Reference<BinaryObj>::Pointer_t();
 }
 
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
 string OOXMLValue::toString() const
 {
     return "OOXMLValue";
@@ -188,7 +188,7 @@ writerfilter::Reference<BinaryObj>::Pointer_t OOXMLBinaryValue::getBinary()
     return mpBinaryObj;
 }
 
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
 string OOXMLBinaryValue::toString() const
 {
     return "BinaryObj";
@@ -245,7 +245,7 @@ uno::Any OOXMLBooleanValue::getAny() const
     return uno::Any(mbValue);
 }
 
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
 string OOXMLBooleanValue::toString() const
 {
     return mbValue ? "true" : "false";
@@ -280,7 +280,7 @@ OUString OOXMLStringValue::getString() const
     return mStr;
 }
 
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
 string OOXMLStringValue::toString() const
 {
     return OUStringToOString(mStr, RTL_TEXTENCODING_ASCII_US).getStr();
@@ -309,7 +309,7 @@ uno::Any OOXMLInputStreamValue::getAny() const
     return uno::Any(mxInputStream);
 }
 
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
 string OOXMLInputStreamValue::toString() const
 {
     return "InputStream";
@@ -401,7 +401,7 @@ OOXMLPropertySet * OOXMLPropertySet::clone() const
     return new OOXMLPropertySet(*this);
 }
 
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
 string OOXMLPropertySet::toString()
 {
     string sResult = "[";
@@ -449,7 +449,7 @@ writerfilter::Reference<Properties>::Pointer_t OOXMLPropertySetValue::getPropert
         (mpPropertySet->clone());
 }
 
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
 string OOXMLPropertySetValue::toString() const
 {
     char sBuffer[256];
@@ -525,7 +525,7 @@ OOXMLValue * OOXMLIntegerValue::clone() const
     return new OOXMLIntegerValue(*this);
 }
 
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
 string OOXMLIntegerValue::toString() const
 {
     char buffer[256];
@@ -563,7 +563,7 @@ OOXMLValue * OOXMLHexValue::clone() const
     return new OOXMLHexValue(*this);
 }
 
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
 string OOXMLHexValue::toString() const
 {
     char buffer[256];
@@ -651,7 +651,7 @@ int OOXMLUniversalMeasureValue::getInt() const
     return mnValue;
 }
 
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
 string OOXMLUniversalMeasureValue::toString() const
 {
     return OString::number(mnValue).getStr();
@@ -681,7 +681,7 @@ int OOXMLMeasurementOrPercentValue::getInt() const
     return mnValue;
 }
 
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
 string OOXMLMeasurementOrPercentValue::toString() const
 {
     return OString::number(mnValue).getStr();
@@ -707,7 +707,7 @@ uno::Any OOXMLShapeValue::getAny() const
     return uno::Any(mrShape);
 }
 
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
 string OOXMLShapeValue::toString() const
 {
     return "Shape";
@@ -738,7 +738,7 @@ uno::Any OOXMLStarMathValue::getAny() const
     return uno::Any(component);
 }
 
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
 string OOXMLStarMathValue::toString() const
 {
     return "StarMath";
diff --git a/writerfilter/source/ooxml/OOXMLPropertySet.hxx b/writerfilter/source/ooxml/OOXMLPropertySet.hxx
index 39480c78d004..482d8ddb6f21 100644
--- a/writerfilter/source/ooxml/OOXMLPropertySet.hxx
+++ b/writerfilter/source/ooxml/OOXMLPropertySet.hxx
@@ -46,7 +46,7 @@ public:
     virtual css::uno::Any getAny() const override;
     virtual writerfilter::Reference<Properties>::Pointer_t getProperties() override;
     virtual writerfilter::Reference<BinaryObj>::Pointer_t getBinary() override;
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
     virtual std::string toString() const override;
 #endif
     virtual OOXMLValue * clone() const;
@@ -70,7 +70,7 @@ public:
     sal_uInt32 getId() const override;
     Value::Pointer_t getValue() override;
     writerfilter::Reference<Properties>::Pointer_t getProps() override;
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
     std::string getName() const override;
     std::string toString() const override;
 #endif
@@ -85,7 +85,7 @@ public:
     virtual ~OOXMLBinaryValue() override;
 
     virtual writerfilter::Reference<BinaryObj>::Pointer_t getBinary() override;
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
     virtual std::string toString() const override;
 #endif
     virtual OOXMLValue * clone() const override;
@@ -108,7 +108,7 @@ public:
 
     virtual int getInt() const override;
     virtual css::uno::Any getAny() const override;
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
     virtual std::string toString() const override;
 #endif
     virtual OOXMLValue * clone() const override;
@@ -128,7 +128,7 @@ public:
 
     virtual css::uno::Any getAny() const override;
     virtual OUString getString() const override;
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
     virtual std::string toString() const override;
 #endif
     virtual OOXMLValue * clone() const override;
@@ -143,7 +143,7 @@ public:
     virtual ~OOXMLInputStreamValue() override;
 
     virtual css::uno::Any getAny() const override;
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
     virtual std::string toString() const override;
 #endif
     virtual OOXMLValue * clone() const override;
@@ -176,7 +176,7 @@ public:
     OOXMLProperties_t::const_iterator begin() const;
     OOXMLProperties_t::const_iterator end() const;
 
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
     std::string toString();
 #endif
 };
@@ -216,7 +216,7 @@ public:
     OOXMLPropertySetValue & operator =(OOXMLPropertySetValue &&) = delete; // due to const mpPropertySet
 
     virtual writerfilter::Reference<Properties>::Pointer_t getProperties() override;
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
     virtual std::string toString() const override;
 #endif
     virtual OOXMLValue * clone() const override;
@@ -237,7 +237,7 @@ public:
 
     virtual int getInt() const override;
     virtual css::uno::Any getAny() const override;
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
     virtual std::string toString() const override;
 #endif
     virtual OOXMLValue * clone() const override;
@@ -258,7 +258,7 @@ public:
     OOXMLHexValue & operator =(OOXMLHexValue &&) = default;
 
     virtual int getInt() const override;
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
     virtual std::string toString() const override;
 #endif
     virtual OOXMLValue * clone() const override;
@@ -284,7 +284,7 @@ public:
     OOXMLUniversalMeasureValue & operator =(OOXMLUniversalMeasureValue &&) = default;
 
     virtual int getInt() const override;
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
     virtual std::string toString() const override;
 #endif
 };
@@ -318,7 +318,7 @@ public:
     {
         return new OOXMLMeasurementOrPercentValue(*this);
     }
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
     virtual std::string toString() const override;
 #endif
 };
@@ -331,7 +331,7 @@ public:
     virtual ~OOXMLShapeValue() override;
 
     virtual css::uno::Any getAny() const override;
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
     virtual std::string toString() const override;
 #endif
     virtual OOXMLValue * clone() const override;
@@ -345,7 +345,7 @@ public:
     virtual ~OOXMLStarMathValue() override;
 
     virtual css::uno::Any getAny() const override;
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
     virtual std::string toString() const override;
 #endif
     virtual OOXMLValue * clone() const override;
diff --git a/writerfilter/source/ooxml/factoryimpl.py b/writerfilter/source/ooxml/factoryimpl.py
index 5f397ab9cbad..41b42929563a 100644
--- a/writerfilter/source/ooxml/factoryimpl.py
+++ b/writerfilter/source/ooxml/factoryimpl.py
@@ -113,7 +113,7 @@ def fastTokenToId(model):
 std::string fastTokenToId(sal_uInt32 nToken)
 {
     std::string sResult;
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
 
     switch (oox::getNamespace(nToken))
     {""")
diff --git a/writerfilter/source/ooxml/qnametostr.py b/writerfilter/source/ooxml/qnametostr.py
index 6e02d2c69f98..473efc096196 100644
--- a/writerfilter/source/ooxml/qnametostr.py
+++ b/writerfilter/source/ooxml/qnametostr.py
@@ -26,7 +26,7 @@ namespace writerfilter
 
 void QNameToString::init()
 {
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
     /* ooxml */
 """)
 
diff --git a/writerfilter/source/ooxml/qnametostrcore.cxx b/writerfilter/source/ooxml/qnametostrcore.cxx
index 91b6795afe25..0794f5ca427e 100644
--- a/writerfilter/source/ooxml/qnametostrcore.cxx
+++ b/writerfilter/source/ooxml/qnametostrcore.cxx
@@ -34,7 +34,7 @@ QNameToString::Pointer_t const & QNameToString::Instance()
 
 std::string QNameToString::operator()(Id qName)
 {
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
     Map::const_iterator aIt = mMap.find(qName);
 
     if (aIt != mMap.end())
diff --git a/writerfilter/source/rtftok/rtfsprm.cxx b/writerfilter/source/rtftok/rtfsprm.cxx
index 9acc19675bb1..3526476249d4 100644
--- a/writerfilter/source/rtftok/rtfsprm.cxx
+++ b/writerfilter/source/rtftok/rtfsprm.cxx
@@ -32,11 +32,11 @@ writerfilter::Reference<Properties>::Pointer_t RTFSprm::getProps()
     return m_pValue->getProperties();
 }
 
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
 std::string RTFSprm::getName() const { return "RTFSprm"; }
 #endif
 
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
 std::string RTFSprm::toString() const
 {
     OStringBuffer aBuf("RTFSprm");
diff --git a/writerfilter/source/rtftok/rtfsprm.hxx b/writerfilter/source/rtftok/rtfsprm.hxx
index cc5fb73ff13f..ceda04d52c46 100644
--- a/writerfilter/source/rtftok/rtfsprm.hxx
+++ b/writerfilter/source/rtftok/rtfsprm.hxx
@@ -88,7 +88,7 @@ public:
     sal_uInt32 getId() const override;
     Value::Pointer_t getValue() override;
     writerfilter::Reference<Properties>::Pointer_t getProps() override;
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
     std::string getName() const override;
     std::string toString() const override;
 #endif
diff --git a/writerfilter/source/rtftok/rtfvalue.cxx b/writerfilter/source/rtftok/rtfvalue.cxx
index 0164307ffad2..15648f9dba9b 100644
--- a/writerfilter/source/rtftok/rtfvalue.cxx
+++ b/writerfilter/source/rtftok/rtfvalue.cxx
@@ -164,7 +164,7 @@ writerfilter::Reference<BinaryObj>::Pointer_t RTFValue::getBinary()
     return writerfilter::Reference<BinaryObj>::Pointer_t();
 }
 
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
 std::string RTFValue::toString() const
 {
     if (!m_sValue.isEmpty() || m_bForceString)
diff --git a/writerfilter/source/rtftok/rtfvalue.hxx b/writerfilter/source/rtftok/rtfvalue.hxx
index 5944c87cf1fe..e2ff4e9e8fcc 100644
--- a/writerfilter/source/rtftok/rtfvalue.hxx
+++ b/writerfilter/source/rtftok/rtfvalue.hxx
@@ -64,7 +64,7 @@ public:
     css::uno::Any getAny() const override;
     writerfilter::Reference<Properties>::Pointer_t getProperties() override;
     writerfilter::Reference<BinaryObj>::Pointer_t getBinary() override;
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
     std::string toString() const override;
 #endif
     RTFValue* Clone();