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>

1 files changed, 14 insertions, 14 deletions

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
 }