diff options
| author | Michael Stahl <mst@openoffice.org> | 2011-10-11 14:19:09 +0200 |
|---|---|---|
| committer | Michael Stahl <mst@openoffice.org> | 2011-10-11 17:57:01 +0200 |
| commit | 8666469d7b0f450ec1448f80eda3c591f8d8d318 (patch) | |
| tree | ae63c5f07df7d3c2d45ea03e47f147661f280923 /sc/source/filter/xml/XMLTableShapeImportHelper.cxx | |
| parent | ae3e2f170045a1525f67e9f3e9b7e03d94f2b56b (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 'sc/source/filter/xml/XMLTableShapeImportHelper.cxx')
| -rw-r--r-- | sc/source/filter/xml/XMLTableShapeImportHelper.cxx | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sc/source/filter/xml/XMLTableShapeImportHelper.cxx b/sc/source/filter/xml/XMLTableShapeImportHelper.cxx index 27c9cb701a27..a523f6ffbcf3 100644 --- a/sc/source/filter/xml/XMLTableShapeImportHelper.cxx +++ b/sc/source/filter/xml/XMLTableShapeImportHelper.cxx @@ -121,12 +121,16 @@ void XMLTableShapeImportHelper::finishShape( } else if (IsXMLToken(aLocalName, XML_END_X)) { - static_cast<ScXMLImport&>(mrImporter).GetMM100UnitConverter().convertMeasure(nEndX, rValue); + static_cast<ScXMLImport&>(mrImporter). + GetMM100UnitConverter().convertMeasureToCore( + nEndX, rValue); aAnchor.maEndOffset.X() = nEndX; } else if (IsXMLToken(aLocalName, XML_END_Y)) { - static_cast<ScXMLImport&>(mrImporter).GetMM100UnitConverter().convertMeasure(nEndY, rValue); + static_cast<ScXMLImport&>(mrImporter). + GetMM100UnitConverter().convertMeasureToCore( + nEndY, rValue); aAnchor.maEndOffset.Y() = nEndY; } else if (IsXMLToken(aLocalName, XML_TABLE_BACKGROUND)) |