[Libreoffice-commits] core.git: writerfilter/source

[Miklos Vajna]

 writerfilter/source/dmapper/DomainMapperTableHandler.cxx |   40 ---------------
 writerfilter/source/dmapper/PropertyMap.cxx              |   37 +++++++++++++
 writerfilter/source/dmapper/PropertyMap.hxx              |    3 +
 3 files changed, 40 insertions(+), 40 deletions(-)

New commits:
commit 4b2c5a943dc43f9da6e690f103945abd8999fa46
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Fri Aug 1 16:18:12 2014 +0200

    writerfilter: fix dbglevel=2 build
    
    Regression from commit 4c3ba3a413be7339115ea5e6edc825a8434cd345
    (fdo#75757: Remove inheritance from std::map., 2014-07-26).
    
    Change-Id: I2a532182697ae7a5fe4ec2f880a0f5237a21b723

diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
index 401aaeb..0b91ef6 100644
--- a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
@@ -46,43 +46,6 @@ using namespace ::std;
 
 #define DEF_BORDER_DIST 190  //0,19cm
 
-#ifdef DEBUG_DOMAINMAPPER
-static void  lcl_printProperties( PropertyMapPtr pProps )
-{
-    if( pProps.get() )
-    {
-        dmapper_logger->startElement("properties");
-
-        PropertyMap::const_iterator aMapIter = pProps->begin();
-        PropertyMap::const_iterator aEndIter = pProps->end();
-        PropertyNameSupplier& rPropSupplier = PropertyNameSupplier::GetPropertyNameSupplier();
-        for( ; aMapIter != aEndIter; ++aMapIter )
-        {
-            SAL_INFO("writerfilter", rPropSupplier.GetName(aMapIter->first));
-
-            table::BorderLine2 aLine;
-            sal_Int32 nColor;
-            if ( aMapIter->second.getValue() >>= aLine )
-            {
-                dmapper_logger->startElement("borderline");
-                dmapper_logger->attribute("color", aLine.Color);
-                dmapper_logger->attribute("inner", aLine.InnerLineWidth);
-                dmapper_logger->attribute("outer", aLine.OuterLineWidth);
-                dmapper_logger->endElement();
-            }
-            else if ( aMapIter->second.getValue() >>= nColor )
-            {
-                dmapper_logger->startElement("color");
-                dmapper_logger->attribute("number", nColor);
-                dmapper_logger->endElement();
-            }
-        }
-
-        dmapper_logger->endElement();
-    }
-}
-#endif
-
 DomainMapperTableHandler::DomainMapperTableHandler(TextReference_t const& xText,
             DomainMapper_Impl& rDMapper_Impl)
     : m_xText(xText),
@@ -1104,7 +1067,8 @@ void DomainMapperTableHandler::startCell(const Handle_t & start,
     dmapper_logger->startElement("table.cell.start");
     dmapper_logger->chars(toString(start));
     dmapper_logger->endElement();
-    lcl_printProperties( pProps );
+    if (pProps.get())
+        pProps->printProperties();
 #endif
 
     //add a new 'row' of properties
diff --git a/writerfilter/source/dmapper/PropertyMap.cxx b/writerfilter/source/dmapper/PropertyMap.cxx
index b1d5c5b..ab1d48d 100644
--- a/writerfilter/source/dmapper/PropertyMap.cxx
+++ b/writerfilter/source/dmapper/PropertyMap.cxx
@@ -232,8 +232,8 @@ void PropertyMap::dumpXml( const TagLogger::Pointer_t pLogger ) const
     pLogger->startElement("PropertyMap");
 
     PropertyNameSupplier& rPropNameSupplier = PropertyNameSupplier::GetPropertyNameSupplier();
-    PropertyMap::const_iterator aMapIter = begin();
-    while (aMapIter != end())
+    MapIterator aMapIter = m_vMap.begin();
+    while (aMapIter != m_vMap.end())
     {
         pLogger->startElement("property");
 
@@ -301,6 +301,39 @@ void PropertyMap::insertTableProperties( const PropertyMap* )
 #endif
 }
 
+#ifdef DEBUG_DOMAINMAPPER
+void PropertyMap::printProperties()
+{
+    dmapper_logger->startElement("properties");
+
+    MapIterator aMapIter = m_vMap.begin();
+    MapIterator aEndIter = m_vMap.end();
+    PropertyNameSupplier& rPropSupplier = PropertyNameSupplier::GetPropertyNameSupplier();
+    for( ; aMapIter != aEndIter; ++aMapIter )
+    {
+        SAL_INFO("writerfilter", rPropSupplier.GetName(aMapIter->first));
+
+        table::BorderLine2 aLine;
+        sal_Int32 nColor;
+        if ( aMapIter->second.getValue() >>= aLine )
+        {
+            dmapper_logger->startElement("borderline");
+            dmapper_logger->attribute("color", aLine.Color);
+            dmapper_logger->attribute("inner", aLine.InnerLineWidth);
+            dmapper_logger->attribute("outer", aLine.OuterLineWidth);
+            dmapper_logger->endElement();
+        }
+        else if ( aMapIter->second.getValue() >>= nColor )
+        {
+            dmapper_logger->startElement("color");
+            dmapper_logger->attribute("number", nColor);
+            dmapper_logger->endElement();
+        }
+    }
+
+    dmapper_logger->endElement();
+}
+#endif
 
 SectionPropertyMap::SectionPropertyMap(bool bIsFirstSection) :
     m_bIsFirstSection( bIsFirstSection )
diff --git a/writerfilter/source/dmapper/PropertyMap.hxx b/writerfilter/source/dmapper/PropertyMap.hxx
index 2183f96..c9f78aa 100644
--- a/writerfilter/source/dmapper/PropertyMap.hxx
+++ b/writerfilter/source/dmapper/PropertyMap.hxx
@@ -149,6 +149,9 @@ public:
     void                        SetFootnoteFontName( const OUString& rSet ) { m_sFootnoteFontName = rSet;}
 
     virtual void insertTableProperties( const PropertyMap* );
+#ifdef DEBUG_DOMAINMAPPER
+    void printProperties();
+#endif
 
 #if OSL_DEBUG_LEVEL > 1
     virtual void dumpXml( const TagLogger::Pointer_t pLogger ) const;