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-05 01:24:21 +0530 |
| commit | 706707812b581cbc8f9afc2d72120cffd0c4c09d (patch) | |
| tree | b44e8780355b4beb68d98f77d39e8c6a64aa2868 | |
| parent | d2106ef4d506cd49bf7905493fa4aae33df5c611 (diff) | |
lokdialog: InitShow can happen multiple times
Change-Id: I120a49f8a3fa96eb93d6de6de1d0715134520678
| -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 1de5c4fb2f79..c9865a50c37a 100644 --- a/sfx2/source/dialog/basedlgs.cxx +++ b/sfx2/source/dialog/basedlgs.cxx @@ -174,7 +174,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(); @@ -246,7 +246,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 eac3ea1968ae..ea555008a152 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(); |