summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sfx2/source/dialog/basedlgs.cxx4
-rw-r--r--sfx2/source/dialog/tabdlg.cxx2
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();