From 8666469d7b0f450ec1448f80eda3c591f8d8d318 Mon Sep 17 00:00:00 2001
From: Michael Stahl <mst@openoffice.org>
Date: Tue, 11 Oct 2011 14:19:09 +0200
Subject: #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 :)
---
 linguistic/source/convdicxml.hxx | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'linguistic')

diff --git a/linguistic/source/convdicxml.hxx b/linguistic/source/convdicxml.hxx
index c93965d65dcf..998b40a00d29 100644
--- a/linguistic/source/convdicxml.hxx
+++ b/linguistic/source/convdicxml.hxx
@@ -31,6 +31,7 @@
 
 #include <com/sun/star/linguistic2/XConversionDictionary.hpp>
 #include <com/sun/star/util/XFlushable.hpp>
+#include <com/sun/star/util/MeasureUnit.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/xml/sax/XDocumentHandler.hpp>
 #include <xmloff/xmlexp.hxx>
@@ -55,7 +56,8 @@ public:
     ConvDicXMLExport( ConvDic &rConvDic,
         const rtl::OUString &rFileName,
         com::sun::star::uno::Reference< com::sun::star::xml::sax::XDocumentHandler > &rHandler) :
-        SvXMLExport ( utl::getProcessServiceFactory(), rFileName, rHandler ),
+        SvXMLExport ( utl::getProcessServiceFactory(), rFileName,
+                      ::com::sun::star::util::MeasureUnit::CM, rHandler ),
         rDic        ( rConvDic ),
         bSuccess    ( sal_False )
     {
-- 
cgit