diff options
Diffstat (limited to 'sc/source/filter/oox/pagesettings.cxx')
-rw-r--r-- | sc/source/filter/oox/pagesettings.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sc/source/filter/oox/pagesettings.cxx b/sc/source/filter/oox/pagesettings.cxx index bae8c61f6034..c650a538a497 100644 --- a/sc/source/filter/oox/pagesettings.cxx +++ b/sc/source/filter/oox/pagesettings.cxx @@ -965,12 +965,12 @@ void PageSettingsConverter::writePageSettingsProperties( 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 )); + 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.setProperty( 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.setProperty( PROP_BottomMargin, rUnitConv.scaleToMm100( maFooterData.mbHasContent ? rModel.mfFooterMargin : rModel.mfBottomMargin, UNIT_INCH )); + 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); @@ -1015,7 +1015,7 @@ void PageSettingsConverter::convertHeaderFooterData( /* Calc contains distance between bottom of header and top of page body in "HeaderBodyDistance" property, and distance between bottom of page body and top of footer in "FooterBodyDistance" property */ - orHFData.mnBodyDist = getUnitConverter().scaleToMm100( fPageMargin - fContentMargin, UNIT_INCH ) - orHFData.mnHeight; + orHFData.mnBodyDist = getUnitConverter().scaleToMm100( fPageMargin - fContentMargin, Unit::Inch ) - orHFData.mnHeight; /* #i23296# Distance less than 0 means, header or footer overlays page body. As this is not possible in Calc, set fixed header or footer height (crop header/footer) to get correct top position of page body. */ @@ -1042,7 +1042,7 @@ sal_Int32 PageSettingsConverter::writeHeaderFooter( { double fTotalHeight = mxHFParser->parse( xHFContent, rContent ); rPropSet.setProperty( nPropId, xHFContent ); - nHeight = getUnitConverter().scaleToMm100( fTotalHeight, UNIT_POINT ); + nHeight = getUnitConverter().scaleToMm100( fTotalHeight, Unit::Point ); } } return nHeight; |