diff options
| author | Szymon Kłos <szymon.klos@collabora.com> | 2020-03-09 14:11:06 +0100 |
|---|---|---|
| committer | Szymon Kłos <szymon.klos@collabora.com> | 2020-06-22 10:58:41 +0200 |
| commit | 027245720fec55bada1f787f81508c212f941c58 (patch) | |
| tree | ad4ce3f6c274f68d813eb7af52612b0ffc6a2f07 /include | |
| parent | 3f3b50015e4fd9efc3459612a70409fca49cf390 (diff) | |
jsdialog: handle nested tab pages
Change-Id: I04d5df55af0df18948730fcd9ee387abce77ac27
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94339
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96831
Tested-by: Jenkins
Diffstat (limited to 'include')
| -rw-r--r-- | include/vcl/builderpage.hxx | 2 | ||||
| -rw-r--r-- | include/vcl/jsdialog/jsdialogbuilder.hxx | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/include/vcl/builderpage.hxx b/include/vcl/builderpage.hxx index 85d9accd9a1c..e77cf47c443b 100644 --- a/include/vcl/builderpage.hxx +++ b/include/vcl/builderpage.hxx @@ -16,7 +16,7 @@ class VCL_DLLPUBLIC BuilderPage { public: BuilderPage(weld::Widget* pParent, weld::DialogController* pController, - const OUString& rUIXMLDescription, const OString& rID); + const OUString& rUIXMLDescription, const OString& rID, bool bIsMobile = false); virtual ~BuilderPage() COVERITY_NOEXCEPT_FALSE; /* The title of the page, in an Assistant the dialog may append this page title to the diff --git a/include/vcl/jsdialog/jsdialogbuilder.hxx b/include/vcl/jsdialog/jsdialogbuilder.hxx index f57d3da7ec7f..2c6977b205dc 100644 --- a/include/vcl/jsdialog/jsdialogbuilder.hxx +++ b/include/vcl/jsdialog/jsdialogbuilder.hxx @@ -28,8 +28,12 @@ public: class VCL_DLLPUBLIC JSInstanceBuilder : public SalInstanceBuilder { vcl::LOKWindowId m_nWindowId; + /// used in case of tab pages where dialog is not a direct top level + VclPtr<vcl::Window> m_aParentDialog; + bool m_bHasTopLevelDialog; static std::map<vcl::LOKWindowId, WidgetMap>& GetLOKWeldWidgetsMap(); + static void InsertWindowToMap(int nWindowId); void RememberWidget(const OString& id, weld::Widget* pWidget); public: @@ -112,6 +116,7 @@ public: virtual void insert(int pos, const OUString& rStr, const OUString* pId, const OUString* pIconName, VirtualDevice* pImageSurface) override; virtual void remove(int pos) override; + virtual void set_active(int pos) override; }; class VCL_DLLPUBLIC JSComboBox : public JSWidget<SalInstanceComboBoxWithEdit, ::ComboBox> |