diff options
| author | Jan Holesovsky <kendy@collabora.com> | 2017-11-24 12:06:42 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2018-03-19 14:55:38 +0100 |
| commit | a119f3efb68109e98458a0b8f0abd8fdff1f369e (patch) | |
| tree | abdfc4439946325e2cad6804b410dbc69853814d /sfx2/source/dialog/basedlgs.cxx | |
| parent | 6f2dbd9f89f3fc2ccd3a62b4ef320da40048a2bb (diff) | |
lokdialogs: Assign the LOK window id only when necessary.
Change-Id: Id48957a8c2bde068f30bb26e66df81972fe38e0f
(cherry picked from commit 5de24bea47e7ae971a53b51ee7d1b85d134bbe52)
Diffstat (limited to 'sfx2/source/dialog/basedlgs.cxx')
| -rw-r--r-- | sfx2/source/dialog/basedlgs.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sfx2/source/dialog/basedlgs.cxx b/sfx2/source/dialog/basedlgs.cxx index 9d30c8596e33..18d2a395631d 100644 --- a/sfx2/source/dialog/basedlgs.cxx +++ b/sfx2/source/dialog/basedlgs.cxx @@ -176,8 +176,8 @@ short SfxModalDialog::Execute() SfxViewShell* pViewShell = SfxViewShell::Current(); if (comphelper::LibreOfficeKit::isActive() && pViewShell) { - pViewShell->RegisterDlg(GetLOKWindowId(), this); SetLOKNotifier(pViewShell); + pViewShell->RegisterDlg(GetLOKWindowId(), this); const Size aSize = GetOptimalSize(); std::vector<vcl::LOKPayloadItem> aItems; aItems.emplace_back(std::make_pair("size", aSize.toString())); @@ -248,8 +248,8 @@ void SfxModelessDialog::StateChanged( StateChangedType nStateChange ) SfxViewShell* pViewShell = SfxViewShell::Current(); if (comphelper::LibreOfficeKit::isActive() && pViewShell) { - pViewShell->RegisterDlg(GetLOKWindowId(), this); SetLOKNotifier(pViewShell); + pViewShell->RegisterDlg(GetLOKWindowId(), this); // Below method doesn't really give the exact dimensions, // Check GetSizePixel() ? const Size aOptimalSize = GetOptimalSize(); |