diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2021-02-26 17:32:29 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2021-02-27 20:14:36 +0100 |
| commit | 15b86b9dc15afbb5cc3c318f57f500a6a77b67c9 (patch) | |
| tree | 2a2554cc42af634e7da15e9daff8240413d8a82d /include | |
| parent | 6d21adad1cf0c6b5a61e7540af9d0f6bdaff099b (diff) | |
hide some FloatingWindow details
Change-Id: I1dc8cb7adc9a26efb74634353b9d75286e31ebb7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111663
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/sfx2/childwin.hxx | 3 | ||||
| -rw-r--r-- | include/vcl/dockwin.hxx | 6 | ||||
| -rw-r--r-- | include/vcl/floatwin.hxx | 1 | ||||
| -rw-r--r-- | include/vcl/syswin.hxx | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/include/sfx2/childwin.hxx b/include/sfx2/childwin.hxx index 3a945b47b1de..fd614a06d632 100644 --- a/include/sfx2/childwin.hxx +++ b/include/sfx2/childwin.hxx @@ -112,7 +112,6 @@ struct SFX2_DLLPUBLIC SfxChildWinFactory ~SfxChildWinFactory(); }; -class FloatingWindow; struct SfxChildWindow_Impl; class SFX2_DLLPUBLIC SfxChildWindowContext { @@ -133,7 +132,7 @@ public: sal_uInt16 GetContextId() const { return nContextId; } - static FloatingWindow* GetFloatingWindow(vcl::Window *pParent); + static SystemWindow* GetFloatingWindow(vcl::Window *pParent); static void RegisterChildWindowContext(SfxModule*, sal_uInt16, std::unique_ptr<SfxChildWinContextFactory>); }; diff --git a/include/vcl/dockwin.hxx b/include/vcl/dockwin.hxx index 7315ca9d4f6c..48116e42d11c 100644 --- a/include/vcl/dockwin.hxx +++ b/include/vcl/dockwin.hxx @@ -69,7 +69,7 @@ struct EndPopupModeData * All DockingWindows should be converted the new class. */ -class ImplDockingWindowWrapper final +class VCL_DLLPUBLIC ImplDockingWindowWrapper final { friend class ::vcl::Window; friend class DockingManager; @@ -155,7 +155,7 @@ public: void SetFloatingMode( bool bFloatMode ); bool IsFloatingMode() const; - FloatingWindow* GetFloatingWindow() const { return mpFloatWin; } + SystemWindow* GetFloatingWindow() const; void SetFloatStyle( WinBits nWinStyle ); WinBits GetFloatStyle() const { return mnFloatBits;} @@ -308,7 +308,7 @@ public: void SetFloatingMode( bool bFloatMode ); bool IsFloatingMode() const; - FloatingWindow* GetFloatingWindow() const { return mpFloatWin; } + SystemWindow* GetFloatingWindow() const; void SetFloatingPos( const Point& rNewPos ); Point GetFloatingPos() const; diff --git a/include/vcl/floatwin.hxx b/include/vcl/floatwin.hxx index 1c715a46cbc7..ad87e036b0c4 100644 --- a/include/vcl/floatwin.hxx +++ b/include/vcl/floatwin.hxx @@ -132,7 +132,6 @@ public: void SetPopupModeEndHdl( const Link<FloatingWindow*,void>& rLink ) { maPopupModeEndHdl = rLink; } bool GrabsFocus() const { return mbGrabFocus; } - bool UpdatePositionData(); static Point CalcFloatingPosition( vcl::Window* pWindow, const tools::Rectangle& rRect, FloatWinPopupFlags nFlags, sal_uInt16& rArrangeIndex ); }; diff --git a/include/vcl/syswin.hxx b/include/vcl/syswin.hxx index f8d1683bd490..7c6f279b7037 100644 --- a/include/vcl/syswin.hxx +++ b/include/vcl/syswin.hxx @@ -235,6 +235,8 @@ public: void SetApplicationID( const OUString &rApplicationID ); + bool UpdatePositionData(); + void SetCloseHdl(const Link<SystemWindow&,void>& rLink); const Link<SystemWindow&,void>& GetCloseHdl() const; |