Kaydet (Commit) b660210e authored tarafından Michael Stahl's avatar Michael Stahl

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
üst 4d13a68d
...@@ -223,21 +223,12 @@ template<class T> ...@@ -223,21 +223,12 @@ template<class T>
} }
}; };
void PropertyMap::InsertProps(const PropertyMapPtr pMap) void PropertyMap::InsertProps(const PropertyMapPtr pMap)
{ {
if( pMap.get() ) if( pMap.get() )
{ {
::std::for_each( pMap->begin(), pMap->end(), ::std::for_each( pMap->begin(), pMap->end(),
removeExistingElements<PropertyMap::value_type>(*this) ); removeExistingElements<PropertyMap::value_type>(*this) );
InsertPropsNoOverwrite(pMap);
}
}
void PropertyMap::InsertPropsNoOverwrite(const PropertyMapPtr pMap)
{
if( pMap.get() )
{
_PropertyMap::insert(pMap->begin(), pMap->end()); _PropertyMap::insert(pMap->begin(), pMap->end());
insertTableProperties(pMap.get()); insertTableProperties(pMap.get());
...@@ -245,7 +236,6 @@ void PropertyMap::InsertPropsNoOverwrite(const PropertyMapPtr pMap) ...@@ -245,7 +236,6 @@ void PropertyMap::InsertPropsNoOverwrite(const PropertyMapPtr pMap)
} }
} }
const uno::Reference< text::XFootnote>& PropertyMap::GetFootnote() const const uno::Reference< text::XFootnote>& PropertyMap::GetFootnote() const
{ {
return m_xFootnote; return m_xFootnote;
......
...@@ -105,7 +105,6 @@ public: ...@@ -105,7 +105,6 @@ public:
/** Add property, usually overwrites already available attributes. It shouldn't overwrite in case of default attributes /** 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 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); void InsertProps(const boost::shared_ptr<PropertyMap> pMap);
const ::com::sun::star::uno::Reference< ::com::sun::star::text::XFootnote>& GetFootnote() const; const ::com::sun::star::uno::Reference< ::com::sun::star::text::XFootnote>& GetFootnote() const;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment