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/style/xmltabi.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/style/xmltabi.cxx')
| -rw-r--r-- | xmloff/source/style/xmltabi.cxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/xmloff/source/style/xmltabi.cxx b/xmloff/source/style/xmltabi.cxx index a5c92fb5469d..51915d77a584 100644 --- a/xmloff/source/style/xmltabi.cxx +++ b/xmloff/source/style/xmltabi.cxx @@ -125,9 +125,11 @@ SvxXMLTabStopContext_Impl::SvxXMLTabStopContext_Impl( switch( aTokenMap.Get( nPrefix, aLocalName ) ) { case XML_TOK_TABSTOP_POSITION: - if( GetImport().GetMM100UnitConverter().convertMeasure( nVal, - rValue ) ) + if (GetImport().GetMM100UnitConverter().convertMeasureToCore( + nVal, rValue)) + { aTabStop.Position = nVal; + } break; case XML_TOK_TABSTOP_TYPE: if( IsXMLToken( rValue, XML_LEFT ) ) |