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 /filter | |
| 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 'filter')
| -rw-r--r-- | filter/source/svg/svgexport.cxx | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx index 9357a365a625..c87d44302ba1 100644 --- a/filter/source/svg/svgexport.cxx +++ b/filter/source/svg/svgexport.cxx @@ -37,6 +37,8 @@ #include "svgscript.hxx" #include "impsvgdialog.hxx" +#include <com/sun/star/util/MeasureUnit.hpp> + #include <svtools/miscopt.hxx> #include <svtools/FilterConfigItem.hxx> #include <svx/unopage.hxx> @@ -57,6 +59,7 @@ using ::rtl::OUString; +using namespace ::com::sun::star; @@ -326,9 +329,9 @@ sal_Bool operator==( const TextField & aLhsTextField, const TextField & aRhsText SVGExport::SVGExport( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xServiceFactory, const Reference< XDocumentHandler >& rxHandler, - const Sequence< PropertyValue >& rFilterData ) : - SvXMLExport( xServiceFactory, MAP_100TH_MM ), - mrFilterData( rFilterData ) + const Sequence< PropertyValue >& rFilterData ) + : SvXMLExport( util::MeasureUnit::MM_100TH, xServiceFactory ) + , mrFilterData( rFilterData ) { SetDocHandler( rxHandler ); sal_uInt16 nExportFlags = getExportFlags() | EXPORT_PRETTY; |