allow tree and tab boxes to have borders via .ui

Change-Id: I988f307d2ce88ac5f7e1ee7d7c5cffd352c963e0

2 files changed, 12 insertions, 10 deletions

diff --git a/vcl/inc/vcl/builder.hxx b/vcl/inc/vcl/builder.hxx
index 8202aa1494fe..5de792aaab5e 100644
--- a/vcl/inc/vcl/builder.hxx
+++ b/vcl/inc/vcl/builder.hxx
@@ -257,6 +257,8 @@ public:
     //Convert _ gtk markup to ~ vcl markup
     static OString convertMnemonicMarkup(const OString &rIn);
 
+    static OString extractCustomProperty(stringmap &rMap);
+
 private:
     Window *insertObject(Window *pParent, const OString &rClass, const OString &rID,
         stringmap &rProps, stringmap &rPangoAttributes,
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index bf09bbc71e11..7a7919054c9a 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -490,20 +490,20 @@ void VclBuilder::handleTranslations(xmlreader::XmlReader &reader)
     }
 }
 
-namespace
+OString VclBuilder::extractCustomProperty(VclBuilder::stringmap &rMap)
 {
-    OString extractCustomProperty(VclBuilder::stringmap &rMap)
+    OString sCustomProperty;
+    VclBuilder::stringmap::iterator aFind = rMap.find(OString("customproperty"));
+    if (aFind != rMap.end())
     {
-        OString sCustomProperty;
-        VclBuilder::stringmap::iterator aFind = rMap.find(OString("customproperty"));
-        if (aFind != rMap.end())
-        {
-            sCustomProperty = aFind->second;
-            rMap.erase(aFind);
-        }
-        return sCustomProperty;
+        sCustomProperty = aFind->second;
+        rMap.erase(aFind);
     }
+    return sCustomProperty;
+}
 
+namespace
+{
     bool extractResizable(VclBuilder::stringmap &rMap)
     {
         bool bResizable = true;