diff options
Diffstat (limited to 'avmedia/source/viewer')
-rw-r--r-- | avmedia/source/viewer/mediaevent_impl.cxx | 16 | ||||
-rw-r--r-- | avmedia/source/viewer/mediaevent_impl.hxx | 4 | ||||
-rw-r--r-- | avmedia/source/viewer/mediawindow.cxx | 8 | ||||
-rw-r--r-- | avmedia/source/viewer/mediawindow_impl.cxx | 8 | ||||
-rw-r--r-- | avmedia/source/viewer/mediawindow_impl.hxx | 8 |
5 files changed, 22 insertions, 22 deletions
diff --git a/avmedia/source/viewer/mediaevent_impl.cxx b/avmedia/source/viewer/mediaevent_impl.cxx index b994bd3ecdf1..2db883172d5e 100644 --- a/avmedia/source/viewer/mediaevent_impl.cxx +++ b/avmedia/source/viewer/mediaevent_impl.cxx @@ -30,7 +30,7 @@ namespace avmedia { namespace priv { // - MediaEventListenersImpl - -MediaEventListenersImpl::MediaEventListenersImpl( Window& rEventWindow ) : +MediaEventListenersImpl::MediaEventListenersImpl( vcl::Window& rEventWindow ) : mpNotifyWindow( &rEventWindow ) { } @@ -45,7 +45,7 @@ MediaEventListenersImpl::~MediaEventListenersImpl() void MediaEventListenersImpl::cleanUp() { - Application::RemoveMouseAndKeyEvents( reinterpret_cast< ::Window* >( mpNotifyWindow ) ); + Application::RemoveMouseAndKeyEvents( reinterpret_cast< vcl::Window* >( mpNotifyWindow ) ); mpNotifyWindow = NULL; } @@ -72,7 +72,7 @@ void SAL_CALL MediaEventListenersImpl::keyPressed( const ::com::sun::star::awt:: ( ( e.Modifiers & 4 ) ? KEY_MOD2 : 0 ) ); KeyEvent aVCLKeyEvt( e.KeyChar, aVCLKeyCode ); - Application::PostKeyEvent( VCLEVENT_WINDOW_KEYINPUT, reinterpret_cast< ::Window* >( mpNotifyWindow ), &aVCLKeyEvt ); + Application::PostKeyEvent( VCLEVENT_WINDOW_KEYINPUT, reinterpret_cast< vcl::Window* >( mpNotifyWindow ), &aVCLKeyEvt ); } } @@ -91,7 +91,7 @@ void SAL_CALL MediaEventListenersImpl::keyReleased( const ::com::sun::star::awt: ( ( e.Modifiers & 2 ) ? KEY_MOD1 : 0 ) | ( ( e.Modifiers & 4 ) ? KEY_MOD2 : 0 ) ); KeyEvent aVCLKeyEvt( e.KeyChar, aVCLKeyCode ); - Application::PostKeyEvent( VCLEVENT_WINDOW_KEYUP, reinterpret_cast< ::Window* >( mpNotifyWindow ), &aVCLKeyEvt ); + Application::PostKeyEvent( VCLEVENT_WINDOW_KEYUP, reinterpret_cast< vcl::Window* >( mpNotifyWindow ), &aVCLKeyEvt ); } } @@ -112,7 +112,7 @@ void SAL_CALL MediaEventListenersImpl::mousePressed( const ::com::sun::star::awt ( ( e.Buttons & 2 ) ? MOUSE_RIGHT : 0 ) | ( ( e.Buttons & 4 ) ? MOUSE_MIDDLE : 0 ), e.Modifiers ); - Application::PostMouseEvent( VCLEVENT_WINDOW_MOUSEBUTTONDOWN, reinterpret_cast< ::Window* >( mpNotifyWindow ), &aVCLMouseEvt ); + Application::PostMouseEvent( VCLEVENT_WINDOW_MOUSEBUTTONDOWN, reinterpret_cast< vcl::Window* >( mpNotifyWindow ), &aVCLMouseEvt ); } } @@ -133,7 +133,7 @@ void SAL_CALL MediaEventListenersImpl::mouseReleased( const ::com::sun::star::aw ( ( e.Buttons & 2 ) ? MOUSE_RIGHT : 0 ) | ( ( e.Buttons & 4 ) ? MOUSE_MIDDLE : 0 ), e.Modifiers ); - Application::PostMouseEvent( VCLEVENT_WINDOW_MOUSEBUTTONUP, reinterpret_cast< ::Window* >( mpNotifyWindow ), &aVCLMouseEvt ); + Application::PostMouseEvent( VCLEVENT_WINDOW_MOUSEBUTTONUP, reinterpret_cast< vcl::Window* >( mpNotifyWindow ), &aVCLMouseEvt ); } } @@ -174,7 +174,7 @@ void SAL_CALL MediaEventListenersImpl::mouseDragged( const ::com::sun::star::awt if( mpNotifyWindow ) { MouseEvent aVCLMouseEvt( Point( e.X, e.Y ), 0, 0, e.Buttons, e.Modifiers ); - Application::PostMouseEvent( VCLEVENT_WINDOW_MOUSEMOVE, reinterpret_cast< ::Window* >( mpNotifyWindow ), &aVCLMouseEvt ); + Application::PostMouseEvent( VCLEVENT_WINDOW_MOUSEMOVE, reinterpret_cast< vcl::Window* >( mpNotifyWindow ), &aVCLMouseEvt ); } } @@ -189,7 +189,7 @@ void SAL_CALL MediaEventListenersImpl::mouseMoved( const ::com::sun::star::awt:: if( mpNotifyWindow ) { MouseEvent aVCLMouseEvt( Point( e.X, e.Y ), 0, 0, e.Buttons, e.Modifiers ); - Application::PostMouseEvent( VCLEVENT_WINDOW_MOUSEMOVE, reinterpret_cast< ::Window* >( mpNotifyWindow ), &aVCLMouseEvt ); + Application::PostMouseEvent( VCLEVENT_WINDOW_MOUSEMOVE, reinterpret_cast< vcl::Window* >( mpNotifyWindow ), &aVCLMouseEvt ); } } diff --git a/avmedia/source/viewer/mediaevent_impl.hxx b/avmedia/source/viewer/mediaevent_impl.hxx index 9f551bd2ea51..63e1a0d77ba2 100644 --- a/avmedia/source/viewer/mediaevent_impl.hxx +++ b/avmedia/source/viewer/mediaevent_impl.hxx @@ -41,7 +41,7 @@ namespace avmedia { public: - MediaEventListenersImpl( Window& rNotifyWindow ); + MediaEventListenersImpl( vcl::Window& rNotifyWindow ); virtual ~MediaEventListenersImpl(); void cleanUp(); @@ -69,7 +69,7 @@ namespace avmedia private: - Window* mpNotifyWindow; + vcl::Window* mpNotifyWindow; mutable ::osl::Mutex maMutex; }; } diff --git a/avmedia/source/viewer/mediawindow.cxx b/avmedia/source/viewer/mediawindow.cxx index b824c2dd4217..2e5d92fd8c1d 100644 --- a/avmedia/source/viewer/mediawindow.cxx +++ b/avmedia/source/viewer/mediawindow.cxx @@ -45,7 +45,7 @@ namespace avmedia { // - MediaWindow - -MediaWindow::MediaWindow( Window* parent, bool bInternalMediaControl ) : +MediaWindow::MediaWindow( vcl::Window* parent, bool bInternalMediaControl ) : mpImpl( new priv::MediaWindowImpl( parent, this, bInternalMediaControl ) ) { mpImpl->Show(); @@ -190,7 +190,7 @@ void MediaWindow::hide() -Window* MediaWindow::getWindow() const +vcl::Window* MediaWindow::getWindow() const { return mpImpl.get(); } @@ -236,7 +236,7 @@ void MediaWindow::getMediaFilters( FilterNameVector& rFilterNameVector ) -bool MediaWindow::executeMediaURLDialog(Window* /* pParent */, +bool MediaWindow::executeMediaURLDialog(vcl::Window* /* pParent */, OUString& rURL, bool *const o_pbLink) { ::sfx2::FileDialogHelper aDlg( (o_pbLink) @@ -325,7 +325,7 @@ bool MediaWindow::executeMediaURLDialog(Window* /* pParent */, -void MediaWindow::executeFormatErrorBox( Window* pParent ) +void MediaWindow::executeFormatErrorBox( vcl::Window* pParent ) { MessageDialog aErrBox( pParent, AVMEDIA_RESID( AVMEDIA_STR_ERR_URL ) ); diff --git a/avmedia/source/viewer/mediawindow_impl.cxx b/avmedia/source/viewer/mediawindow_impl.cxx index f4c88561f426..3bd2b46595f5 100644 --- a/avmedia/source/viewer/mediawindow_impl.cxx +++ b/avmedia/source/viewer/mediawindow_impl.cxx @@ -49,7 +49,7 @@ namespace avmedia { namespace priv { // - MediaWindowControl - -MediaWindowControl::MediaWindowControl( Window* pParent ) : +MediaWindowControl::MediaWindowControl( vcl::Window* pParent ) : MediaControl( pParent, MEDIACONTROLSTYLE_MULTILINE ) { } @@ -81,13 +81,13 @@ void MediaWindowControl::execute( const MediaItem& rItem ) // - MediaChildWindow - -MediaChildWindow::MediaChildWindow( Window* pParent ) : +MediaChildWindow::MediaChildWindow( vcl::Window* pParent ) : SystemChildWindow( pParent, WB_CLIPCHILDREN ) { } #if HAVE_FEATURE_GLTF -MediaChildWindow::MediaChildWindow( Window* pParent, SystemWindowData* pData ) : +MediaChildWindow::MediaChildWindow( vcl::Window* pParent, SystemWindowData* pData ) : SystemChildWindow( pParent, WB_CLIPCHILDREN, pData ) { } @@ -161,7 +161,7 @@ void MediaChildWindow::Command( const CommandEvent& rCEvt ) // - MediaWindowImpl - -MediaWindowImpl::MediaWindowImpl( Window* pParent, MediaWindow* pMediaWindow, bool bInternalMediaControl ) : +MediaWindowImpl::MediaWindowImpl( vcl::Window* pParent, MediaWindow* pMediaWindow, bool bInternalMediaControl ) : Control( pParent ), DropTargetHelper( this ), DragSourceHelper( this ), diff --git a/avmedia/source/viewer/mediawindow_impl.hxx b/avmedia/source/viewer/mediawindow_impl.hxx index 7bf7f369143f..ce2c24bb9ab9 100644 --- a/avmedia/source/viewer/mediawindow_impl.hxx +++ b/avmedia/source/viewer/mediawindow_impl.hxx @@ -48,7 +48,7 @@ namespace avmedia { public: - MediaWindowControl( Window* pParent ); + MediaWindowControl( vcl::Window* pParent ); virtual ~MediaWindowControl(); protected: @@ -65,8 +65,8 @@ namespace avmedia { public: - MediaChildWindow( Window* pParent ); - MediaChildWindow( Window* pParent, SystemWindowData* pData ); + MediaChildWindow( vcl::Window* pParent ); + MediaChildWindow( vcl::Window* pParent, SystemWindowData* pData ); virtual ~MediaChildWindow(); protected: @@ -92,7 +92,7 @@ namespace avmedia { public: - MediaWindowImpl( Window* parent, MediaWindow* pMediaWindow, bool bInternalMediaControl ); + MediaWindowImpl( vcl::Window* parent, MediaWindow* pMediaWindow, bool bInternalMediaControl ); virtual ~MediaWindowImpl(); static ::com::sun::star::uno::Reference< ::com::sun::star::media::XPlayer > createPlayer( const OUString& rURL, const OUString& rReferer, const OUString* pMimeType = 0 ); |