writerfilter07: Made PropertyMap::Invalidate protected. Invalidate in PropertyMap::insert

3 files changed, 12 insertions, 10 deletions

diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
index 24fcf795d5b4..6e75eedfa1bf 100644
--- a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
@@ -691,7 +691,6 @@ RowPropertyValuesSeq_t DomainMapperTableHandler::endTableGetRowProperties()
             if( aRowIter->get()->find( PropertyDefinition( PROP_IS_SPLIT_ALLOWED, false )) == aRowIter->get()->end())
                 aRowIter->get()->Insert( PROP_IS_SPLIT_ALLOWED, false, uno::makeAny(sal_True ) );
 
-            (*aRowIter)->Invalidate();
             aRowProperties[nRow] = (*aRowIter)->GetPropertyValues();
 #ifdef DEBUG_DOMAINMAPPER
             dmapper_logger->addTag((*aRowIter)->toTag());
diff --git a/writerfilter/source/dmapper/PropertyMap.cxx b/writerfilter/source/dmapper/PropertyMap.cxx
index 85b97783f546..33b8ecdeeb2a 100644
--- a/writerfilter/source/dmapper/PropertyMap.cxx
+++ b/writerfilter/source/dmapper/PropertyMap.cxx
@@ -198,6 +198,8 @@ void PropertyMap::insert( const PropertyMapPtr pMap, bool bOverwrite )
             ::std::for_each( pMap->begin(), pMap->end(), removeExistingElements<PropertyMap::value_type>(*this) );
         _PropertyMap::insert(pMap->begin(), pMap->end());
         insertTableProperties(pMap.get());
+
+        Invalidate();
     }
 }
 /*-- 06.06.2007 15:49:09---------------------------------------------------
diff --git a/writerfilter/source/dmapper/PropertyMap.hxx b/writerfilter/source/dmapper/PropertyMap.hxx
index 9d349be5cae6..97642eff21a2 100644
--- a/writerfilter/source/dmapper/PropertyMap.hxx
+++ b/writerfilter/source/dmapper/PropertyMap.hxx
@@ -106,9 +106,16 @@ class PropertyMap : public _PropertyMap
     ::rtl::OUString                                                             m_sFootnoteFontName;
     ::com::sun::star::uno::Reference< ::com::sun::star::text::XFootnote >       m_xFootnote;
 
-    public:
-        PropertyMap();
-        virtual ~PropertyMap();
+protected:
+    void Invalidate()
+    {
+        if(m_aValues.getLength())
+            m_aValues.realloc( 0 );
+    }
+
+public:
+    PropertyMap();
+    virtual ~PropertyMap();
 
     ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > GetPropertyValues();
     bool hasEmptyPropertyValues() const {return !m_aValues.getLength();}
@@ -118,12 +125,6 @@ class PropertyMap : public _PropertyMap
     using _PropertyMap::insert;
     void insert(const boost::shared_ptr<PropertyMap> pMap, bool bOverwrite = true);
 
-    void Invalidate()
-        {
-            if(m_aValues.getLength())
-                m_aValues.realloc( 0 );
-        }
-
     const ::com::sun::star::uno::Reference< ::com::sun::star::text::XFootnote>&  GetFootnote() const;
     void SetFootnote( ::com::sun::star::uno::Reference< ::com::sun::star::text::XFootnote> xF ) { m_xFootnote = xF; }