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 /include | |
| 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 'include')
| -rw-r--r-- | include/vcl/dialog.hxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/vcl/dialog.hxx b/include/vcl/dialog.hxx index 9130ee2e46cd..4ae5e040103a 100644 --- a/include/vcl/dialog.hxx +++ b/include/vcl/dialog.hxx @@ -76,7 +76,8 @@ private: protected: using Window::ImplInit; SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle, InitFlag eFlag = InitFlag::Default ); - OUString maID; // identifier for this dialog + OUString maID; // Dialog ID (UNO name) for this dialog (set + // and used by LOK for now) public: SAL_DLLPRIVATE bool IsInClose() const { return mbInClose; } @@ -87,7 +88,7 @@ public: Size PaintActiveFloatingWindow(VirtualDevice& rDevice); /// Necessary to register dialog renderable instance to emit LOK callbacks - void registerDialogRenderable(vcl::IDialogRenderable* pDialogRenderable); + void registerDialogRenderable(vcl::IDialogRenderable* pDialogRenderable, const OUString& aDialogId); /// Paints the current dialog to the given virtual device void paintDialog(VirtualDevice& rDevice); void LogicMouseButtonDown(const MouseEvent& rMouseEvent); |