diff options
| -rw-r--r-- | avmedia/source/viewer/mediawindow_impl.cxx | 2 | ||||
| -rw-r--r-- | include/vcl/cmdevt.hxx | 6 | ||||
| -rw-r--r-- | svtools/source/brwbox/datwin.cxx | 2 | ||||
| -rw-r--r-- | svx/source/sdr/contact/sdrmediawindow.cxx | 2 | ||||
| -rw-r--r-- | sw/source/uibase/docvw/edtwin.cxx | 2 | ||||
| -rw-r--r-- | vcl/source/window/event.cxx | 2 |
6 files changed, 8 insertions, 8 deletions
diff --git a/avmedia/source/viewer/mediawindow_impl.cxx b/avmedia/source/viewer/mediawindow_impl.cxx index 21bd7c5a14cd..e5fffff82aeb 100644 --- a/avmedia/source/viewer/mediawindow_impl.cxx +++ b/avmedia/source/viewer/mediawindow_impl.cxx @@ -151,7 +151,7 @@ void MediaChildWindow::KeyUp( const KeyEvent& rKEvt ) void MediaChildWindow::Command( const CommandEvent& rCEvt ) { const CommandEvent aTransformedEvent( GetParent()->ScreenToOutputPixel( OutputToScreenPixel( rCEvt.GetMousePosPixel() ) ), - rCEvt.GetCommand(), rCEvt.IsMouseEvent(), rCEvt.GetData() ); + rCEvt.GetCommand(), rCEvt.IsMouseEvent(), rCEvt.GetEventData() ); SystemChildWindow::Command( rCEvt ); GetParent()->Command( aTransformedEvent ); diff --git a/include/vcl/cmdevt.hxx b/include/vcl/cmdevt.hxx index 439e9692d9e4..bd4df39d234d 100644 --- a/include/vcl/cmdevt.hxx +++ b/include/vcl/cmdevt.hxx @@ -358,7 +358,7 @@ class VCL_DLLPUBLIC CommandEvent private: Point maPos; void* mpData; - sal_uInt16 mnCommand; + sal_uInt16 mnCommand; bool mbMouseEvent; public: @@ -366,10 +366,10 @@ public: CommandEvent( const Point& rMousePos, sal_uInt16 nCmd, bool bMEvt = false, const void* pCmdData = NULL ); - sal_uInt16 GetCommand() const { return mnCommand; } + sal_uInt16 GetCommand() const { return mnCommand; } const Point& GetMousePosPixel() const { return maPos; } bool IsMouseEvent() const { return mbMouseEvent; } - void* GetData() const { return mpData; } + void* GetEventData() const { return mpData; } const CommandExtTextInputData* GetExtTextInputData() const; const CommandInputContextData* GetInputContextChangeData() const; diff --git a/svtools/source/brwbox/datwin.cxx b/svtools/source/brwbox/datwin.cxx index c5a9ae217590..a3dd14049979 100644 --- a/svtools/source/brwbox/datwin.cxx +++ b/svtools/source/brwbox/datwin.cxx @@ -420,7 +420,7 @@ void BrowserDataWin::Command( const CommandEvent& rEvt ) aEventPos.Y() += GetParent()->GetTitleHeight(); CommandEvent aEvt( aEventPos, rEvt.GetCommand(), - rEvt.IsMouseEvent(), rEvt.GetData() ); + rEvt.IsMouseEvent(), rEvt.GetEventData() ); bInCommand = true; GetParent()->Command( aEvt ); if( bInDtor ) diff --git a/svx/source/sdr/contact/sdrmediawindow.cxx b/svx/source/sdr/contact/sdrmediawindow.cxx index 3313eedf53a2..9c24087d72d6 100644 --- a/svx/source/sdr/contact/sdrmediawindow.cxx +++ b/svx/source/sdr/contact/sdrmediawindow.cxx @@ -117,7 +117,7 @@ void SdrMediaWindow::Command( const CommandEvent& rCEvt ) if( pWindow && getWindow() ) { const CommandEvent aTransformedEvent( pWindow->ScreenToOutputPixel( getWindow()->OutputToScreenPixel( rCEvt.GetMousePosPixel() ) ), - rCEvt.GetCommand(), rCEvt.IsMouseEvent(), rCEvt.GetData() ); + rCEvt.GetCommand(), rCEvt.IsMouseEvent(), rCEvt.GetEventData() ); pWindow->Command( aTransformedEvent ); } diff --git a/sw/source/uibase/docvw/edtwin.cxx b/sw/source/uibase/docvw/edtwin.cxx index 5e3033bea3e4..61d1093871a1 100644 --- a/sw/source/uibase/docvw/edtwin.cxx +++ b/sw/source/uibase/docvw/edtwin.cxx @@ -5383,7 +5383,7 @@ void SwEditWin::Command( const CommandEvent& rCEvt ) break; case COMMAND_MODKEYCHANGE : { - const CommandModKeyData* pCommandData = (const CommandModKeyData*)rCEvt.GetData(); + const CommandModKeyData* pCommandData = static_cast<const CommandModKeyData*>(rCEvt.GetEventData()); if(pCommandData->IsMod1() && !pCommandData->IsMod2()) { sal_uInt16 nSlot = 0; diff --git a/vcl/source/window/event.cxx b/vcl/source/window/event.cxx index 01fb32213ff8..091165c5181d 100644 --- a/vcl/source/window/event.cxx +++ b/vcl/source/window/event.cxx @@ -317,7 +317,7 @@ CommandEvent ImplTranslateCommandEvent( const CommandEvent& rCEvt, vcl::Window* Point aPos = pSource->OutputToScreenPixel( rCEvt.GetMousePosPixel() ); aPos = pDest->ScreenToOutputPixel( aPos ); - return CommandEvent( aPos, rCEvt.GetCommand(), rCEvt.IsMouseEvent(), rCEvt.GetData() ); + return CommandEvent( aPos, rCEvt.GetCommand(), rCEvt.IsMouseEvent(), rCEvt.GetEventData() ); } void Window::ImplNotifyKeyMouseCommandEventListeners( NotifyEvent& rNEvt ) |