From f08b066f3c6a80fe3daa430f9099aae8b0850e80 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Wed, 4 Dec 2019 09:14:58 +0000 Subject: drop newly unused SfxFloatingWindow MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I8ac3957579c76a89b9692bdb50cbe7a56e1693e3 Reviewed-on: https://gerrit.libreoffice.org/84444 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- include/sfx2/basedlgs.hxx | 38 -------------------------------------- include/sfx2/childwin.hxx | 8 -------- include/sfx2/tabdlg.hxx | 1 + 3 files changed, 1 insertion(+), 46 deletions(-) (limited to 'include') diff --git a/include/sfx2/basedlgs.hxx b/include/sfx2/basedlgs.hxx index fedaa598109c..92da31ed12af 100644 --- a/include/sfx2/basedlgs.hxx +++ b/include/sfx2/basedlgs.hxx @@ -23,7 +23,6 @@ #include #include #include -#include #include class SfxTabPage; @@ -83,43 +82,6 @@ public: SfxBindings& GetBindings() const { return *m_pBindings; } }; -// class SfxFloatingWindow -------------------------------------------------- -class SfxFloatingWindow_Impl; -class SFX2_DLLPUBLIC SfxFloatingWindow: public FloatingWindow -{ - SfxBindings* pBindings; - Size aSize; - std::unique_ptr< SfxFloatingWindow_Impl > pImpl; - - SfxFloatingWindow(SfxFloatingWindow const &) = delete; - SfxFloatingWindow& operator =(SfxFloatingWindow const &) = delete; - -protected: - SfxFloatingWindow( SfxBindings *pBindings, - SfxChildWindow *pCW, - vcl::Window* pParent, - WinBits nWinBits); - virtual ~SfxFloatingWindow() override; - virtual void dispose() override; - - virtual void StateChanged( StateChangedType nStateChange ) override; - virtual bool Close() override; - virtual void Resize() override; - virtual void Move() override; - virtual bool EventNotify( NotifyEvent& rNEvt ) override; - SfxBindings& GetBindings() - { return *pBindings; } - -public: - virtual void FillInfo(SfxChildWinInfo&) const; - void Initialize (SfxChildWinInfo const * pInfo); - - DECL_LINK(TimerHdl, Timer *, void); - -}; - -// class SfxNoLayoutSingleTabDialog -------------------------------------------------- - typedef const sal_uInt16* (*GetTabPageRanges)(); // provides international Which values class SFX2_DLLPUBLIC SfxOkDialogController : public SfxDialogController diff --git a/include/sfx2/childwin.hxx b/include/sfx2/childwin.hxx index f5e64fdfedf3..68279262d11d 100644 --- a/include/sfx2/childwin.hxx +++ b/include/sfx2/childwin.hxx @@ -272,14 +272,6 @@ public: sal_uInt16 Class::GetChildWindowId () \ { return MyID; } \ -#define SFX_IMPL_FLOATINGWINDOW(Class, MyID) \ - SFX_IMPL_CHILDWINDOW(Class, MyID) \ - SfxChildWinInfo Class::GetInfo() const \ - { \ - SfxChildWinInfo aInfo = SfxChildWindow::GetInfo(); \ - static_cast(GetWindow())->FillInfo( aInfo ); \ - return aInfo; } - #define SFX_IMPL_MODELESSDIALOGCONTOLLER(Class, MyID) \ SFX_IMPL_CHILDWINDOW(Class, MyID) \ SfxChildWinInfo Class::GetInfo() const \ diff --git a/include/sfx2/tabdlg.hxx b/include/sfx2/tabdlg.hxx index 325bfb8b4b4b..b8229ca338a0 100644 --- a/include/sfx2/tabdlg.hxx +++ b/include/sfx2/tabdlg.hxx @@ -24,6 +24,7 @@ #include #include #include +#include #include #include #include -- cgit