[Libreoffice-commits] core.git: sfx2/source

[Pranav Kant]

 sfx2/source/dialog/basedlgs.cxx |    4 ++--
 sfx2/source/dialog/tabdlg.cxx   |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 10e73684468a811acae56dfeafc8ecb5876a7960
Author: Pranav Kant <pranavk at collabora.co.uk>
Date:   Tue Dec 5 01:24:21 2017 +0530

    lokdialog: InitShow can happen multiple times
    
    Change-Id: I120a49f8a3fa96eb93d6de6de1d0715134520678
    (cherry picked from commit c24bfdbff68f52d65ca56cc4ff7d8377898180d7)

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();