diff options
| author | Szymon Kłos <szymon.klos@collabora.com> | 2022-04-04 23:27:01 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2022-04-11 11:15:11 +0200 |
| commit | ace42fde4a7e15b9a6da8cbf40d34cd6141da781 (patch) | |
| tree | af04a135011157e55043c33ec198176b39520316 /vcl | |
| parent | 479e379f7178444d69b4bb5090d8da25f090e061 (diff) | |
jsdialog: autofilter: unify with regular popup
- remove special type "autofilter"
- now autofilter will be handled by dialog code in online
Change-Id: I3478c3e05ab2e83030a8d68632d0426a5cc0accd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132539
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Mert Tumer <mert.tumer@collabora.com>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/jsdialog/jsdialogbuilder.cxx | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/vcl/jsdialog/jsdialogbuilder.cxx b/vcl/jsdialog/jsdialogbuilder.cxx index 1891e7f72c8e..408e7a9e53da 100644 --- a/vcl/jsdialog/jsdialogbuilder.cxx +++ b/vcl/jsdialog/jsdialogbuilder.cxx @@ -211,7 +211,7 @@ JSDialogNotifyIdle::generatePopupMessage(VclPtr<vcl::Window> pWindow, OUString s } } - if (m_sTypeOfJSON == "autofilter") + // try to get the position eg. for the autofilter { vcl::Window* pVclWindow = pWindow.get(); DockingWindow* pDockingWindow = dynamic_cast<DockingWindow*>(pVclWindow); @@ -231,7 +231,7 @@ JSDialogNotifyIdle::generatePopupMessage(VclPtr<vcl::Window> pWindow, OUString s } } - aJsonWriter->put("jsontype", (m_sTypeOfJSON == "autofilter") ? "autofilter" : "dialog"); + aJsonWriter->put("jsontype", "dialog"); aJsonWriter->put("type", "modalpopup"); aJsonWriter->put("cancellable", true); aJsonWriter->put("popupParent", sParentId); @@ -500,9 +500,6 @@ JSInstanceBuilder::JSInstanceBuilder(weld::Widget* pParent, const OUString& rUIR , m_bIsNotebookbar(false) , m_aWindowToRelease(nullptr) { - if (rUIFile == "modules/scalc/ui/filterdropdown.ui") - m_sTypeOfJSON = "autofilter"; - // when it is a popup we initialize sender in weld_popover if (bPopup) return; |