map 'relief' none/half/normal to flat/bevel/3dlook

Change-Id: Ib125363a649d3bef6b9563ad7d07871b2c247383

1 files changed, 18 insertions, 1 deletions

diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 95f07376ed7a..7018789c8171 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -617,6 +617,21 @@ namespace
         return bIsStock;
     }
 
+    WinBits extractRelief(VclBuilder::stringmap &rMap)
+    {
+        WinBits nBits = WB_3DLOOK;
+        VclBuilder::stringmap::iterator aFind = rMap.find(OString("relief"));
+        if (aFind != rMap.end())
+        {
+            if (aFind->second == "half")
+                nBits = WB_FLATBUTTON | WB_BEVELBUTTON;
+            else if (aFind->second == "none")
+                nBits = WB_FLATBUTTON;
+            rMap.erase(aFind);
+        }
+        return nBits;
+    }
+
     OString extractLabel(VclBuilder::stringmap &rMap)
     {
         OString sType;
@@ -676,7 +691,9 @@ namespace
 
     Window * extractStockAndBuildPushButton(Window *pParent, VclBuilder::stringmap &rMap)
     {
-        WinBits nBits = WB_CENTER|WB_VCENTER|WB_3DLOOK;
+        WinBits nBits = WB_CENTER|WB_VCENTER;
+
+        nBits |= extractRelief(rMap);
 
         bool bIsStock = extractStock(rMap);