diff options
| author | Pranav Kant <pranavk@collabora.co.uk> | 2017-12-05 01:24:21 +0530 |
|---|---|---|
| committer | Pranav Kant <pranavk@collabora.co.uk> | 2017-12-21 18:20:18 +0530 |
| commit | 10e73684468a811acae56dfeafc8ecb5876a7960 (patch) | |
| tree | d9dac10ae3f39b43796a9550d275663ac9b1dfba /sfx2 | |
| parent | 292639d76e3eb47c8a94db17203d8b7d3cbacf37 (diff) | |
lokdialog: InitShow can happen multiple times
Change-Id: I120a49f8a3fa96eb93d6de6de1d0715134520678
(cherry picked from commit c24bfdbff68f52d65ca56cc4ff7d8377898180d7)
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/dialog/basedlgs.cxx | 4 | ||||
| -rw-r--r-- | sfx2/source/dialog/tabdlg.cxx | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sfx2/source/dialog/basedlgs.cxx b/sfx2/source/dialog/basedlgs.cxx index 83ab4520e026..5379702e7d0a 100644 --- a/sfx2/source/dialog/basedlgs.cxx +++ b/sfx2/source/dialog/basedlgs.cxx @@ -173,7 +173,7 @@ void SfxModalDialog::dispose() short SfxModalDialog::Execute() { SfxViewShell* pViewShell = SfxViewShell::Current(); - if (comphelper::LibreOfficeKit::isActive() && pViewShell) + if (comphelper::LibreOfficeKit::isActive() && pViewShell && !GetLOKNotifier()) { SetLOKNotifier(pViewShell); const Size aSize = GetOptimalSize(); @@ -278,7 +278,7 @@ void SfxModelessDialog::StateChanged( StateChangedType nStateChange ) } SfxViewShell* pViewShell = SfxViewShell::Current(); - if (comphelper::LibreOfficeKit::isActive() && pViewShell) + if (comphelper::LibreOfficeKit::isActive() && pViewShell && !GetLOKNotifier()) { SetLOKNotifier(pViewShell); std::vector<vcl::LOKPayloadItem> aItems; diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx index c62a1c315e65..784a0c274b45 100644 --- a/sfx2/source/dialog/tabdlg.cxx +++ b/sfx2/source/dialog/tabdlg.cxx @@ -519,7 +519,7 @@ short SfxTabDialog::Execute() Start_Impl(); SfxViewShell* pViewShell = SfxViewShell::Current(); - if (comphelper::LibreOfficeKit::isActive() && pViewShell) + if (comphelper::LibreOfficeKit::isActive() && pViewShell && !GetLOKNotifier()) { SetLOKNotifier(pViewShell); const Size aSize = GetOptimalSize(); |