diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2021-04-07 21:27:44 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2021-04-08 13:23:04 +0200 |
| commit | 396dfdd2164d095e4ec182956b31aca8c3908655 (patch) | |
| tree | cce590ec29f535896d09203b051f79883c808618 /vbahelper | |
| parent | f4c66a2272d890eaa7a6d7429e5bfa7bdb1f7162 (diff) | |
move set/get Pointer to VCLUnoHelper
Change-Id: I7dadc7bc881e0b892720b3eb89fdc60c8d87c541
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113776
Tested-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vbahelper')
| -rw-r--r-- | vbahelper/source/msforms/vbacontrol.cxx | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/vbahelper/source/msforms/vbacontrol.cxx b/vbahelper/source/msforms/vbacontrol.cxx index 66165d9c7ba7..050d27a19823 100644 --- a/vbahelper/source/msforms/vbacontrol.cxx +++ b/vbahelper/source/msforms/vbacontrol.cxx @@ -55,7 +55,6 @@ #include "vbasystemaxcontrol.hxx" #include "vbaimage.hxx" #include <toolkit/helper/vclunohelper.hxx> -#include <vcl/window.hxx> #include <com/sun/star/drawing/XDrawPagesSupplier.hpp> #include <com/sun/star/form/XFormsSupplier.hpp> #include <svx/svdobj.hxx> @@ -494,24 +493,13 @@ static PointerStyle lcl_msoPointerToLOPointer( tools::Long msoPointerStyle ) ::sal_Int32 SAL_CALL ScVbaControl::getMousePointer() { - PointerStyle eType = PointerStyle::Arrow; // default ? - VclPtr<vcl::Window> pWindow = VCLUnoHelper::GetWindow( getWindowPeer() ); - if ( pWindow ) - { - eType = pWindow->GetPointer(); - } - return lcl_loPointerToMsoPointer( eType ); + return lcl_loPointerToMsoPointer(VCLUnoHelper::getMousePointer(getWindowPeer())); } void SAL_CALL ScVbaControl::setMousePointer( ::sal_Int32 _mousepointer ) { - VclPtr<vcl::Window> pWindow = VCLUnoHelper::GetWindow( getWindowPeer() ); - if ( pWindow ) - { - PointerStyle aPointer = lcl_msoPointerToLOPointer( _mousepointer ); - pWindow->SetPointer( aPointer ); - } + VCLUnoHelper::setMousePointer(getWindowPeer(), lcl_msoPointerToLOPointer(_mousepointer)); } void SAL_CALL ScVbaControl::fireEvent( const script::ScriptEvent& rEvt ) |