diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2020-02-12 16:27:06 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2020-02-13 09:49:00 +0100 |
| commit | 9733174ea00e525c91b4edf1bbc6ab4897f5fbf8 (patch) | |
| tree | 57ce3beb1d5d8f8089cb509f9f118ce05aec1d3a /avmedia/inc | |
| parent | b8d0c50eff51ebe919680a2023ae807973674f75 (diff) | |
inherit MediaControl from InterimItemWindow
to de-dup some code
Change-Id: I8bf20d4b57f3ec7bd2902f01e11278da8ded194b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88550
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'avmedia/inc')
| -rw-r--r-- | avmedia/inc/mediacontrol.hxx | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/avmedia/inc/mediacontrol.hxx b/avmedia/inc/mediacontrol.hxx index 9899418a6052..254c29dbc434 100644 --- a/avmedia/inc/mediacontrol.hxx +++ b/avmedia/inc/mediacontrol.hxx @@ -21,7 +21,7 @@ #include <avmedia/mediaitem.hxx> -#include <vcl/ctrl.hxx> +#include <sfx2/InterimItemWindow.hxx> #include <vcl/timer.hxx> #include <vcl/idle.hxx> #include <vcl/weld.hxx> @@ -34,15 +34,13 @@ namespace avmedia class MediaItem; -class MediaControl : public Control, public MediaControlBase +class MediaControl : public InterimItemWindow, public MediaControlBase { public: MediaControl( vcl::Window* pParent, MediaControlStyle eControlStyle ); virtual ~MediaControl() override; virtual void dispose() override; - Size getMinSizePixel() const; - void setState( const MediaItem& rItem ); void UpdateURLField( MediaItem const & maItem ); @@ -51,7 +49,6 @@ protected: virtual void update() = 0; virtual void execute( const MediaItem& rItem ) = 0; - virtual void Resize() override; virtual void InitializeWidgets() override; std::unique_ptr<weld::Label> mxMediaPath; @@ -64,10 +61,6 @@ private: DECL_LINK(implZoomSelectHdl, weld::ComboBox&, void); DECL_LINK(implTimeoutHdl, Timer*, void); - std::unique_ptr<weld::Builder> m_xBuilder; - VclPtr<vcl::Window> m_xVclContentArea; - std::unique_ptr<weld::Container> m_xContainer; - Idle maIdle; Idle maChangeTimeIdle; MediaItem maItem; |