diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2019-12-04 09:14:58 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2019-12-09 13:28:46 +0100 |
| commit | f08b066f3c6a80fe3daa430f9099aae8b0850e80 (patch) | |
| tree | 520bdfa03790c544ac91e0872933a9e9a05e9289 /include | |
| parent | 1efeb17837c22499f00299c033ae59ba3910f7d7 (diff) | |
drop newly unused SfxFloatingWindow
Change-Id: I8ac3957579c76a89b9692bdb50cbe7a56e1693e3
Reviewed-on: https://gerrit.libreoffice.org/84444
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/sfx2/basedlgs.hxx | 38 | ||||
| -rw-r--r-- | include/sfx2/childwin.hxx | 8 | ||||
| -rw-r--r-- | include/sfx2/tabdlg.hxx | 1 |
3 files changed, 1 insertions, 46 deletions
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 <sal/config.h> #include <sfx2/dllapi.h> #include <sal/types.h> -#include <vcl/floatwin.hxx> #include <vcl/weld.hxx> 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<SfxFloatingWindow*>(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 <sfx2/dllapi.h> #include <sfx2/basedlgs.hxx> #include <sal/types.h> +#include <vcl/bitmapex.hxx> #include <vcl/builderpage.hxx> #include <svl/itempool.hxx> #include <svl/itemset.hxx> |