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 :)
---
 sax/source/tools/converter.cxx | 82 +++++++++++-------------------------------
 1 file changed, 21 insertions(+), 61 deletions(-)

(limited to 'sax/source')

diff --git a/sax/source/tools/converter.cxx b/sax/source/tools/converter.cxx
index aff5ead60ae4..092e82df6281 100644
--- a/sax/source/tools/converter.cxx
+++ b/sax/source/tools/converter.cxx
@@ -271,12 +271,6 @@ void Converter::convertMeasure( OUStringBuffer& rBuffer,
                                 sal_Int16 nSourceUnit /* = MeasureUnit::MM_100TH */,
                                 sal_Int16 nTargetUnit /* = MeasureUnit::INCH */  )
 {
-    OSL_FAIL( "Converter::convertMeasure - not implemented, tools/BigInt needs replacement" );
-    (void)rBuffer;
-    (void)nMeasure;
-    (void)nSourceUnit;
-    (void)nTargetUnit;
-#if 0
     if( nSourceUnit == MeasureUnit::PERCENT )
     {
         OSL_ENSURE( nTargetUnit == MeasureUnit::PERCENT,
@@ -284,9 +278,9 @@ void Converter::convertMeasure( OUStringBuffer& rBuffer,
 
         rBuffer.append( nMeasure );
         rBuffer.append( sal_Unicode('%' ) );
+
+        return;
     }
-    else
-    {
     // the sign is processed seperatly
     if( nMeasure < 0 )
     {
@@ -400,69 +394,31 @@ void Converter::convertMeasure( OUStringBuffer& rBuffer,
             }
             break;
         }
+    default:
+        OSL_ENSURE(false, "sax::Converter::convertMeasure(): "
+                "source unit not supported");
+        break;
     }
 
-    long nLongVal = 0;
-    bool bOutLongVal = true;
-    if( nMeasure > SAL_INT32_MAX / nMul )
-    {
-        // A big int is required for calculation
-        BigInt nBigVal( nMeasure );
-        BigInt nBigFac( nFac );
-        nBigVal *= nMul;
-        nBigVal /= nDiv;
-        nBigVal += 5;
-        nBigVal /= 10;
-
-        if( nBigVal.IsLong() )
-        {
-            // To convert the value into a string a long is sufficient
-            nLongVal = (long)nBigVal;
-        }
-        else
-        {
-            BigInt nBigFac2( nFac );
-            BigInt nBig10( 10 );
-            rBuffer.append( (sal_Int32)(nBigVal / nBigFac2) );
-            if( !(nBigVal % nBigFac2).IsZero() )
-            {
-                rBuffer.append( sal_Unicode('.') );
-                while( nFac > 1 && !(nBigVal % nBigFac2).IsZero() )
-                {
-                    nFac /= 10;
-                    nBigFac2 = nFac;
-                    rBuffer.append( (sal_Int32)((nBigVal / nBigFac2) % nBig10 ) );
-                }
-            }
-            bOutLongVal = false;
-        }
-    }
-    else
-    {
-        nLongVal = nMeasure * nMul;
-        nLongVal /= nDiv;
-        nLongVal += 5;
-        nLongVal /= 10;
-    }
+    OSL_ENSURE(nMeasure <= SAL_MAX_INT64 / nMul, "convertMeasure: overflow");
+    sal_Int64 nValue = nMeasure * nMul;
+    nValue /= nDiv;
+    nValue += 5;
+    nValue /= 10;
 
-    if( bOutLongVal )
+    rBuffer.append( static_cast<sal_Int64>(nValue / nFac) );
+    if (nFac > 1 && (nValue % nFac) != 0)
     {
-        rBuffer.append( (sal_Int32)(nLongVal / nFac) );
-        if( nFac > 1 && (nLongVal % nFac) != 0 )
+        rBuffer.append( sal_Unicode('.') );
+        while (nFac > 1 && (nValue % nFac) != 0)
         {
-            rBuffer.append( sal_Unicode('.') );
-            while( nFac > 1 && (nLongVal % nFac) != 0 )
-            {
-                nFac /= 10;
-                rBuffer.append( (sal_Int32)((nLongVal / nFac) % 10) );
-            }
+            nFac /= 10;
+            rBuffer.append( static_cast<sal_Int32>((nValue / nFac) % 10) );
         }
     }
 
     if( psUnit )
         rBuffer.appendAscii( psUnit );
-    }
-#endif
 }
 
 static const OUString& getTrueString()
@@ -2009,6 +1965,10 @@ double Converter::GetConversionFactor(::rtl::OUStringBuffer& rUnit, sal_Int16 nS
                 }
                 break;
             }
+            default:
+                OSL_ENSURE(false, "sax::Converter::GetConversionFactor(): "
+                        "source unit not supported");
+                break;
         }
 
         if( psUnit )
-- 
cgit