summaryrefslogtreecommitdiff
path: root/xmloff/source/style/XMLFillBitmapSizePropertyHandler.cxx
diff options
context:
space:
mode:
authorMichael Stahl <mst@openoffice.org>2011-10-11 14:19:09 +0200
committerMichael Stahl <mst@openoffice.org>2011-10-11 17:57:01 +0200
commit8666469d7b0f450ec1448f80eda3c591f8d8d318 (patch)
treeae63c5f07df7d3c2d45ea03e47f147661f280923 /xmloff/source/style/XMLFillBitmapSizePropertyHandler.cxx
parentae3e2f170045a1525f67e9f3e9b7e03d94f2b56b (diff)
#i108468#: clean up xmluconv code duplication, measured approach:
modify sax::Converter::convertMeasure to use sal_Int64 instead of BigInt: should be sufficient, since the largest number is SAL_INT32_MAX * 10^7. remove duplicate methods from SvXMLUnitConverter: convertMeasurePx, convertMeasure (static variants) remove entirely duplicative class SvXMLExportHelper: GetConversionFactor, GetUnitFromString, AddLength change SvXMLUnitConverter interface from MapUnit to css::util::MeasureUnit. change SvXMLExport constructor params from MapUnit to css::util::MeasureUnit. rename some methods to turn compiler into merge conflict detector :)
Diffstat (limited to 'xmloff/source/style/XMLFillBitmapSizePropertyHandler.cxx')
-rw-r--r--xmloff/source/style/XMLFillBitmapSizePropertyHandler.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/xmloff/source/style/XMLFillBitmapSizePropertyHandler.cxx b/xmloff/source/style/XMLFillBitmapSizePropertyHandler.cxx
index 6f1363751214..19ccab8e4f33 100644
--- a/xmloff/source/style/XMLFillBitmapSizePropertyHandler.cxx
+++ b/xmloff/source/style/XMLFillBitmapSizePropertyHandler.cxx
@@ -65,7 +65,7 @@ sal_Bool XMLFillBitmapSizePropertyHandler::importXML(
}
else
{
- bRet = rUnitConverter.convertMeasure( nValue, rStrImpValue );
+ bRet = rUnitConverter.convertMeasureToCore( nValue, rStrImpValue );
}
if( bRet )
@@ -90,7 +90,7 @@ sal_Bool XMLFillBitmapSizePropertyHandler::exportXML(
}
else
{
- rUnitConverter.convertMeasure( aOut, nValue );
+ rUnitConverter.convertMeasureToXML( aOut, nValue );
}
rStrExpValue = aOut.makeStringAndClear();