diff options
| author | Pranav Kant <pranavk@collabora.co.uk> | 2018-02-21 15:21:43 +0530 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2018-07-18 17:37:19 +0200 |
| commit | 3f0b135bdcb8e0eb25cbf532d117729a1519ed97 (patch) | |
| tree | 4ae794999072c029d6ee4f75f490746c762150eb /include | |
| parent | d69e830fb874582459134d483e7698d9dad805c6 (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>
(cherry picked from commit c565a1a36dc6e75744df284edbb36ffd09edc42b)
Reviewed-on: https://gerrit.libreoffice.org/57651
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 c6bc49157b28..8d5554a5cbdb 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 0ba15407ae08..dff20e7d7e2f 100644 --- a/include/vcl/dialog.hxx +++ b/include/vcl/dialog.hxx @@ -146,8 +146,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 d973704f8802..ed9762c509f8 100644 --- a/include/vcl/layout.hxx +++ b/include/vcl/layout.hxx @@ -629,6 +629,7 @@ private: void setButtonHandlers(VclButtonBox const *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); @@ -640,6 +641,11 @@ public: VclButtonsType eButtonsType = VclButtonsType::Ok); MessageDialog(vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription); virtual bool set_property(const OString &rKey, const OUString &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); |