[Libreoffice-commits] .: vcl/source

[Libreoffice Gerrit user]

 vcl/source/control/edit.cxx   |    4 +++-
 vcl/source/window/builder.cxx |    3 +++
 2 files changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 40796af946498d7fb69396dc7b07be40790863df
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Oct 10 16:07:25 2012 +0100

    map GtkTextView to VCLMultiLineEdit
    
    Change-Id: I05c4b4d50400035a2542e375a773ed6d867187e6

diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index eb40448..d271051 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -230,8 +230,10 @@ void Edit::SetMaxWidthInChars(sal_Int32 nMinWidthInChars)
 
 bool Edit::set_property(const rtl::OString &rKey, const rtl::OString &rValue)
 {
-    if (rKey.equalsL(RTL_CONSTASCII_STRINGPARAM("width-chars")))
+    if (rKey == "width-chars")
         SetMaxWidthInChars(rValue.toInt32());
+    else if (rKey == "editable")
+        SetReadOnly(!toBool(rValue));
     else
         return Control::set_property(rKey, rValue);
     return true;
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 5ab64b3..40c0b71 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -22,6 +22,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/tabctrl.hxx>
 #include <vcl/tabpage.hxx>
+#include <vcl/vclmedit.hxx>
 #include <svdata.hxx>
 #include <svids.hrc>
 #include <window.h>
@@ -698,6 +699,8 @@ Window *VclBuilder::makeObject(Window *pParent, const OString &name, const OStri
         pWindow = new TabControl(pParent, WB_STDTABCONTROL|WB_3DLOOK);
     else if (name == "GtkDrawingArea")
         pWindow = new Window(pParent);
+    else if (name == "GtkTextView")
+        pWindow = new VCLMultiLineEdit(pParent);
     else
     {
         sal_Int32 nDelim = name.indexOf(':');