diff options
| author | Pranav Kant <pranavk@collabora.co.uk> | 2017-10-26 13:39:06 -0700 |
|---|---|---|
| committer | pranavk <pranavk@collabora.co.uk> | 2017-10-28 17:06:22 +0200 |
| commit | 1a1ee7803d8f17532fb2149fcc386cc70720eef0 (patch) | |
| tree | c08410e3bfc6548a4531e9ca35e528129f26de8f /sfx2/source | |
| parent | 149b613ccfa929265df98fc534cc724264fbb776 (diff) | |
lokdialog: Use UNO name as dialog id when invoking lok callbacks
... not the frame id from the .ui file
Remove temporary hacks introduced earlier in GTV also.
Change-Id: I71290a5fac6547a5584094da21e2301ef8fbce0c
Reviewed-on: https://gerrit.libreoffice.org/43957
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: pranavk <pranavk@collabora.co.uk>
Diffstat (limited to 'sfx2/source')
| -rw-r--r-- | sfx2/source/view/lokhelper.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sfx2/source/view/lokhelper.cxx b/sfx2/source/view/lokhelper.cxx index 702e88d09cf0..eccb3b1bf1f0 100644 --- a/sfx2/source/view/lokhelper.cxx +++ b/sfx2/source/view/lokhelper.cxx @@ -146,7 +146,7 @@ void SfxLokHelper::notifyOtherViews(SfxViewShell* pThisView, int nType, const OS void SfxLokHelper::notifyDialog(const OUString& rDialogID, const OUString& rAction) { - if (SfxLokHelper::getViewsCount() <= 0) + if (SfxLokHelper::getViewsCount() <= 0 || rDialogID.isEmpty()) return; SfxViewShell* pViewShell = SfxViewShell::GetFirst(); @@ -163,7 +163,7 @@ void SfxLokHelper::notifyDialog(const OUString& rDialogID, const OUString& rActi void SfxLokHelper::notifyDialogChild(const OUString& rDialogID, const OUString& rAction, const Point& rPos) { - if (SfxLokHelper::getViewsCount() <= 0) + if (SfxLokHelper::getViewsCount() <= 0 || rDialogID.isEmpty()) return; SfxViewShell* pViewShell = SfxViewShell::GetFirst(); |