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 /editeng | |
| 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 'editeng')
| -rw-r--r-- | editeng/source/misc/SvXMLAutoCorrectExport.cxx | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/editeng/source/misc/SvXMLAutoCorrectExport.cxx b/editeng/source/misc/SvXMLAutoCorrectExport.cxx index 2b01f036abf7..050504e1d7bb 100644 --- a/editeng/source/misc/SvXMLAutoCorrectExport.cxx +++ b/editeng/source/misc/SvXMLAutoCorrectExport.cxx @@ -28,7 +28,10 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_editeng.hxx" + #include <SvXMLAutoCorrectExport.hxx> + +#include <com/sun/star/util/MeasureUnit.hpp> #define _SVSTDARR_STRINGSISORTDTOR #define _SVSTDARR_STRINGSDTOR #include <svl/svstdarr.hxx> @@ -44,7 +47,7 @@ SvXMLAutoCorrectExport::SvXMLAutoCorrectExport( const SvxAutocorrWordList * pNewAutocorr_List, const rtl::OUString &rFileName, com::sun::star::uno::Reference< com::sun::star::xml::sax::XDocumentHandler> &rHandler) -: SvXMLExport( xServiceFactory, rFileName, rHandler ), +: SvXMLExport( xServiceFactory, rFileName, util::MeasureUnit::CM, rHandler ), pAutocorr_List( pNewAutocorr_List ) { _GetNamespaceMap().Add( GetXMLToken ( XML_NP_BLOCK_LIST), @@ -87,7 +90,7 @@ SvXMLExceptionListExport::SvXMLExceptionListExport( const SvStringsISortDtor &rNewList, const rtl::OUString &rFileName, com::sun::star::uno::Reference< com::sun::star::xml::sax::XDocumentHandler> &rHandler) -: SvXMLExport( xServiceFactory, rFileName, rHandler ), +: SvXMLExport( xServiceFactory, rFileName, util::MeasureUnit::CM, rHandler ), rList( rNewList ) { _GetNamespaceMap().Add( GetXMLToken ( XML_NP_BLOCK_LIST ), |