added bool bForExport parameter to XMLPropertySetMapper ctor

Set to true for export, false for import. If export true, an
XMLPropertyMapEntry with mbImportOnly==true is not added to the
mappings. This to be able to have more than one mappings for import
(for example a current extension namespace and the future namespace
proposed to the ODF-TC, or corrected typos in element or attribute
names), but map only to one entry on export, of course.

Change-Id: Ia01ea949c88eda2f8a6c10f51c59e35e7abdcaf3

4 files changed, 25 insertions, 25 deletions

diff --git a/xmloff/source/text/txtimp.cxx b/xmloff/source/text/txtimp.cxx
index 18091977d56e..259633dee671 100644
--- a/xmloff/source/text/txtimp.cxx
+++ b/xmloff/source/text/txtimp.cxx
@@ -996,23 +996,23 @@ XMLTextImportHelper::XMLTextImportHelper(
     }
 
     XMLPropertySetMapper *pPropMapper =
-            new XMLTextPropertySetMapper( TEXT_PROP_MAP_PARA );
+            new XMLTextPropertySetMapper( TEXT_PROP_MAP_PARA, false );
     m_pImpl->m_xParaImpPrMap =
         new XMLTextImportPropertyMapper( pPropMapper, rImport );
 
-    pPropMapper = new XMLTextPropertySetMapper( TEXT_PROP_MAP_TEXT );
+    pPropMapper = new XMLTextPropertySetMapper( TEXT_PROP_MAP_TEXT, false );
     m_pImpl->m_xTextImpPrMap =
         new XMLTextImportPropertyMapper( pPropMapper, rImport );
 
-    pPropMapper = new XMLTextPropertySetMapper( TEXT_PROP_MAP_FRAME );
+    pPropMapper = new XMLTextPropertySetMapper( TEXT_PROP_MAP_FRAME, false );
     m_pImpl->m_xFrameImpPrMap =
         new XMLTextImportPropertyMapper( pPropMapper, rImport );
 
-    pPropMapper = new XMLTextPropertySetMapper( TEXT_PROP_MAP_SECTION );
+    pPropMapper = new XMLTextPropertySetMapper( TEXT_PROP_MAP_SECTION, false );
     m_pImpl->m_xSectionImpPrMap =
         new XMLTextImportPropertyMapper( pPropMapper, rImport );
 
-    pPropMapper = new XMLTextPropertySetMapper( TEXT_PROP_MAP_RUBY );
+    pPropMapper = new XMLTextPropertySetMapper( TEXT_PROP_MAP_RUBY, false );
     m_pImpl->m_xRubyImpPrMap =
         new SvXMLImportPropertyMapper( pPropMapper, rImport );
 }
@@ -1024,25 +1024,25 @@ XMLTextImportHelper::~XMLTextImportHelper()
 SvXMLImportPropertyMapper *XMLTextImportHelper::CreateShapeExtPropMapper(SvXMLImport& rImport)
 {
     XMLPropertySetMapper *pPropMapper =
-        new XMLTextPropertySetMapper( TEXT_PROP_MAP_FRAME );
+        new XMLTextPropertySetMapper( TEXT_PROP_MAP_FRAME, false );
     return new XMLTextImportPropertyMapper( pPropMapper, rImport );
 }
 
 SvXMLImportPropertyMapper *XMLTextImportHelper::CreateParaExtPropMapper(SvXMLImport& rImport)
 {
     XMLPropertySetMapper *pPropMapper =
-        new XMLTextPropertySetMapper( TEXT_PROP_MAP_SHAPE_PARA );
+        new XMLTextPropertySetMapper( TEXT_PROP_MAP_SHAPE_PARA, false );
     return new XMLTextImportPropertyMapper( pPropMapper, rImport );
 }
 
 SvXMLImportPropertyMapper *XMLTextImportHelper::CreateParaDefaultExtPropMapper(SvXMLImport& rImport)
 {
     XMLPropertySetMapper* pPropMapper =
-        new XMLTextPropertySetMapper( TEXT_PROP_MAP_SHAPE_PARA );
+        new XMLTextPropertySetMapper( TEXT_PROP_MAP_SHAPE_PARA, false );
     SvXMLImportPropertyMapper* pImportMapper = new XMLTextImportPropertyMapper( pPropMapper, rImport );
 
     pPropMapper =
-        new XMLTextPropertySetMapper( TEXT_PROP_MAP_TEXT_ADDITIONAL_DEFAULTS );
+        new XMLTextPropertySetMapper( TEXT_PROP_MAP_TEXT_ADDITIONAL_DEFAULTS, false );
     pImportMapper->ChainImportMapper( new XMLTextImportPropertyMapper( pPropMapper, rImport ) );
 
     return pImportMapper;
@@ -1053,7 +1053,7 @@ SvXMLImportPropertyMapper*
         SvXMLImport& rImport )
 {
     XMLPropertySetMapper *pPropMapper =
-        new XMLTextPropertySetMapper( TEXT_PROP_MAP_TABLE_DEFAULTS );
+        new XMLTextPropertySetMapper( TEXT_PROP_MAP_TABLE_DEFAULTS, false );
     return new SvXMLImportPropertyMapper( pPropMapper, rImport );
 }
 
