diff options
| author | Pranav Kant <pranavk@collabora.co.uk> | 2017-12-01 13:54:45 +0530 |
|---|---|---|
| committer | Pranav Kant <pranavk@collabora.co.uk> | 2017-12-04 17:14:02 +0530 |
| commit | b5e27fd809845577a90cc1811de062c070110078 (patch) | |
| tree | 679cb1c3712b6b0a5b693dfa9990e6de8592cc62 /include/vcl | |
| parent | 3d8154ec427777eadf5719f194662e5ade78fae5 (diff) | |
lokdialog: Simplify; make the LOK dialog API more generic
Merge the dialog floating window callbacks and function calls into one.
Unique window ids across vcl::Window is enough to distinguish between
them.
Floating windows don't have a LOK notifier as they are created in the
vcl itself (so we can't access them from sfx2). Use the parent LOK
notifier in that case (which would be a dialog).
This API should also help in autopopup filter tunneling later.
Change-Id: I63a2c97ffdd84695dc967e14c793089a7c50b41b
Diffstat (limited to 'include/vcl')
| -rw-r--r-- | include/vcl/IDialogRenderable.hxx | 2 | ||||
| -rw-r--r-- | include/vcl/dialog.hxx | 2 | ||||
| -rw-r--r-- | include/vcl/floatwin.hxx | 2 | ||||
| -rw-r--r-- | include/vcl/window.hxx | 1 |
4 files changed, 2 insertions, 5 deletions
diff --git a/include/vcl/IDialogRenderable.hxx b/include/vcl/IDialogRenderable.hxx index 281d04385aee..ef8d42a4a46c 100644 --- a/include/vcl/IDialogRenderable.hxx +++ b/include/vcl/IDialogRenderable.hxx @@ -34,8 +34,6 @@ public: virtual void notifyWindow(vcl::LOKWindowId nLOKWindowId, const OUString& rAction, const std::vector<LOKPayloadItem>& rPayload = std::vector<LOKPayloadItem>()) const = 0; - - virtual void notifyWindowChild(vcl::LOKWindowId nLOKWindowId, const OUString& rAction, const Point& rPos) const = 0; }; } // namespace vcl diff --git a/include/vcl/dialog.hxx b/include/vcl/dialog.hxx index f8c58122396d..3da4ec0cb59a 100644 --- a/include/vcl/dialog.hxx +++ b/include/vcl/dialog.hxx @@ -75,8 +75,6 @@ protected: public: SAL_DLLPRIVATE bool IsInClose() const { return mbInClose; } virtual void doDeferredInit(WinBits nBits) override; - void InvalidateFloatingWindow(const Point& rPos); - void CloseFloatingWindow(); protected: explicit Dialog( WindowType nType ); diff --git a/include/vcl/floatwin.hxx b/include/vcl/floatwin.hxx index f0faa3c3e260..6ebb5c84cf37 100644 --- a/include/vcl/floatwin.hxx +++ b/include/vcl/floatwin.hxx @@ -129,7 +129,7 @@ public: SAL_DLLPRIVATE tools::Rectangle& ImplGetItemEdgeClipRect(); SAL_DLLPRIVATE bool ImplIsInPrivatePopupMode() const { return mbInPopupMode; } virtual void doDeferredInit(WinBits nBits) override; - virtual void LogicInvalidate(const tools::Rectangle* pRectangle) override; + void LogicInvalidate(const tools::Rectangle* pRectangle) override; public: explicit FloatingWindow(vcl::Window* pParent, WinBits nStyle); diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx index 603e7307291f..f7c4e6e09dfd 100644 --- a/include/vcl/window.hxx +++ b/include/vcl/window.hxx @@ -1207,6 +1207,7 @@ public: void SetLOKNotifier(const vcl::ILibreOfficeKitNotifier* pNotifier); const vcl::ILibreOfficeKitNotifier* GetLOKNotifier() const; vcl::LOKWindowId GetLOKWindowId() const; + vcl::Window* GetParentWithLOKNotifier(); /// Indicate that LOK is not going to use this dialog any more. void ReleaseLOKNotifier(); |