diff options
| author | Pranav Kant <pranavk@collabora.co.uk> | 2017-11-24 01:20:56 +0530 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2017-11-29 10:16:53 +0100 |
| commit | f3f4c039072657739d2bedb7210f2a22b85fdb55 (patch) | |
| tree | 62c9bb21bee0ac5e497416be7e3b4ba00866aa85 /include/vcl | |
| parent | 2798e1aae5311094c30d8e667c1e8be4e4314f8d (diff) | |
lokdialog: Make vcl::DialogID an integer
This will help launching multiple instances of dialog from multiple
views. The earlier approach of using the UNO command strings as dialog
id would not have been useful for multi-view case.
Change-Id: I01cfb3c8b204d5654df2417efdac6b50dc920f0e
Diffstat (limited to 'include/vcl')
| -rw-r--r-- | include/vcl/IDialogRenderable.hxx | 2 | ||||
| -rw-r--r-- | include/vcl/dialog.hxx | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/include/vcl/IDialogRenderable.hxx b/include/vcl/IDialogRenderable.hxx index 9a63830566f0..f606782692e3 100644 --- a/include/vcl/IDialogRenderable.hxx +++ b/include/vcl/IDialogRenderable.hxx @@ -23,7 +23,7 @@ namespace vcl typedef std::pair<const OString, const OString> LOKPayloadItem; -typedef OUString DialogID; +typedef sal_uInt32 DialogID; class VCL_DLLPUBLIC IDialogRenderable { diff --git a/include/vcl/dialog.hxx b/include/vcl/dialog.hxx index 874828f92a0e..e4d9f88f6d83 100644 --- a/include/vcl/dialog.hxx +++ b/include/vcl/dialog.hxx @@ -59,6 +59,8 @@ private: vcl::IDialogNotifier* mpDialogNotifier; // to emit LOK callbacks + static vcl::DialogID mnLastDialogId; + SAL_DLLPRIVATE void ImplInitDialogData(); SAL_DLLPRIVATE void ImplInitSettings(); SAL_DLLPRIVATE VclPtr<vcl::Window> AddBorderWindow(vcl::Window* pParent, WinBits nBits); @@ -73,8 +75,8 @@ private: protected: using Window::ImplInit; SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle, InitFlag eFlag = InitFlag::Default ); - /// Dialog ID (UNO name) for this dialog - OUString maID; + /// Dialog ID (used for LOK) + vcl::DialogID maID; /// Necessary to register dialog notifier instance to emit LOK callbacks void registerDialogNotifier(vcl::IDialogNotifier* pDialogNotifier); |