widget layout: Take decimal digits into account for MetricBoxes.

Change-Id: I2870dbf9dc1f7fb84adfe81b9be8f4060677e6d0

1 files changed, 20 insertions, 0 deletions

diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index c6134c49ee6d..7dd2f3c39710 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -754,6 +754,25 @@ namespace
         return sUnit;
     }
 
+    int extractDecimalDigits(const OString& sPattern)
+    {
+        int nDigits = 0;
+        bool bAfterPoint = false;
+        for (sal_Int32 i = 0; i < sPattern.getLength(); ++i)
+        {
+            if (sPattern[i] == '.' || sPattern[i] == ',')
+                bAfterPoint = true;
+            else if (sPattern[i] == '0')
+            {
+                if (bAfterPoint)
+                    ++nDigits;
+            }
+            else
+                break;
+        }
+        return nDigits;
+    }
+
     FieldUnit detectMetricUnit(OString sUnit)
     {
         FieldUnit eUnit = FUNIT_NONE;
@@ -1199,6 +1218,7 @@ Window *VclBuilder::makeObject(Window *pParent, const OString &name, const OStri
             MetricBox *pBox = new MetricBox(pParent, nBits);
             pBox->EnableAutoSize(true);
             pBox->SetUnit(eUnit);
+            pBox->SetDecimalDigits(extractDecimalDigits(sPattern));
             if (eUnit == FUNIT_CUSTOM)
                 pBox->SetCustomUnitText(OStringToOUString(sUnit, RTL_TEXTENCODING_UTF8));
             pWindow = pBox;