diff options
| author | Pranav Kant <pranavk@collabora.co.uk> | 2017-10-26 13:39:06 -0700 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2017-11-15 17:07:16 +0100 |
| commit | df8f50170b502a8ad4a528507740f4f15ce1bc6d (patch) | |
| tree | d68537eda1b146fe7ce3a7e89a96592787e574a3 /sfx2 | |
| parent | 1418849287f07443603feefe11c0aa51fc312c06 (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')
| -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 7ae0e65459bd..8128f88fef10 100644 --- a/sfx2/source/view/lokhelper.cxx +++ b/sfx2/source/view/lokhelper.cxx @@ -134,7 +134,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(); @@ -151,7 +151,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(); |