@@ -1062,7 +1062,7 @@ SvXMLImportPropertyMapper*
         SvXMLImport& rImport )
 {
     XMLPropertySetMapper *pPropMapper =
-        new XMLTextPropertySetMapper( TEXT_PROP_MAP_TABLE_ROW_DEFAULTS );
+        new XMLTextPropertySetMapper( TEXT_PROP_MAP_TABLE_ROW_DEFAULTS, false );
     return new SvXMLImportPropertyMapper( pPropMapper, rImport );
 }
 
diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx
index 4b5dead0108d..721e9b26f77b 100644
--- a/xmloff/source/text/txtparae.cxx
+++ b/xmloff/source/text/txtparae.cxx
@@ -1267,7 +1267,7 @@ XMLTextParagraphExport::XMLTextParagraphExport(
     sTextFieldStartEnd( "TextFieldStartEnd"  ),
     aCharStyleNamesPropInfoCache( sCharStyleNames )
 {
-    UniReference < XMLPropertySetMapper > xPropMapper(new XMLTextPropertySetMapper( TEXT_PROP_MAP_PARA ));
+    UniReference < XMLPropertySetMapper > xPropMapper(new XMLTextPropertySetMapper( TEXT_PROP_MAP_PARA, true ));
     xParaPropMapper = new XMLTextExportPropertySetMapper( xPropMapper,
                                                              GetExport() );
 
@@ -1276,7 +1276,7 @@ XMLTextParagraphExport::XMLTextParagraphExport(
     rAutoStylePool.AddFamily( XML_STYLE_FAMILY_TEXT_PARAGRAPH, sFamily,
                               xParaPropMapper, aPrefix );
 
-    xPropMapper = new XMLTextPropertySetMapper( TEXT_PROP_MAP_TEXT );
+    xPropMapper = new XMLTextPropertySetMapper( TEXT_PROP_MAP_TEXT, true );
     xTextPropMapper = new XMLTextExportPropertySetMapper( xPropMapper,
                                                              GetExport() );
     sFamily = GetXMLToken(XML_TEXT);
@@ -1284,7 +1284,7 @@ XMLTextParagraphExport::XMLTextParagraphExport(
     rAutoStylePool.AddFamily( XML_STYLE_FAMILY_TEXT_TEXT, sFamily,
                               xTextPropMapper, aPrefix );
 
-    xPropMapper = new XMLTextPropertySetMapper( TEXT_PROP_MAP_AUTO_FRAME );
+    xPropMapper = new XMLTextPropertySetMapper( TEXT_PROP_MAP_AUTO_FRAME, true );
     xAutoFramePropMapper = new XMLTextExportPropertySetMapper( xPropMapper,
                                                                   GetExport() );
     sFamily = XML_STYLE_FAMILY_SD_GRAPHICS_NAME;
@@ -1292,7 +1292,7 @@ XMLTextParagraphExport::XMLTextParagraphExport(
     rAutoStylePool.AddFamily( XML_STYLE_FAMILY_TEXT_FRAME, sFamily,
                               xAutoFramePropMapper, aPrefix );
 
-    xPropMapper = new XMLTextPropertySetMapper( TEXT_PROP_MAP_SECTION );
+    xPropMapper = new XMLTextPropertySetMapper( TEXT_PROP_MAP_SECTION, true );
     xSectionPropMapper = new XMLTextExportPropertySetMapper( xPropMapper,
                                                              GetExport() );
     sFamily = GetXMLToken( XML_SECTION );
@@ -1300,14 +1300,14 @@ XMLTextParagraphExport::XMLTextParagraphExport(
     rAutoStylePool.AddFamily( XML_STYLE_FAMILY_TEXT_SECTION, sFamily,
                               xSectionPropMapper, aPrefix );
 
-    xPropMapper = new XMLTextPropertySetMapper( TEXT_PROP_MAP_RUBY );
+    xPropMapper = new XMLTextPropertySetMapper( TEXT_PROP_MAP_RUBY, true );
     xRubyPropMapper = new SvXMLExportPropertyMapper( xPropMapper );
     sFamily = GetXMLToken( XML_RUBY );
     aPrefix = "Ru";
     rAutoStylePool.AddFamily( XML_STYLE_FAMILY_TEXT_RUBY, sFamily,
                               xRubyPropMapper, aPrefix );
 
-    xPropMapper = new XMLTextPropertySetMapper( TEXT_PROP_MAP_FRAME );
+    xPropMapper = new XMLTextPropertySetMapper( TEXT_PROP_MAP_FRAME, true );
     xFramePropMapper = new XMLTextExportPropertySetMapper( xPropMapper,
                                                               GetExport() );
 
@@ -1351,7 +1351,7 @@ SvXMLExportPropertyMapper *XMLTextParagraphExport::CreateShapeExtPropMapper(
         SvXMLExport& rExport )
 {
     UniReference < XMLPropertySetMapper > xPropMapper =
-        new XMLTextPropertySetMapper( TEXT_PROP_MAP_SHAPE );
+        new XMLTextPropertySetMapper( TEXT_PROP_MAP_SHAPE, true );
     return new XMLTextExportPropertySetMapper( xPropMapper, rExport );
 }
 
@@ -1359,7 +1359,7 @@ SvXMLExportPropertyMapper *XMLTextParagraphExport::CreateCharExtPropMapper(
         SvXMLExport& rExport)
 {
     XMLPropertySetMapper *pPropMapper =
-        new XMLTextPropertySetMapper( TEXT_PROP_MAP_TEXT );
+        new XMLTextPropertySetMapper( TEXT_PROP_MAP_TEXT, true );
     return new XMLTextExportPropertySetMapper( pPropMapper, rExport );
 }
 
@@ -1367,7 +1367,7 @@ SvXMLExportPropertyMapper *XMLTextParagraphExport::CreateParaExtPropMapper(
         SvXMLExport& rExport)
 {
     XMLPropertySetMapper *pPropMapper =
-        new XMLTextPropertySetMapper( TEXT_PROP_MAP_SHAPE_PARA );
+        new XMLTextPropertySetMapper( TEXT_PROP_MAP_SHAPE_PARA, true );
     return new XMLTextExportPropertySetMapper( pPropMapper, rExport );
 }
 
@@ -1375,7 +1375,7 @@ SvXMLExportPropertyMapper *XMLTextParagraphExport::CreateParaDefaultExtPropMappe
         SvXMLExport& rExport)
 {
     XMLPropertySetMapper *pPropMapper =
-        new XMLTextPropertySetMapper( TEXT_PROP_MAP_TEXT_ADDITIONAL_DEFAULTS );
+        new XMLTextPropertySetMapper( TEXT_PROP_MAP_TEXT_ADDITIONAL_DEFAULTS, true );
     return new XMLTextExportPropertySetMapper( pPropMapper, rExport );
 }
 
diff --git a/xmloff/source/text/txtprmap.cxx b/xmloff/source/text/txtprmap.cxx
index 430d70611fd3..ae30b1154b80 100644
--- a/xmloff/source/text/txtprmap.cxx
+++ b/xmloff/source/text/txtprmap.cxx
@@ -944,9 +944,9 @@ const XMLPropertyMapEntry* XMLTextPropertySetMapper::getPropertyMapForType( sal_
     return lcl_txtprmap_getMap( _nType );
 }
 
-XMLTextPropertySetMapper::XMLTextPropertySetMapper( sal_uInt16 nType ) :
+XMLTextPropertySetMapper::XMLTextPropertySetMapper( sal_uInt16 nType, bool bForExport ) :
     XMLPropertySetMapper( lcl_txtprmap_getMap( nType ),
-                          new XMLTextPropertyHandlerFactory )
+                          new XMLTextPropertyHandlerFactory, bForExport )
 {
 }
 
diff --git a/xmloff/source/text/txtstyle.cxx b/xmloff/source/text/txtstyle.cxx
index 0f690b0c20d7..eba122b9d2ee 100644
--- a/xmloff/source/text/txtstyle.cxx
+++ b/xmloff/source/text/txtstyle.cxx
@@ -127,7 +127,7 @@ void XMLTextParagraphExport::exportTextStyles( sal_Bool bUsed, sal_Bool bProg )
                 GetXMLToken(XML_TABLE),
                 new XMLTextExportPropertySetMapper(
                     new XMLTextPropertySetMapper(
-                        TEXT_PROP_MAP_TABLE_DEFAULTS ),
+                        TEXT_PROP_MAP_TABLE_DEFAULTS, true ),
                     GetExport() ) );
 
             exportDefaultStyle(
@@ -135,7 +135,7 @@ void XMLTextParagraphExport::exportTextStyles( sal_Bool bUsed, sal_Bool bProg )
                 GetXMLToken(XML_TABLE_ROW),
                 new XMLTextExportPropertySetMapper(
                     new XMLTextPropertySetMapper(
-                        TEXT_PROP_MAP_TABLE_ROW_DEFAULTS ),
+                        TEXT_PROP_MAP_TABLE_ROW_DEFAULTS, true ),
                     GetExport() ) );
         }
     }