writerfilter07: debugging code for property maps

4 files changed, 27 insertions, 34 deletions

diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
index ca8f962f3e85..24fcf795d5b4 100644
--- a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
@@ -505,39 +505,9 @@ TableStyleSheetEntry * DomainMapperTableHandler::endTableGetTableStyle(TableInfo
         rInfo.aTableProperties = m_aTableProperties->GetPropertyValues();
 
 #ifdef DEBUG_DOMAINMAPPER
-        {
-            sal_uInt32 nCells = 0;
-            sal_uInt32 nRows = m_aRowProperties.size();
-            if( nRows == m_aCellProperties.size() )
-            {
-                for( sal_uInt32 nRow = 0; nRow < nRows; ++nRow )
-                    nCells += m_aCellProperties[nRow].size();
-            }
-            sal_uInt32 nTblPropSize = m_aTableProperties.get() ? m_aTableProperties->size() : 0;
-            (void)nTblPropSize;
-
-            if( nTblPropSize )
-            {
-                dmapper_logger->startElement("debug.tableprops");
-                const beans::PropertyValues aDebugTbl = m_aTableProperties->GetPropertyValues();
-                for( sal_uInt32 nDebug = 0; nDebug < nTblPropSize; ++nDebug)
-                {
-                    dmapper_logger->startElement("property");
-
-                    const ::rtl::OUString sName = aDebugTbl[nDebug].Name;
-                    dmapper_logger->attribute("name", sName);
-
-                    ::rtl::OUString sValue;
-                    aDebugTbl[nDebug].Value >>= sValue;
-                    dmapper_logger->chars(sValue);
-
-                    dmapper_logger->endElement("property");
-                }
-                m_aTableProperties->Invalidate();
-
-                dmapper_logger->endElement("debug.tableprops");
-            }
-        }
+        dmapper_logger->startElement("debug.tableprops");
+        dmapper_logger->addTag(m_aTableProperties->toTag());
+        dmapper_logger->endElement("debug.tableprops");
 #endif
 
     }
diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.cxx b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
index 9aa07ecc4b95..0db6b68fb069 100644
--- a/writerfilter/source/dmapper/DomainMapperTableManager.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
@@ -84,7 +84,8 @@ bool DomainMapperTableManager::sprm(Sprm & rSprm)
 {
 #ifdef DEBUG_DOMAINMAPPER
     dmapper_logger->startElement("tablemanager.sprm");
-    dmapper_logger->chars(rSprm.toString());
+    string sSprm = rSprm.toString();
+    dmapper_logger->chars(sSprm);
     dmapper_logger->endElement("tablemanager.sprm");
 #endif
     bool bRet = DomainMapperTableManager_Base_t::sprm(rSprm);
@@ -127,6 +128,9 @@ bool DomainMapperTableManager::sprm(Sprm & rSprm)
                         if( m_nTableWidth )
                             pPropMap->setValue( TablePropertyMap::TABLE_WIDTH, m_nTableWidth );
                     }
+#ifdef DEBUG_DOMAINMAPPER
+                    dmapper_logger->addTag(pPropMap->toTag());
+#endif
                     insertTableProps(pPropMap);
                 }
             }
diff --git a/writerfilter/source/dmapper/PropertyMap.cxx b/writerfilter/source/dmapper/PropertyMap.cxx
index 373a484bc671..85b97783f546 100644
--- a/writerfilter/source/dmapper/PropertyMap.cxx
+++ b/writerfilter/source/dmapper/PropertyMap.cxx
@@ -150,6 +150,15 @@ XMLTag::Pointer_t PropertyMap::toTag()
                 pTag->addTag(lcl_TableColumnSeparatorsToTag(aMapIter->second));
                 break;
             default:
+            {
+                try {
+                    sal_Int32 aInt;
+                    aMapIter->second >>= aInt;
+                    pTag->addAttr("value", aInt);
+                }
+                catch (...) {
+                }
+            }
                 break;
         }
 
diff --git a/writerfilter/source/dmapper/PropertyMapHelper.cxx b/writerfilter/source/dmapper/PropertyMapHelper.cxx
index 8ec5aae189e4..787af38084cd 100644
--- a/writerfilter/source/dmapper/PropertyMapHelper.cxx
+++ b/writerfilter/source/dmapper/PropertyMapHelper.cxx
@@ -72,6 +72,16 @@ XMLTag::Pointer_t lcl_PropertyValuesToTag(beans::PropertyValues & rValues)
 
         pTag->addAttr("name", pValues[n].Name);
 
+        try
+        {
+            sal_Int32 aInt;
+            pValues[n].Value >>= aInt;
+            pTag->addAttr("value", aInt);
+        }
+        catch (...)
+        {
+        }
+
         if (pValues[n].Name.equalsAscii("TableColumnSeparators"))
         {
             pTag->addTag(lcl_TableColumnSeparatorsToTag(pValues[n].Value));