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

[Szymon KÅ‚os (via logerrit)]

 desktop/source/lib/init.cxx   |    1 +
 vcl/source/window/builder.cxx |    4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 4dc8142fa9ecba72650405100ffa429e2992feb7
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Tue Jun 23 07:48:48 2020 +0200
Commit:     Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Wed Jun 24 14:01:59 2020 +0200

    jsdialog: working number format field
    
    Change-Id: Ibc3dcd34008767a7a38cc9b52a23935e0387f67e
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97016
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Szymon Kłos <szymon.klos at collabora.com>

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index bb2307363ab0..bf07eee76637 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -3635,6 +3635,7 @@ static void doc_sendDialogEvent(LibreOfficeKitDocument* /*pThis*/, unsigned nWin
                                 OString posString = OUStringToOString(entryPos, RTL_TEXTENCODING_ASCII_US);
                                 int pos = std::atoi(posString.getStr());
                                 pCombobox->set_active(pos);
+                                pCombobox->signal_changed();
                             }
                         }
                         else if (sAction == "change")
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index eaca96c6e57c..3604c2bd2f9b 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -167,7 +167,9 @@ weld::Builder* Application::CreateBuilder(weld::Widget* pParent, const OUString
 
 weld::Builder* Application::CreateInterimBuilder(vcl::Window* pParent, const OUString &rUIFile)
 {
-    if (comphelper::LibreOfficeKit::isActive() && rUIFile == "svx/ui/stylespreview.ui")
+    if (comphelper::LibreOfficeKit::isActive()
+        && (rUIFile == "svx/ui/stylespreview.ui"
+        || rUIFile == "modules/scalc/ui/numberbox.ui"))
     {
         return new JSInstanceBuilder(pParent, VclBuilderContainer::getUIRootDir(), rUIFile, css::uno::Reference<css::frame::XFrame>());
     }