diff options
author | Michael Stahl <mstahl@redhat.com> | 2012-10-30 22:39:23 +0100 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2012-10-30 22:54:47 +0100 |
commit | b660210ed809aacfc4095542e93e22c51500c377 (patch) | |
tree | a8ad26dd16ff12ecf6b00a776ce48f027529e6ba | |
parent | 4d13a68d75bc7e125d57ec34322c54967d12ecbb (diff) |
writerfilter: remove PropertyMap::InsertPropsNoOverwrite again:
Turns out nobody calls that, so the boolean parameter to insert method
was not just ugly but entirely pointless.
Change-Id: Icb928747d51487d6884a16dcc1f4e22b00c7c22b
-rw-r--r-- | writerfilter/source/dmapper/PropertyMap.cxx | 10 | ||||
-rw-r--r-- | writerfilter/source/dmapper/PropertyMap.hxx | 1 |
2 files changed, 0 insertions, 11 deletions
diff --git a/writerfilter/source/dmapper/PropertyMap.cxx b/writerfilter/source/dmapper/PropertyMap.cxx index 4ea094b6c19a..5a90e50d4760 100644 --- a/writerfilter/source/dmapper/PropertyMap.cxx +++ b/writerfilter/source/dmapper/PropertyMap.cxx @@ -223,21 +223,12 @@ template<class T> } }; - void PropertyMap::InsertProps(const PropertyMapPtr pMap) { if( pMap.get() ) { ::std::for_each( pMap->begin(), pMap->end(), removeExistingElements<PropertyMap::value_type>(*this) ); - InsertPropsNoOverwrite(pMap); - } -} - -void PropertyMap::InsertPropsNoOverwrite(const PropertyMapPtr pMap) -{ - if( pMap.get() ) - { _PropertyMap::insert(pMap->begin(), pMap->end()); insertTableProperties(pMap.get()); @@ -245,7 +236,6 @@ void PropertyMap::InsertPropsNoOverwrite(const PropertyMapPtr pMap) } } - const uno::Reference< text::XFootnote>& PropertyMap::GetFootnote() const { return m_xFootnote; diff --git a/writerfilter/source/dmapper/PropertyMap.hxx b/writerfilter/source/dmapper/PropertyMap.hxx index 90fb5c45ca00..50878e0822db 100644 --- a/writerfilter/source/dmapper/PropertyMap.hxx +++ b/writerfilter/source/dmapper/PropertyMap.hxx @@ -105,7 +105,6 @@ public: /** Add property, usually overwrites already available attributes. It shouldn't overwrite in case of default attributes */ void Insert( PropertyIds eId, bool bIsTextProperty, const ::com::sun::star::uno::Any& rAny, bool bOverwrite = true ); - void InsertPropsNoOverwrite(const boost::shared_ptr<PropertyMap> pMap); void InsertProps(const boost::shared_ptr<PropertyMap> pMap); const ::com::sun::star::uno::Reference< ::com::sun::star::text::XFootnote>& GetFootnote() const; |