[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - sw/qa sw/source

[Tamás Zolnai (via logerrit)]

 sw/qa/extras/tiledrendering/tiledrendering.cxx |    3 +++
 sw/source/core/crsr/bookmrk.cxx                |    6 +++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

New commits:
commit 21e5746b04067e3bc9e6b78ed5e9636f05e756e2
Author:     Tamás Zolnai <tamas.zolnai at collabora.com>
AuthorDate: Mon May 11 13:12:44 2020 +0200
Commit:     Tamás Zolnai <tamas.zolnai at collabora.com>
CommitDate: Mon May 11 19:43:35 2020 +0200

    lok: MSForms: send also the placeholder text.
    
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93960
    Tested-by: Jenkins
    Reviewed-by: Tamás Zolnai <tamas.zolnai at collabora.com>
    (cherry picked from commit c0517c6215c78e65af8b20e8c033a75586a794bd)
    
    Change-Id: I5cce5af22f56079e840707cfffb01785d7a15c6a
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93978
    Tested-by: Tamás Zolnai <tamas.zolnai at collabora.com>
    Reviewed-by: Tamás Zolnai <tamas.zolnai at collabora.com>

diff --git a/sw/qa/extras/tiledrendering/tiledrendering.cxx b/sw/qa/extras/tiledrendering/tiledrendering.cxx
index 602791b57728..3d922d088309 100644
--- a/sw/qa/extras/tiledrendering/tiledrendering.cxx
+++ b/sw/qa/extras/tiledrendering/tiledrendering.cxx
@@ -2582,6 +2582,9 @@ void SwTiledRenderingTest::testDropDownFormFieldButton()
 
         OString sSelected = aTree.get_child("params").get_child("selected").get_value<std::string>().c_str();
         CPPUNIT_ASSERT_EQUAL(OString("1"), sSelected);
+
+        OString sPlaceholder = aTree.get_child("params").get_child("placeholderText").get_value<std::string>().c_str();
+        CPPUNIT_ASSERT_EQUAL(OString("No Item specified"), sPlaceholder);
     }
 
     // Move the cursor back so the button becomes hidden.
diff --git a/sw/source/core/crsr/bookmrk.cxx b/sw/source/core/crsr/bookmrk.cxx
index 484480283ce5..5f8ba1b51b9d 100644
--- a/sw/source/core/crsr/bookmrk.cxx
+++ b/sw/source/core/crsr/bookmrk.cxx
@@ -48,6 +48,7 @@
 #include <LibreOfficeKit/LibreOfficeKitEnums.h>
 #include <wrtsh.hxx>
 #include <rtl/strbuf.hxx>
+#include <strings.hrc>
 
 using namespace ::sw::mark;
 using namespace ::com::sun::star;
@@ -622,7 +623,10 @@ namespace sw { namespace mark
                 {
                     pSelectedItemIter->second >>= nSelection;
                 }
-                sPayload.append("\"selected\": \"" + OString::number(nSelection) + "\"}}");
+                sPayload.append("\"selected\": \"" + OString::number(nSelection) + "\", ");
+
+                // Placeholder text
+                sPayload.append("\"placeholderText\": \"" + OUStringToOString(SwResId(STR_DROP_DOWN_EMPTY_LIST), RTL_TEXTENCODING_UTF8) + "\"}}");
             }
             else
             {