diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-10-14 11:52:35 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-10-14 12:53:01 +0200 |
| commit | 3e6c930842eea53a1faa0721c0807e07466c8fb2 (patch) | |
| tree | 841dc0febaecc3d569ae759852d18d916da23b16 /sfx2/source/inc/workwin.hxx | |
| parent | 11570275c601496bd709da1454cd8ffde50823e7 (diff) | |
loplugin:mergeclasses merge SfxWorkWindow with SfxFrameWorkWin_Impl
Change-Id: If6cab49904fdb044d85a4fd29f79faa7b52c9959
Diffstat (limited to 'sfx2/source/inc/workwin.hxx')
| -rw-r--r-- | sfx2/source/inc/workwin.hxx | 23 |
1 files changed, 7 insertions, 16 deletions
diff --git a/sfx2/source/inc/workwin.hxx b/sfx2/source/inc/workwin.hxx index 78fe13049ca9..d0fe42d5c8c4 100644 --- a/sfx2/source/inc/workwin.hxx +++ b/sfx2/source/inc/workwin.hxx @@ -222,6 +222,8 @@ protected: OUString m_aTbxTypeName; OUString m_aProgressBarResName; css::uno::Reference< css::lang::XComponent > m_xLayoutManagerListener; + SfxFrame* pMasterFrame; + SfxFrame* pFrame; protected: void CreateChildWin_Impl(SfxChildWin_Impl*,bool); @@ -229,13 +231,13 @@ protected: void Sort_Impl(); SfxChild_Impl* FindChild_Impl( const vcl::Window& rWindow ) const; bool RequestTopToolSpacePixel_Impl( SvBorder aBorder ); - virtual Rectangle GetTopRect_Impl(); + Rectangle GetTopRect_Impl(); SvBorder Arrange_Impl(); void SaveStatus_Impl(SfxChildWindow*, const SfxChildWinInfo&); static bool IsPluginMode( SfxObjectShell* pObjShell ); public: - SfxWorkWindow( vcl::Window *pWin, SfxBindings& rBindings, SfxWorkWindow* pParent = nullptr); + SfxWorkWindow( vcl::Window* pWin, SfxFrame* pFrm, SfxFrame* pMaster ); virtual ~SfxWorkWindow(); SfxBindings& GetBindings() { return *pBindings; } @@ -260,7 +262,7 @@ public: void ShowChildren_Impl(); void HideChildren_Impl(); bool PrepareClose_Impl(); - virtual void ArrangeChildren_Impl( bool bForce = true ); + void ArrangeChildren_Impl( bool bForce = true ); void DeleteControllers_Impl(); void HidePopups_Impl(bool bHide, bool bParent, sal_uInt16 nId=0); void ConfigChild_Impl(SfxChildIdentifier, @@ -272,7 +274,8 @@ public: void SetFullScreen_Impl( bool bSet ) { bIsFullScreen = bSet; } // Methods for Objectbars - virtual void UpdateObjectBars_Impl(); + void UpdateObjectBars_Impl(); + void UpdateObjectBars_Impl2(); void ResetObjectBars_Impl(); void SetObjectBar_Impl(sal_uInt16 nPos, sal_uInt32 nResId, SfxInterface *pIFace); @@ -307,18 +310,6 @@ public: css::uno::Reference< css::frame::XFrame > GetFrameInterface(); }; -class SfxFrameWorkWin_Impl : public SfxWorkWindow -{ - SfxFrame* pMasterFrame; - SfxFrame* pFrame; -public: - SfxFrameWorkWin_Impl( vcl::Window* pWin, SfxFrame* pFrm, SfxFrame* pMaster ); - virtual void ArrangeChildren_Impl( bool bForce = true ) override; - virtual void UpdateObjectBars_Impl() override; - virtual Rectangle GetTopRect_Impl() override; -}; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |