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 | |
| parent | Disable HTML export "hspace" and "vspace" check on OSX (diff) | |
| download | core-827c46e7d75000cb03b0ce21759f9d0825f0c096.tar.gz core-827c46e7d75000cb03b0ce21759f9d0825f0c096.zip | |
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')
| -rw-r--r-- | include/avmedia/mediaplayer.hxx | 4 | ||||
| -rw-r--r-- | include/avmedia/mediatoolbox.hxx | 2 | ||||
| -rw-r--r-- | include/avmedia/mediawindow.hxx | 10 |
3 files changed, 8 insertions, 8 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 ); diff --git a/include/avmedia/mediatoolbox.hxx b/include/avmedia/mediatoolbox.hxx index 3e4d636ca7d0..4c512979288a 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 Window* CreateItemWindow( Window* pParent ) SAL_OVERRIDE; + virtual vcl::Window* CreateItemWindow( vcl::Window* pParent ) SAL_OVERRIDE; private: diff --git a/include/avmedia/mediawindow.hxx b/include/avmedia/mediawindow.hxx index a42e95efbc40..1ab2c0552fa6 100644 --- a/include/avmedia/mediawindow.hxx +++ b/include/avmedia/mediawindow.hxx @@ -32,7 +32,7 @@ #define AVMEDIA_FRAMEGRABBER_DEFAULTFRAME -1.0 -class Window; +namespace vcl { class Window; } class KeyEvent; class MouseEvent; class CommandEvent; @@ -53,7 +53,7 @@ namespace avmedia class AVMEDIA_DLLPUBLIC MediaWindow { public: - MediaWindow( Window* parent, bool bInternalMediaControl ); + MediaWindow( vcl::Window* parent, bool bInternalMediaControl ); virtual ~MediaWindow(); void setURL( const OUString& rURL, const OUString& rReferer ); @@ -62,7 +62,7 @@ namespace avmedia bool isValid() const; Size getPreferredSize() const; - Window* getWindow() const; + vcl::Window* getWindow() const; void setPosSize( const Rectangle& rNewRect ); @@ -97,9 +97,9 @@ namespace avmedia static void getMediaFilters( FilterNameVector& rFilterNameVector ); /// @param o_pbLink if not 0, this is an "insert" dialog: display link /// checkbox and store its state in *o_pbLink - static bool executeMediaURLDialog( Window* pParent, + static bool executeMediaURLDialog( vcl::Window* pParent, OUString& rURL, bool *const o_pbLink ); - static void executeFormatErrorBox( Window* pParent ); + static void executeFormatErrorBox( vcl::Window* pParent ); static bool isMediaURL( const OUString& rURL, const OUString& rReferer, bool bDeep = false, Size* pPreferredSizePixel = NULL ); static ::com::sun::star::uno::Reference< ::com::sun::star::media::XPlayer > createPlayer( const OUString& rURL, const OUString& rReferer, const OUString* pMimeType = 0 ); |