writerfilter07: debugging property sets improved

5 files changed, 31 insertions, 5 deletions

diff --git a/writerfilter/source/dmapper/PropertyMap.cxx b/writerfilter/source/dmapper/PropertyMap.cxx
index 33b8ecdeeb2a..95340eb054a4 100644
--- a/writerfilter/source/dmapper/PropertyMap.cxx
+++ b/writerfilter/source/dmapper/PropertyMap.cxx
@@ -42,6 +42,7 @@
 #include <com/sun/star/text/WritingMode.hpp>
 #include <com/sun/star/text/XTextColumns.hpp>
 #include <com/sun/star/text/XText.hpp>
+#include "dmapperLoggers.hxx"
 #include "PropertyMapHelper.hxx"
 
 using namespace ::com::sun::star;
@@ -132,12 +133,12 @@ void PropertyMap::Insert( PropertyIds eId, bool bIsTextProperty, const uno::Any&
 }
 
 #ifdef DEBUG_DOMAINMAPPER
-XMLTag::Pointer_t PropertyMap::toTag()
+XMLTag::Pointer_t PropertyMap::toTag() const
 {
     XMLTag::Pointer_t pResult(new XMLTag("PropertyMap"));
 
     PropertyNameSupplier& rPropNameSupplier = PropertyNameSupplier::GetPropertyNameSupplier();
-    PropertyMap::iterator aMapIter = begin();
+    PropertyMap::const_iterator aMapIter = begin();
     while (aMapIter != end())
     {
         XMLTag::Pointer_t pTag(new XMLTag("property"));
@@ -214,6 +215,9 @@ const uno::Reference< text::XFootnote>&  PropertyMap::GetFootnote() const
   -----------------------------------------------------------------------*/
 void PropertyMap::insertTableProperties( const PropertyMap* )
 {
+#ifdef DEBUG_DOMAINMAPPER
+    dmapper_logger->element("PropertyMap.insertTableProperties");
+#endif
 }
 /*-- 24.07.2006 08:29:01---------------------------------------------------
 
@@ -1091,6 +1095,11 @@ void TablePropertyMap::setValue( TablePropertyMapTarget eWhich, sal_Int32 nSet )
   -----------------------------------------------------------------------*/
 void TablePropertyMap::insertTableProperties( const PropertyMap* pMap )
 {
+#ifdef DEBUG_DOMAINMAPPER
+    dmapper_logger->startElement("TablePropertyMap.insertTableProperties");
+    dmapper_logger->addTag(pMap->toTag());
+#endif
+
     const TablePropertyMap* pSource = dynamic_cast< const TablePropertyMap* >(pMap);
     if( pSource )
     {
@@ -1104,6 +1113,10 @@ void TablePropertyMap::insertTableProperties( const PropertyMap* pMap )
             }
         }
     }
+#ifdef DEBUG_DOMAINMAPPER
+    dmapper_logger->addTag(toTag());
+    dmapper_logger->endElement("TablePropertyMap.insertTableProperties");
+#endif
 }
 
 
diff --git a/writerfilter/source/dmapper/PropertyMap.hxx b/writerfilter/source/dmapper/PropertyMap.hxx
index 97642eff21a2..6db501a14eea 100644
--- a/writerfilter/source/dmapper/PropertyMap.hxx
+++ b/writerfilter/source/dmapper/PropertyMap.hxx
@@ -140,7 +140,7 @@ public:
     virtual void insertTableProperties( const PropertyMap* );
 
 #ifdef DEBUG_DOMAINMAPPER
-    virtual XMLTag::Pointer_t toTag();
+    virtual XMLTag::Pointer_t toTag() const;
 #endif
 
 };
diff --git a/writerfilter/source/dmapper/PropertyMapHelper.cxx b/writerfilter/source/dmapper/PropertyMapHelper.cxx
index 787af38084cd..d5bf9b444186 100644
--- a/writerfilter/source/dmapper/PropertyMapHelper.cxx
+++ b/writerfilter/source/dmapper/PropertyMapHelper.cxx
@@ -39,7 +39,7 @@ namespace dmapper
 
 using namespace ::com::sun::star;
 
-    XMLTag::Pointer_t lcl_TableColumnSeparatorsToTag(uno::Any & rTableColumnSeparators)
+    XMLTag::Pointer_t lcl_TableColumnSeparatorsToTag(const uno::Any & rTableColumnSeparators)
 {
     uno::Sequence<text::TableColumnSeparator> aSeq;
     rTableColumnSeparators >>= aSeq;
diff --git a/writerfilter/source/dmapper/PropertyMapHelper.hxx b/writerfilter/source/dmapper/PropertyMapHelper.hxx
index e327a53c1575..9ed1fbf0aa42 100644
--- a/writerfilter/source/dmapper/PropertyMapHelper.hxx
+++ b/writerfilter/source/dmapper/PropertyMapHelper.hxx
@@ -36,7 +36,7 @@ namespace writerfilter
 namespace dmapper
 {
 
-XMLTag::Pointer_t lcl_TableColumnSeparatorsToTag(uno::Any & rTableColumnSeparators);
+XMLTag::Pointer_t lcl_TableColumnSeparatorsToTag(const uno::Any & rTableColumnSeparators);
 XMLTag::Pointer_t lcl_PropertyValuesToTag(beans::PropertyValues & rValues);
 
 typedef uno::Sequence<beans::PropertyValues> PropertyValueSeq_t;
diff --git a/writerfilter/source/dmapper/TablePropertiesHandler.cxx b/writerfilter/source/dmapper/TablePropertiesHandler.cxx
index 52bf124f790c..5472622b47f4 100644
--- a/writerfilter/source/dmapper/TablePropertiesHandler.cxx
+++ b/writerfilter/source/dmapper/TablePropertiesHandler.cxx
@@ -220,6 +220,19 @@ namespace dmapper {
                 }
             }
             break;
+           case NS_ooxml::LN_CT_TblPrBase_tblInd:
+           {
+               writerfilter::Reference<Properties>::Pointer_t pProperties = rSprm.getProps();
+               if (pProperties.get())
+               {
+                   MeasureHandlerPtr pHandler(new MeasureHandler);
+                   TablePropertyMapPtr pTblIndMap(new TablePropertyMap);
+                   sal_uInt32 nTblInd = pHandler->getMeasureValue();
+                   pTblIndMap->Insert( TablePropertyMap::LEFT_MARGIN, nTblInd);
+                   insertTableProps(pTblIndMap);
+               }
+           }
+            break;
             default: bRet = false;
         }