SvxRelativeField: set the unit from the passed stringmap

In the Paragraph "Indents & Spacing" tab there are fields with unit:
<object class="svxlo-SvxRelativeField" id="spinED_LEFTINDENT:0cm">

But the unit is effectively ignored, and the resulting SvxRelativeField
with FUNIT_NONE and 9999 max somehow results in 0.18cm max when the
dialog sets cm as unit.

Change-Id: I6001c93079fd7d899f1e119913b29ea4898b1c34

include/svx/relfld.hxx

@@ -19,6 +19,7 @@
 #ifndef INCLUDED_SVX_RELFLD_HXX
 #define INCLUDED_SVX_RELFLD_HXX
 
+#include <tools/fldunit.hxx>
 #include <vcl/field.hxx>
 #include <svx/svxdllapi.h>
 
@@ -39,7 +40,7 @@ protected:
     void            Modify() SAL_OVERRIDE;
 
 public:
-    SvxRelativeField( Window* pParent, WinBits nBits);
+    SvxRelativeField(Window* pParent, WinBits nBits, FieldUnit eUnit);
 
     void            EnableRelativeMode( sal_uInt16 nMin = 50, sal_uInt16 nMax = 150,
                                         sal_uInt16 nStep = 5 );

include/vcl/builder.hxx

@@ -13,6 +13,7 @@
 #include <typeinfo>
 #include <osl/module.hxx>
 #include <tools/resmgr.hxx>
+#include <tools/fldunit.hxx>
 #include <vcl/dllapi.h>
 #include <vcl/window.hxx>
 #include <xmlreader/xmlreader.hxx>
@@ -303,6 +304,7 @@ public:
     static OString convertMnemonicMarkup(const OString &rIn);
 
     static OString extractCustomProperty(stringmap &rMap);
+    static FieldUnit detectUnit(OString const&);
 
     static bool extractDropdown(stringmap &rMap);
 

svx/source/dialog/relfld.cxx

@@ -22,7 +22,8 @@
 
 
 
-SvxRelativeField::SvxRelativeField( Window* pParent, WinBits nBits)
+SvxRelativeField::SvxRelativeField(
+        Window *const pParent, WinBits const nBits, FieldUnit const eUnit)
     : MetricField( pParent, nBits)
     , nRelMin(0)
     , nRelMax(0)
@@ -32,15 +33,20 @@ SvxRelativeField::SvxRelativeField( Window* pParent, WinBits nBits)
     , bNegativeEnabled(false)
 
 {
-
+    SetUnit(eUnit);
     SetDecimalDigits( 2 );
     SetMin( 0 );
     SetMax( 9999 );
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxRelativeField(Window *pParent, VclBuilder::stringmap &)
+extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL
+makeSvxRelativeField(Window *const pParent, VclBuilder::stringmap & rMap)
 {
-    return new SvxRelativeField(pParent, WB_BORDER | WB_SPIN | WB_REPEAT | WB_LEFT | WB_GROUP);
+    OString const custom(VclBuilder::extractCustomProperty(rMap));
+    FieldUnit const eUnit(VclBuilder::detectUnit(custom));
+    SvxRelativeField *const pRet = new SvxRelativeField(pParent,
+            WB_BORDER | WB_SPIN | WB_REPEAT | WB_LEFT | WB_GROUP, eUnit);
+    return pRet;
 }
 
 

vcl/source/window/builder.cxx

@@ -904,6 +904,12 @@ namespace
     }
 }
 
+FieldUnit VclBuilder::detectUnit(OString const& rString)
+{
+    OString const unit(extractUnit(rString));
+    return detectMetricUnit(unit);
+}
+
 void VclBuilder::ensureDefaultWidthChars(VclBuilder::stringmap &rMap)
 {
     OString sWidthChars("width-chars");