make border property of multiline edit optional

Change-Id: Ideeda46baf3d96dd52a77b5d225df3c00153183e

9 files changed, 12 insertions, 9 deletions

diff --git a/cui/uiconfig/ui/comment.ui b/cui/uiconfig/ui/comment.ui
index 12137d23f041..5959b4abab14 100644
--- a/cui/uiconfig/ui/comment.ui
+++ b/cui/uiconfig/ui/comment.ui
@@ -202,7 +202,7 @@
                         <property name="vscrollbar_policy">always</property>
                         <property name="shadow_type">in</property>
                         <child>
-                          <object class="GtkTextView" id="edit">
+                          <object class="GtkTextView" id="edit:border">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="hexpand">True</property>
diff --git a/cui/uiconfig/ui/insertplugin.ui b/cui/uiconfig/ui/insertplugin.ui
index 194e71db5ec7..481c5d14e23e 100644
--- a/cui/uiconfig/ui/insertplugin.ui
+++ b/cui/uiconfig/ui/insertplugin.ui
@@ -109,7 +109,7 @@
                         <property name="vscrollbar_policy">always</property>
                         <property name="shadow_type">in</property>
                         <child>
-                          <object class="GtkTextView" id="pluginoptions">
+                          <object class="GtkTextView" id="pluginoptions:border">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="wrap_mode">char</property>
diff --git a/cui/uiconfig/ui/macroselectordialog.ui b/cui/uiconfig/ui/macroselectordialog.ui
index 40131bef50b5..1734426b60da 100644
--- a/cui/uiconfig/ui/macroselectordialog.ui
+++ b/cui/uiconfig/ui/macroselectordialog.ui
@@ -299,7 +299,7 @@
                         <property name="vexpand">True</property>
                         <property name="shadow_type">in</property>
                         <child>
-                          <object class="GtkTextView" id="description">
+                          <object class="GtkTextView" id="description:border">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="editable">False</property>
diff --git a/cui/uiconfig/ui/objecttitledescdialog.ui b/cui/uiconfig/ui/objecttitledescdialog.ui
index ff22684bcdad..2e639b97feda 100644
--- a/cui/uiconfig/ui/objecttitledescdialog.ui
+++ b/cui/uiconfig/ui/objecttitledescdialog.ui
@@ -125,7 +125,7 @@
                 <property name="vscrollbar_policy">always</property>
                 <property name="shadow_type">in</property>
                 <child>
-                  <object class="GtkTextView" id="desc_entry">
+                  <object class="GtkTextView" id="desc_entry:border">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="wrap_mode">word</property>
diff --git a/sfx2/uiconfig/ui/checkin.ui b/sfx2/uiconfig/ui/checkin.ui
index 71285193db1f..e50809cb321f 100644
--- a/sfx2/uiconfig/ui/checkin.ui
+++ b/sfx2/uiconfig/ui/checkin.ui
@@ -91,7 +91,7 @@
                     <property name="top_padding">6</property>
                     <property name="left_padding">12</property>
                     <child>
-                      <object class="GtkTextView" id="VersionComment">
+                      <object class="GtkTextView" id="VersionComment:border">
                         <property name="width_request">300</property>
                         <property name="height_request">150</property>
                         <property name="visible">True</property>
diff --git a/sfx2/uiconfig/ui/descriptioninfopage.ui b/sfx2/uiconfig/ui/descriptioninfopage.ui
index c257d3187b22..113e60c9dd87 100644
--- a/sfx2/uiconfig/ui/descriptioninfopage.ui
+++ b/sfx2/uiconfig/ui/descriptioninfopage.ui
@@ -128,7 +128,7 @@
         <property name="vscrollbar_policy">always</property>
         <property name="shadow_type">in</property>
         <child>
-          <object class="GtkTextView" id="comments">
+          <object class="GtkTextView" id="comments:border">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="hexpand">True</property>
diff --git a/sfx2/uiconfig/ui/managestylepage.ui b/sfx2/uiconfig/ui/managestylepage.ui
index beeeed7c0067..551f2d37d32d 100644
--- a/sfx2/uiconfig/ui/managestylepage.ui
+++ b/sfx2/uiconfig/ui/managestylepage.ui
@@ -165,7 +165,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkTextView" id="namero">
+                      <object class="GtkTextView" id="namero:border">
                         <property name="can_focus">True</property>
                         <property name="no_show_all">True</property>
                         <property name="valign">center</property>
diff --git a/sw/uiconfig/swriter/ui/insertscript.ui b/sw/uiconfig/swriter/ui/insertscript.ui
index fe538930cbc6..74b24b74e9be 100644
--- a/sw/uiconfig/swriter/ui/insertscript.ui
+++ b/sw/uiconfig/swriter/ui/insertscript.ui
@@ -119,7 +119,7 @@
                 <property name="can_focus">True</property>
                 <property name="shadow_type">in</property>
                 <child>
-                  <object class="GtkTextView" id="textentry">
+                  <object class="GtkTextView" id="textentry:border">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                   </object>
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 01a71857c951..6b7c2cbc93d3 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -1185,7 +1185,10 @@ Window *VclBuilder::makeObject(Window *pParent, const OString &name, const OStri
     {
         extractBuffer(id, rMap);
 
-        WinBits nWinStyle = WB_LEFT | WB_BORDER;
+        WinBits nWinStyle = WB_LEFT;
+        OString sBorder = extractCustomProperty(rMap);
+        if (!sBorder.isEmpty())
+            nWinStyle |= WB_BORDER;
         //VclMultiLineEdit manages its own scrolling,
         Window *pRealParent = prepareWidgetOwnScrolling(pParent, nWinStyle);
         pWindow = new VclMultiLineEdit(pRealParent, nWinStyle);