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 /xmloff/source/draw/XMLImageMapContext.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 'xmloff/source/draw/XMLImageMapContext.cxx')
| -rw-r--r-- | xmloff/source/draw/XMLImageMapContext.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/xmloff/source/draw/XMLImageMapContext.cxx b/xmloff/source/draw/XMLImageMapContext.cxx index d92bb7cab331..711bf1dd1921 100644 --- a/xmloff/source/draw/XMLImageMapContext.cxx +++ b/xmloff/source/draw/XMLImageMapContext.cxx @@ -385,7 +385,7 @@ void XMLImageMapRectangleContext::ProcessAttribute( switch (eToken) { case XML_TOK_IMAP_X: - if (GetImport().GetMM100UnitConverter().convertMeasure(nTmp, + if (GetImport().GetMM100UnitConverter().convertMeasureToCore(nTmp, rValue)) { aRectangle.X = nTmp; @@ -393,7 +393,7 @@ void XMLImageMapRectangleContext::ProcessAttribute( } break; case XML_TOK_IMAP_Y: - if (GetImport().GetMM100UnitConverter().convertMeasure(nTmp, + if (GetImport().GetMM100UnitConverter().convertMeasureToCore(nTmp, rValue)) { aRectangle.Y = nTmp; @@ -401,7 +401,7 @@ void XMLImageMapRectangleContext::ProcessAttribute( } break; case XML_TOK_IMAP_WIDTH: - if (GetImport().GetMM100UnitConverter().convertMeasure(nTmp, + if (GetImport().GetMM100UnitConverter().convertMeasureToCore(nTmp, rValue)) { aRectangle.Width = nTmp; @@ -409,7 +409,7 @@ void XMLImageMapRectangleContext::ProcessAttribute( } break; case XML_TOK_IMAP_HEIGTH: - if (GetImport().GetMM100UnitConverter().convertMeasure(nTmp, + if (GetImport().GetMM100UnitConverter().convertMeasureToCore(nTmp, rValue)) { aRectangle.Height = nTmp; @@ -593,7 +593,7 @@ void XMLImageMapCircleContext::ProcessAttribute( switch (eToken) { case XML_TOK_IMAP_CENTER_X: - if (GetImport().GetMM100UnitConverter().convertMeasure(nTmp, + if (GetImport().GetMM100UnitConverter().convertMeasureToCore(nTmp, rValue)) { aCenter.X = nTmp; @@ -601,7 +601,7 @@ void XMLImageMapCircleContext::ProcessAttribute( } break; case XML_TOK_IMAP_CENTER_Y: - if (GetImport().GetMM100UnitConverter().convertMeasure(nTmp, + if (GetImport().GetMM100UnitConverter().convertMeasureToCore(nTmp, rValue)) { aCenter.Y = nTmp; @@ -609,7 +609,7 @@ void XMLImageMapCircleContext::ProcessAttribute( } break; case XML_TOK_IMAP_RADIUS: - if (GetImport().GetMM100UnitConverter().convertMeasure(nTmp, + if (GetImport().GetMM100UnitConverter().convertMeasureToCore(nTmp, rValue)) { nRadius = nTmp; |