diff options
| author | Pranav Kant <pranavk@collabora.co.uk> | 2017-11-24 01:40:38 +0530 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2017-11-28 17:57:08 +0100 |
| commit | a99ce78f4fdf4689c3e3f9ce9d7d0ffebf069c94 (patch) | |
| tree | 764e484918fcbe5e60cebd31344c5a79b4ca5536 /sfx2 | |
| parent | 58b1efba272d76b1c3a9c0866af76375f0320f2f (diff) | |
lokdialog: Notify dialog closure from sfx2/, instead of vcl/
Change-Id: I49f5e0d5f6c7c0077a6d4390f8788c1691d47bd6
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/dialog/tabdlg.cxx | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx index 7d37ad998b42..b072efbcbbc9 100644 --- a/sfx2/source/dialog/tabdlg.cxx +++ b/sfx2/source/dialog/tabdlg.cxx @@ -21,12 +21,9 @@ #include <limits.h> #include <stdlib.h> #include <algorithm> -#include <vcl/builder.hxx> -#include <vcl/msgbox.hxx> -#include <vcl/IDialogRenderable.hxx> -#include <unotools/viewoptions.hxx> #include "appdata.hxx" +#include <comphelper/lok.hxx> #include "sfxtypes.hxx" #include <sfx2/tabdlg.hxx> #include <sfx2/viewfrm.hxx> @@ -40,6 +37,10 @@ #include <sfx2/viewsh.hxx> #include "uitest/sfx_uiobject.hxx" +#include <unotools/viewoptions.hxx> +#include <vcl/builder.hxx> +#include <vcl/msgbox.hxx> +#include <vcl/IDialogRenderable.hxx> #include "dialog.hrc" #include "helpid.hrc" @@ -404,6 +405,13 @@ void SfxTabDialog::dispose() m_pBaseFmtBtn.clear(); m_pActionArea.clear(); + SfxViewShell* pViewShell = SfxViewShell::Current(); + if (comphelper::LibreOfficeKit::isActive() && pViewShell) + { + pViewShell->notifyDialog(maID, "close"); + pViewShell->UnregisterDlg(maID); + } + TabDialog::dispose(); } @@ -513,7 +521,7 @@ short SfxTabDialog::Execute() Start_Impl(); SfxViewShell* pViewShell = SfxViewShell::Current(); - if (pViewShell) + if (comphelper::LibreOfficeKit::isActive() && pViewShell) { pViewShell->RegisterDlg(maID, this); registerDialogNotifier(static_cast<vcl::IDialogNotifier*>(pViewShell)); |