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 /vcl | |
| 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 'vcl')
| -rw-r--r-- | vcl/source/window/dialog.cxx | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx index a8b63bc59a72..4ff9d42896a1 100644 --- a/vcl/source/window/dialog.cxx +++ b/vcl/source/window/dialog.cxx @@ -527,7 +527,6 @@ void Dialog::doDeferredInit(WinBits nBits) Dialog::Dialog(vcl::Window* pParent, const OUString& rID, const OUString& rUIXMLDescription) : SystemWindow(WINDOW_DIALOG) , mnInitFlag(InitFlag::Default) - , maID(rID) { ImplInitDialogData(); loadUI(pParent, OUStringToOString(rID, RTL_TEXTENCODING_UTF8), rUIXMLDescription); @@ -536,7 +535,6 @@ Dialog::Dialog(vcl::Window* pParent, const OUString& rID, const OUString& rUIXML Dialog::Dialog(vcl::Window* pParent, const OUString& rID, const OUString& rUIXMLDescription, WindowType nType, InitFlag eFlag) : SystemWindow(nType) , mnInitFlag(eFlag) - , maID(rID) { ImplInitDialogData(); loadUI(pParent, OUStringToOString(rID, RTL_TEXTENCODING_UTF8), rUIXMLDescription); @@ -877,11 +875,12 @@ bool Dialog::selectPageByUIXMLDescription(const OString& /*rUIXMLDescription*/) return true; } -void Dialog::registerDialogRenderable(vcl::IDialogRenderable* pDialogRenderable) +void Dialog::registerDialogRenderable(vcl::IDialogRenderable* pDialogRenderable, const OUString& aDialogId) { if (pDialogRenderable && !mpDialogRenderable) { mpDialogRenderable = pDialogRenderable; + maID = aDialogId; } } |