diff options
Diffstat (limited to 'vbahelper')
-rw-r--r-- | vbahelper/inc/pch/precompiled_msforms.hxx | 1 | ||||
-rw-r--r-- | vbahelper/inc/pch/precompiled_vbahelper.hxx | 1 | ||||
-rw-r--r-- | vbahelper/source/msforms/vbacontrol.cxx | 11 | ||||
-rw-r--r-- | vbahelper/source/vbahelper/vbahelper.cxx | 6 |
4 files changed, 8 insertions, 11 deletions
diff --git a/vbahelper/inc/pch/precompiled_msforms.hxx b/vbahelper/inc/pch/precompiled_msforms.hxx index 4a3e19b5683f..36752910cc83 100644 --- a/vbahelper/inc/pch/precompiled_msforms.hxx +++ b/vbahelper/inc/pch/precompiled_msforms.hxx @@ -123,7 +123,6 @@ #include <vcl/outdev.hxx> #include <vcl/outdevmap.hxx> #include <vcl/outdevstate.hxx> -#include <vcl/pointr.hxx> #include <vcl/ptrstyle.hxx> #include <vcl/region.hxx> #include <vcl/salnativewidgets.hxx> diff --git a/vbahelper/inc/pch/precompiled_vbahelper.hxx b/vbahelper/inc/pch/precompiled_vbahelper.hxx index 366ffdaca915..5a1fdb822aba 100644 --- a/vbahelper/inc/pch/precompiled_vbahelper.hxx +++ b/vbahelper/inc/pch/precompiled_vbahelper.hxx @@ -60,7 +60,6 @@ #include <vcl/keycodes.hxx> #include <vcl/metric.hxx> #include <vcl/outdev.hxx> -#include <vcl/pointr.hxx> #include <vcl/region.hxx> #include <vcl/salnativewidgets.hxx> #include <vcl/uitest/factory.hxx> diff --git a/vbahelper/source/msforms/vbacontrol.cxx b/vbahelper/source/msforms/vbacontrol.cxx index de81fc5d9fdc..99c6b41fea33 100644 --- a/vbahelper/source/msforms/vbacontrol.cxx +++ b/vbahelper/source/msforms/vbacontrol.cxx @@ -472,14 +472,14 @@ static long lcl_loPointerToMsoPointer( PointerStyle eType ) return nRet; } -static Pointer lcl_msoPointerToLOPointer( long msoPointerStyle ) +static PointerStyle lcl_msoPointerToLOPointer( long msoPointerStyle ) { - Pointer aPointer( PointerStyle::Arrow ); + PointerStyle aPointer( PointerStyle::Arrow ); for ( int i = 0; i < int(SAL_N_ELEMENTS( styles )); ++i ) { if ( styles[ i ].msoPointerStyle == msoPointerStyle ) { - aPointer = Pointer( styles[ i ].loPointStyle ); + aPointer = styles[ i ].loPointStyle; break; } } @@ -493,7 +493,7 @@ ScVbaControl::getMousePointer() VclPtr<vcl::Window> pWindow = VCLUnoHelper::GetWindow( getWindowPeer() ); if ( pWindow ) { - eType = pWindow->GetPointer().GetStyle(); + eType = pWindow->GetPointer(); } return lcl_loPointerToMsoPointer( eType ); } @@ -504,8 +504,7 @@ ScVbaControl::setMousePointer( ::sal_Int32 _mousepointer ) VclPtr<vcl::Window> pWindow = VCLUnoHelper::GetWindow( getWindowPeer() ); if ( pWindow ) { - Pointer aPointer( PointerStyle::Arrow ); - aPointer = lcl_msoPointerToLOPointer( _mousepointer ); + PointerStyle aPointer = lcl_msoPointerToLOPointer( _mousepointer ); pWindow->SetPointer( aPointer ); } } diff --git a/vbahelper/source/vbahelper/vbahelper.cxx b/vbahelper/source/vbahelper/vbahelper.cxx index 5ec3311899f1..34f320b3578b 100644 --- a/vbahelper/source/vbahelper/vbahelper.cxx +++ b/vbahelper/source/vbahelper/vbahelper.cxx @@ -685,7 +685,7 @@ PointerStyle getPointerStyle( const uno::Reference< frame::XModel >& xModel ) // why the heck isn't there an XWindowPeer::getPointer, but a setPointer only? const vcl::Window* pWindow = VCLUnoHelper::GetWindow( xWindow ); if ( pWindow ) - nPointerStyle = pWindow->GetSystemWindow()->GetPointer().GetStyle(); + nPointerStyle = pWindow->GetSystemWindow()->GetPointer(); } catch (const uno::Exception&) { @@ -697,7 +697,7 @@ PointerStyle getPointerStyle( const uno::Reference< frame::XModel >& xModel ) // #FIXME this method looks wrong, shouldn't it just affect calc *or* writer // document/frame/window(s) but not both ( and depending on what api called // this ) -void setCursorHelper( const uno::Reference< frame::XModel >& xModel, const Pointer& rPointer, bool bOverWrite ) +void setCursorHelper( const uno::Reference< frame::XModel >& xModel, PointerStyle nPointer, bool bOverWrite ) { ::std::vector< uno::Reference< frame::XController > > aControllers; @@ -730,7 +730,7 @@ void setCursorHelper( const uno::Reference< frame::XModel >& xModel, const Point if ( !pWindow ) continue; - pWindow->GetSystemWindow()->SetPointer( rPointer ); + pWindow->GetSystemWindow()->SetPointer( nPointer ); pWindow->GetSystemWindow()->EnableChildPointerOverwrite( bOverWrite ); } } |