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 /dbaccess | |
| 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 'dbaccess')
| -rw-r--r-- | dbaccess/source/filter/xml/xmlExport.cxx | 7 | ||||
| -rw-r--r-- | dbaccess/source/filter/xml/xmlfilter.cxx | 5 |
2 files changed, 7 insertions, 5 deletions
diff --git a/dbaccess/source/filter/xml/xmlExport.cxx b/dbaccess/source/filter/xml/xmlExport.cxx index 10bc983291de..661e237e0a95 100644 --- a/dbaccess/source/filter/xml/xmlExport.cxx +++ b/dbaccess/source/filter/xml/xmlExport.cxx @@ -205,12 +205,13 @@ namespace dbaxml }; // ----------------------------------------------------------------------------- ODBExport::ODBExport(const Reference< XMultiServiceFactory >& _rxMSF,sal_uInt16 nExportFlag) -: SvXMLExport( _rxMSF,MAP_10TH_MM,XML_DATABASE, EXPORT_OASIS | nExportFlag) +: SvXMLExport( util::MeasureUnit::MM_10TH, _rxMSF, XML_DATABASE, + EXPORT_OASIS | nExportFlag) ,m_aTypeCollection(_rxMSF) ,m_bAllreadyFilled(sal_False) { - GetMM100UnitConverter().setCoreMeasureUnit(MAP_10TH_MM); - GetMM100UnitConverter().setXMLMeasureUnit(MAP_CM); + GetMM100UnitConverter().SetCoreMeasureUnit(util::MeasureUnit::MM_10TH); + GetMM100UnitConverter().SetXMLMeasureUnit(util::MeasureUnit::CM); _GetNamespaceMap().Add( GetXMLToken(XML_NP_OFFICE), GetXMLToken(XML_N_OFFICE), XML_NAMESPACE_OFFICE ); _GetNamespaceMap().Add( GetXMLToken(XML_NP_OOO), GetXMLToken(XML_N_OOO), XML_NAMESPACE_OOO ); diff --git a/dbaccess/source/filter/xml/xmlfilter.cxx b/dbaccess/source/filter/xml/xmlfilter.cxx index 78074ba6a0a5..8e6f01c1e59e 100644 --- a/dbaccess/source/filter/xml/xmlfilter.cxx +++ b/dbaccess/source/filter/xml/xmlfilter.cxx @@ -29,6 +29,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_dbaccess.hxx" +#include <com/sun/star/util/MeasureUnit.hpp> #include <com/sun/star/packages/zip/ZipIOException.hpp> #include <com/sun/star/embed/ElementModes.hpp> #include <com/sun/star/sdb/XOfficeDatabaseDocument.hpp> @@ -381,8 +382,8 @@ ODBFilter::ODBFilter( const uno::Reference< XMultiServiceFactory >& _rxMSF ) { DBG_CTOR(ODBFilter,NULL); - GetMM100UnitConverter().setCoreMeasureUnit(MAP_10TH_MM); - GetMM100UnitConverter().setXMLMeasureUnit(MAP_CM); + GetMM100UnitConverter().SetCoreMeasureUnit(util::MeasureUnit::MM_10TH); + GetMM100UnitConverter().SetXMLMeasureUnit(util::MeasureUnit::CM); GetNamespaceMap().Add( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( sXML_np__db) ), GetXMLToken(XML_N_DB), XML_NAMESPACE_DB ); |