From 5e2bd2bb4c1a2f8a5467009b4ab7007401a14446 Mon Sep 17 00:00:00 2001 From: Rashesh Date: Thu, 26 Sep 2024 16:39:55 +0530 Subject: cool#10115 sc: enable ScPosWnd for lokit with jsdialog MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I18829c48a2495e3aa31af83970c8c1c4791a170a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/173987 Tested-by: Jenkins CollaboraOffice Reviewed-by: Szymon Kłos (cherry picked from commit 9ffc274bbc414d1e98313af804386861beeff9bf) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/177645 Tested-by: Jenkins --- vcl/source/window/builder.cxx | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'vcl/source/window/builder.cxx') diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx index 62469d222d82..ed59785cc791 100644 --- a/vcl/source/window/builder.cxx +++ b/vcl/source/window/builder.cxx @@ -207,8 +207,12 @@ std::unique_ptr Application::CreateInterimBuilder(vcl::Window* pP // Notebookbar sub controls if (jsdialog::isInterimBuilderEnabledForNotebookbar(rUIFile)) return JSInstanceBuilder::CreateNotebookbarBuilder(pParent, AllSettings::GetUIRootDir(), rUIFile, css::uno::Reference(), nLOKWindowId); - else if (rUIFile == u"modules/scalc/ui/inputbar.ui") - return JSInstanceBuilder::CreateFormulabarBuilder(pParent, AllSettings::GetUIRootDir(), rUIFile, nLOKWindowId); + else if (jsdialog::isBuilderEnabledForFormulabar(rUIFile)) + return JSInstanceBuilder::CreateFormulabarBuilder(pParent, AllSettings::GetUIRootDir(), + rUIFile, nLOKWindowId); + else if (jsdialog::isBuilderEnabledForAddressInput(rUIFile)) + return JSInstanceBuilder::CreateAddressInputBuilder( + pParent, AllSettings::GetUIRootDir(), rUIFile, nLOKWindowId); } return ImplGetSVData()->mpDefInst->CreateInterimBuilder(pParent, AllSettings::GetUIRootDir(), rUIFile, bAllowCycleFocusOut, nLOKWindowId); -- cgit