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 /vcl/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 'vcl/source')
| -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 de6f1d71f48f..eb196997c4b6 100644 --- a/vcl/source/window/dialog.cxx +++ b/vcl/source/window/dialog.cxx @@ -525,7 +525,6 @@ Dialog::Dialog(vcl::Window* pParent, const OUString& rID, const OUString& rUIXML : SystemWindow(WindowType::DIALOG) , mbForceBorderWindow(false) , mnInitFlag(InitFlag::Default) - , maID(rID) { ImplInitDialogData(); loadUI(pParent, OUStringToOString(rID, RTL_TEXTENCODING_UTF8), rUIXMLDescription); @@ -535,7 +534,6 @@ Dialog::Dialog(vcl::Window* pParent, const OUString& rID, const OUString& rUIXML : SystemWindow(nType) , mbForceBorderWindow(bBorder) , mnInitFlag(eFlag) - , maID(rID) { ImplInitDialogData(); loadUI(pParent, OUStringToOString(rID, RTL_TEXTENCODING_UTF8), rUIXMLDescription); @@ -876,11 +874,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; } } |