remove the inheritance to std::map in PropertyMap

Change-Id: Iaaf5b7ab47ffa151cd7c8ea376763d02c883f377

5 files changed, 111 insertions, 111 deletions

diff --git a/sc/source/filter/oox/drawingfragment.cxx b/sc/source/filter/oox/drawingfragment.cxx
index 7d8c5ba3baf7..0da5045e122d 100644
--- a/sc/source/filter/oox/drawingfragment.cxx
+++ b/sc/source/filter/oox/drawingfragment.cxx
@@ -101,7 +101,7 @@ Shape::Shape( const WorksheetHelper& rHelper, const AttributeList& rAttribs, con
 void Shape::finalizeXShape( XmlFilterBase& rFilter, const Reference< XShapes >& rxShapes )
 {
     OUString sURL;
-    getShapeProperties()[ PROP_URL ] >>= sURL;
+    getShapeProperties().getProperty( PROP_URL ) >>= sURL;
     getWorksheets().convertSheetNameRef( sURL );
     if( !maMacroName.isEmpty() && mxShape.is() )
     {
diff --git a/sc/source/filter/oox/numberformatsbuffer.cxx b/sc/source/filter/oox/numberformatsbuffer.cxx
index a72a43645fba..a7709b3d28f5 100644
--- a/sc/source/filter/oox/numberformatsbuffer.cxx
+++ b/sc/source/filter/oox/numberformatsbuffer.cxx
@@ -1946,7 +1946,7 @@ void NumberFormat::fillToItemSet( SfxItemSet& rItemSet, bool bSkipPoolDefs ) con
 
 void NumberFormat::writeToPropertyMap( PropertyMap& rPropMap ) const
 {
-    rPropMap[ PROP_NumberFormat ] <<= maApiData.mnIndex;
+    rPropMap.setProperty( PROP_NumberFormat, maApiData.mnIndex);
 }
 
 
diff --git a/sc/source/filter/oox/pagesettings.cxx b/sc/source/filter/oox/pagesettings.cxx
index 1f504cbaccb2..1f06e82e77c3 100644
--- a/sc/source/filter/oox/pagesettings.cxx
+++ b/sc/source/filter/oox/pagesettings.cxx
@@ -972,35 +972,35 @@ void PageSettingsConverter::writePageSettingsProperties(
     // write all properties to property set
     const UnitConverter& rUnitConv = getUnitConverter();
     PropertyMap aPropMap;
-    aPropMap[ PROP_IsLandscape ]           <<= bLandscape;
-    aPropMap[ PROP_FirstPageNumber ]       <<= getLimitedValue< sal_Int16, sal_Int32 >( rModel.mbUseFirstPage ? rModel.mnFirstPage : 0, 0, 9999 );
-    aPropMap[ PROP_PrintDownFirst ]        <<= (rModel.mnPageOrder == XML_downThenOver);
-    aPropMap[ PROP_PrintAnnotations ]      <<= (rModel.mnCellComments == XML_asDisplayed);
-    aPropMap[ PROP_CenterHorizontally ]    <<= rModel.mbHorCenter;
-    aPropMap[ PROP_CenterVertically ]      <<= rModel.mbVerCenter;
-    aPropMap[ PROP_PrintGrid ]             <<= (!bChartSheet && rModel.mbPrintGrid);     // no gridlines in chart sheets
-    aPropMap[ PROP_PrintHeaders ]          <<= (!bChartSheet && rModel.mbPrintHeadings); // no column/row headings in chart sheets
-    aPropMap[ PROP_LeftMargin ]            <<= rUnitConv.scaleToMm100( rModel.mfLeftMargin, UNIT_INCH );
-    aPropMap[ PROP_RightMargin ]           <<= rUnitConv.scaleToMm100( rModel.mfRightMargin, UNIT_INCH );
+    aPropMap.setProperty( PROP_IsLandscape, bLandscape);
+    aPropMap.setProperty( PROP_FirstPageNumber, getLimitedValue< sal_Int16, sal_Int32 >( rModel.mbUseFirstPage ? rModel.mnFirstPage : 0, 0, 9999 ));
+    aPropMap.setProperty( PROP_PrintDownFirst, (rModel.mnPageOrder == XML_downThenOver));
+    aPropMap.setProperty( PROP_PrintAnnotations, (rModel.mnCellComments == XML_asDisplayed));
+    aPropMap.setProperty( PROP_CenterHorizontally, rModel.mbHorCenter);
+    aPropMap.setProperty( PROP_CenterVertically, rModel.mbVerCenter);
+    aPropMap.setProperty( PROP_PrintGrid, (!bChartSheet && rModel.mbPrintGrid));     // no gridlines in chart sheets
+    aPropMap.setProperty( PROP_PrintHeaders, (!bChartSheet && rModel.mbPrintHeadings)); // no column/row headings in chart sheets
+    aPropMap.setProperty( PROP_LeftMargin, rUnitConv.scaleToMm100( rModel.mfLeftMargin, UNIT_INCH ));
+    aPropMap.setProperty( PROP_RightMargin, rUnitConv.scaleToMm100( rModel.mfRightMargin, UNIT_INCH ));
     // #i23296# In Calc, "TopMargin" property is distance to top of header if enabled
-    aPropMap[ PROP_TopMargin ]             <<= rUnitConv.scaleToMm100( maHeaderData.mbHasContent ? rModel.mfHeaderMargin : rModel.mfTopMargin, UNIT_INCH );
+    aPropMap.setProperty( PROP_TopMargin, rUnitConv.scaleToMm100( maHeaderData.mbHasContent ? rModel.mfHeaderMargin : rModel.mfTopMargin, UNIT_INCH ));
     // #i23296# In Calc, "BottomMargin" property is distance to bottom of footer if enabled
-    aPropMap[ PROP_BottomMargin ]          <<= rUnitConv.scaleToMm100( maFooterData.mbHasContent ? rModel.mfFooterMargin : rModel.mfBottomMargin, UNIT_INCH );
-    aPropMap[ PROP_HeaderIsOn ]            <<= maHeaderData.mbHasContent;
-    aPropMap[ PROP_HeaderIsShared ]        <<= maHeaderData.mbShareOddEven;
-    aPropMap[ PROP_HeaderIsDynamicHeight ] <<= maHeaderData.mbDynamicHeight;
-    aPropMap[ PROP_HeaderHeight ]          <<= maHeaderData.mnHeight;
-    aPropMap[ PROP_HeaderBodyDistance ]    <<= maHeaderData.mnBodyDist;
-    aPropMap[ PROP_FooterIsOn ]            <<= maFooterData.mbHasContent;
-    aPropMap[ PROP_FooterIsShared ]        <<= maFooterData.mbShareOddEven;
-    aPropMap[ PROP_FooterIsDynamicHeight ] <<= maFooterData.mbDynamicHeight;
-    aPropMap[ PROP_FooterHeight ]          <<= maFooterData.mnHeight;
-    aPropMap[ PROP_FooterBodyDistance ]    <<= maFooterData.mnBodyDist;
+    aPropMap.setProperty( PROP_BottomMargin, rUnitConv.scaleToMm100( maFooterData.mbHasContent ? rModel.mfFooterMargin : rModel.mfBottomMargin, UNIT_INCH ));
+    aPropMap.setProperty( PROP_HeaderIsOn, maHeaderData.mbHasContent);
+    aPropMap.setProperty( PROP_HeaderIsShared, maHeaderData.mbShareOddEven);
+    aPropMap.setProperty( PROP_HeaderIsDynamicHeight, maHeaderData.mbDynamicHeight);
+    aPropMap.setProperty( PROP_HeaderHeight, maHeaderData.mnHeight);
+    aPropMap.setProperty( PROP_HeaderBodyDistance, maHeaderData.mnBodyDist);
+    aPropMap.setProperty( PROP_FooterIsOn, maFooterData.mbHasContent);
+    aPropMap.setProperty( PROP_FooterIsShared, maFooterData.mbShareOddEven);
+    aPropMap.setProperty( PROP_FooterIsDynamicHeight, maFooterData.mbDynamicHeight);
+    aPropMap.setProperty( PROP_FooterHeight, maFooterData.mnHeight);
+    aPropMap.setProperty( PROP_FooterBodyDistance, maFooterData.mnBodyDist);
     // background image
     if( !rModel.maGraphicUrl.isEmpty() )
     {
-        aPropMap[ PROP_BackGraphicURL ] <<= rModel.maGraphicUrl;
-        aPropMap[ PROP_BackGraphicLocation ] <<= ::com::sun::star::style::GraphicLocation_TILED;
+        aPropMap.setProperty( PROP_BackGraphicURL, rModel.maGraphicUrl);
+        aPropMap.setProperty( PROP_BackGraphicLocation, ::com::sun::star::style::GraphicLocation_TILED);
     }
 
     rPropSet.setProperties( aPropMap );
diff --git a/sc/source/filter/oox/stylesbuffer.cxx b/sc/source/filter/oox/stylesbuffer.cxx
index 915fb92c6b71..5b8447ffacd4 100644
--- a/sc/source/filter/oox/stylesbuffer.cxx
+++ b/sc/source/filter/oox/stylesbuffer.cxx
@@ -1046,67 +1046,67 @@ void Font::writeToPropertyMap( PropertyMap& rPropMap, FontPropertyType ePropType
     {
         if( !maApiData.maLatinFont.maName.isEmpty() )
         {
-            rPropMap[ PROP_CharFontName ]    <<= maApiData.maLatinFont.maName;
-            rPropMap[ PROP_CharFontFamily ]  <<= maApiData.maLatinFont.mnFamily;
-            rPropMap[ PROP_CharFontCharSet ] <<= maApiData.maLatinFont.mnTextEnc;
+            rPropMap.setProperty( PROP_CharFontName, maApiData.maLatinFont.maName);
+            rPropMap.setProperty( PROP_CharFontFamily, maApiData.maLatinFont.mnFamily);
+            rPropMap.setProperty( PROP_CharFontCharSet, maApiData.maLatinFont.mnTextEnc);
         }
         if( !maApiData.maAsianFont.maName.isEmpty() )
         {
-            rPropMap[ PROP_CharFontNameAsian ]    <<= maApiData.maAsianFont.maName;
-            rPropMap[ PROP_CharFontFamilyAsian ]  <<= maApiData.maAsianFont.mnFamily;
-            rPropMap[ PROP_CharFontCharSetAsian ] <<= maApiData.maAsianFont.mnTextEnc;
+            rPropMap.setProperty( PROP_CharFontNameAsian, maApiData.maAsianFont.maName);
+            rPropMap.setProperty( PROP_CharFontFamilyAsian, maApiData.maAsianFont.mnFamily);
+            rPropMap.setProperty( PROP_CharFontCharSetAsian, maApiData.maAsianFont.mnTextEnc);
         }
         if( !maApiData.maCmplxFont.maName.isEmpty() )
         {
-            rPropMap[ PROP_CharFontNameComplex ]    <<= maApiData.maCmplxFont.maName;
-            rPropMap[ PROP_CharFontFamilyComplex ]  <<= maApiData.maCmplxFont.mnFamily;
-            rPropMap[ PROP_CharFontCharSetComplex ] <<= maApiData.maCmplxFont.mnTextEnc;
+            rPropMap.setProperty( PROP_CharFontNameComplex, maApiData.maCmplxFont.maName);
+            rPropMap.setProperty( PROP_CharFontFamilyComplex, maApiData.maCmplxFont.mnFamily);
+            rPropMap.setProperty( PROP_CharFontCharSetComplex, maApiData.maCmplxFont.mnTextEnc);
         }
     }
     // font height
     if( maUsedFlags.mbHeightUsed )
     {
         float fHeight = static_cast< float >( maApiData.maDesc.Height / 20.0 ); // twips to points
-        rPropMap[ PROP_CharHeight ] <<= fHeight;
-        rPropMap[ PROP_CharHeightAsian ] <<= fHeight;
-        rPropMap[ PROP_CharHeightComplex ] <<= fHeight;
+        rPropMap.setProperty( PROP_CharHeight, fHeight);
+        rPropMap.setProperty( PROP_CharHeightAsian, fHeight);
+        rPropMap.setProperty( PROP_CharHeightComplex, fHeight);
     }
     // font weight
     if( maUsedFlags.mbWeightUsed )
     {
         float fWeight = maApiData.maDesc.Weight;
-        rPropMap[ PROP_CharWeight ] <<= fWeight;
-        rPropMap[ PROP_CharWeightAsian ] <<= fWeight;
-        rPropMap[ PROP_CharWeightComplex ] <<= fWeight;
+        rPropMap.setProperty( PROP_CharWeight, fWeight);
+        rPropMap.setProperty( PROP_CharWeightAsian, fWeight);
+        rPropMap.setProperty( PROP_CharWeightComplex, fWeight);
     }
     // font posture
     if( maUsedFlags.mbPostureUsed )
     {
-        rPropMap[ PROP_CharPosture ] <<= maApiData.maDesc.Slant;
-        rPropMap[ PROP_CharPostureAsian ] <<= maApiData.maDesc.Slant;
-        rPropMap[ PROP_CharPostureComplex ] <<= maApiData.maDesc.Slant;
+        rPropMap.setProperty( PROP_CharPosture, maApiData.maDesc.Slant);
+        rPropMap.setProperty( PROP_CharPostureAsian, maApiData.maDesc.Slant);
+        rPropMap.setProperty( PROP_CharPostureComplex, maApiData.maDesc.Slant);
     }
     // character color
     if( maUsedFlags.mbColorUsed )
-        rPropMap[ PROP_CharColor ] <<= maApiData.mnColor;
+        rPropMap.setProperty( PROP_CharColor, maApiData.mnColor);
     // underline style
     if( maUsedFlags.mbUnderlineUsed )
-        rPropMap[ PROP_CharUnderline ] <<= maApiData.maDesc.Underline;
+        rPropMap.setProperty( PROP_CharUnderline, maApiData.maDesc.Underline);
     // strike out style
     if( maUsedFlags.mbStrikeoutUsed )
-        rPropMap[ PROP_CharStrikeout ] <<= maApiData.maDesc.Strikeout;
+        rPropMap.setProperty( PROP_CharStrikeout, maApiData.maDesc.Strikeout);
     // outline style
     if( maUsedFlags.mbOutlineUsed )
-        rPropMap[ PROP_CharContoured ] <<= maApiData.mbOutline;
+        rPropMap.setProperty( PROP_CharContoured, maApiData.mbOutline);
     // shadow style
     if( maUsedFlags.mbShadowUsed )
-        rPropMap[ PROP_CharShadowed ] <<= maApiData.mbShadow;
+        rPropMap.setProperty( PROP_CharShadowed, maApiData.mbShadow);
     // escapement
     if( maUsedFlags.mbEscapementUsed )
     {
-        rPropMap[ PROP_CharEscapement ] <<= maApiData.mnEscapement;
+        rPropMap.setProperty( PROP_CharEscapement, maApiData.mnEscapement);
         if( ePropType == FONT_PROPTYPE_TEXT )
-            rPropMap[ PROP_CharEscapementHeight ] <<= maApiData.mnEscapeHeight;
+            rPropMap.setProperty( PROP_CharEscapementHeight, maApiData.mnEscapeHeight);
     }
 }
 
@@ -1379,16 +1379,16 @@ void Alignment::fillToItemSet( SfxItemSet& rItemSet, bool bSkipPoolDefs ) const
 
 void Alignment::writeToPropertyMap( PropertyMap& rPropMap ) const
 {
-    rPropMap[ PROP_HoriJustify ]     <<= maApiData.meHorJustify;
-    rPropMap[ PROP_HoriJustifyMethod ] <<= maApiData.mnHorJustifyMethod;
-    rPropMap[ PROP_VertJustify ]     <<= maApiData.mnVerJustify;
-    rPropMap[ PROP_VertJustifyMethod ] <<= maApiData.mnVerJustifyMethod;
-    rPropMap[ PROP_WritingMode ]     <<= maApiData.mnWritingMode;
-    rPropMap[ PROP_RotateAngle ]     <<= maApiData.mnRotation;
-    rPropMap[ PROP_Orientation ]     <<= maApiData.meOrientation;
-    rPropMap[ PROP_ParaIndent ]      <<= maApiData.mnIndent;
-    rPropMap[ PROP_IsTextWrapped ]   <<= maApiData.mbWrapText;
-    rPropMap[ PROP_ShrinkToFit ]     <<= maApiData.mbShrink;
+    rPropMap.setProperty( PROP_HoriJustify, maApiData.meHorJustify);
+    rPropMap.setProperty( PROP_HoriJustifyMethod, maApiData.mnHorJustifyMethod);
+    rPropMap.setProperty( PROP_VertJustify, maApiData.mnVerJustify);
+    rPropMap.setProperty( PROP_VertJustifyMethod, maApiData.mnVerJustifyMethod);
+    rPropMap.setProperty( PROP_WritingMode, maApiData.mnWritingMode);
+    rPropMap.setProperty( PROP_RotateAngle, maApiData.mnRotation);
+    rPropMap.setProperty( PROP_Orientation, maApiData.meOrientation);
+    rPropMap.setProperty( PROP_ParaIndent, maApiData.mnIndent);
+    rPropMap.setProperty( PROP_IsTextWrapped, maApiData.mbWrapText);
+    rPropMap.setProperty( PROP_ShrinkToFit, maApiData.mbShrink);
 }
 
 
@@ -1442,7 +1442,7 @@ void Protection::finalizeImport()
 
 void Protection::writeToPropertyMap( PropertyMap& rPropMap ) const
 {
-    rPropMap[ PROP_CellProtection ] <<= maApiData.maCellProt;
+    rPropMap.setProperty( PROP_CellProtection, maApiData.maCellProt);
 }
 
 void Protection::fillToItemSet( SfxItemSet& rItemSet, bool bSkipPoolDefs ) const
@@ -1676,15 +1676,15 @@ void Border::writeToPropertyMap( PropertyMap& rPropMap ) const
 {
     if( maApiData.mbBorderUsed )
     {
-        rPropMap[ PROP_LeftBorder ]   <<= maApiData.maLeft;
-        rPropMap[ PROP_RightBorder ]  <<= maApiData.maRight;
-        rPropMap[ PROP_TopBorder ]    <<= maApiData.maTop;
-        rPropMap[ PROP_BottomBorder ] <<= maApiData.maBottom;
+        rPropMap.setProperty( PROP_LeftBorder, maApiData.maLeft);
+        rPropMap.setProperty( PROP_RightBorder, maApiData.maRight);
+        rPropMap.setProperty( PROP_TopBorder, maApiData.maTop);
+        rPropMap.setProperty( PROP_BottomBorder, maApiData.maBottom);
     }
     if( maApiData.mbDiagUsed )
     {
-        rPropMap[ PROP_DiagonalTLBR ] <<= maApiData.maTLtoBR;
-        rPropMap[ PROP_DiagonalBLTR ] <<= maApiData.maBLtoTR;
+        rPropMap.setProperty( PROP_DiagonalTLBR, maApiData.maTLtoBR);
+        rPropMap.setProperty( PROP_DiagonalBLTR, maApiData.maBLtoTR);
     }
 }
 
@@ -2079,8 +2079,8 @@ void Fill::writeToPropertyMap( PropertyMap& rPropMap ) const
 {
     if( maApiData.mbUsed )
     {
-        rPropMap[ PROP_CellBackColor ] <<= maApiData.mnColor;
-        rPropMap[ PROP_IsCellBackgroundTransparent ] <<= maApiData.mbTransparent;
+        rPropMap.setProperty( PROP_CellBackColor, maApiData.mnColor);
+        rPropMap.setProperty( PROP_IsCellBackgroundTransparent, maApiData.mbTransparent);
     }
 }
 
@@ -2245,7 +2245,7 @@ void Xf::writeToPropertyMap( PropertyMap& rPropMap ) const
 
     // create and set cell style
     if( isCellXf() )
-        rPropMap[ PROP_CellStyle ] <<= rStyles.createCellStyle( maModel.mnStyleXfId );
+        rPropMap.setProperty( PROP_CellStyle, rStyles.createCellStyle( maModel.mnStyleXfId ));
 
     if( maModel.mbFontUsed )
         rStyles.writeFontToPropertyMap( rPropMap, maModel.mnFontId );
@@ -2260,12 +2260,12 @@ void Xf::writeToPropertyMap( PropertyMap& rPropMap ) const
     if( maModel.mbAreaUsed )
         rStyles.writeFillToPropertyMap( rPropMap, maModel.mnFillId );
     if( maModel.mbAlignUsed || maModel.mbBorderUsed )
-        rPropMap[ PROP_RotateReference ] <<= meRotationRef;
+        rPropMap.setProperty( PROP_RotateReference, meRotationRef);
 
     sal_Int32 eRotRef = ::com::sun::star::table::CellVertJustify2::STANDARD;
     if (maModel.mbBorderUsed && rStyles.hasBorder(maModel.mnBorderId) && maAlignment.getApiData().mnRotation)
         eRotRef = ::com::sun::star::table::CellVertJustify2::BOTTOM;
-    rPropMap[ PROP_RotateReference ] <<= eRotRef;
+    rPropMap.setProperty( PROP_RotateReference, eRotRef);
 }
 
 void Xf::writeToPropertySet( PropertySet& rPropSet ) const
diff --git a/sc/source/filter/oox/viewsettings.cxx b/sc/source/filter/oox/viewsettings.cxx
index c4c7d50ababb..de36ecf6dd02 100644
--- a/sc/source/filter/oox/viewsettings.cxx
+++ b/sc/source/filter/oox/viewsettings.cxx
@@ -419,28 +419,28 @@ void SheetViewSettings::finalizeImport()
 
     // write the sheet view settings into the property sequence
     PropertyMap aPropMap;
-    aPropMap[ PROP_TableSelected ]                <<= bSelected;
-    aPropMap[ PROP_CursorPositionX ]              <<= aCursor.Column;
-    aPropMap[ PROP_CursorPositionY ]              <<= aCursor.Row;
-    aPropMap[ PROP_HorizontalSplitMode ]          <<= nHSplitMode;
-    aPropMap[ PROP_VerticalSplitMode ]            <<= nVSplitMode;
-    aPropMap[ PROP_HorizontalSplitPositionTwips ] <<= nHSplitPos;
-    aPropMap[ PROP_VerticalSplitPositionTwips ]   <<= nVSplitPos;
-    aPropMap[ PROP_ActiveSplitRange ]             <<= nActivePane;
-    aPropMap[ PROP_PositionLeft ]                 <<= aFirstPos.Column;
-    aPropMap[ PROP_PositionTop ]                  <<= aFirstPos.Row;
-    aPropMap[ PROP_PositionRight ]                <<= xModel->maSecondPos.Column;
-    aPropMap[ PROP_PositionBottom ]               <<= ((nVSplitPos > 0) ? xModel->maSecondPos.Row : xModel->maFirstPos.Row);
-    aPropMap[ PROP_ZoomType ]                     <<= API_ZOOMTYPE_PERCENT;
-    aPropMap[ PROP_ZoomValue ]                    <<= static_cast< sal_Int16 >( xModel->getNormalZoom() );
-    aPropMap[ PROP_PageViewZoomValue ]            <<= static_cast< sal_Int16 >( xModel->getPageBreakZoom() );
-    aPropMap[ PROP_GridColor ]                    <<= xModel->getGridColor( getBaseFilter() );
-    aPropMap[ PROP_ShowPageBreakPreview ]         <<= xModel->isPageBreakPreview();
-    aPropMap[ PROP_ShowFormulas ]                 <<= xModel->mbShowFormulas;
-    aPropMap[ PROP_ShowGrid ]                     <<= xModel->mbShowGrid;
-    aPropMap[ PROP_HasColumnRowHeaders ]          <<= xModel->mbShowHeadings;
-    aPropMap[ PROP_ShowZeroValues ]               <<= xModel->mbShowZeros;
-    aPropMap[ PROP_IsOutlineSymbolsSet ]          <<= xModel->mbShowOutline;
+    aPropMap.setProperty( PROP_TableSelected, bSelected);
+    aPropMap.setProperty( PROP_CursorPositionX, aCursor.Column);
+    aPropMap.setProperty( PROP_CursorPositionY, aCursor.Row);
+    aPropMap.setProperty( PROP_HorizontalSplitMode, nHSplitMode);
+    aPropMap.setProperty( PROP_VerticalSplitMode, nVSplitMode);
+    aPropMap.setProperty( PROP_HorizontalSplitPositionTwips, nHSplitPos);
+    aPropMap.setProperty( PROP_VerticalSplitPositionTwips, nVSplitPos);
+    aPropMap.setProperty( PROP_ActiveSplitRange, nActivePane);
+    aPropMap.setProperty( PROP_PositionLeft, aFirstPos.Column);
+    aPropMap.setProperty( PROP_PositionTop, aFirstPos.Row);
+    aPropMap.setProperty( PROP_PositionRight, xModel->maSecondPos.Column);
+    aPropMap.setProperty( PROP_PositionBottom, ((nVSplitPos > 0) ? xModel->maSecondPos.Row : xModel->maFirstPos.Row));
+    aPropMap.setProperty( PROP_ZoomType, API_ZOOMTYPE_PERCENT);
+    aPropMap.setProperty( PROP_ZoomValue, static_cast< sal_Int16 >( xModel->getNormalZoom() ));
+    aPropMap.setProperty( PROP_PageViewZoomValue, static_cast< sal_Int16 >( xModel->getPageBreakZoom() ));
+    aPropMap.setProperty( PROP_GridColor, xModel->getGridColor( getBaseFilter() ));
+    aPropMap.setProperty( PROP_ShowPageBreakPreview, xModel->isPageBreakPreview());
+    aPropMap.setProperty( PROP_ShowFormulas, xModel->mbShowFormulas);
+    aPropMap.setProperty( PROP_ShowGrid, xModel->mbShowGrid);
+    aPropMap.setProperty( PROP_HasColumnRowHeaders, xModel->mbShowHeadings);
+    aPropMap.setProperty( PROP_ShowZeroValues, xModel->mbShowZeros);
+    aPropMap.setProperty( PROP_IsOutlineSymbolsSet, xModel->mbShowOutline);
 
     // store sheet view settings in global view settings object
     getViewSettings().setSheetViewSettings( getSheetIndex(), xModel, Any( aPropMap.makePropertyValueSequence() ) );
@@ -567,22 +567,22 @@ void ViewSettings::finalizeImport()
     if( xContainer.is() ) try
     {
         PropertyMap aPropMap;
-        aPropMap[ PROP_Tables ]                        <<= xSheetsNC;
-        aPropMap[ PROP_ActiveTable ]                   <<= rWorksheets.getCalcSheetName( nActiveSheet );
-        aPropMap[ PROP_HasHorizontalScrollBar ]        <<= rModel.mbShowHorScroll;
-        aPropMap[ PROP_HasVerticalScrollBar ]          <<= rModel.mbShowVerScroll;
-        aPropMap[ PROP_HasSheetTabs ]                  <<= rModel.mbShowTabBar;
-        aPropMap[ PROP_RelativeHorizontalTabbarWidth ] <<= double( rModel.mnTabBarWidth / 1000.0 );
-        aPropMap[ PROP_ShowObjects ]                   <<= nShowMode;
-        aPropMap[ PROP_ShowCharts ]                    <<= nShowMode;
-        aPropMap[ PROP_ShowDrawing ]                   <<= nShowMode;
-        aPropMap[ PROP_GridColor ]                     <<= rxActiveSheetView->getGridColor( getBaseFilter() );
-        aPropMap[ PROP_ShowPageBreakPreview ]          <<= rxActiveSheetView->isPageBreakPreview();
-        aPropMap[ PROP_ShowFormulas ]                  <<= rxActiveSheetView->mbShowFormulas;
-        aPropMap[ PROP_ShowGrid ]                      <<= rxActiveSheetView->mbShowGrid;
-        aPropMap[ PROP_HasColumnRowHeaders ]           <<= rxActiveSheetView->mbShowHeadings;
-        aPropMap[ PROP_ShowZeroValues ]                <<= rxActiveSheetView->mbShowZeros;
-        aPropMap[ PROP_IsOutlineSymbolsSet ]           <<= rxActiveSheetView->mbShowOutline;
+        aPropMap.setProperty( PROP_Tables, xSheetsNC);
+        aPropMap.setProperty( PROP_ActiveTable, rWorksheets.getCalcSheetName( nActiveSheet ));
+        aPropMap.setProperty( PROP_HasHorizontalScrollBar, rModel.mbShowHorScroll);
+        aPropMap.setProperty( PROP_HasVerticalScrollBar, rModel.mbShowVerScroll);
+        aPropMap.setProperty( PROP_HasSheetTabs, rModel.mbShowTabBar);
+        aPropMap.setProperty( PROP_RelativeHorizontalTabbarWidth, double( rModel.mnTabBarWidth / 1000.0 ));
+        aPropMap.setProperty( PROP_ShowObjects, nShowMode);
+        aPropMap.setProperty( PROP_ShowCharts, nShowMode);
+        aPropMap.setProperty( PROP_ShowDrawing, nShowMode);
+        aPropMap.setProperty( PROP_GridColor, rxActiveSheetView->getGridColor( getBaseFilter() ));
+        aPropMap.setProperty( PROP_ShowPageBreakPreview, rxActiveSheetView->isPageBreakPreview());
+        aPropMap.setProperty( PROP_ShowFormulas, rxActiveSheetView->mbShowFormulas);
+        aPropMap.setProperty( PROP_ShowGrid, rxActiveSheetView->mbShowGrid);
+        aPropMap.setProperty( PROP_HasColumnRowHeaders, rxActiveSheetView->mbShowHeadings);
+        aPropMap.setProperty( PROP_ShowZeroValues, rxActiveSheetView->mbShowZeros);
+        aPropMap.setProperty( PROP_IsOutlineSymbolsSet, rxActiveSheetView->mbShowOutline);
 
         xContainer->insertByIndex( 0, Any( aPropMap.makePropertyValueSequence() ) );
         Reference< XViewDataSupplier > xViewDataSuppl( getDocument(), UNO_QUERY_THROW );