desktop/source/lib/init.cxx | 1 + vcl/jsdialog/jsdialogbuilder.cxx | 6 +----- vcl/source/window/builder.cxx | 4 +++- 3 files changed, 5 insertions(+), 6 deletions(-)
New commits: commit 645021ad49628319423ad29d866d7adb3aee9d97 Author: Szymon Kłos <szymon.k...@collabora.com> AuthorDate: Thu Jun 18 14:08:48 2020 +0200 Commit: Szymon Kłos <szymon.k...@collabora.com> CommitDate: Fri Jul 3 12:13:25 2020 +0200 jsdialog: always clean remember widgets avoid crash when old, freed widged will be used Change-Id: I4f4ec40bc8d1fdda4a141d1167c05d863d516633 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97014 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com> Reviewed-by: Szymon Kłos <szymon.k...@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97814 Tested-by: Jenkins diff --git a/vcl/jsdialog/jsdialogbuilder.cxx b/vcl/jsdialog/jsdialogbuilder.cxx index 9f566b7c7434..1932bcbd7d02 100644 --- a/vcl/jsdialog/jsdialogbuilder.cxx +++ b/vcl/jsdialog/jsdialogbuilder.cxx @@ -101,11 +101,7 @@ JSInstanceBuilder::JSInstanceBuilder(vcl::Window* pParent, const OUString& rUIRo } } -JSInstanceBuilder::~JSInstanceBuilder() -{ - if (m_nWindowId && m_bHasTopLevelDialog) - GetLOKWeldWidgetsMap().erase(m_nWindowId); -} +JSInstanceBuilder::~JSInstanceBuilder() { GetLOKWeldWidgetsMap().erase(m_nWindowId); } std::map<vcl::LOKWindowId, WidgetMap>& JSInstanceBuilder::GetLOKWeldWidgetsMap() { commit cef4ed2a79a5c0643afd513bc163fadff047ea82 Author: Szymon Kłos <szymon.k...@collabora.com> AuthorDate: Tue Jun 23 07:48:48 2020 +0200 Commit: Szymon Kłos <szymon.k...@collabora.com> CommitDate: Fri Jul 3 12:13:13 2020 +0200 jsdialog: working number format field Change-Id: Ibc3dcd34008767a7a38cc9b52a23935e0387f67e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97016 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com> Reviewed-by: Szymon Kłos <szymon.k...@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97815 Tested-by: Jenkins diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx index 1ced81cb6ea2..2f14c8ab2518 100644 --- a/desktop/source/lib/init.cxx +++ b/desktop/source/lib/init.cxx @@ -3662,6 +3662,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 e1c00944fc8c..3e1b71105a2c 100644 --- a/vcl/source/window/builder.cxx +++ b/vcl/source/window/builder.cxx @@ -174,7 +174,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>()); } _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits