gnumake4: switching gbuildization

* mostly switching to gnumake4/writerfilter10 gbuild implementation (thanks mst, hb)

1 files changed, 3 insertions, 63 deletions

diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
index 466fcb7237e7..407b119e8a5f 100644
--- a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
@@ -52,58 +52,6 @@ using namespace ::std;
 #define DEFAULT_CELL_MARGIN 108 //default cell margin, not documented
 
 #ifdef DEBUG_DMAPPER_TABLE_HANDLER
-XMLTag::Pointer_t handleToTag(Handle_t & rHandle)
-{
-    XMLTag::Pointer_t pTag(new XMLTag("handle"));
-
-    pTag->chars(rHandle->getString());
-
-    return pTag;
-}
-
-void cellSequenceToTags(XMLTag::Pointer_t pTag, CellSequence_t & rCellSequence)
-{
-    sal_Int32 nCount = rCellSequence.getLength();
-    pTag->addAttr("count", nCount);
-
-    for (sal_Int32 n = 0; n < nCount; n++)
-    {
-        Handle_t aHandle = rCellSequence[n];
-        pTag->addTag(handleToTag(aHandle));
-    }
-}
-
-void rowSequenceToTags(XMLTag::Pointer_t pTag, RowSequence_t & rRowSequence)
-{
-    sal_Int32 nCount = rRowSequence.getLength();
-    pTag->addAttr("count", nCount);
-
-    for (sal_Int32 n = 0; n < nCount; n++)
-    {
-        CellSequence_t & rCells = rRowSequence[n];
-        XMLTag::Pointer_t pCellTag(new XMLTag("cell"));
-        cellSequenceToTags(pCellTag, rCells);
-        pTag->addTag(pCellTag);
-    }
-}
-
-XMLTag::Pointer_t tableSequenceToTag(TableSequence_t & rTableSequence)
-{
-    XMLTag::Pointer_t pTag(new XMLTag("table"));
-    sal_Int32 nCount = rTableSequence.getLength();
-    pTag->addAttr("count", nCount);
-
-    for (sal_Int32 n = 0; n < nCount; n++)
-    {
-        RowSequence_t & rRowSequence = rTableSequence[n];
-        XMLTag::Pointer_t pRowTag(new XMLTag("row"));
-        rowSequenceToTags(pRowTag, rRowSequence);
-        pTag->addTag(pRowTag);
-    }
-
-    return pTag;
-}
-
 static void  lcl_printProperties( PropertyMapPtr pProps )
 {
     if( pProps.get() )
@@ -116,9 +64,8 @@ static void  lcl_printProperties( PropertyMapPtr pProps )
         for( ; aMapIter != aEndIter; ++aMapIter )
         {
             rtl::OUString aOUStr = rPropSupplier.GetName( aMapIter->first.eId );
-            dmapper_logger->startElement("entry");
-            dmapper_logger->chars(aOUStr);
-            dmapper_logger->endElement("entry");
+            rtl::OString aOStr(aOUStr.getStr(), aOUStr.getLength(),  RTL_TEXTENCODING_ASCII_US );
+            clog << aOStr.getStr();
 
             table::BorderLine2 aLine;
             sal_Int32 nColor;
@@ -761,12 +708,6 @@ void DomainMapperTableHandler::endTable()
     {
         try
         {
-#ifdef DEBUG_DMAPPER_TABLE_HANDLER
-            XMLTag::Pointer_t pTag = tableSequenceToTag(*m_pTableSeq);
-            dmapper_logger->addTag(pTag);
-
-            ::std::clog << pTag->toTree() << ::std::endl;
-#endif
             uno::Reference<text::XTextTable> xTable = m_xText->convertToTable(*m_pTableSeq,
                                     aCellProperties,
                                     aRowProperties,
@@ -776,14 +717,12 @@ void DomainMapperTableHandler::endTable()
         }
         catch (lang::IllegalArgumentException)
         {
-            (void) e;
 #ifdef DEBUG_DMAPPER_TABLE_HANDLER
             dmapper_logger->chars("failed to import table!");
 #endif
         }
         catch ( uno::Exception &e )
         {
-            (void) e;
 #ifdef DEBUG_DMAPPER_TABLE_HANDLER
             dmapper_logger->startElement("exception");
             dmapper_logger->chars(rtl::OUStringToOString( e.Message, RTL_TEXTENCODING_UTF8 ).getStr( ));
@@ -865,6 +804,7 @@ void DomainMapperTableHandler::endCell(const Handle_t & end)
     dmapper_logger->chars(toString(end));
     dmapper_logger->endElement();
     dmapper_logger->endElement();
+    clog << "</table.cell>" << endl;
 #endif
 
     if (!end.get())