Using libxml2 instead of homemade stuffs for the debug output

This also seems to fix a memory leak that was present only with some
debug output enabled.

1 files changed, 31 insertions, 31 deletions

diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
index 642a9723364c..088625af04b3 100644
--- a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
@@ -75,17 +75,17 @@ static void  lcl_printProperties( PropertyMapPtr pProps )
                 dmapper_logger->attribute("color", aLine.Color);
                 dmapper_logger->attribute("inner", aLine.InnerLineWidth);
                 dmapper_logger->attribute("outer", aLine.OuterLineWidth);
-                dmapper_logger->endElement("borderline");
+                dmapper_logger->endElement();
             }
             else if ( aMapIter->second >>= nColor )
             {
                 dmapper_logger->startElement("color");
                 dmapper_logger->attribute("number", nColor);
-                dmapper_logger->endElement("color");
+                dmapper_logger->endElement();
             }
         }
 
-        dmapper_logger->endElement("properties");
+        dmapper_logger->endElement();
     }
 }
 #endif
@@ -115,7 +115,7 @@ void DomainMapperTableHandler::startTable(unsigned int nRows,
     dmapper_logger->attribute("rows", nRows);
 
     if (pProps.get() != NULL)
-        dmapper_logger->addTag(pProps->toTag());
+        pProps->dumpXml( dmapper_logger );
 #endif
 }
 
@@ -126,7 +126,7 @@ PropertyMapPtr lcl_SearchParentStyleSheetAndMergeProperties(const StyleSheetEntr
 {
 #ifdef DEBUG_DOMAINMAPPER
     dmapper_logger->startElement("lcl_SearchParentStyleSheetAndMergeProperties");
-    dmapper_logger->addTag(pStyleSheet->toTag());
+    pStyleSheet->dumpXml( dmapper_logger );
 #endif
 
     PropertyMapPtr pRet;
@@ -143,7 +143,7 @@ PropertyMapPtr lcl_SearchParentStyleSheetAndMergeProperties(const StyleSheetEntr
     pRet->insert(  pStyleSheet->pProperties, true );
 
 #ifdef DEBUG_DOMAINMAPPER
-    dmapper_logger->endElement("lcl_SearchParentStyleSheetAndMergeProperties");
+    dmapper_logger->endElement();
 #endif
 
     return pRet;
@@ -256,7 +256,7 @@ void lcl_debug_BorderLine(table::BorderLine & rLine)
     dmapper_logger->attribute("InnerLineWidth", rLine.InnerLineWidth);
     dmapper_logger->attribute("OuterLineWidth", rLine.OuterLineWidth);
     dmapper_logger->attribute("LineDistance", rLine.LineDistance);
-    dmapper_logger->endElement("BorderLine");
+    dmapper_logger->endElement();
 }
 
 void lcl_debug_TableBorder(table::TableBorder & rBorder)
@@ -276,7 +276,7 @@ void lcl_debug_TableBorder(table::TableBorder & rBorder)
     dmapper_logger->attribute("IsHorizontalLineValid", rBorder.IsHorizontalLineValid);
     dmapper_logger->attribute("Distance", rBorder.Distance);
     dmapper_logger->attribute("IsDistanceValid", rBorder.IsDistanceValid);
-    dmapper_logger->endElement("TableBorder");
+    dmapper_logger->endElement();
 }
 #endif
 
@@ -342,8 +342,8 @@ TableStyleSheetEntry * DomainMapperTableHandler::endTableGetTableStyle(TableInfo
 
 #ifdef DEBUG_DOMAINMAPPER
                 dmapper_logger->startElement("mergedProps");
-                dmapper_logger->addTag(pMergedProperties->toTag());
-                dmapper_logger->endElement("mergedProps");
+                pMergedProperties->dumpXml( dmapper_logger );
+                dmapper_logger->endElement();
 #endif
 
                 m_aTableProperties->insert( pMergedProperties );
@@ -351,8 +351,8 @@ TableStyleSheetEntry * DomainMapperTableHandler::endTableGetTableStyle(TableInfo
 
 #ifdef DEBUG_DOMAINMAPPER
                 dmapper_logger->startElement("TableProperties");
-                dmapper_logger->addTag(m_aTableProperties->toTag());
-                dmapper_logger->endElement("TableProperties");
+                m_aTableProperties->dumpXml( dmapper_logger );
+                dmapper_logger->endElement();
 #endif
             }
         }
@@ -362,8 +362,8 @@ TableStyleSheetEntry * DomainMapperTableHandler::endTableGetTableStyle(TableInfo
 
 #ifdef DEBUG_DOMAINMAPPER
         dmapper_logger->startElement("TableDefaults");
-        dmapper_logger->addTag(rInfo.pTableDefaults->toTag());
-        dmapper_logger->endElement("TableDefaults");
+        rInfo.pTableDefaults->dumpXml( dmapper_logger );
+        dmapper_logger->endElement();
 #endif
 
         m_aTableProperties->getValue( TablePropertyMap::GAP_HALF, nGapHalf );
@@ -502,8 +502,8 @@ TableStyleSheetEntry * DomainMapperTableHandler::endTableGetTableStyle(TableInfo
 
 #ifdef DEBUG_DOMAINMAPPER
         dmapper_logger->startElement("debug.tableprops");
-        dmapper_logger->addTag(m_aTableProperties->toTag());
-        dmapper_logger->endElement("debug.tableprops");
+        m_aTableProperties->dumpXml( dmapper_logger );
+        dmapper_logger->endElement();
 #endif
 
     }
@@ -633,7 +633,7 @@ CellPropertyValuesSeq_t DomainMapperTableHandler::endTableGetCellProperties(Tabl
 
                 pSingleCellProperties[nCell] = aCellIterator->get()->GetPropertyValues();
 #ifdef DEBUG_DOMAINMAPPER
-                dmapper_logger->endElement("cell");
+                dmapper_logger->endElement();
 #endif
             }
             ++nCell;
@@ -667,7 +667,7 @@ CellPropertyValuesSeq_t DomainMapperTableHandler::endTableGetCellProperties(Tabl
     }
 
 #ifdef DEBUG_DOMAINMAPPER
-    dmapper_logger->endElement("getCellProperties");
+    dmapper_logger->endElement();
 #endif
 
     return aCellProperties;
@@ -696,19 +696,19 @@ RowPropertyValuesSeq_t DomainMapperTableHandler::endTableGetRowProperties()
 
             aRowProperties[nRow] = (*aRowIter)->GetPropertyValues();
 #ifdef DEBUG_DOMAINMAPPER
-            dmapper_logger->addTag((*aRowIter)->toTag());
-            dmapper_logger->addTag(lcl_PropertyValuesToTag(aRowProperties[nRow]));
+            ((*aRowIter)->dumpXml( dmapper_logger ));
+            lcl_DumpPropertyValues(dmapper_logger, aRowProperties[nRow]);
 #endif
         }
         ++nRow;
         ++aRowIter;
 #ifdef DEBUG_DOMAINMAPPER
-        dmapper_logger->endElement("rowProps.row");
+        dmapper_logger->endElement();
 #endif
     }
 
 #ifdef DEBUG_DOMAINMAPPER
-    dmapper_logger->endElement("getRowProperties");
+    dmapper_logger->endElement();
 #endif
 
     return aRowProperties;
@@ -729,7 +729,7 @@ void DomainMapperTableHandler::endTable()
     RowPropertyValuesSeq_t aRowProperties = endTableGetRowProperties();
 
 #ifdef DEBUG_DOMAINMAPPER
-    dmapper_logger->addTag(lcl_PropertyValueSeqToTag(aRowProperties));
+    lcl_DumpPropertyValueSeq(dmapper_logger, aRowProperties);
 #endif
 
     if (m_pTableSeq->getLength() > 0)
@@ -754,7 +754,7 @@ void DomainMapperTableHandler::endTable()
         {
             dmapper_logger->startElement("exception");
             dmapper_logger->chars(rtl::OUStringToOString( e.Message, RTL_TEXTENCODING_UTF8 ).getStr( ));
-            dmapper_logger->endElement("exeception");
+            dmapper_logger->endElement();
         }
 #endif
     }
@@ -764,8 +764,8 @@ void DomainMapperTableHandler::endTable()
     m_aRowProperties.clear();
 
 #ifdef DEBUG_DOMAINMAPPER
-    dmapper_logger->endElement("tablehandler.endTable");
-    dmapper_logger->endElement("tablehandler.table");
+    dmapper_logger->endElement();
+    dmapper_logger->endElement();
 #endif
 }
 
@@ -779,7 +779,7 @@ void DomainMapperTableHandler::startRow(unsigned int nCells,
     dmapper_logger->startElement("table.row");
     dmapper_logger->attribute("cells", nCells);
     if (pProps != NULL)
-        dmapper_logger->addTag(pProps->toTag());
+        pProps->dumpXml(dmapper_logger);
 #endif
 
     m_pRowSeq = RowSequencePointer_t(new RowSequence_t(nCells));
@@ -792,7 +792,7 @@ void DomainMapperTableHandler::endRow()
     ++m_nRowIndex;
     m_nCellIndex = 0;
 #ifdef DEBUG_DOMAINMAPPER
-    dmapper_logger->endElement("table.row");
+    dmapper_logger->endElement();
 #endif
 }
 
@@ -814,7 +814,7 @@ void DomainMapperTableHandler::startCell(const Handle_t & start,
     dmapper_logger->startElement("table.cell");
     dmapper_logger->startElement("table.cell.start");
     dmapper_logger->chars(toString(start));
-    dmapper_logger->endElement("table.cell.start");
+    dmapper_logger->endElement();
     lcl_printProperties( pProps );
 #endif
 
@@ -833,8 +833,8 @@ void DomainMapperTableHandler::endCell(const Handle_t & end)
 #ifdef DEBUG_DOMAINMAPPER
     dmapper_logger->startElement("table.cell.end");
     dmapper_logger->chars(toString(end));
-    dmapper_logger->endElement("table.cell.end");
-    dmapper_logger->endElement("table.cell");
+    dmapper_logger->endElement();
+    dmapper_logger->endElement();
     clog << "</table.cell>" << endl;
 #endif