diff options
| author | Henry Castro <hcastro@collabora.com> | 2018-01-11 13:31:36 -0400 |
|---|---|---|
| committer | pranavk <pranavk@collabora.co.uk> | 2018-01-18 11:17:00 +0100 |
| commit | 072e3ce1cfea5bb61cc5f3001c288df6deb45613 (patch) | |
| tree | 60dcc15428c831065ed2c0673c2f73f0123a12ca /include | |
| parent | 64619789a45babbaa3071951e3502927f191e459 (diff) | |
lok dialog: enable MessageDialog tunneling
Change-Id: I05b270a19e29c5ed3a2482fd8163e61e66bfdf74
Reviewed-on: https://gerrit.libreoffice.org/47772
Reviewed-by: pranavk <pranavk@collabora.co.uk>
Tested-by: pranavk <pranavk@collabora.co.uk>
Diffstat (limited to 'include')
| -rw-r--r-- | include/sfx2/basedlgs.hxx | 1 | ||||
| -rw-r--r-- | include/vcl/dialog.hxx | 1 | ||||
| -rw-r--r-- | include/vcl/window.hxx | 2 |
3 files changed, 2 insertions, 2 deletions
diff --git a/include/sfx2/basedlgs.hxx b/include/sfx2/basedlgs.hxx index db885c7173a2..670fc10f7238 100644 --- a/include/sfx2/basedlgs.hxx +++ b/include/sfx2/basedlgs.hxx @@ -72,7 +72,6 @@ public: virtual ~SfxModalDialog() override; virtual void dispose() override; - virtual short Execute() override; const SfxItemSet* GetOutputItemSet() const { return pOutputSet; } const SfxItemSet* GetInputItemSet() const { return pInputSet; } void StateChanged( StateChangedType nStateChange ) override; diff --git a/include/vcl/dialog.hxx b/include/vcl/dialog.hxx index 7fe00ba1c8c3..eaf9bbe99960 100644 --- a/include/vcl/dialog.hxx +++ b/include/vcl/dialog.hxx @@ -60,6 +60,7 @@ private: SAL_DLLPRIVATE void RemoveFromDlgList(); SAL_DLLPRIVATE void ImplInitDialogData(); SAL_DLLPRIVATE void ImplInitSettings(); + SAL_DLLPRIVATE inline void ImplLOKNotifier(vcl::Window* pParent); SAL_DLLPRIVATE VclPtr<vcl::Window> AddBorderWindow(vcl::Window* pParent, WinBits nBits); virtual void ApplySettings(vcl::RenderContext& rRenderContext) override; diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx index 528ba110bd04..3fe40355bab3 100644 --- a/include/vcl/window.hxx +++ b/include/vcl/window.hxx @@ -1209,7 +1209,7 @@ public: void SetComponentInterface( css::uno::Reference< css::awt::XWindowPeer > const & xIFace ); /// Interface to register for dialog / window tunneling. - void SetLOKNotifier(const vcl::ILibreOfficeKitNotifier* pNotifier); + void SetLOKNotifier(const vcl::ILibreOfficeKitNotifier* pNotifier, bool bParent = false); const vcl::ILibreOfficeKitNotifier* GetLOKNotifier() const; vcl::LOKWindowId GetLOKWindowId() const; |