writerfilter: clean up PropertyMap::insert mess:

Rumor has it that MSVC 2010 has problems choosing the right overload in
PropertyMap::insert call, which is no surprise as that is a ridiculous
piece of garbage.  Special bonus points for having another class
TablePropsRef that must have a call compatible method because it's used
as parameter to the same templates, and for the call with a pointer
converted to boolean implicitly in StyleSheetTable.cxx:163.
Also remove the silly boolean parameter while at it, just have 2 methods
instead.

Change-Id: I022d5dd7008f3e6c510d94e19fbacbf04bcf1986

1 files changed, 7 insertions, 7 deletions

diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
index e6d63f5d69e1..b5c993bb789b 100644
--- a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
@@ -120,7 +120,7 @@ PropertyMapPtr lcl_SearchParentStyleSheetAndMergeProperties(const StyleSheetEntr
         pRet.reset( new PropertyMap );
     }
 
-    pRet->insert(  pStyleSheet->pProperties, true );
+    pRet->InsertProps(pStyleSheet->pProperties);
 
     return pRet;
 }
@@ -347,8 +347,8 @@ TableStyleSheetEntry * DomainMapperTableHandler::endTableGetTableStyle(TableInfo
                 dmapper_logger->endElement();
 #endif
 
-                m_aTableProperties->insert( pMergedProperties );
-                m_aTableProperties->insert( pTableProps );
+                m_aTableProperties->InsertProps(pMergedProperties);
+                m_aTableProperties->InsertProps(pTableProps);
 
 #ifdef DEBUG_DMAPPER_TABLE_HANDLER
                 dmapper_logger->startElement("TableProperties");
@@ -359,7 +359,7 @@ TableStyleSheetEntry * DomainMapperTableHandler::endTableGetTableStyle(TableInfo
         }
 
         // Set the table default attributes for the cells
-        rInfo.pTableDefaults->insert( m_aTableProperties );
+        rInfo.pTableDefaults->InsertProps(m_aTableProperties);
 
 #ifdef DEBUG_DMAPPER_TABLE_HANDLER
         dmapper_logger->startElement("TableDefaults");
@@ -543,7 +543,7 @@ CellPropertyValuesSeq_t DomainMapperTableHandler::endTableGetCellProperties(Tabl
             if( aCellIterator->get() )
             {
                 if ( rInfo.pTableDefaults->size( ) )
-                    pAllCellProps->insert( rInfo.pTableDefaults );
+                    pAllCellProps->InsertProps(rInfo.pTableDefaults);
 
                 // Fill the cell properties with the ones of the style
                 sal_Int32 nCellStyleMask = 0;
@@ -562,7 +562,7 @@ CellPropertyValuesSeq_t DomainMapperTableHandler::endTableGetCellProperties(Tabl
                 if ( rInfo.pTableStyle )
                 {
                     PropertyMapPtr pStyleProps = rInfo.pTableStyle->GetProperties( nCellStyleMask + nRowStyleMask );
-                    pAllCellProps->insert( pStyleProps );
+                    pAllCellProps->InsertProps(pStyleProps);
                 }
 
                 // Remove properties from style/row that aren't allowed in cells
@@ -573,7 +573,7 @@ CellPropertyValuesSeq_t DomainMapperTableHandler::endTableGetCellProperties(Tabl
                     pAllCellProps->erase( aDefaultRepeatIt );
 
                 // Then add the cell properties
-                pAllCellProps->insert( *aCellIterator );
+                pAllCellProps->InsertProps(*aCellIterator);
                 aCellIterator->get( )->swap( *pAllCellProps.get( ) );
 
 #ifdef DEBUG_DMAPPER_TABLE_HANDLER