From 706707812b581cbc8f9afc2d72120cffd0c4c09d Mon Sep 17 00:00:00 2001 From: Pranav Kant Date: Tue, 5 Dec 2017 01:24:21 +0530 Subject: lokdialog: InitShow can happen multiple times Change-Id: I120a49f8a3fa96eb93d6de6de1d0715134520678 --- sfx2/source/dialog/basedlgs.cxx | 4 ++-- 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 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(); -- cgit v1.2.3