[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - 2 commits - include/vcl vcl/jsdialog vcl/source

[Szymon KÅ‚os (via logerrit)]

 include/vcl/edit.hxx        |    2 ++
 vcl/jsdialog/executor.cxx   |    2 +-
 vcl/source/control/edit.cxx |   11 +++++++++++
 3 files changed, 14 insertions(+), 1 deletion(-)

New commits:
commit 966dcbab42bf3c6cf21e4b28903fe5ba65437514
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Tue Nov 3 11:32:21 2020 +0100
Commit:     Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Mon Nov 30 15:03:06 2020 +0100

    jsdialog: prevent from crash
    
    Change-Id: If17738b7f58037929e29def75736434c33649b42
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106567
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Szymon Kłos <szymon.klos at collabora.com>

diff --git a/vcl/jsdialog/executor.cxx b/vcl/jsdialog/executor.cxx
index 53fded14e1c1..27d61d65209a 100644
--- a/vcl/jsdialog/executor.cxx
+++ b/vcl/jsdialog/executor.cxx
@@ -47,7 +47,7 @@ bool ExecuteAction(sal_uInt64 nWindowId, const OString& rWidget, StringMap& rDat
                 if (sAction == "selected")
                 {
                     int separatorPos = rData["data"].indexOf(';');
-                    if (separatorPos)
+                    if (separatorPos > 0)
                     {
                         OUString entryPos = rData["data"].copy(0, separatorPos);
                         OString posString = OUStringToOString(entryPos, RTL_TEXTENCODING_ASCII_US);
commit bc3ec10d244efa512da2e9c82d8b0ebbf4b972c1
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Mon Nov 2 12:14:50 2020 +0100
Commit:     Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Mon Nov 30 15:02:53 2020 +0100

    jsdialog: export placeholder text for edit fields
    
    Change-Id: I6031025a72cc72e8bc3834c256479ec1a07971b7
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106566
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Szymon Kłos <szymon.klos at collabora.com>

diff --git a/include/vcl/edit.hxx b/include/vcl/edit.hxx
index 5958f124ae51..a1aed62c24a3 100644
--- a/include/vcl/edit.hxx
+++ b/include/vcl/edit.hxx
@@ -259,6 +259,8 @@ public:
     void SetForceControlBackground(bool b) { mbForceControlBackground = b; }
 
     bool IsPassword() const { return mbPassword; }
+
+    virtual boost::property_tree::ptree DumpAsPropertyTree() override;
 };
 
 #endif // INCLUDED_VCL_EDIT_HXX
diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index 75f224d64acb..b579ab3948b7 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -2938,4 +2938,15 @@ FactoryFunction Edit::GetUITestFactory() const
     return EditUIObject::create;
 }
 
+
+boost::property_tree::ptree Edit::DumpAsPropertyTree()
+{
+    boost::property_tree::ptree aTree(Control::DumpAsPropertyTree());
+
+    if (!maPlaceholderText.isEmpty())
+        aTree.put("placeholder", maPlaceholderText);
+
+    return aTree;
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */