diff options
Diffstat (limited to 'include/avmedia')
| -rw-r--r-- | include/avmedia/mediaplayer.hxx | 1 | ||||
| -rw-r--r-- | include/avmedia/mediatoolbox.hxx | 2 | ||||
| -rw-r--r-- | include/avmedia/mediawindow.hxx | 3 |
3 files changed, 4 insertions, 2 deletions
diff --git a/include/avmedia/mediaplayer.hxx b/include/avmedia/mediaplayer.hxx index 101c6c623dfc..bb24bd08ff0a 100644 --- a/include/avmedia/mediaplayer.hxx +++ b/include/avmedia/mediaplayer.hxx @@ -45,6 +45,7 @@ public: MediaFloater( SfxBindings* pBindings, SfxChildWindow* pCW, vcl::Window* pParent ); virtual ~MediaFloater(); + virtual void dispose() SAL_OVERRIDE; void setURL( const OUString& rURL, const OUString& rReferer, bool bPlayImmediately ); diff --git a/include/avmedia/mediatoolbox.hxx b/include/avmedia/mediatoolbox.hxx index 4c512979288a..fb61d33b865f 100644 --- a/include/avmedia/mediatoolbox.hxx +++ b/include/avmedia/mediatoolbox.hxx @@ -45,7 +45,7 @@ public: virtual ~MediaToolBoxControl(); virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) SAL_OVERRIDE; - virtual vcl::Window* CreateItemWindow( vcl::Window* pParent ) SAL_OVERRIDE; + virtual VclPtr<vcl::Window> CreateItemWindow( vcl::Window* pParent ) SAL_OVERRIDE; private: diff --git a/include/avmedia/mediawindow.hxx b/include/avmedia/mediawindow.hxx index b17ffe4afbc8..3eeb7078552b 100644 --- a/include/avmedia/mediawindow.hxx +++ b/include/avmedia/mediawindow.hxx @@ -28,6 +28,7 @@ #include <com/sun/star/graphic/XGraphic.hpp> #include <com/sun/star/uno/XInterface.hpp> #include <vcl/bitmapex.hxx> +#include <vcl/vclptr.hxx> #include <avmedia/avmediadllapi.h> #define AVMEDIA_FRAMEGRABBER_DEFAULTFRAME -1.0 @@ -115,7 +116,7 @@ namespace avmedia MediaWindow& operator =( const MediaWindow& ) SAL_DELETED_FUNCTION; ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > mxIFace; - std::unique_ptr<priv::MediaWindowImpl> mpImpl; + VclPtr<priv::MediaWindowImpl> mpImpl; }; } |