diff options
| author | Pranav Kant <pranavk@collabora.co.uk> | 2018-02-21 15:21:43 +0530 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2018-02-21 17:01:13 +0100 |
| commit | c565a1a36dc6e75744df284edbb36ffd09edc42b (patch) | |
| tree | 570763cc6610435868181c3718bbb12cd3106c51 /include | |
| parent | f2d3192e8a4ae743fcaab27ab6d829d57ae8fb60 (diff) | |
lokdialog: Convert InfoReadonlyDialog -> execute async
Change-Id: I3f2e7fb676911570276f66d000c91ca3ef2bdeb0
Reviewed-on: https://gerrit.libreoffice.org/50096
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
Tested-by: Jan Holesovsky <kendy@collabora.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/sfx2/tabdlg.hxx | 2 | ||||
| -rw-r--r-- | include/vcl/dialog.hxx | 4 | ||||
| -rw-r--r-- | include/vcl/layout.hxx | 6 |
3 files changed, 10 insertions, 2 deletions
diff --git a/include/sfx2/tabdlg.hxx b/include/sfx2/tabdlg.hxx index a758d4544291..d771dc32da6d 100644 --- a/include/sfx2/tabdlg.hxx +++ b/include/sfx2/tabdlg.hxx @@ -190,6 +190,8 @@ public: short Execute() override; void StartExecuteModal( const Link<Dialog&,void>& rEndDialogHdl ) override; + + using Dialog::StartExecuteAsync; bool StartExecuteAsync( VclAbstractDialog::AsyncContext &rCtx ) override; void Start(); diff --git a/include/vcl/dialog.hxx b/include/vcl/dialog.hxx index 92bf603400f6..f028b7cb57c9 100644 --- a/include/vcl/dialog.hxx +++ b/include/vcl/dialog.hxx @@ -129,8 +129,8 @@ private: public: // FIXME: Need to remove old StartExecuteModal in favour of this one. - /// Returns true of the dialog successfully starts - bool StartExecuteAsync(const std::function<void(sal_Int32)> &rEndDialogFn) + /// Returns true if the dialog successfully starts + virtual bool StartExecuteAsync(const std::function<void(sal_Int32)> &rEndDialogFn) { VclAbstractDialog::AsyncContext aCtx; aCtx.mxOwner = this; diff --git a/include/vcl/layout.hxx b/include/vcl/layout.hxx index 59a0817d70c6..b8df9a3ee877 100644 --- a/include/vcl/layout.hxx +++ b/include/vcl/layout.hxx @@ -657,6 +657,7 @@ private: void setButtonHandlers(VclButtonBox *pButtonBox); short get_response(const vcl::Window *pWindow) const; void create_owned_areas(); + void InitExecute(); friend class VclPtr<MessageDialog>; MessageDialog(vcl::Window* pParent, WinBits nStyle); @@ -668,6 +669,11 @@ public: VclButtonsType eButtonsType = VCL_BUTTONS_OK); MessageDialog(vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription); virtual bool set_property(const OString &rKey, const OString &rValue) override; + + // Avoid -Woverloaded-virtual + using Dialog::StartExecuteAsync; + virtual bool StartExecuteAsync(const std::function<void(sal_Int32)> &rEndDialogFn) override; + virtual short Execute() override; ///Emitted when an action widget is clicked virtual void response(short nResponseId); |