diff options
| author | Noel Grandin <noel@peralex.com> | 2014-09-23 11:20:40 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2014-09-23 14:11:39 +0300 |
| commit | 827c46e7d75000cb03b0ce21759f9d0825f0c096 (patch) | |
| tree | 3a84ccc45d54607c61328b18f58f914c1d6ec240 /include/avmedia/mediaplayer.hxx | |
| parent | 7cbbefae224ab85343accb42b03f9431ec693a83 (diff) | |
fdo#82577: Handle Window
Put the VCL Window class in the vcl namespace. Avoids clash with the X11
Window typedef.
Change-Id: Ib1beb7ab4ad75562a42aeb252732a073d25eff1a
Diffstat (limited to 'include/avmedia/mediaplayer.hxx')
| -rw-r--r-- | include/avmedia/mediaplayer.hxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/avmedia/mediaplayer.hxx b/include/avmedia/mediaplayer.hxx index e7c16c8c67d9..52d351ec6e12 100644 --- a/include/avmedia/mediaplayer.hxx +++ b/include/avmedia/mediaplayer.hxx @@ -31,7 +31,7 @@ namespace avmedia class AVMEDIA_DLLPUBLIC MediaPlayer : public SfxChildWindow { public: - MediaPlayer( Window*, sal_uInt16, SfxBindings*, SfxChildWinInfo* ); + MediaPlayer( vcl::Window*, sal_uInt16, SfxBindings*, SfxChildWinInfo* ); virtual ~MediaPlayer(); SFX_DECL_CHILDWINDOW_WITHID( MediaPlayer ); @@ -43,7 +43,7 @@ class AVMEDIA_DLLPUBLIC MediaFloater : public SfxDockingWindow { public: - MediaFloater( SfxBindings* pBindings, SfxChildWindow* pCW, Window* pParent ); + MediaFloater( SfxBindings* pBindings, SfxChildWindow* pCW, vcl::Window* pParent ); virtual ~MediaFloater(); void setURL( const OUString& rURL, const OUString& rReferer, bool bPlayImmediately ); |