diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-02-12 10:12:03 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-02-13 11:00:17 +0100 |
| commit | a2b687a88feedfae0087bfc999b3cf49b9d3d24b (patch) | |
| tree | 1615bf7094f106a4f92ee4aa460599a2c84282bf | |
| parent | tdf#120786: show undocked toolbar only when it's ready (diff) | |
| download | core-a2b687a88feedfae0087bfc999b3cf49b9d3d24b.tar.gz core-a2b687a88feedfae0087bfc999b3cf49b9d3d24b.zip | |
Pointer is pointless
since it is just a wrapper around PointerStyle
Change-Id: I51f065e0d4ad8bd91f5c84c5819048c720a19267
Reviewed-on: https://gerrit.libreoffice.org/67711
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
169 files changed, 509 insertions, 531 deletions
diff --git a/avmedia/source/viewer/mediawindow.cxx b/avmedia/source/viewer/mediawindow.cxx index f1ef17a4b664..4cc6d4e043b4 100644 --- a/avmedia/source/viewer/mediawindow.cxx +++ b/avmedia/source/viewer/mediawindow.cxx @@ -130,9 +130,9 @@ void MediaWindow::setPosSize( const tools::Rectangle& rNewRect ) } -void MediaWindow::setPointer( const Pointer& rPointer ) +void MediaWindow::setPointer( PointerStyle nPointer ) { - mpImpl->setPointer( rPointer ); + mpImpl->setPointer( nPointer ); } diff --git a/avmedia/source/viewer/mediawindow_impl.cxx b/avmedia/source/viewer/mediawindow_impl.cxx index 434e8b42faa7..d76923bf09f8 100644 --- a/avmedia/source/viewer/mediawindow_impl.cxx +++ b/avmedia/source/viewer/mediawindow_impl.cxx @@ -36,6 +36,7 @@ #include <vcl/svapp.hxx> #include <vcl/commandevent.hxx> #include <vcl/event.hxx> +#include <vcl/ptrstyle.hxx> #include <com/sun/star/awt/SystemPointer.hpp> #include <com/sun/star/lang/XComponent.hpp> @@ -480,18 +481,18 @@ void MediaWindowImpl::setPosSize(const tools::Rectangle& rRect) SetPosSizePixel(rRect.TopLeft(), rRect.GetSize()); } -void MediaWindowImpl::setPointer(const Pointer& rPointer) +void MediaWindowImpl::setPointer(PointerStyle aPointer) { - SetPointer(rPointer); + SetPointer(aPointer); if (mpChildWindow) - mpChildWindow->SetPointer(rPointer); + mpChildWindow->SetPointer(aPointer); if (mxPlayerWindow.is()) { long nPointer; - switch (rPointer.GetStyle()) + switch (aPointer) { case PointerStyle::Cross: nPointer = awt::SystemPointer::CROSS; diff --git a/avmedia/source/viewer/mediawindow_impl.hxx b/avmedia/source/viewer/mediawindow_impl.hxx index e1fc3d56fcc0..e188c8876004 100644 --- a/avmedia/source/viewer/mediawindow_impl.hxx +++ b/avmedia/source/viewer/mediawindow_impl.hxx @@ -99,7 +99,7 @@ public: void setPosSize( const tools::Rectangle& rRect ); - void setPointer( const Pointer& rPointer ); + void setPointer( PointerStyle nPointer ); private: diff --git a/basctl/inc/pch/precompiled_basctl.hxx b/basctl/inc/pch/precompiled_basctl.hxx index ccec453c65c7..61e03945be69 100644 --- a/basctl/inc/pch/precompiled_basctl.hxx +++ b/basctl/inc/pch/precompiled_basctl.hxx @@ -161,7 +161,6 @@ #include <vcl/outdev.hxx> #include <vcl/outdevmap.hxx> #include <vcl/outdevstate.hxx> -#include <vcl/pointr.hxx> #include <vcl/ptrstyle.hxx> #include <vcl/quickselectionengine.hxx> #include <vcl/region.hxx> diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx index 5ab200ceaf63..e1d526df52cf 100644 --- a/basctl/source/basicide/baside2b.cxx +++ b/basctl/source/basicide/baside2b.cxx @@ -44,6 +44,7 @@ #include <vcl/textview.hxx> #include <vcl/txtattr.hxx> #include <vcl/settings.hxx> +#include <vcl/ptrstyle.hxx> #include <svtools/textwindowpeer.hxx> #include <vcl/treelistentry.hxx> #include <vcl/taskpanelist.hxx> @@ -231,7 +232,7 @@ EditorWindow::EditorWindow (vcl::Window* pParent, ModulWindow* pModulWindow) : pCodeCompleteWnd(VclPtr<CodeCompleteWindow>::Create(this)) { SetBackground(Wallpaper(rModulWindow.GetLayout().GetBackgroundColor())); - SetPointer( Pointer( PointerStyle::Text ) ); + SetPointer( PointerStyle::Text ); SetHelpId( HID_BASICIDE_EDITORWINDOW ); listener_ = new ChangesListener(*this); diff --git a/chart2/inc/pch/precompiled_chartcontroller.hxx b/chart2/inc/pch/precompiled_chartcontroller.hxx index 1131205f270f..d74343b59568 100644 --- a/chart2/inc/pch/precompiled_chartcontroller.hxx +++ b/chart2/inc/pch/precompiled_chartcontroller.hxx @@ -151,7 +151,6 @@ #include <vcl/outdev.hxx> #include <vcl/outdevmap.hxx> #include <vcl/outdevstate.hxx> -#include <vcl/pointr.hxx> #include <vcl/print.hxx> #include <vcl/prntypes.hxx> #include <vcl/ptrstyle.hxx> diff --git a/chart2/source/controller/main/ChartController_Window.cxx b/chart2/source/controller/main/ChartController_Window.cxx index d8e7b3744352..d2c7dfbd69a3 100644 --- a/chart2/source/controller/main/ChartController_Window.cxx +++ b/chart2/source/controller/main/ChartController_Window.cxx @@ -75,6 +75,7 @@ #include <vcl/svapp.hxx> #include <vcl/settings.hxx> #include <vcl/weld.hxx> +#include <vcl/ptrstyle.hxx> #include <svtools/acceleratorexecute.hxx> #include <tools/diagnose_ex.h> #include <sal/log.hxx> @@ -1864,7 +1865,7 @@ void ChartController::impl_SetMousePointer( const MouseEvent & rEvent ) SdrObject* pObject = m_pDrawViewWrapper->getHitObject(aMousePos); if (pObject && pObject->GetName().startsWith("FieldButton")) { - pChartWindow->SetPointer(Pointer(PointerStyle::Arrow)); + pChartWindow->SetPointer(PointerStyle::Arrow); return; } @@ -1888,13 +1889,13 @@ void ChartController::impl_SetMousePointer( const MouseEvent & rEvent ) if( pHitSelectionHdl ) { - Pointer aPointer = m_pDrawViewWrapper->GetPreferredPointer( + PointerStyle aPointer = m_pDrawViewWrapper->GetPreferredPointer( aMousePos, pChartWindow, nModifier, bLeftDown ); bool bForceArrowPointer = false; ObjectIdentifier aOID( m_aSelection.getSelectedOID() ); - switch( aPointer.GetStyle()) + switch( aPointer) { case PointerStyle::NSize: case PointerStyle::SSize: @@ -1922,7 +1923,7 @@ void ChartController::impl_SetMousePointer( const MouseEvent & rEvent ) } if( bForceArrowPointer ) - pChartWindow->SetPointer( Pointer( PointerStyle::Arrow )); + pChartWindow->SetPointer( PointerStyle::Arrow ); else pChartWindow->SetPointer( aPointer ); @@ -1974,7 +1975,7 @@ void ChartController::impl_SetMousePointer( const MouseEvent & rEvent ) } break; } - pChartWindow->SetPointer( Pointer( ePointerStyle ) ); + pChartWindow->SetPointer( ePointerStyle ); return; } @@ -1986,7 +1987,7 @@ void ChartController::impl_SetMousePointer( const MouseEvent & rEvent ) { if( aHitObjectCID == m_aSelection.getSelectedCID() ) { - pChartWindow->SetPointer( Pointer( PointerStyle::Arrow )); + pChartWindow->SetPointer( PointerStyle::Arrow ); return; } } @@ -2001,7 +2002,7 @@ void ChartController::impl_SetMousePointer( const MouseEvent & rEvent ) if( (m_eDragMode == SdrDragMode::Rotate) && SelectionHelper::isRotateableObject( aHitObjectCID , getModel() ) ) - pChartWindow->SetPointer( Pointer( PointerStyle::Rotate ) ); + pChartWindow->SetPointer( PointerStyle::Rotate ); else { ObjectType eHitObjectType = ObjectIdentifier::getObjectType( aHitObjectCID ); @@ -2010,7 +2011,7 @@ void ChartController::impl_SetMousePointer( const MouseEvent & rEvent ) if( !ObjectIdentifier::areSiblings(aHitObjectCID,m_aSelection.getSelectedCID()) && !ObjectIdentifier::areIdenticalObjects(aHitObjectCID,m_aSelection.getSelectedCID()) ) { - pChartWindow->SetPointer( Pointer( PointerStyle::Arrow )); + pChartWindow->SetPointer( PointerStyle::Arrow ); return; } } @@ -2018,7 +2019,7 @@ void ChartController::impl_SetMousePointer( const MouseEvent & rEvent ) } } else - pChartWindow->SetPointer( Pointer( PointerStyle::Arrow )); + pChartWindow->SetPointer( PointerStyle::Arrow ); } css::uno::Reference<css::uno::XInterface> const & ChartController::getChartView() diff --git a/chart2/source/controller/main/DragMethod_Base.cxx b/chart2/source/controller/main/DragMethod_Base.cxx index d4f2971465cb..0ea306632448 100644 --- a/chart2/source/controller/main/DragMethod_Base.cxx +++ b/chart2/source/controller/main/DragMethod_Base.cxx @@ -25,6 +25,7 @@ #include <svx/ActionDescriptionProvider.hxx> #include <com/sun/star/frame/XModel.hpp> +#include <vcl/ptrstyle.hxx> namespace chart { @@ -64,12 +65,12 @@ void DragMethod_Base::TakeSdrDragComment(OUString& rStr) const { rStr = getUndoDescription(); } -Pointer DragMethod_Base::GetSdrDragPointer() const +PointerStyle DragMethod_Base::GetSdrDragPointer() const { if( IsDraggingPoints() || IsDraggingGluePoints() ) - return Pointer(PointerStyle::MovePoint); + return PointerStyle::MovePoint; else - return Pointer(PointerStyle::Move); + return PointerStyle::Move; } } //namespace chart diff --git a/chart2/source/controller/main/DragMethod_Base.hxx b/chart2/source/controller/main/DragMethod_Base.hxx index d9fc78d72be9..03494044b032 100644 --- a/chart2/source/controller/main/DragMethod_Base.hxx +++ b/chart2/source/controller/main/DragMethod_Base.hxx @@ -40,7 +40,7 @@ public: OUString getUndoDescription() const; virtual void TakeSdrDragComment(OUString& rStr) const override; - virtual Pointer GetSdrDragPointer() const override; + virtual PointerStyle GetSdrDragPointer() const override; protected: css::uno::Reference< css::frame::XModel > getChartModel() const; diff --git a/cui/inc/pch/precompiled_cui.hxx b/cui/inc/pch/precompiled_cui.hxx index dafc0f95caf6..260b3a3350b9 100644 --- a/cui/inc/pch/precompiled_cui.hxx +++ b/cui/inc/pch/precompiled_cui.hxx @@ -163,7 +163,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/salgtype.hxx> diff --git a/dbaccess/inc/pch/precompiled_dbaxml.hxx b/dbaccess/inc/pch/precompiled_dbaxml.hxx index f0442e7397d8..d72ac77b52dc 100644 --- a/dbaccess/inc/pch/precompiled_dbaxml.hxx +++ b/dbaccess/inc/pch/precompiled_dbaxml.hxx @@ -48,7 +48,6 @@ #include <vcl/inputtypes.hxx> #include <vcl/keycodes.hxx> #include <vcl/outdev.hxx> -#include <vcl/pointr.hxx> #include <vcl/region.hxx> #include <vcl/salnativewidgets.hxx> #include <vcl/svapp.hxx> diff --git a/dbaccess/inc/pch/precompiled_dbmm.hxx b/dbaccess/inc/pch/precompiled_dbmm.hxx index d8331303f9cb..dc580df57f57 100644 --- a/dbaccess/inc/pch/precompiled_dbmm.hxx +++ b/dbaccess/inc/pch/precompiled_dbmm.hxx @@ -120,7 +120,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/dbaccess/source/ui/inc/JoinTableView.hxx b/dbaccess/source/ui/inc/JoinTableView.hxx index ecd2dcd69d18..caad1eaebf93 100644 --- a/dbaccess/source/ui/inc/JoinTableView.hxx +++ b/dbaccess/source/ui/inc/JoinTableView.hxx @@ -130,7 +130,7 @@ namespace dbaui void InvalidateConnections(); void BeginChildMove( OTableWindow* pTabWin, const Point& rMousePos ); - void BeginChildSizing( OTableWindow* pTabWin, const Pointer& rPointer ); + void BeginChildSizing( OTableWindow* pTabWin, PointerStyle nPointer ); void NotifyTitleClicked( OTableWindow* pTabWin, const Point& rMousePos ); diff --git a/dbaccess/source/ui/querydesign/JoinTableView.cxx b/dbaccess/source/ui/querydesign/JoinTableView.cxx index 942ddafa40bf..54f595e79d47 100644 --- a/dbaccess/source/ui/querydesign/JoinTableView.cxx +++ b/dbaccess/source/ui/querydesign/JoinTableView.cxx @@ -36,6 +36,7 @@ #include <vcl/settings.hxx> #include <vcl/commandevent.hxx> #include <vcl/event.hxx> +#include <vcl/ptrstyle.hxx> #include <TableWindowData.hxx> #include <JAccess.hxx> #include <com/sun/star/accessibility/XAccessible.hpp> @@ -612,7 +613,7 @@ void OJoinTableView::BeginChildMove( OTableWindow* pTabWin, const Point& rMouseP return; m_pDragWin = pTabWin; - SetPointer(Pointer(PointerStyle::Move)); + SetPointer(PointerStyle::Move); Point aMousePos = ScreenToOutputPixel( rMousePos ); m_aDragOffset = aMousePos - pTabWin->GetPosPixel(); m_pDragWin->SetZOrder(nullptr, ZOrderFlags::First); @@ -625,13 +626,13 @@ void OJoinTableView::NotifyTitleClicked( OTableWindow* pTabWin, const Point& rMo BeginChildMove(pTabWin, rMousePos); } -void OJoinTableView::BeginChildSizing( OTableWindow* pTabWin, const Pointer& rPointer ) +void OJoinTableView::BeginChildSizing( OTableWindow* pTabWin, PointerStyle nPointer ) { if (m_pView->getController().isReadOnly()) return; - SetPointer( rPointer ); + SetPointer( nPointer ); m_pSizingWin = pTabWin; StartTracking(); } @@ -757,12 +758,12 @@ void OJoinTableView::Tracking( const TrackingEvent& rTEvt ) m_pDragWin->GrabFocus(); } m_pDragWin = nullptr; - SetPointer(Pointer(PointerStyle::Arrow)); + SetPointer(PointerStyle::Arrow); } // else we handle the resizing else if( m_pSizingWin ) { - SetPointer( Pointer() ); + SetPointer( PointerStyle::Arrow ); EndTracking(); // old physical coordinates diff --git a/dbaccess/source/ui/querydesign/TableWindow.cxx b/dbaccess/source/ui/querydesign/TableWindow.cxx index b43244dfa5d5..f4e132493b0c 100644 --- a/dbaccess/source/ui/querydesign/TableWindow.cxx +++ b/dbaccess/source/ui/querydesign/TableWindow.cxx @@ -30,6 +30,7 @@ #include <vcl/settings.hxx> #include <vcl/commandevent.hxx> #include <vcl/event.hxx> +#include <vcl/ptrstyle.hxx> #include <com/sun/star/sdbcx/XColumnsSupplier.hpp> #include <com/sun/star/container/XNameAccess.hpp> @@ -397,21 +398,21 @@ void OTableWindow::MouseMove( const MouseEvent& rEvt ) Point aPos = rEvt.GetPosPixel(); setSizingFlag(aPos); - Pointer aPointer; + PointerStyle aPointer = PointerStyle::Arrow; // Set the mouse cursor when it is in the sizing area if ( m_nSizingFlags == SizingFlags::Top || m_nSizingFlags == SizingFlags::Bottom ) - aPointer = Pointer( PointerStyle::SSize ); + aPointer = PointerStyle::SSize; else if ( m_nSizingFlags == SizingFlags::Left || m_nSizingFlags ==SizingFlags::Right ) - aPointer = Pointer( PointerStyle::ESize ); + aPointer = PointerStyle::ESize; else if ( m_nSizingFlags == (SizingFlags::Left | SizingFlags::Top) || m_nSizingFlags == (SizingFlags::Right | SizingFlags::Bottom) ) - aPointer = Pointer( PointerStyle::SESize ); + aPointer = PointerStyle::SESize; else if ( m_nSizingFlags == (SizingFlags::Right | SizingFlags::Top) || m_nSizingFlags == (SizingFlags::Left | SizingFlags::Bottom) ) - aPointer = Pointer( PointerStyle::NESize ); + aPointer = PointerStyle::NESize; SetPointer( aPointer ); } diff --git a/desktop/inc/pch/precompiled_sofficeapp.hxx b/desktop/inc/pch/precompiled_sofficeapp.hxx index 02702f9444a4..ac170ca3b966 100644 --- a/desktop/inc/pch/precompiled_sofficeapp.hxx +++ b/desktop/inc/pch/precompiled_sofficeapp.hxx @@ -146,7 +146,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/drawinglayer/inc/pch/precompiled_drawinglayer.hxx b/drawinglayer/inc/pch/precompiled_drawinglayer.hxx index 5f070d4f77df..d15d6cd75db6 100644 --- a/drawinglayer/inc/pch/precompiled_drawinglayer.hxx +++ b/drawinglayer/inc/pch/precompiled_drawinglayer.hxx @@ -64,7 +64,6 @@ #include <vcl/inputtypes.hxx> #include <vcl/keycodes.hxx> #include <vcl/outdev.hxx> -#include <vcl/pointr.hxx> #include <vcl/region.hxx> #include <vcl/salnativewidgets.hxx> #include <vcl/svapp.hxx> diff --git a/editeng/source/editeng/editview.cxx b/editeng/source/editeng/editview.cxx index 713028a67d0b..18408c38d9bf 100644 --- a/editeng/source/editeng/editview.cxx +++ b/editeng/source/editeng/editview.cxx @@ -399,7 +399,7 @@ const tools::Rectangle& EditView::GetOutputArea() const return pImpEditView->GetOutputArea(); } -const Pointer& EditView::GetPointer() const +PointerStyle EditView::GetPointer() const { return pImpEditView->GetPointer(); } diff --git a/editeng/source/editeng/impedit.hxx b/editeng/source/editeng/impedit.hxx index b85046088c41..a1e332f6db05 100644 --- a/editeng/source/editeng/impedit.hxx +++ b/editeng/source/editeng/impedit.hxx @@ -39,6 +39,7 @@ #include <tools/fract.hxx> #include <vcl/idle.hxx> #include <vcl/commandevent.hxx> +#include <vcl/ptrstyle.hxx> #include <vcl/dndhelp.hxx> #include <svl/ondemand.hxx> @@ -60,6 +61,7 @@ #include <o3tl/deleter.hxx> #include <o3tl/typed_flags_set.hxx> +#include <boost/optional.hpp> #include <memory> #include <vector> @@ -236,7 +238,7 @@ private: EditEngine* pEditEngine; VclPtr<vcl::Window> pOutWin; EditView::OutWindowSet aOutWindowSet; - std::unique_ptr<Pointer> pPointer; + boost::optional<PointerStyle> mxPointer; std::unique_ptr<DragAndDropInfo> pDragAndDropInfo; css::uno::Reference< css::datatransfer::dnd::XDragSourceListener > mxDnDListener; @@ -350,7 +352,7 @@ public: void SetSelectionMode( EESelectionMode eMode ); - inline const Pointer& GetPointer(); + inline PointerStyle GetPointer(); inline vcl::Cursor* GetCursor(); @@ -1196,24 +1198,24 @@ inline sal_uInt16 ImpEditEngine::GetYValue( sal_uInt16 nYValue ) const return static_cast<sal_uInt16>(static_cast<long>(nYValue)*nStretchY/100); } -inline const Pointer& ImpEditView::GetPointer() +inline PointerStyle ImpEditView::GetPointer() { - if ( !pPointer ) + if ( !mxPointer ) { - pPointer.reset( new Pointer( IsVertical() ? PointerStyle::TextVertical : PointerStyle::Text ) ); - return *pPointer; + mxPointer = IsVertical() ? PointerStyle::TextVertical : PointerStyle::Text; + return *mxPointer; } - if(PointerStyle::Text == pPointer->GetStyle() && IsVertical()) + if(PointerStyle::Text == *mxPointer && IsVertical()) { - pPointer.reset( new Pointer(PointerStyle::TextVertical) ); + mxPointer = PointerStyle::TextVertical; } - else if(PointerStyle::TextVertical == pPointer->GetStyle() && !IsVertical()) + else if(PointerStyle::TextVertical == *mxPointer && !IsVertical()) { - pPointer.reset( new Pointer(PointerStyle::Text) ); + mxPointer = PointerStyle::Text; } - return *pPointer; + return *mxPointer; } inline vcl::Cursor* ImpEditView::GetCursor() diff --git a/editeng/source/outliner/outlvw.cxx b/editeng/source/outliner/outlvw.cxx index 1b7013839aeb..7e6c463836c9 100644 --- a/editeng/source/outliner/outlvw.cxx +++ b/editeng/source/outliner/outlvw.cxx @@ -42,6 +42,7 @@ #include <editeng/numitem.hxx> #include <vcl/window.hxx> #include <vcl/event.hxx> +#include <vcl/ptrstyle.hxx> #include <svl/itemset.hxx> #include <svl/eitem.hxx> #include <editeng/editstat.hxx> @@ -292,7 +293,7 @@ bool OutlinerView::MouseMove( const MouseEvent& rMEvt ) if( !pEditView->GetOutputArea().IsInside( aMousePosWin ) ) return false; - Pointer aPointer = GetPointer( rMEvt.GetPosPixel() ); + PointerStyle aPointer = GetPointer( rMEvt.GetPosPixel() ); pEditView->GetWindow()->SetPointer( aPointer ); return pEditView->MouseMove( rMEvt ); } @@ -307,7 +308,7 @@ bool OutlinerView::MouseButtonDown( const MouseEvent& rMEvt ) if( !pEditView->GetOutputArea().IsInside( aMousePosWin ) ) return false; - Pointer aPointer = GetPointer( rMEvt.GetPosPixel() ); + PointerStyle aPointer = GetPointer( rMEvt.GetPosPixel() ); pEditView->GetWindow()->SetPointer( aPointer ); MouseTarget eTarget; @@ -355,7 +356,7 @@ bool OutlinerView::MouseButtonUp( const MouseEvent& rMEvt ) if( !pEditView->GetOutputArea().IsInside( aMousePosWin ) ) return false; - Pointer aPointer = GetPointer( rMEvt.GetPosPixel() ); + PointerStyle aPointer = GetPointer( rMEvt.GetPosPixel() ); pEditView->GetWindow()->SetPointer( aPointer ); return pEditView->MouseButtonUp( rMEvt ); @@ -729,7 +730,7 @@ SfxStyleSheet* OutlinerView::GetStyleSheet() return pEditView->GetStyleSheet(); } -Pointer OutlinerView::GetPointer( const Point& rPosPixel ) +PointerStyle OutlinerView::GetPointer( const Point& rPosPixel ) { MouseTarget eTarget; ImpCheckMousePos( rPosPixel, eTarget ); @@ -748,7 +749,7 @@ Pointer OutlinerView::GetPointer( const Point& rPosPixel ) ePointerStyle = PointerStyle::Move; } - return Pointer( ePointerStyle ); + return ePointerStyle; } diff --git a/extensions/source/propctrlr/standardcontrol.cxx b/extensions/source/propctrlr/standardcontrol.cxx index 241c44bc7dba..948e97278adb 100644 --- a/extensions/source/propctrlr/standardcontrol.cxx +++ b/extensions/source/propctrlr/standardcontrol.cxx @@ -48,6 +48,7 @@ #include <vcl/event.hxx> #include <vcl/svapp.hxx> #include <vcl/settings.hxx> +#include <vcl/ptrstyle.hxx> #include <cstdlib> #include <limits> @@ -359,7 +360,7 @@ namespace pcr ePointerStyle = PointerStyle::RefHand; } - SetPointer( Pointer( ePointerStyle ) ); + SetPointer( ePointerStyle ); } diff --git a/forms/inc/pch/precompiled_frm.hxx b/forms/inc/pch/precompiled_frm.hxx index 75be9d17ee98..a999ed4e6012 100644 --- a/forms/inc/pch/precompiled_frm.hxx +++ b/forms/inc/pch/precompiled_frm.hxx @@ -75,7 +75,6 @@ #include <vcl/keycodes.hxx> #include <vcl/mapmod.hxx> #include <vcl/outdev.hxx> -#include <vcl/pointr.hxx> #include <vcl/region.hxx> #include <vcl/salnativewidgets.hxx> #include <vcl/settings.hxx> diff --git a/fpicker/source/office/RemoteFilesDialog.cxx b/fpicker/source/office/RemoteFilesDialog.cxx index c20b7460282f..850490ae9041 100644 --- a/fpicker/source/office/RemoteFilesDialog.cxx +++ b/fpicker/source/office/RemoteFilesDialog.cxx @@ -18,6 +18,7 @@ #include <ucbhelper/commandenvironment.hxx> #include <vcl/treelistentry.hxx> #include <bitmaps.hlst> +#include <vcl/ptrstyle.hxx> class FileViewContainer : public vcl::Window { diff --git a/framework/inc/pch/precompiled_fwe.hxx b/framework/inc/pch/precompiled_fwe.hxx index c3c7e9898a90..7cdb1caee827 100644 --- a/framework/inc/pch/precompiled_fwe.hxx +++ b/framework/inc/pch/precompiled_fwe.hxx @@ -127,7 +127,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/framework/inc/pch/precompiled_fwl.hxx b/framework/inc/pch/precompiled_fwl.hxx index dbd6bebac772..1fa07d4c6f70 100644 --- a/framework/inc/pch/precompiled_fwl.hxx +++ b/framework/inc/pch/precompiled_fwl.hxx @@ -147,7 +147,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/include/avmedia/mediawindow.hxx b/include/avmedia/mediawindow.hxx index da97ec8c5fd0..83a69ecf7378 100644 --- a/include/avmedia/mediawindow.hxx +++ b/include/avmedia/mediawindow.hxx @@ -38,9 +38,9 @@ class KeyEvent; class MouseEvent; class CommandEvent; class PopupMenu; -class Pointer; struct AcceptDropEvent; struct ExecuteDropEvent; +enum class PointerStyle; namespace avmedia @@ -67,7 +67,7 @@ namespace avmedia void setPosSize( const tools::Rectangle& rNewRect ); - void setPointer( const Pointer& rPointer ); + void setPointer( PointerStyle aPointer ); bool start(); diff --git a/include/editeng/editview.hxx b/include/editeng/editview.hxx index 8d2a5ef2853d..fbb6a614efa2 100644 --- a/include/editeng/editview.hxx +++ b/include/editeng/editview.hxx @@ -45,7 +45,6 @@ class OutlinerViewShell; class SvxSearchItem; class SvxFieldItem; namespace vcl { class Window; } -class Pointer; class KeyEvent; class MouseEvent; class CommandEvent; @@ -60,6 +59,7 @@ namespace vcl { class Font; } class FontList; class OutputDevice; enum class TransliterationFlags; +enum class PointerStyle; namespace com { namespace sun { @@ -182,7 +182,7 @@ public: void SetVisArea( const tools::Rectangle& rRect ); const tools::Rectangle& GetVisArea() const; - const Pointer& GetPointer() const; + PointerStyle GetPointer() const; vcl::Cursor* GetCursor() const; diff --git a/include/editeng/outliner.hxx b/include/editeng/outliner.hxx index 07523577541e..1158f7195fea 100644 --- a/include/editeng/outliner.hxx +++ b/include/editeng/outliner.hxx @@ -67,7 +67,6 @@ class SvxFieldItem; namespace vcl { class Window; } class KeyEvent; class MouseEvent; -class Pointer; class CommandEvent; class MapMode; class OutputDevice; @@ -89,6 +88,7 @@ enum class CharCompressType; enum class TransliterationFlags; class SvxFieldData; class SfxUndoManager; +enum class PointerStyle; namespace com { namespace sun { namespace star { namespace linguistic2 { class XSpellChecker1; @@ -287,7 +287,7 @@ public: void SetAnchorMode( EEAnchorMode eMode ); EEAnchorMode GetAnchorMode() const; - Pointer GetPointer( const Point& rPosPixel ); + PointerStyle GetPointer( const Point& rPosPixel ); void Command( const CommandEvent& rCEvt ); void StartSpeller(); diff --git a/include/svx/svdcrtv.hxx b/include/svx/svdcrtv.hxx index 2b1941373fb0..d66ba7c35f4a 100644 --- a/include/svx/svdcrtv.hxx +++ b/include/svx/svdcrtv.hxx @@ -45,7 +45,7 @@ protected: // compile the apps all the time std::unique_ptr<ImpSdrCreateViewExtraData> mpCreateViewExtraData; - Pointer aCurrentCreatePointer; + PointerStyle aCurrentCreatePointer; sal_Int32 nAutoCloseDistPix; sal_Int32 nFreeHandMinDistPix; diff --git a/include/svx/svddrgmt.hxx b/include/svx/svddrgmt.hxx index 3e1a13d6a3d3..4856adecc27f 100644 --- a/include/svx/svddrgmt.hxx +++ b/include/svx/svddrgmt.hxx @@ -200,7 +200,7 @@ public: virtual void MoveSdrDrag(const Point& rPnt)=0; virtual bool EndSdrDrag(bool bCopy)=0; virtual void CancelSdrDrag(); - virtual Pointer GetSdrDragPointer() const=0; + virtual PointerStyle GetSdrDragPointer() const=0; virtual void CreateOverlayGeometry( sdr::overlay::OverlayManager& rOverlayManager, @@ -246,7 +246,7 @@ public: virtual bool BeginSdrDrag() override; virtual void MoveSdrDrag(const Point& rPnt) override; virtual bool EndSdrDrag(bool bCopy) override; - virtual Pointer GetSdrDragPointer() const override; + virtual PointerStyle GetSdrDragPointer() const override; virtual basegfx::B2DHomMatrix getCurrentTransformation() override; virtual void applyCurrentTransformationToSdrObject(SdrObject& rTarget) override; @@ -268,7 +268,7 @@ public: virtual bool BeginSdrDrag() override; virtual void MoveSdrDrag(const Point& rPnt) override; virtual bool EndSdrDrag(bool bCopy) override; - virtual Pointer GetSdrDragPointer() const override; + virtual PointerStyle GetSdrDragPointer() const override; virtual basegfx::B2DHomMatrix getCurrentTransformation() override; virtual void applyCurrentTransformationToSdrObject(SdrObject& rTarget) override; @@ -297,7 +297,7 @@ public: virtual bool BeginSdrDrag() override; virtual void MoveSdrDrag(const Point& rPnt) override; virtual bool EndSdrDrag(bool bCopy) override; - virtual Pointer GetSdrDragPointer() const override; + virtual PointerStyle GetSdrDragPointer() const override; }; #endif // INCLUDED_SVX_SVDDRGMT_HXX diff --git a/include/svx/svdhdl.hxx b/include/svx/svdhdl.hxx index 5832e33bc2ac..325f91ca653e 100644 --- a/include/svx/svdhdl.hxx +++ b/include/svx/svdhdl.hxx @@ -22,8 +22,6 @@ #include <tools/gen.hxx> -#include <vcl/pointr.hxx> - #include <svl/solar.hrc> #include <svx/xpoly.hxx> @@ -231,7 +229,7 @@ public: void SetSourceHdlNum(sal_uInt32 nNum) { nSourceHdlNum=nNum; } sal_uInt32 GetSourceHdlNum() const { return nSourceHdlNum; } - virtual Pointer GetPointer() const; + virtual PointerStyle GetPointer() const; bool IsHdlHit(const Point& rPnt) const; virtual bool IsFocusHdl() const; @@ -353,7 +351,7 @@ public: SdrHdlLine(SdrHdl& rHdl1, SdrHdl& rHdl2, SdrHdlKind eNewKind) { eKind=eNewKind; pHdl1=&rHdl1; pHdl2=&rHdl2; } virtual ~SdrHdlLine() override; - virtual Pointer GetPointer() const override; + virtual PointerStyle GetPointer() const override; }; // a SdrHdlBezWgt knows about its "base handle". Its draw method @@ -400,7 +398,7 @@ public: void SetLineCode(SdrEdgeLineCode eCode); SdrEdgeLineCode GetLineCode() const { return eLineCode; } bool IsHorzDrag() const; - virtual Pointer GetPointer() const override; + virtual PointerStyle GetPointer() const override; }; @@ -413,7 +411,7 @@ public: ImpMeasureHdl(const Point& rPnt, SdrHdlKind eNewKind): SdrHdl(rPnt,eNewKind) {} virtual ~ImpMeasureHdl() override; - virtual Pointer GetPointer() const override; + virtual PointerStyle GetPointer() const override; }; diff --git a/include/svx/svdhlpln.hxx b/include/svx/svdhlpln.hxx index a2920f2dbbe1..1afb7a139e03 100644 --- a/include/svx/svdhlpln.hxx +++ b/include/svx/svdhlpln.hxx @@ -23,14 +23,13 @@ #include <sal/types.h> #include <tools/gen.hxx> -#include <vcl/pointr.hxx> #include <svx/svxdllapi.h> #include <vector> #include <memory> class OutputDevice; - +enum class PointerStyle; enum class SdrHelpLineKind { Point, Vertical, Horizontal }; @@ -51,7 +50,7 @@ public: void SetPos(const Point& rPnt) { aPos=rPnt; } const Point& GetPos() const { return aPos; } - Pointer GetPointer() const; + PointerStyle GetPointer() const; bool IsHit(const Point& rPnt, sal_uInt16 nTolLog, const OutputDevice& rOut) const; // OutputDevice is required because capture points have a fixed pixel size tools::Rectangle GetBoundRect(const OutputDevice& rOut) const; diff --git a/include/svx/svdobj.hxx b/include/svx/svdobj.hxx index 0177cec8ff3b..ee680b590bcc 100644 --- a/include/svx/svdobj.hxx +++ b/include/svx/svdobj.hxx @@ -42,7 +42,6 @@ #include <functional> class SfxBroadcaster; -class Pointer; class AutoTimer; class OutlinerParaObject; class Outliner; @@ -75,6 +74,7 @@ class SdrGluePoint; class SdrGluePointList; class SdrLayerIDSet; class Fraction; +enum class PointerStyle; namespace basegfx { @@ -569,7 +569,7 @@ public: virtual void BrkCreate(SdrDragStat& rStat); /// get the cursor/pointer that signals creating this object - virtual Pointer GetCreatePointer() const; + virtual PointerStyle GetCreatePointer() const; /// Polygon dragged by the user when creating the object virtual basegfx::B2DPolyPolygon TakeCreatePoly(const SdrDragStat& rDrag) const; @@ -686,7 +686,7 @@ public: // macro abilities, e.g. a rectangle as PushButton. virtual bool HasMacro() const; virtual SdrObject* CheckMacroHit (const SdrObjMacroHitRec& rRec) const; - virtual Pointer GetMacroPointer (const SdrObjMacroHitRec& rRec) const; + virtual PointerStyle GetMacroPointer (const SdrObjMacroHitRec& rRec) const; virtual void PaintMacro (OutputDevice& rOut, const tools::Rectangle& rDirtyRect, const SdrObjMacroHitRec& rRec) const; virtual bool DoMacro (const SdrObjMacroHitRec& rRec); bool IsMacroHit(const SdrObjMacroHitRec& rRec) const; diff --git a/include/svx/svdocapt.hxx b/include/svx/svdocapt.hxx index 68bc32a51fae..89942a7b9154 100644 --- a/include/svx/svdocapt.hxx +++ b/include/svx/svdocapt.hxx @@ -120,7 +120,7 @@ public: virtual bool BckCreate(SdrDragStat& rStat) override; virtual void BrkCreate(SdrDragStat& rStat) override; virtual basegfx::B2DPolyPolygon TakeCreatePoly(const SdrDragStat& rDrag) const override; - virtual Pointer GetCreatePointer() const override; + virtual PointerStyle GetCreatePointer() const override; virtual void NbcMove(const Size& rSiz) override; virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact) override; diff --git a/include/svx/svdocirc.hxx b/include/svx/svdocirc.hxx index b681ad5acc44..5785a725584f 100644 --- a/include/svx/svdocirc.hxx +++ b/include/svx/svdocirc.hxx @@ -123,7 +123,7 @@ public: virtual bool BckCreate(SdrDragStat& rStat) override; virtual void BrkCreate(SdrDragStat& rStat) override; virtual basegfx::B2DPolyPolygon TakeCreatePoly(const SdrDragStat& rDrag) const override; - virtual Pointer GetCreatePointer() const override; + virtual PointerStyle GetCreatePointer() const override; virtual void NbcMove(const Size& aSiz) override; virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact) override; virtual void NbcMirror(const Point& rRef1, const Point& rRef2) override; diff --git a/include/svx/svdoedge.hxx b/include/svx/svdoedge.hxx index 0a68d6f84646..c07a69adbbb2 100644 --- a/include/svx/svdoedge.hxx +++ b/include/svx/svdoedge.hxx @@ -256,7 +256,7 @@ public: virtual bool BckCreate(SdrDragStat& rStat) override; virtual void BrkCreate(SdrDragStat& rStat) override; virtual basegfx::B2DPolyPolygon TakeCreatePoly(const SdrDragStat& rDrag) const override; - virtual Pointer GetCreatePointer() const override; + virtual PointerStyle GetCreatePointer() const override; virtual SdrObject* DoConvertToPolyObj(bool bBezier, bool bAddText) const override; virtual sal_uInt32 GetSnapPointCount() const override; diff --git a/include/svx/svdomeas.hxx b/include/svx/svdomeas.hxx index 374cdff602fd..4007d46be3a8 100644 --- a/include/svx/svdomeas.hxx +++ b/include/svx/svdomeas.hxx @@ -109,7 +109,7 @@ public: virtual bool BckCreate(SdrDragStat& rStat) override; virtual void BrkCreate(SdrDragStat& rStat) override; virtual basegfx::B2DPolyPolygon TakeCreatePoly(const SdrDragStat& rDrag) const override; - virtual Pointer GetCreatePointer() const override; + virtual PointerStyle GetCreatePointer() const override; virtual void NbcMove(const Size& rSiz) override; virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact) override; diff --git a/include/svx/svdopath.hxx b/include/svx/svdopath.hxx index 0dc07e11d5d0..cace0f3764f6 100644 --- a/include/svx/svdopath.hxx +++ b/include/svx/svdopath.hxx @@ -102,7 +102,7 @@ public: virtual bool BckCreate(SdrDragStat& rStat) override; virtual void BrkCreate(SdrDragStat& rStat) override; virtual basegfx::B2DPolyPolygon TakeCreatePoly(const SdrDragStat& rDrag) const override; - Pointer GetCreatePointer() const override; + PointerStyle GetCreatePointer() const override; // during drag or create, allow accessing the so-far created/modified polyPolygon basegfx::B2DPolyPolygon getObjectPolyPolygon(const SdrDragStat& rDrag) const; diff --git a/include/svx/svdorect.hxx b/include/svx/svdorect.hxx index 00f1b481b733..60e4968ecbe1 100644 --- a/include/svx/svdorect.hxx +++ b/include/svx/svdorect.hxx @@ -108,7 +108,7 @@ public: virtual OUString getSpecialDragComment(const SdrDragStat& rDrag) const override; virtual basegfx::B2DPolyPolygon TakeCreatePoly(const SdrDragStat& rDrag) const override; - virtual Pointer GetCreatePointer() const override; + virtual PointerStyle GetCreatePointer() const override; virtual void NbcMove(const Size& rSiz) override; virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact) override; diff --git a/include/svx/svdotable.hxx b/include/svx/svdotable.hxx index 10d6e27f6545..bf0ea2ae87dc 100644 --- a/include/svx/svdotable.hxx +++ b/include/svx/svdotable.hxx @@ -225,7 +225,7 @@ public: virtual bool BckCreate(SdrDragStat& rStat) override; virtual void BrkCreate(SdrDragStat& rStat) override; virtual basegfx::B2DPolyPolygon TakeCreatePoly(const SdrDragStat& rDrag) const override; - virtual Pointer GetCreatePointer() const override; + virtual PointerStyle GetCreatePointer() const override; virtual void NbcMove(const Size& rSiz) override; virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact) override; diff --git a/include/svx/svdotext.hxx b/include/svx/svdotext.hxx index 82d7d9b0657d..c87444c5fe4a 100644 --- a/include/svx/svdotext.hxx +++ b/include/svx/svdotext.hxx @@ -472,7 +472,7 @@ public: virtual bool BckCreate(SdrDragStat& rStat) override; virtual void BrkCreate(SdrDragStat& rStat) override; virtual basegfx::B2DPolyPolygon TakeCreatePoly(const SdrDragStat& rDrag) const override; - virtual Pointer GetCreatePointer() const override; + virtual PointerStyle GetCreatePointer() const override; virtual void NbcMove(const Size& rSiz) override; virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact) override; diff --git a/include/svx/svdovirt.hxx b/include/svx/svdovirt.hxx index 8ab92bd69e8d..7882d8db17d9 100644 --- a/include/svx/svdovirt.hxx +++ b/include/svx/svdovirt.hxx @@ -137,7 +137,7 @@ public: virtual bool HasMacro() const override; virtual SdrObject* CheckMacroHit (const SdrObjMacroHitRec& rRec) const override; - virtual Pointer GetMacroPointer (const SdrObjMacroHitRec& rRec) const override; + virtual PointerStyle GetMacroPointer (const SdrObjMacroHitRec& rRec) const override; virtual void PaintMacro (OutputDevice& rOut, const tools::Rectangle& rDirtyRect, const SdrObjMacroHitRec& rRec) const override; virtual bool DoMacro (const SdrObjMacroHitRec& rRec) override; diff --git a/include/svx/svdsnpv.hxx b/include/svx/svdsnpv.hxx index 7c2d2c753e7a..e45b0ea9f96a 100644 --- a/include/svx/svdsnpv.hxx +++ b/include/svx/svdsnpv.hxx @@ -197,7 +197,7 @@ public: bool BegDragHelpLine(sal_uInt16 nHelpLineNum, SdrPageView* pPV); // interactive insertion of a new auxiliary line void BegDragHelpLine(const Point& rPnt, SdrHelpLineKind eNewKind); - Pointer GetDraggedHelpLinePointer() const; + PointerStyle GetDraggedHelpLinePointer() const; // change the type of auxiliary line while dragging // void SetDraggedHelpLineKind(SdrHelpLineKind eNewKind); diff --git a/include/svx/svdview.hxx b/include/svx/svdview.hxx index a63618089747..5e800e37adb4 100644 --- a/include/svx/svdview.hxx +++ b/include/svx/svdview.hxx @@ -200,7 +200,7 @@ public: // incomplete implementation: // OutputDevice is necessary to determine HandleSize. // If NULL the first signed on Win is used. - Pointer GetPreferredPointer(const Point& rMousePos, const OutputDevice* pOut, sal_uInt16 nModifier=0, bool bLeftDown=false) const; + PointerStyle GetPreferredPointer(const Point& rMousePos, const OutputDevice* pOut, sal_uInt16 nModifier=0, bool bLeftDown=false) const; SdrHitKind PickAnything(const MouseEvent& rMEvt, SdrMouseEventKind nMouseDownOrMoveOrUp, SdrViewEvent& rVEvt) const; SdrHitKind PickAnything(const Point& rLogicPos, SdrViewEvent& rVEvt) const; bool DoMouseEvent(const SdrViewEvent& rVEvt); diff --git a/include/toolkit/awt/vclxpointer.hxx b/include/toolkit/awt/vclxpointer.hxx index 951efeb7457c..f986077e76cd 100644 --- a/include/toolkit/awt/vclxpointer.hxx +++ b/include/toolkit/awt/vclxpointer.hxx @@ -27,7 +27,7 @@ #include <cppuhelper/implbase.hxx> #include <osl/mutex.hxx> -#include <vcl/pointr.hxx> +#include <vcl/ptrstyle.hxx> // class VCLXPointer @@ -37,7 +37,7 @@ class VCLXPointer final : public cppu::WeakImplHelper< css::awt::XPointer, css::lang::XUnoTunnel, css::lang::XServiceInfo> { ::osl::Mutex maMutex; - Pointer maPointer; + PointerStyle maPointer; ::osl::Mutex& GetMutex() { return maMutex; } @@ -45,7 +45,7 @@ public: VCLXPointer(); virtual ~VCLXPointer() override; - const Pointer& GetPointer() const { return maPointer; } + PointerStyle GetPointer() const { return maPointer; } // css::lang::XUnoTunnel static const css::uno::Sequence< sal_Int8 >& GetUnoTunnelId() throw(); diff --git a/include/vbahelper/vbahelper.hxx b/include/vbahelper/vbahelper.hxx index e070a29d59ca..2017c6ff5e3c 100644 --- a/include/vbahelper/vbahelper.hxx +++ b/include/vbahelper/vbahelper.hxx @@ -31,7 +31,6 @@ #include <sal/types.h> #include <tools/color.hxx> #include <vbahelper/vbadllapi.h> -#include <vcl/pointr.hxx> #include <vcl/ptrstyle.hxx> #include <vcl/errcode.hxx> @@ -131,7 +130,7 @@ namespace ooo VBAHELPER_DLLPUBLIC sal_Int32 PointsToHmm( double fPoints ); VBAHELPER_DLLPUBLIC double HmmToPoints( sal_Int32 nHmm ); VBAHELPER_DLLPUBLIC PointerStyle getPointerStyle( const css::uno::Reference< css::frame::XModel >& ); - VBAHELPER_DLLPUBLIC void setCursorHelper( const css::uno::Reference< css::frame::XModel >& xModel, const Pointer& rPointer, bool bOverWrite ); + VBAHELPER_DLLPUBLIC void setCursorHelper( const css::uno::Reference< css::frame::XModel >& xModel, PointerStyle nPointer, bool bOverWrite ); /// @throws css::uno::RuntimeException VBAHELPER_DLLPUBLIC void setDefaultPropByIntrospection( const css::uno::Any& aObj, const css::uno::Any& aValue ); VBAHELPER_DLLPUBLIC css::uno::Any getPropertyValue( const css::uno::Sequence< css::beans::PropertyValue >& aProp, const OUString& aName ); diff --git a/include/vcl/ITiledRenderable.hxx b/include/vcl/ITiledRenderable.hxx index dcd98b959fc9..ae6e58b60da1 100644 --- a/include/vcl/ITiledRenderable.hxx +++ b/include/vcl/ITiledRenderable.hxx @@ -15,7 +15,6 @@ #include <vcl/commandevent.hxx> #include <vcl/event.hxx> #include <vcl/vclevent.hxx> -#include <vcl/pointr.hxx> #include <vcl/ptrstyle.hxx> #include <map> @@ -285,7 +284,7 @@ public: return OString(); } - virtual Pointer getPointer() = 0; + virtual PointerStyle getPointer() = 0; /// Sets the clipboard of the component. virtual void setClipboard(const css::uno::Reference<css::datatransfer::clipboard::XClipboard>& xClipboard) = 0; diff --git a/include/vcl/fixedhyper.hxx b/include/vcl/fixedhyper.hxx index 414ef1661c72..da1e8ea84fbb 100644 --- a/include/vcl/fixedhyper.hxx +++ b/include/vcl/fixedhyper.hxx @@ -27,7 +27,7 @@ class VCL_DLLPUBLIC FixedHyperlink : public FixedText { private: long m_nTextLen; - Pointer m_aOldPointer; + PointerStyle m_aOldPointer; Link<FixedHyperlink&,void> m_aClickHdl; OUString m_sURL; diff --git a/include/vcl/pointr.hxx b/include/vcl/pointr.hxx deleted file mode 100644 index 8370b9f9d296..000000000000 --- a/include/vcl/pointr.hxx +++ /dev/null @@ -1,46 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef INCLUDED_VCL_POINTR_HXX -#define INCLUDED_VCL_POINTR_HXX - -#include <vcl/dllapi.h> -#include <vcl/ptrstyle.hxx> - -class VCL_DLLPUBLIC Pointer -{ - PointerStyle meStyle; - -public: - Pointer() - { meStyle = PointerStyle::Arrow; } - Pointer( PointerStyle eStyle ) - { meStyle = eStyle; } - - PointerStyle GetStyle() const { return meStyle; } - - bool operator==( const Pointer& rPointer ) const - { return (meStyle == rPointer.meStyle); } - bool operator!=( const Pointer& rPointer ) const - { return !(Pointer::operator==( rPointer )); } -}; - -#endif // INCLUDED_VCL_POINTR_HXX - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx index 1e9539cf9a2a..4294c4f1e520 100644 --- a/include/vcl/window.hxx +++ b/include/vcl/window.hxx @@ -23,7 +23,6 @@ #include <tools/solar.h> #include <vcl/dllapi.h> #include <vcl/outdev.hxx> -#include <vcl/pointr.hxx> #include <tools/link.hxx> #include <tools/wintypes.hxx> #include <vcl/vclenum.hxx> @@ -64,6 +63,7 @@ class AllSettings; class InputContext; enum class ImplPaintFlags; enum class VclEventId; +enum class PointerStyle; namespace com { namespace sun { namespace star { namespace accessibility { @@ -1097,8 +1097,8 @@ public: void ReleaseMouse(); bool IsMouseCaptured() const; - void SetPointer( const Pointer& rPointer ); - const Pointer& GetPointer() const; + void SetPointer( PointerStyle ); + PointerStyle GetPointer() const; void EnableChildPointerOverwrite( bool bOverwrite ); void SetPointerPosPixel( const Point& rPos ); Point GetPointerPosPixel(); diff --git a/reportdesign/inc/pch/precompiled_rpt.hxx b/reportdesign/inc/pch/precompiled_rpt.hxx index 56cad9c80450..a19aa62d789d 100644 --- a/reportdesign/inc/pch/precompiled_rpt.hxx +++ b/reportdesign/inc/pch/precompiled_rpt.hxx @@ -146,7 +146,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/reportdesign/inc/pch/precompiled_rptui.hxx b/reportdesign/inc/pch/precompiled_rptui.hxx index 6fcac963124b..92e0fe824920 100644 --- a/reportdesign/inc/pch/precompiled_rptui.hxx +++ b/reportdesign/inc/pch/precompiled_rptui.hxx @@ -165,7 +165,6 @@ #include <vcl/outdev.hxx> #include <vcl/outdevmap.hxx> #include <vcl/outdevstate.hxx> -#include <vcl/pointr.hxx> #include <vcl/prntypes.hxx> #include <vcl/ptrstyle.hxx> #include <vcl/region.hxx> diff --git a/reportdesign/source/ui/report/dlgedfunc.cxx b/reportdesign/source/ui/report/dlgedfunc.cxx index d66ce42d381e..19aa64308845 100644 --- a/reportdesign/source/ui/report/dlgedfunc.cxx +++ b/reportdesign/source/ui/report/dlgedfunc.cxx @@ -19,6 +19,7 @@ #include <vcl/scrbar.hxx> #include <vcl/svapp.hxx> #include <vcl/seleng.hxx> +#include <vcl/ptrstyle.hxx> #include <com/sun/star/embed/EmbedStates.hpp> #include <com/sun/star/embed/XEmbeddedObject.hpp> #include <com/sun/star/beans/XPropertySet.hpp> @@ -611,13 +612,13 @@ bool DlgEdFunc::setMovementPointer(const MouseEvent& rMEvt) { bool bIsSetPoint = isRectangleHit(rMEvt); if ( bIsSetPoint ) - m_pParent->SetPointer( Pointer(PointerStyle::NotAllowed)); + m_pParent->SetPointer( PointerStyle::NotAllowed ); else { bool bCtrlKey = rMEvt.IsMod1(); if (bCtrlKey) { - m_pParent->SetPointer( Pointer(PointerStyle::MoveDataLink )); + m_pParent->SetPointer( PointerStyle::MoveDataLink ); bIsSetPoint = true; } } diff --git a/sc/inc/docuno.hxx b/sc/inc/docuno.hxx index ad4dc8ef931c..580379642610 100644 --- a/sc/inc/docuno.hxx +++ b/sc/inc/docuno.hxx @@ -374,7 +374,7 @@ public: long nTileHeight ) override; /// @see vcl::ITiledRenderable::getPointer(). - virtual Pointer getPointer() override; + virtual PointerStyle getPointer() override; /// @see vcl::ITiledRenderable::getTrackedChanges(). OUString getTrackedChanges() override; diff --git a/sc/inc/pch/precompiled_sc.hxx b/sc/inc/pch/precompiled_sc.hxx index a3560a3b8baf..67f567be8246 100644 --- a/sc/inc/pch/precompiled_sc.hxx +++ b/sc/inc/pch/precompiled_sc.hxx @@ -157,7 +157,6 @@ #include <vcl/metric.hxx> #include <vcl/notebookbar.hxx> #include <vcl/outdev.hxx> -#include <vcl/pointr.hxx> #include <vcl/ptrstyle.hxx> #include <vcl/region.hxx> #include <vcl/salnativewidgets.hxx> diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx index b484a5a44023..a6c1096e9f48 100644 --- a/sc/source/ui/app/inputwin.cxx +++ b/sc/source/ui/app/inputwin.cxx @@ -669,9 +669,9 @@ void ScInputWindow::MouseMove( const MouseEvent& rMEvt ) ScInputBarGroup* pGroupBar = dynamic_cast<ScInputBarGroup*>(pRuntimeWindow.get()); if (bInResize || IsPointerAtResizePos()) - SetPointer(Pointer(PointerStyle::WindowSSize)); + SetPointer(PointerStyle::WindowSSize); else - SetPointer(Pointer(PointerStyle::Arrow)); + SetPointer(PointerStyle::Arrow); if (bInResize) { diff --git a/sc/source/ui/dbgui/csvruler.cxx b/sc/source/ui/dbgui/csvruler.cxx index 2046a770d7c1..533c8744ee18 100644 --- a/sc/source/ui/dbgui/csvruler.cxx +++ b/sc/source/ui/dbgui/csvruler.cxx @@ -27,6 +27,7 @@ #include <vcl/event.hxx> #include <vcl/settings.hxx> #include <vcl/virdev.hxx> +#include <vcl/ptrstyle.hxx> #include <miscuno.hxx> using namespace com::sun::star::uno; @@ -648,7 +649,7 @@ void ScCsvRuler::ImplInvertCursor( sal_Int32 nPos ) void ScCsvRuler::ImplSetMousePointer( sal_Int32 nPos ) { - SetPointer( Pointer( HasSplit( nPos ) ? PointerStyle::HSplit : PointerStyle::Arrow ) ); + SetPointer( HasSplit( nPos ) ? PointerStyle::HSplit : PointerStyle::Arrow ); } // accessibility ============================================================== diff --git a/sc/source/ui/dbgui/scuiasciiopt.cxx b/sc/source/ui/dbgui/scuiasciiopt.cxx index 72b34fa3b811..8c847673f3b0 100644 --- a/sc/source/ui/dbgui/scuiasciiopt.cxx +++ b/sc/source/ui/dbgui/scuiasciiopt.cxx @@ -26,6 +26,7 @@ #include <vcl/field.hxx> #include <vcl/fixed.hxx> #include <vcl/lstbox.hxx> +#include <vcl/ptrstyle.hxx> #include <global.hxx> #include <scresid.hxx> @@ -738,12 +739,12 @@ IMPL_LINK( ScImportAsciiDlg, RbSepFixHdl, Button*, pButton, void ) if( (pButton == pRbFixed) || (pButton == pRbSeparated) ) { - SetPointer( Pointer( PointerStyle::Wait ) ); + SetPointer( PointerStyle::Wait ); if( pRbFixed->IsChecked() ) mpTableBox->SetFixedWidthMode(); else mpTableBox->SetSeparatorsMode(); - SetPointer( Pointer( PointerStyle::Arrow ) ); + SetPointer( PointerStyle::Arrow ); SetupSeparatorCtrls(); } @@ -790,7 +791,7 @@ IMPL_LINK( ScImportAsciiDlg, CharSetHdl, ListBox&, rListBox, void ) SvxTextEncodingBox* pCharSetBox = static_cast<SvxTextEncodingBox*>(&rListBox); if( (pCharSetBox == pLbCharSet) && (pCharSetBox->GetSelectedEntryCount() == 1) ) { - SetPointer( Pointer( PointerStyle::Wait ) ); + SetPointer( PointerStyle::Wait ); rtl_TextEncoding eOldCharSet = meCharSet; SetSelectedCharSet(); // switching char-set invalidates 8bit -> String conversions @@ -798,7 +799,7 @@ IMPL_LINK( ScImportAsciiDlg, CharSetHdl, ListBox&, rListBox, void ) UpdateVertical(); mpTableBox->Execute( CSVCMD_NEWCELLTEXTS ); - SetPointer( Pointer( PointerStyle::Arrow ) ); + SetPointer( PointerStyle::Arrow ); } } diff --git a/sc/source/ui/drawfunc/fuconarc.cxx b/sc/source/ui/drawfunc/fuconarc.cxx index 8fde47db67e0..1c93f4a38882 100644 --- a/sc/source/ui/drawfunc/fuconarc.cxx +++ b/sc/source/ui/drawfunc/fuconarc.cxx @@ -75,22 +75,22 @@ void FuConstArc::Activate() switch (aSfxRequest.GetSlot() ) { case SID_DRAW_ARC: - aNewPointer = Pointer( PointerStyle::DrawArc ); + aNewPointer = PointerStyle::DrawArc; aObjKind = OBJ_CARC; break; case SID_DRAW_PIE: - aNewPointer = Pointer( PointerStyle::DrawPie ); + aNewPointer = PointerStyle::DrawPie; aObjKind = OBJ_SECT; break; case SID_DRAW_CIRCLECUT: - aNewPointer = Pointer( PointerStyle::DrawCircleCut ); + aNewPointer = PointerStyle::DrawCircleCut; aObjKind = OBJ_CCUT; break; default: - aNewPointer = Pointer( PointerStyle::Cross ); + aNewPointer = PointerStyle::Cross; aObjKind = OBJ_CARC; break; } diff --git a/sc/source/ui/drawfunc/fuconcustomshape.cxx b/sc/source/ui/drawfunc/fuconcustomshape.cxx index 23eebb22b5e9..6d168ad82740 100644 --- a/sc/source/ui/drawfunc/fuconcustomshape.cxx +++ b/sc/source/ui/drawfunc/fuconcustomshape.cxx @@ -99,7 +99,7 @@ void FuConstCustomShape::Activate() { pView->SetCurrentObj( OBJ_CUSTOMSHAPE ); - aNewPointer = Pointer( PointerStyle::DrawRect ); + aNewPointer = PointerStyle::DrawRect; aOldPointer = pWindow->GetPointer(); rViewShell.SetActivePointer( aNewPointer ); diff --git a/sc/source/ui/drawfunc/fuconpol.cxx b/sc/source/ui/drawfunc/fuconpol.cxx index 8f2a7506e8ec..ed345c5ae5c2 100644 --- a/sc/source/ui/drawfunc/fuconpol.cxx +++ b/sc/source/ui/drawfunc/fuconpol.cxx @@ -156,7 +156,7 @@ void FuConstPolygon::Activate() FuConstruct::Activate(); - aNewPointer = Pointer( PointerStyle::DrawPolygon ); + aNewPointer = PointerStyle::DrawPolygon; aOldPointer = pWindow->GetPointer(); rViewShell.SetActivePointer( aNewPointer ); } diff --git a/sc/source/ui/drawfunc/fuconrec.cxx b/sc/source/ui/drawfunc/fuconrec.cxx index a77bda2ec917..5ecc2b057bc1 100644 --- a/sc/source/ui/drawfunc/fuconrec.cxx +++ b/sc/source/ui/drawfunc/fuconrec.cxx @@ -165,33 +165,33 @@ void FuConstRectangle::Activate() case SID_LINE_CIRCLE_ARROW: case SID_LINE_SQUARE_ARROW: case SID_LINE_ARROWS: - aNewPointer = Pointer( PointerStyle::DrawLine ); + aNewPointer = PointerStyle::DrawLine; aObjKind = OBJ_LINE; break; case SID_DRAW_MEASURELINE: - aNewPointer = Pointer( PointerStyle::DrawLine ); + aNewPointer = PointerStyle::DrawLine; aObjKind = OBJ_MEASURE; break; case SID_DRAW_RECT: - aNewPointer = Pointer( PointerStyle::DrawRect ); + aNewPointer = PointerStyle::DrawRect; aObjKind = OBJ_RECT; break; case SID_DRAW_ELLIPSE: - aNewPointer = Pointer( PointerStyle::DrawEllipse ); + aNewPointer = PointerStyle::DrawEllipse; aObjKind = OBJ_CIRC; break; case SID_DRAW_CAPTION: case SID_DRAW_CAPTION_VERTICAL: - aNewPointer = Pointer( PointerStyle::DrawCaption ); + aNewPointer = PointerStyle::DrawCaption; aObjKind = OBJ_CAPTION; break; default: - aNewPointer = Pointer( PointerStyle::Cross ); + aNewPointer = PointerStyle::Cross; aObjKind = OBJ_RECT; break; } diff --git a/sc/source/ui/drawfunc/fuconstr.cxx b/sc/source/ui/drawfunc/fuconstr.cxx index e6f61bd3d38d..1f0abb286391 100644 --- a/sc/source/ui/drawfunc/fuconstr.cxx +++ b/sc/source/ui/drawfunc/fuconstr.cxx @@ -118,7 +118,7 @@ bool FuConstruct::MouseMove(const MouseEvent& rMEvt) } else if ( pView->IsMarkedHit(aPnt) ) { - rViewShell.SetActivePointer(Pointer(PointerStyle::Move)); + rViewShell.SetActivePointer(PointerStyle::Move); } else { diff --git a/sc/source/ui/drawfunc/fuconuno.cxx b/sc/source/ui/drawfunc/fuconuno.cxx index 3fe103ac2aa4..948b1568ddb3 100644 --- a/sc/source/ui/drawfunc/fuconuno.cxx +++ b/sc/source/ui/drawfunc/fuconuno.cxx @@ -76,7 +76,7 @@ void FuConstUnoControl::Activate() { pView->SetCurrentObj( nIdentifier, nInventor ); - aNewPointer = Pointer( PointerStyle::DrawRect ); + aNewPointer = PointerStyle::DrawRect; aOldPointer = pWindow->GetPointer(); rViewShell.SetActivePointer( aNewPointer ); diff --git a/sc/source/ui/drawfunc/fudraw.cxx b/sc/source/ui/drawfunc/fudraw.cxx index d0cd38557ec6..dfcce237c551 100644 --- a/sc/source/ui/drawfunc/fudraw.cxx +++ b/sc/source/ui/drawfunc/fudraw.cxx @@ -664,7 +664,7 @@ void FuDraw::ForcePointer(const MouseEvent* pMEvt) if ( pView->IsTextEdit() ) { - rViewShell.SetActivePointer(Pointer(PointerStyle::Text)); // can't be ? + rViewShell.SetActivePointer(PointerStyle::Text); // can't be ? } else if ( pHdl ) { @@ -673,13 +673,13 @@ void FuDraw::ForcePointer(const MouseEvent* pMEvt) } else if ( pView->IsMarkedHit(aPnt) ) { - rViewShell.SetActivePointer( Pointer(PointerStyle::Move) ); + rViewShell.SetActivePointer( PointerStyle::Move ); } else if ( !bAlt && ( !pMEvt || !pMEvt->GetButtons() ) && lcl_UrlHit( pView, aPosPixel, pWindow ) ) { // could be suppressed with ALT - pWindow->SetPointer( Pointer( PointerStyle::RefHand ) ); // Text-URL / ImageMap + pWindow->SetPointer( PointerStyle::RefHand ); // Text-URL / ImageMap } else if ( !bAlt && (pObj = pView->PickObj(aPnt, pView->getHitTolLog(), pPV, SdrSearchOptions::PICKMACRO)) ) { @@ -688,9 +688,9 @@ void FuDraw::ForcePointer(const MouseEvent* pMEvt) rViewShell.SetActivePointer( pObj->GetMacroPointer(aHitRec) ); } else if ( !bAlt && pInfo && (!pInfo->GetMacro().isEmpty() || !pInfo->GetHlink().isEmpty()) ) - pWindow->SetPointer( Pointer( PointerStyle::RefHand ) ); + pWindow->SetPointer( PointerStyle::RefHand ); else if ( IsDetectiveHit( aPnt ) ) - rViewShell.SetActivePointer( Pointer( PointerStyle::Detective ) ); + rViewShell.SetActivePointer( PointerStyle::Detective ); else rViewShell.SetActivePointer( aNewPointer ); //! in Gridwin? } diff --git a/sc/source/ui/drawfunc/futext.cxx b/sc/source/ui/drawfunc/futext.cxx index ae3290911a26..a298bab0aed6 100644 --- a/sc/source/ui/drawfunc/futext.cxx +++ b/sc/source/ui/drawfunc/futext.cxx @@ -517,7 +517,7 @@ void FuText::Activate() pView->SetCreateMode(); } - aNewPointer = Pointer(PointerStyle::Text); + aNewPointer = PointerStyle::Text; aOldPointer = pWindow->GetPointer(); rViewShell.SetActivePointer( aNewPointer ); diff --git a/sc/source/ui/inc/fudraw.hxx b/sc/source/ui/inc/fudraw.hxx index e980f3c5de68..a3c1e6f2ddba 100644 --- a/sc/source/ui/inc/fudraw.hxx +++ b/sc/source/ui/inc/fudraw.hxx @@ -21,14 +21,15 @@ #define INCLUDED_SC_SOURCE_UI_INC_FUDRAW_HXX #include "fupoor.hxx" -#include <vcl/pointr.hxx> + +enum class PointerStyle; /** Base class for all Drawmodule specific functions */ class FuDraw : public FuPoor { protected: - Pointer aNewPointer; - Pointer aOldPointer; + PointerStyle aNewPointer; + PointerStyle aOldPointer; public: FuDraw(ScTabViewShell& rViewSh, vcl::Window* pWin, ScDrawView* pView, diff --git a/sc/source/ui/inc/tabview.hxx b/sc/source/ui/inc/tabview.hxx index d53480945284..d2be9e94a35a 100644 --- a/sc/source/ui/inc/tabview.hxx +++ b/sc/source/ui/inc/tabview.hxx @@ -381,7 +381,7 @@ public: ScSplitPos FindWindow( const vcl::Window* pWindow ) const; - void SetActivePointer( const Pointer& rPointer ); + void SetActivePointer( PointerStyle nPointer ); void ActiveGrabFocus(); diff --git a/sc/source/ui/miscdlgs/acredlin.cxx b/sc/source/ui/miscdlgs/acredlin.cxx index 7020f891497f..0c769df17cd2 100644 --- a/sc/source/ui/miscdlgs/acredlin.cxx +++ b/sc/source/ui/miscdlgs/acredlin.cxx @@ -743,7 +743,7 @@ void ScAcceptChgDlg::UpdateView() SvTreeListEntry* pParent=nullptr; ScChangeTrack* pChanges=nullptr; const ScChangeAction* pScChangeAction=nullptr; - SetPointer(Pointer(PointerStyle::Wait)); + SetPointer(PointerStyle::Wait); pTheView->SetUpdateMode(false); bool bFilterFlag = pTPFilter->IsDate() || pTPFilter->IsRange() || pTPFilter->IsAuthor() || pTPFilter->IsComment(); @@ -828,7 +828,7 @@ void ScAcceptChgDlg::UpdateView() pParent->EnableChildrenOnDemand(); } pTheView->SetUpdateMode(true); - SetPointer(Pointer(PointerStyle::Arrow)); + SetPointer(PointerStyle::Arrow); SvTreeListEntry* pEntry=pTheView->First(); if(pEntry!=nullptr) pTheView->Select(pEntry); @@ -906,7 +906,7 @@ IMPL_LINK( ScAcceptChgDlg, FilterHandle, SvxTPFilter*, pRef, void ) IMPL_LINK( ScAcceptChgDlg, RejectHandle, SvxTPView*, pRef, void ) { - SetPointer(Pointer(PointerStyle::Wait)); + SetPointer(PointerStyle::Wait); bIgnoreMsg=true; ScChangeTrack* pChanges=pDoc->GetChangeTrack(); @@ -937,13 +937,13 @@ IMPL_LINK( ScAcceptChgDlg, RejectHandle, SvxTPView*, pRef, void ) ClearView(); UpdateView(); } - SetPointer(Pointer(PointerStyle::Arrow)); + SetPointer(PointerStyle::Arrow); bIgnoreMsg=false; } IMPL_LINK( ScAcceptChgDlg, AcceptHandle, SvxTPView*, pRef, void ) { - SetPointer(Pointer(PointerStyle::Wait)); + SetPointer(PointerStyle::Wait); ScChangeTrack* pChanges=pDoc->GetChangeTrack(); bIgnoreMsg=true; @@ -1020,7 +1020,7 @@ void ScAcceptChgDlg::AcceptFiltered() IMPL_LINK_NOARG(ScAcceptChgDlg, RejectAllHandle, SvxTPView*, void) { - SetPointer(Pointer(PointerStyle::Wait)); + SetPointer(PointerStyle::Wait); bIgnoreMsg=true; ScChangeTrack* pChanges=pDoc->GetChangeTrack(); if(pChanges!=nullptr) @@ -1040,14 +1040,14 @@ IMPL_LINK_NOARG(ScAcceptChgDlg, RejectAllHandle, SvxTPView*, void) ClearView(); UpdateView(); } - SetPointer(Pointer(PointerStyle::Arrow)); + SetPointer(PointerStyle::Arrow); bIgnoreMsg=false; } IMPL_LINK_NOARG(ScAcceptChgDlg, AcceptAllHandle, SvxTPView*, void) { - SetPointer(Pointer(PointerStyle::Wait)); + SetPointer(PointerStyle::Wait); bIgnoreMsg=true; ScChangeTrack* pChanges=pDoc->GetChangeTrack(); @@ -1066,7 +1066,7 @@ IMPL_LINK_NOARG(ScAcceptChgDlg, AcceptAllHandle, SvxTPView*, void) UpdateView(); } bIgnoreMsg=false; - SetPointer(Pointer(PointerStyle::Arrow)); + SetPointer(PointerStyle::Arrow); } IMPL_LINK_NOARG(ScAcceptChgDlg, SelectHandle, SvTreeListBox*, void) @@ -1302,7 +1302,7 @@ bool ScAcceptChgDlg::Expand( IMPL_LINK( ScAcceptChgDlg, ExpandingHandle, SvTreeListBox*, pTable, bool ) { ScChangeTrack* pChanges=pDoc->GetChangeTrack(); - SetPointer(Pointer(PointerStyle::Wait)); + SetPointer(PointerStyle::Wait); if(pTable!=nullptr && pChanges!=nullptr) { ScChangeActionMap aActionMap; @@ -1357,7 +1357,7 @@ IMPL_LINK( ScAcceptChgDlg, ExpandingHandle, SvTreeListBox*, pTable, bool ) } } - SetPointer(Pointer(PointerStyle::Arrow)); + SetPointer(PointerStyle::Arrow); return true; } @@ -1367,7 +1367,7 @@ void ScAcceptChgDlg::AppendChanges(const ScChangeTrack* pChanges,sal_uLong nStar if(pChanges!=nullptr) { SvTreeListEntry* pParent=nullptr; - SetPointer(Pointer(PointerStyle::Wait)); + SetPointer(PointerStyle::Wait); pTheView->SetUpdateMode(false); bool bTheFlag = false; @@ -1433,7 +1433,7 @@ void ScAcceptChgDlg::AppendChanges(const ScChangeTrack* pChanges,sal_uLong nStar pTPView->EnableRejectAll(bTheFlag); pTheView->SetUpdateMode(true); - SetPointer(Pointer(PointerStyle::Arrow)); + SetPointer(PointerStyle::Arrow); } } diff --git a/sc/source/ui/miscdlgs/conflictsdlg.cxx b/sc/source/ui/miscdlgs/conflictsdlg.cxx index bd62d7d24fd6..0f5286d4ddda 100644 --- a/sc/source/ui/miscdlgs/conflictsdlg.cxx +++ b/sc/source/ui/miscdlgs/conflictsdlg.cxx @@ -572,11 +572,11 @@ void ScConflictsDlg::KeepHandler( bool bMine ) { return; } - SetPointer( Pointer( PointerStyle::Wait ) ); + SetPointer( PointerStyle::Wait ); ScConflictAction eConflictAction = ( bMine ? SC_CONFLICT_ACTION_KEEP_MINE : SC_CONFLICT_ACTION_KEEP_OTHER ); SetConflictAction( pRootEntry, eConflictAction ); m_pLbConflicts->RemoveEntry( pRootEntry ); - SetPointer( Pointer( PointerStyle::Arrow ) ); + SetPointer( PointerStyle::Arrow ); if ( m_pLbConflicts->GetEntryCount() == 0 ) { EndDialog( RET_OK ); @@ -591,7 +591,7 @@ void ScConflictsDlg::KeepAllHandler( bool bMine ) { return; } - SetPointer( Pointer( PointerStyle::Wait ) ); + SetPointer( PointerStyle::Wait ); ScConflictAction eConflictAction = ( bMine ? SC_CONFLICT_ACTION_KEEP_MINE : SC_CONFLICT_ACTION_KEEP_OTHER ); while ( pRootEntry ) { @@ -601,7 +601,7 @@ void ScConflictsDlg::KeepAllHandler( bool bMine ) m_pLbConflicts->SetUpdateMode( false ); m_pLbConflicts->Clear(); m_pLbConflicts->SetUpdateMode( true ); - SetPointer( Pointer( PointerStyle::Arrow ) ); + SetPointer( PointerStyle::Arrow ); EndDialog( RET_OK ); } diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx index eee3d8029ba3..962c2da2df1b 100644 --- a/sc/source/ui/unoobj/docuno.cxx +++ b/sc/source/ui/unoobj/docuno.cxx @@ -1027,17 +1027,17 @@ OString ScModelObj::getCellCursor( int nOutputWidth, int nOutputHeight, return "{ \"commandName\": \".uno:CellCursor\", \"commandValues\": \"" + pGridWindow->getCellCursor( nOutputWidth, nOutputHeight, nTileWidth, nTileHeight ) + "\" }"; } -Pointer ScModelObj::getPointer() +PointerStyle ScModelObj::getPointer() { SolarMutexGuard aGuard; ScViewData* pViewData = ScDocShell::GetViewData(); if (!pViewData) - return Pointer(); + return PointerStyle::Arrow; ScGridWindow* pGridWindow = pViewData->GetActiveWin(); if (!pGridWindow) - return Pointer(); + return PointerStyle::Arrow; return pGridWindow->GetPointer(); } diff --git a/sc/source/ui/vba/vbaapplication.cxx b/sc/source/ui/vba/vbaapplication.cxx index 9a139117454c..b8b8228afe36 100644 --- a/sc/source/ui/vba/vbaapplication.cxx +++ b/sc/source/ui/vba/vbaapplication.cxx @@ -722,22 +722,21 @@ ScVbaApplication::setCursor( sal_Int32 _cursor ) { case excel::XlMousePointer::xlNorthwestArrow: { - const Pointer& rPointer( PointerStyle::Arrow ); - setCursorHelper( xModel, rPointer, false ); + PointerStyle nPointer( PointerStyle::Arrow ); + setCursorHelper( xModel, nPointer, false ); break; } case excel::XlMousePointer::xlWait: case excel::XlMousePointer::xlIBeam: { - const Pointer& rPointer( static_cast< PointerStyle >( _cursor ) ); + PointerStyle nPointer( static_cast< PointerStyle >( _cursor ) ); //It will set the edit window, toobar and statusbar's mouse pointer. - setCursorHelper( xModel, rPointer, true ); + setCursorHelper( xModel, nPointer, true ); break; } case excel::XlMousePointer::xlDefault: { - const Pointer& rPointer( PointerStyle::Null ); - setCursorHelper( xModel, rPointer, false ); + setCursorHelper( xModel, PointerStyle::Null, false ); break; } default: diff --git a/sc/source/ui/view/formatsh.cxx b/sc/source/ui/view/formatsh.cxx index d9fdf1a6b20d..2cce67118824 100644 --- a/sc/source/ui/view/formatsh.cxx +++ b/sc/source/ui/view/formatsh.cxx @@ -476,13 +476,13 @@ void ScFormatShell::ExecuteStyle( SfxRequest& rReq ) if ( !bWaterCan && pStyleSheet ) { pScMod->SetWaterCan( true ); - pTabViewShell->SetActivePointer( Pointer(PointerStyle::Fill) ); + pTabViewShell->SetActivePointer( PointerStyle::Fill ); rReq.Done(); } else { pScMod->SetWaterCan( false ); - pTabViewShell->SetActivePointer( Pointer(PointerStyle::Arrow) ); + pTabViewShell->SetActivePointer( PointerStyle::Arrow ); rReq.Done(); } } diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx index 72ec475c1b21..5310e1a8cbed 100644 --- a/sc/source/ui/view/gridwin.cxx +++ b/sc/source/ui/view/gridwin.cxx @@ -1291,7 +1291,7 @@ bool ScGridWindow::TestMouse( const MouseEvent& rMEvt, bool bAction ) Point aMousePos = rMEvt.GetPosPixel(); if (mpAutoFillRect->IsInside(aMousePos)) { - SetPointer( Pointer( PointerStyle::Cross ) ); //! bold cross ? + SetPointer( PointerStyle::Cross ); //! bold cross ? if (bAction) { SCCOL nX = aMarkRange.aEnd.Col(); @@ -1335,7 +1335,7 @@ bool ScGridWindow::TestMouse( const MouseEvent& rMEvt, bool bAction ) aMousePos.Y() >= aEndPos.Y()-3 && aMousePos.Y() <= aEndPos.Y()+1 ); if ( bTop || bBottom ) { - SetPointer( Pointer( PointerStyle::Cross ) ); + SetPointer( PointerStyle::Cross ); if (bAction) { ScFillMode nMode = bTop ? ScFillMode::EMBED_LT : ScFillMode::EMBED_RB; @@ -1783,7 +1783,7 @@ void ScGridWindow::HandleMouseButtonDown( const MouseEvent& rMEvt, MouseEventSta if ( !bAlt && rMEvt.IsLeft() && GetEditUrl(rMEvt.GetPosPixel()) ) // click on link: do not move cursor { - SetPointer( Pointer( PointerStyle::RefHand ) ); + SetPointer( PointerStyle::RefHand ); nMouseStatus = SC_GM_URLDOWN; // also only execute when ButtonUp return; } @@ -1891,7 +1891,7 @@ void ScGridWindow::MouseButtonUp( const MouseEvent& rMEvt ) { RFMouseMove( rMEvt, true ); // Again the proper range bRFMouse = false; - SetPointer( Pointer( PointerStyle::Arrow ) ); + SetPointer( PointerStyle::Arrow ); ReleaseMouse(); return; } @@ -1900,7 +1900,7 @@ void ScGridWindow::MouseButtonUp( const MouseEvent& rMEvt ) { PagebreakMove( rMEvt, true ); nPagebreakMouse = SC_PD_NONE; - SetPointer( Pointer( PointerStyle::Arrow ) ); + SetPointer( PointerStyle::Arrow ); ReleaseMouse(); return; } @@ -1931,7 +1931,7 @@ void ScGridWindow::MouseButtonUp( const MouseEvent& rMEvt ) rMark.SetMarking(false); - SetPointer( Pointer( PointerStyle::Arrow ) ); + SetPointer( PointerStyle::Arrow ); if (pViewData->IsFillMode() || ( pViewData->GetFillMode() == ScFillMode::MATRIX && rMEvt.IsMod1() )) @@ -2340,7 +2340,7 @@ void ScGridWindow::MouseMove( const MouseEvent& rMEvt ) if ( pViewData->GetViewShell()->IsAuditShell() ) // Detective Fill Mode { - SetPointer( Pointer( PointerStyle::Fill ) ); + SetPointer( PointerStyle::Fill ); return; } @@ -2411,7 +2411,7 @@ void ScGridWindow::MouseMove( const MouseEvent& rMEvt ) { if ( !pEditView ) { - SetPointer( Pointer( PointerStyle::Text ) ); + SetPointer( PointerStyle::Text ); return; } @@ -2428,18 +2428,18 @@ void ScGridWindow::MouseMove( const MouseEvent& rMEvt ) // Field can only be URL field bool bAlt = rMEvt.IsMod2(); if ( !bAlt && !nButtonDown && pFld ) - SetPointer( Pointer( PointerStyle::RefHand ) ); + SetPointer( PointerStyle::RefHand ); else if ( pEditView->GetEditEngine()->IsVertical() ) - SetPointer( Pointer( PointerStyle::TextVertical ) ); + SetPointer( PointerStyle::TextVertical ); else - SetPointer( Pointer( PointerStyle::Text ) ); + SetPointer( PointerStyle::Text ); return; } } bool bWater = SC_MOD()->GetIsWaterCan() || pViewData->GetView()->HasPaintBrush(); if (bWater) - SetPointer( Pointer(PointerStyle::Fill) ); + SetPointer( PointerStyle::Fill ); if (!bWater) { @@ -2451,9 +2451,9 @@ void ScGridWindow::MouseMove( const MouseEvent& rMEvt ) if ( HitRangeFinder( rMEvt.GetPosPixel(), rCorner, nullptr, nullptr, nullptr ) ) { if (rCorner != NONE) - SetPointer( Pointer( PointerStyle::Cross ) ); + SetPointer( PointerStyle::Cross ); else - SetPointer( Pointer( PointerStyle::Hand ) ); + SetPointer( PointerStyle::Hand ); bCross = true; } @@ -2485,7 +2485,7 @@ void ScGridWindow::MouseMove( const MouseEvent& rMEvt ) eNew = PointerStyle::NESize; break; } - SetPointer( Pointer( eNew ) ); + SetPointer( eNew ); bCross = true; } @@ -2497,7 +2497,7 @@ void ScGridWindow::MouseMove( const MouseEvent& rMEvt ) if ( nButtonDown && pViewData->IsAnyFillMode() ) { - SetPointer( Pointer( PointerStyle::Cross ) ); + SetPointer( PointerStyle::Cross ); bCross = true; nScFillModeMouseModifier = rMEvt.GetModifier(); // evaluated for AutoFill and Matrix } @@ -2507,10 +2507,10 @@ void ScGridWindow::MouseMove( const MouseEvent& rMEvt ) bool bAlt = rMEvt.IsMod2(); if (bEditMode) // First has to be in edit mode! - SetPointer( Pointer( PointerStyle::Arrow ) ); + SetPointer( PointerStyle::Arrow ); else if ( !bAlt && !nButtonDown && GetEditUrl(rMEvt.GetPosPixel()) ) - SetPointer( Pointer( PointerStyle::RefHand ) ); + SetPointer( PointerStyle::RefHand ); else if ( DrawMouseMove(rMEvt) ) // Reset pointer return; } @@ -2626,7 +2626,7 @@ void ScGridWindow::Tracking( const TrackingEvent& rTEvt ) nPagebreakMouse = SC_PD_NONE; } - SetPointer( Pointer( PointerStyle::Arrow ) ); + SetPointer( PointerStyle::Arrow ); StopMarking(); MouseButtonUp( rMEvt ); // With status SC_GM_IGNORE from StopMarking @@ -4958,9 +4958,9 @@ void ScGridWindow::RFMouseMove( const MouseEvent& rMEvt, bool bUp ) // Mouse pointer if (bRFSize) - SetPointer( Pointer( PointerStyle::Cross ) ); + SetPointer( PointerStyle::Cross ); else - SetPointer( Pointer( PointerStyle::Hand ) ); + SetPointer( PointerStyle::Hand ); // Scrolling diff --git a/sc/source/ui/view/gridwin2.cxx b/sc/source/ui/view/gridwin2.cxx index 5a00f4b51c51..fda045a3789f 100644 --- a/sc/source/ui/view/gridwin2.cxx +++ b/sc/source/ui/view/gridwin2.cxx @@ -645,7 +645,7 @@ void ScGridWindow::DPMouseButtonUp( const MouseEvent& rMEvt ) ReleaseMouse(); DPTestMouse( rMEvt, false ); - SetPointer( Pointer( PointerStyle::Arrow ) ); + SetPointer( PointerStyle::Arrow ); } void ScGridWindow::UpdateDragRect( bool bShowRange, const tools::Rectangle& rPosRect ) diff --git a/sc/source/ui/view/gridwin3.cxx b/sc/source/ui/view/gridwin3.cxx index 96ecb6e580db..73df69c7172c 100644 --- a/sc/source/ui/view/gridwin3.cxx +++ b/sc/source/ui/view/gridwin3.cxx @@ -116,7 +116,7 @@ bool ScGridWindow::DrawMouseMove(const MouseEvent& rMEvt) } else { - SetPointer( Pointer( PointerStyle::Arrow ) ); + SetPointer( PointerStyle::Arrow ); return false; } } diff --git a/sc/source/ui/view/hdrcont.cxx b/sc/source/ui/view/hdrcont.cxx index cc3366ba024b..2feae6d48f4a 100644 --- a/sc/source/ui/view/hdrcont.cxx +++ b/sc/source/ui/view/hdrcont.cxx @@ -685,7 +685,7 @@ void ScHeaderControl::MouseButtonDown( const MouseEvent& rMEvt ) if ( nClicks && nClicks%2==0 ) { SetEntrySize( nDragNo, HDR_SIZE_OPTIMUM ); - SetPointer( Pointer( PointerStyle::Arrow ) ); + SetPointer( PointerStyle::Arrow ); } else { @@ -797,7 +797,7 @@ void ScHeaderControl::MouseMove( const MouseEvent& rMEvt ) { if ( IsDisabled() ) { - SetPointer( Pointer( PointerStyle::Arrow ) ); + SetPointer( PointerStyle::Arrow ); return; } @@ -836,9 +836,9 @@ void ScHeaderControl::MouseMove( const MouseEvent& rMEvt ) (void)GetMousePos( rMEvt, bIsBorder ); if ( bIsBorder && rMEvt.GetButtons()==0 && ResizeAllowed() ) - SetPointer( Pointer( bVertical ? PointerStyle::VSizeBar : PointerStyle::HSizeBar ) ); + SetPointer( bVertical ? PointerStyle::VSizeBar : PointerStyle::HSizeBar ); else - SetPointer( Pointer( PointerStyle::Arrow ) ); + SetPointer( PointerStyle::Arrow ); if (!bIgnoreMove) pSelEngine->SelMouseMove( rMEvt ); diff --git a/sc/source/ui/view/preview.cxx b/sc/source/ui/view/preview.cxx index 848c0045bcc2..26b1f4fa6825 100644 --- a/sc/source/ui/view/preview.cxx +++ b/sc/source/ui/view/preview.cxx @@ -1052,7 +1052,7 @@ void ScPreview::MouseButtonUp( const MouseEvent& rMEvt ) if( rMEvt.IsLeft() && GetPointer() == PointerStyle::HSizeBar ) { - SetPointer( Pointer( PointerStyle::Arrow ) ); + SetPointer( PointerStyle::Arrow ); ScDocument& rDoc = pDocShell->GetDocument(); OUString aOldName = rDoc.GetPageStyle( nTab ); @@ -1408,7 +1408,7 @@ void ScPreview::MouseMove( const MouseEvent& rMEvt ) { if( bOnColRulerChange || bColRulerMove ) { - SetPointer( Pointer( PointerStyle::HSplit ) ); + SetPointer( PointerStyle::HSplit ); if( bColRulerMove ) { if( aMouseMovePoint.X() > -aOffset.X() && aMouseMovePoint.X() < nWidth * HMM_PER_TWIPS - aOffset.X() ) @@ -1419,7 +1419,7 @@ void ScPreview::MouseMove( const MouseEvent& rMEvt ) { if( bLeftRulerChange && !bTopRulerMove && !bBottomRulerMove && !bHeaderRulerMove && !bFooterRulerMove ) { - SetPointer( Pointer( PointerStyle::HSizeBar ) ); + SetPointer( PointerStyle::HSizeBar ); if( bLeftRulerMove ) { if( aMouseMovePoint.X() > -aOffset.X() && aMouseMovePoint.X() < nWidth * HMM_PER_TWIPS - aOffset.X() ) @@ -1428,7 +1428,7 @@ void ScPreview::MouseMove( const MouseEvent& rMEvt ) } else if( bRightRulerChange && !bTopRulerMove && !bBottomRulerMove && !bHeaderRulerMove && !bFooterRulerMove ) { - SetPointer( Pointer( PointerStyle::HSizeBar ) ); + SetPointer( PointerStyle::HSizeBar ); if( bRightRulerMove ) { if( aMouseMovePoint.X() > -aOffset.X() && aMouseMovePoint.X() < nWidth * HMM_PER_TWIPS - aOffset.X() ) @@ -1447,7 +1447,7 @@ void ScPreview::MouseMove( const MouseEvent& rMEvt ) { if( bTopRulerChange ) { - SetPointer( Pointer( PointerStyle::VSizeBar ) ); + SetPointer( PointerStyle::VSizeBar ); if( bTopRulerMove ) { if( aMouseMovePoint.Y() > -aOffset.Y() && aMouseMovePoint.Y() < nHeight * HMM_PER_TWIPS - aOffset.Y() ) @@ -1456,7 +1456,7 @@ void ScPreview::MouseMove( const MouseEvent& rMEvt ) } else if( bBottomRulerChange ) { - SetPointer( Pointer( PointerStyle::VSizeBar ) ); + SetPointer( PointerStyle::VSizeBar ); if( bBottomRulerMove ) { if( aMouseMovePoint.Y() > -aOffset.Y() && aMouseMovePoint.Y() < nHeight * HMM_PER_TWIPS - aOffset.Y() ) @@ -1465,7 +1465,7 @@ void ScPreview::MouseMove( const MouseEvent& rMEvt ) } else if( bHeaderRulerChange ) { - SetPointer( Pointer( PointerStyle::VSizeBar ) ); + SetPointer( PointerStyle::VSizeBar ); if( bHeaderRulerMove ) { if( aMouseMovePoint.Y() > -aOffset.Y() && aMouseMovePoint.Y() < nHeight * HMM_PER_TWIPS - aOffset.Y() ) @@ -1474,7 +1474,7 @@ void ScPreview::MouseMove( const MouseEvent& rMEvt ) } else if( bFooterRulerChange ) { - SetPointer( Pointer( PointerStyle::VSizeBar ) ); + SetPointer( PointerStyle::VSizeBar ); if( bFooterRulerMove ) { if( aMouseMovePoint.Y() > -aOffset.Y() && aMouseMovePoint.Y() < nHeight * HMM_PER_TWIPS - aOffset.Y() ) @@ -1483,7 +1483,7 @@ void ScPreview::MouseMove( const MouseEvent& rMEvt ) } } else - SetPointer( Pointer( PointerStyle::Arrow ) ); + SetPointer( PointerStyle::Arrow ); } } } diff --git a/sc/source/ui/view/tabview.cxx b/sc/source/ui/view/tabview.cxx index d61b42d00812..b868c29280c3 100644 --- a/sc/source/ui/view/tabview.cxx +++ b/sc/source/ui/view/tabview.cxx @@ -914,11 +914,11 @@ ScGridWindow* ScTabView::GetActiveWin() return pGridWin[ePos]; } -void ScTabView::SetActivePointer( const Pointer& rPointer ) +void ScTabView::SetActivePointer( PointerStyle nPointer ) { for (VclPtr<ScGridWindow> & pWin : pGridWin) if (pWin) - pWin->SetPointer( rPointer ); + pWin->SetPointer( nPointer ); } void ScTabView::ActiveGrabFocus() diff --git a/sc/source/ui/view/tabview5.cxx b/sc/source/ui/view/tabview5.cxx index caf096317435..bb8855ddfb03 100644 --- a/sc/source/ui/view/tabview5.cxx +++ b/sc/source/ui/view/tabview5.cxx @@ -640,7 +640,7 @@ void ScTabView::ResetBrushDocument() if ( HasPaintBrush() ) { SetBrushDocument( nullptr, false ); - SetActivePointer( Pointer( PointerStyle::Arrow ) ); // switch pointers also when ended with escape key + SetActivePointer( PointerStyle::Arrow ); // switch pointers also when ended with escape key } } diff --git a/sd/inc/pch/precompiled_sdui.hxx b/sd/inc/pch/precompiled_sdui.hxx index dd6dc1a1ce3c..1a323669d41d 100644 --- a/sd/inc/pch/precompiled_sdui.hxx +++ b/sd/inc/pch/precompiled_sdui.hxx @@ -165,7 +165,6 @@ #include <vcl/outdev.hxx> #include <vcl/outdevmap.hxx> #include <vcl/outdevstate.hxx> -#include <vcl/pointr.hxx> #include <vcl/print.hxx> #include <vcl/prntypes.hxx> #include <vcl/ptrstyle.hxx> diff --git a/sd/source/ui/annotations/annotationwindow.cxx b/sd/source/ui/annotations/annotationwindow.cxx index 69a03e0712ef..621ea1d45502 100644 --- a/sd/source/ui/annotations/annotationwindow.cxx +++ b/sd/source/ui/annotations/annotationwindow.cxx @@ -66,6 +66,7 @@ #include <vcl/gradient.hxx> #include <vcl/cursor.hxx> #include <vcl/settings.hxx> +#include <vcl/ptrstyle.hxx> #include <tools/helpers.hxx> @@ -296,7 +297,7 @@ void AnnotationWindow::InitControls() { // actual window which holds the user text mpTextWindow = VclPtr<AnnotationTextWindow>::Create(this, WB_NODIALOGCONTROL); - mpTextWindow->SetPointer(Pointer(PointerStyle::Text)); + mpTextWindow->SetPointer(PointerStyle::Text); // window control for author and date mpMeta = VclPtr<MultiLineEdit>::Create(this,0); diff --git a/sd/source/ui/func/fuconuno.cxx b/sd/source/ui/func/fuconuno.cxx index 0458a8724de8..a2f345c25e94 100644 --- a/sd/source/ui/func/fuconuno.cxx +++ b/sd/source/ui/func/fuconuno.cxx @@ -28,6 +28,7 @@ #include <svx/fmglob.hxx> #include <svx/dialogs.hrc> +#include <vcl/ptrstyle.hxx> #include <app.hrc> #include <strings.hrc> @@ -117,7 +118,7 @@ void FuConstructUnoControl::Activate() { mpView->SetCurrentObj( nIdentifier, nInventor ); - aNewPointer = Pointer(PointerStyle::DrawRect); + aNewPointer = PointerStyle::DrawRect; aOldPointer = mpWindow->GetPointer(); mpWindow->SetPointer( aNewPointer ); diff --git a/sd/source/ui/func/fudraw.cxx b/sd/source/ui/func/fudraw.cxx index 2ecc44fe0a20..265915ec671f 100644 --- a/sd/source/ui/func/fudraw.cxx +++ b/sd/source/ui/func/fudraw.cxx @@ -21,6 +21,7 @@ #include <editeng/eeitem.hxx> #include <vcl/waitobj.hxx> +#include <vcl/ptrstyle.hxx> #include <editeng/flditem.hxx> #include <svx/svdogrp.hxx> #include <svx/svdoole2.hxx> @@ -478,7 +479,7 @@ void FuDraw::ForcePointer(const MouseEvent* pMEvt) { // water can mode bDefPointer = false; - mpWindow->SetPointer(Pointer(PointerStyle::Fill)); + mpWindow->SetPointer(PointerStyle::Fill); } } else @@ -489,7 +490,7 @@ void FuDraw::ForcePointer(const MouseEvent* pMEvt) { // water can mode bDefPointer = false; - mpWindow->SetPointer(Pointer(PointerStyle::Fill)); + mpWindow->SetPointer(PointerStyle::Fill); } else if (!pHdl && mpViewShell->GetViewFrame()->HasChildWindow(SvxBmpMaskChildWindow::GetChildWindowId())) @@ -500,7 +501,7 @@ void FuDraw::ForcePointer(const MouseEvent* pMEvt) if (pMask && pMask->IsEyedropping()) { bDefPointer = false; - mpWindow->SetPointer(Pointer(PointerStyle::RefHand)); + mpWindow->SetPointer(PointerStyle::RefHand); } } else if (!mpView->IsAction()) @@ -526,7 +527,7 @@ void FuDraw::ForcePointer(const MouseEvent* pMEvt) SdrObject* pObject = rMarkList.GetMark(0)->GetMarkedSdrObj(); if ((dynamic_cast<const E3dObject* >(pObject) != nullptr) && (rMarkList.GetMarkCount() == 1)) { - mpWindow->SetPointer(Pointer(PointerStyle::Rotate)); + mpWindow->SetPointer(PointerStyle::Rotate); bDefPointer = false; // Otherwise it'll be called Joe's routine and the mousepointer will reconfigurate again } } @@ -551,7 +552,7 @@ void FuDraw::ForcePointer(const MouseEvent* pMEvt) { pObj = nullptr; bDefPointer = false; - mpWindow->SetPointer(Pointer(PointerStyle::Arrow)); + mpWindow->SetPointer(PointerStyle::Arrow); } } @@ -648,7 +649,7 @@ bool FuDraw::SetPointer(SdrObject* pObj, const Point& rPos) { // Animation object bSet = true; - mpWindow->SetPointer(Pointer(PointerStyle::RefHand)); + mpWindow->SetPointer(PointerStyle::RefHand); } } else if (bImageMapInfo && @@ -658,7 +659,7 @@ bool FuDraw::SetPointer(SdrObject* pObj, const Point& rPos) * ImageMap ******************************************************/ bSet = true; - mpWindow->SetPointer(Pointer(PointerStyle::RefHand)); + mpWindow->SetPointer(PointerStyle::RefHand); } } } diff --git a/sd/source/ui/func/fudspord.cxx b/sd/source/ui/func/fudspord.cxx index 369fb95423f8..2157ba57b9ba 100644 --- a/sd/source/ui/func/fudspord.cxx +++ b/sd/source/ui/func/fudspord.cxx @@ -20,7 +20,7 @@ #include <fudspord.hxx> #include <svx/svxids.hrc> -#include <vcl/pointr.hxx> +#include <vcl/ptrstyle.hxx> #include <app.hrc> #include <fupoor.hxx> @@ -119,7 +119,7 @@ bool FuDisplayOrder::MouseButtonUp(const MouseEvent& rMEvt) void FuDisplayOrder::Activate() { maPtr = mpWindow->GetPointer(); - mpWindow->SetPointer( Pointer( PointerStyle::RefHand ) ); + mpWindow->SetPointer( PointerStyle::RefHand ); } void FuDisplayOrder::Deactivate() diff --git a/sd/source/ui/func/fuformatpaintbrush.cxx b/sd/source/ui/func/fuformatpaintbrush.cxx index 3781cf0322de..3af7592c1fbb 100644 --- a/sd/source/ui/func/fuformatpaintbrush.cxx +++ b/sd/source/ui/func/fuformatpaintbrush.cxx @@ -30,6 +30,7 @@ #include <editeng/outliner.hxx> #include <editeng/eeitem.hxx> #include <editeng/editeng.hxx> +#include <vcl/ptrstyle.hxx> #include <sdmod.hxx> @@ -152,7 +153,7 @@ bool FuFormatPaintBrush::MouseMove(const MouseEvent& rMEvt) if ( mpView->IsTextEdit() ) { bReturn = FuText::MouseMove( rMEvt ); - mpWindow->SetPointer(Pointer(PointerStyle::Fill)); + mpWindow->SetPointer(PointerStyle::Fill); } else { @@ -160,9 +161,9 @@ bool FuFormatPaintBrush::MouseMove(const MouseEvent& rMEvt) SdrPageView* pPV=nullptr; SdrObject* pObj = mpView->PickObj(mpWindow->PixelToLogic( rMEvt.GetPosPixel() ),nHitLog, pPV, SdrSearchOptions::PICKMARKABLE); if (pObj && HasContentForThisType(pObj->GetObjInventor(),pObj->GetObjIdentifier()) ) - mpWindow->SetPointer(Pointer(PointerStyle::Fill)); + mpWindow->SetPointer(PointerStyle::Fill); else - mpWindow->SetPointer(Pointer(PointerStyle::Arrow)); + mpWindow->SetPointer(PointerStyle::Arrow); } } return bReturn; diff --git a/sd/source/ui/func/fuzoom.cxx b/sd/source/ui/func/fuzoom.cxx index e71452847a9d..fc4489989298 100644 --- a/sd/source/ui/func/fuzoom.cxx +++ b/sd/source/ui/func/fuzoom.cxx @@ -24,6 +24,7 @@ #include <sfx2/viewfrm.hxx> #include <app.hrc> #include <svx/svdpagv.hxx> +#include <vcl/ptrstyle.hxx> #include <FrameView.hxx> #include <ViewShell.hxx> @@ -90,9 +91,9 @@ bool FuZoom::MouseButtonDown(const MouseEvent& rMEvt) bool FuZoom::MouseMove(const MouseEvent& rMEvt) { if (rMEvt.IsShift()) - mpWindow->SetPointer(Pointer(PointerStyle::Hand)); + mpWindow->SetPointer(PointerStyle::Hand); else if (nSlotId != SID_ZOOM_PANNING) - mpWindow->SetPointer(Pointer(PointerStyle::Magnify)); + mpWindow->SetPointer(PointerStyle::Magnify); if (bStartDrag) { @@ -197,11 +198,11 @@ void FuZoom::Activate() if (nSlotId == SID_ZOOM_PANNING) { - mpWindow->SetPointer(Pointer(PointerStyle::Hand)); + mpWindow->SetPointer(PointerStyle::Hand); } else { - mpWindow->SetPointer(Pointer(PointerStyle::Magnify)); + mpWindow->SetPointer(PointerStyle::Magnify); } } diff --git a/sd/source/ui/inc/fudraw.hxx b/sd/source/ui/inc/fudraw.hxx index 64bcde950f80..11158738ff82 100644 --- a/sd/source/ui/inc/fudraw.hxx +++ b/sd/source/ui/inc/fudraw.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_SD_SOURCE_UI_INC_FUDRAW_HXX #define INCLUDED_SD_SOURCE_UI_INC_FUDRAW_HXX -#include <vcl/pointr.hxx> #include "fupoor.hxx" struct SdrViewEvent; @@ -70,8 +69,8 @@ protected: virtual ~FuDraw() override; - Pointer aNewPointer; - Pointer aOldPointer; + PointerStyle aNewPointer; + PointerStyle aOldPointer; bool bMBDown; bool bDragHelpLine; sal_uInt16 nHelpLine; diff --git a/sd/source/ui/inc/fudspord.hxx b/sd/source/ui/inc/fudspord.hxx index 38534115b31b..8984cd5dee22 100644 --- a/sd/source/ui/inc/fudspord.hxx +++ b/sd/source/ui/inc/fudspord.hxx @@ -21,7 +21,6 @@ #define INCLUDED_SD_SOURCE_UI_INC_FUDSPORD_HXX #include "fupoor.hxx" -#include <vcl/pointr.hxx> class SdrDropMarkerOverlay; class SdrObject; @@ -47,7 +46,7 @@ private: virtual ~FuDisplayOrder() override; void implClearOverlay(); - Pointer maPtr; + PointerStyle maPtr; SdrObject* mpRefObj; std::unique_ptr<SdrDropMarkerOverlay> mpOverlay; diff --git a/sd/source/ui/inc/fuzoom.hxx b/sd/source/ui/inc/fuzoom.hxx index 1dfefb204735..50d15b029ce7 100644 --- a/sd/source/ui/inc/fuzoom.hxx +++ b/sd/source/ui/inc/fuzoom.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_SD_SOURCE_UI_INC_FUZOOM_HXX #define INCLUDED_SD_SOURCE_UI_INC_FUZOOM_HXX -#include <vcl/pointr.hxx> #include "fupoor.hxx" namespace sd { @@ -51,7 +50,7 @@ private: ::tools::Rectangle aZoomRect; bool bVisible; bool bStartDrag; - Pointer aPtr; + PointerStyle aPtr; FuZoom ( ViewShell* pViewSh, diff --git a/sd/source/ui/inc/unomodel.hxx b/sd/source/ui/inc/unomodel.hxx index b072bf303d6c..d13109d0667e 100644 --- a/sd/source/ui/inc/unomodel.hxx +++ b/sd/source/ui/inc/unomodel.hxx @@ -260,7 +260,7 @@ public: /// @see vcl::ITiledRenderable::isMimeTypeSupported(). virtual bool isMimeTypeSupported() override; /// @see vcl::ITiledRenderable::getPointer(). - virtual Pointer getPointer() override; + virtual PointerStyle getPointer() override; /// @see vcl::ITiledRenderable::getPostIts(). virtual OUString getPostIts() override; diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx index 4a3b066665b1..22b7019a7b9d 100644 --- a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx @@ -61,6 +61,7 @@ #include <sfx2/dispatch.hxx> #include <svx/svdpagv.hxx> #include <svx/svxids.hrc> +#include <vcl/ptrstyle.hxx> #include <boost/optional.hpp> #include <sdmod.hxx> @@ -254,7 +255,7 @@ protected: private: SelectionMode meSelectionMode; Point maSecondCorner; - Pointer const maSavedPointer; + PointerStyle const maSavedPointer; bool mbAutoScrollInstalled; sal_Int32 mnAnchorIndex; sal_Int32 mnSecondIndex; @@ -1253,8 +1254,7 @@ MultiSelectionModeHandler::MultiSelectionModeHandler ( void MultiSelectionModeHandler::Initialize(const sal_uInt32 nEventCode) { #endif - const Pointer aSelectionPointer (PointerStyle::Text); - mrSlideSorter.GetContentWindow()->SetPointer(aSelectionPointer); + mrSlideSorter.GetContentWindow()->SetPointer(PointerStyle::Text); SetSelectionModeFromModifier(nEventCode); } diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx index 457afdffdefa..927f33e44eef 100644 --- a/sd/source/ui/unoidl/unomodel.cxx +++ b/sd/source/ui/unoidl/unomodel.cxx @@ -2667,16 +2667,16 @@ bool SdXImpressDocument::isMimeTypeSupported() return EditEngine::HasValidData(aDataHelper.GetTransferable()); } -Pointer SdXImpressDocument::getPointer() +PointerStyle SdXImpressDocument::getPointer() { SolarMutexGuard aGuard; DrawViewShell* pViewShell = GetViewShell(); if (!pViewShell) - return Pointer(); + return PointerStyle::Arrow; Window* pWindow = pViewShell->GetActiveWindow(); if (!pWindow) - return Pointer(); + return PointerStyle::Arrow; return pWindow->GetPointer(); } diff --git a/sd/source/ui/view/viewoverlaymanager.cxx b/sd/source/ui/view/viewoverlaymanager.cxx index e4c450a10f29..0a23a60119cc 100644 --- a/sd/source/ui/view/viewoverlaymanager.cxx +++ b/sd/source/ui/view/viewoverlaymanager.cxx @@ -27,6 +27,7 @@ #include <vcl/help.hxx> #include <vcl/lazydelete.hxx> +#include <vcl/ptrstyle.hxx> #include <svx/sdrpagewindow.hxx> #include <svx/sdrpaintwindow.hxx> @@ -141,7 +142,7 @@ public: virtual ~ImageButtonHdl() override; virtual void CreateB2dIAObject() override; virtual bool IsFocusHdl() const override; - virtual Pointer GetPointer() const override; + virtual PointerStyle GetPointer() const override; virtual bool isMarkable() const override; virtual void onMouseEnter(const MouseEvent& rMEvt) override; @@ -298,9 +299,9 @@ bool ImageButtonHdl::isMarkable() const return false; } -Pointer ImageButtonHdl::GetPointer() const +PointerStyle ImageButtonHdl::GetPointer() const { - return Pointer( PointerStyle::Arrow ); + return PointerStyle::Arrow; } ChangePlaceholderTag::ChangePlaceholderTag( ::sd::View& rView, SdrObject& rPlaceholderObj ) diff --git a/sfx2/source/control/recentdocsview.cxx b/sfx2/source/control/recentdocsview.cxx index 4c38ae64ec5a..c1173e7c2e8b 100644 --- a/sfx2/source/control/recentdocsview.cxx +++ b/sfx2/source/control/recentdocsview.cxx @@ -28,6 +28,7 @@ #include <vcl/builderfactory.hxx> #include <vcl/event.hxx> #include <vcl/pngread.hxx> +#include <vcl/ptrstyle.hxx> #include <tools/stream.hxx> #include <tools/urlobj.hxx> #include <com/sun/star/beans/NamedValue.hpp> diff --git a/sfx2/source/control/recentdocsviewitem.cxx b/sfx2/source/control/recentdocsviewitem.cxx index bee417f91c7f..f1992285e782 100644 --- a/sfx2/source/control/recentdocsviewitem.cxx +++ b/sfx2/source/control/recentdocsviewitem.cxx @@ -22,6 +22,7 @@ #include <unotools/historyoptions.hxx> #include <vcl/svapp.hxx> #include <vcl/event.hxx> +#include <vcl/ptrstyle.hxx> #include <bitmaps.hlst> @@ -177,7 +178,7 @@ void RecentDocsViewItem::MouseButtonUp(const MouseEvent& rMEvt) void RecentDocsViewItem::OpenDocument() { // show busy mouse pointer - mrParent.SetPointer(Pointer(PointerStyle::Wait)); + mrParent.SetPointer(PointerStyle::Wait); Reference<frame::XDispatch> xDispatch; Reference<frame::XDispatchProvider> xDispatchProvider; diff --git a/sfx2/source/sidebar/DeckTitleBar.cxx b/sfx2/source/sidebar/DeckTitleBar.cxx index c0cf41d2e23e..601ae9966002 100644 --- a/sfx2/source/sidebar/DeckTitleBar.cxx +++ b/sfx2/source/sidebar/DeckTitleBar.cxx @@ -24,6 +24,7 @@ #include <sfx2/strings.hrc> #include <vcl/image.hxx> +#include <vcl/ptrstyle.hxx> #ifdef DEBUG #include <sfx2/sidebar/Tools.hxx> @@ -134,8 +135,7 @@ void DeckTitleBar::MouseMove (const MouseEvent& rMouseEvent) if ( aGrip.IsInside( rMouseEvent.GetPosPixel() ) ) eStyle = PointerStyle::Move; - Pointer aPtr( eStyle ); - SetPointer( aPtr ); + SetPointer( eStyle ); Window::MouseMove( rMouseEvent ); } diff --git a/slideshow/inc/pch/precompiled_slideshow.hxx b/slideshow/inc/pch/precompiled_slideshow.hxx index 70167a428d12..e12d6dcafa9f 100644 --- a/slideshow/inc/pch/precompiled_slideshow.hxx +++ b/slideshow/inc/pch/precompiled_slideshow.hxx @@ -129,7 +129,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/solenv/clang-format/blacklist b/solenv/clang-format/blacklist index 3d48948e1734..9ddb06f9e255 100644 --- a/solenv/clang-format/blacklist +++ b/solenv/clang-format/blacklist @@ -7993,7 +7993,6 @@ include/vcl/pdfextoutdevdata.hxx include/vcl/pdfwriter.hxx include/vcl/pngread.hxx include/vcl/pngwrite.hxx -include/vcl/pointr.hxx include/vcl/popupmenuwindow.hxx include/vcl/ppdparser.hxx include/vcl/prgsbar.hxx diff --git a/svtools/inc/table/tablecontrolinterface.hxx b/svtools/inc/table/tablecontrolinterface.hxx index 201f0035642a..a15cc432138d 100644 --- a/svtools/inc/table/tablecontrolinterface.hxx +++ b/svtools/inc/table/tablecontrolinterface.hxx @@ -27,8 +27,6 @@ #include <svtools/table/tabletypes.hxx> #include <svtools/table/tablemodel.hxx> -class Pointer; - namespace svt { namespace table { @@ -207,7 +205,7 @@ namespace svt { namespace table virtual ::Size getTableSizePixel() const = 0; /// sets a new mouse pointer for the table window - virtual void setPointer( Pointer const & i_pointer ) = 0; + virtual void setPointer( PointerStyle i_pointer ) = 0; /// captures the mouse to the table window virtual void captureMouse() = 0; diff --git a/svtools/source/brwbox/brwbox2.cxx b/svtools/source/brwbox/brwbox2.cxx index f2aa331e18b7..70a5b24050fa 100644 --- a/svtools/source/brwbox/brwbox2.cxx +++ b/svtools/source/brwbox/brwbox2.cxx @@ -26,6 +26,7 @@ #include <vcl/salgtype.hxx> #include <vcl/settings.hxx> #include <vcl/commandevent.hxx> +#include <vcl/ptrstyle.hxx> #include <tools/multisel.hxx> #include <tools/fract.hxx> @@ -1324,7 +1325,7 @@ void BrowseBox::MouseButtonDown( const MouseEvent& rEvt ) bResizing = true; nResizeCol = nCol; nDragX = nResizeX = rEvtPos.X(); - SetPointer( Pointer( PointerStyle::HSplit ) ); + SetPointer( PointerStyle::HSplit ); CaptureMouse(); pDataWin->DrawLine( Point( nDragX, 0 ), Point( nDragX, pDataWin->GetSizePixel().Height() ) ); @@ -1354,7 +1355,7 @@ void BrowseBox::MouseMove( const MouseEvent& rEvt ) { SAL_INFO("svtools", "BrowseBox::MouseMove( MouseEvent )" ); - Pointer aNewPointer; + PointerStyle aNewPointer = PointerStyle::Arrow; sal_uInt16 nX = 0; for ( size_t nCol = 0; @@ -1372,7 +1373,7 @@ void BrowseBox::MouseMove( const MouseEvent& rEvt ) if ( bResizing || ( pCol->GetId() && std::abs( static_cast<long>(nR) - rEvt.GetPosPixel().X() ) < MIN_COLUMNWIDTH ) ) { - aNewPointer = Pointer( PointerStyle::HSplit ); + aNewPointer = PointerStyle::HSplit; if ( bResizing ) { // delete old auxiliary line @@ -1422,7 +1423,7 @@ void BrowseBox::MouseButtonUp( const MouseEvent & rEvt ) } // end action - SetPointer( Pointer() ); + SetPointer( PointerStyle::Arrow ); ReleaseMouse(); bResizing = false; } diff --git a/svtools/source/brwbox/datwin.cxx b/svtools/source/brwbox/datwin.cxx index 046a9796506b..941ae66de4c8 100644 --- a/svtools/source/brwbox/datwin.cxx +++ b/svtools/source/brwbox/datwin.cxx @@ -25,6 +25,7 @@ #include <vcl/help.hxx> #include <vcl/image.hxx> #include <vcl/settings.hxx> +#include <vcl/ptrstyle.hxx> #include <rtl/string.hxx> #include <tools/debug.hxx> #include <tools/fract.hxx> @@ -452,7 +453,7 @@ void BrowserDataWin::MouseMove( const MouseEvent& rEvt ) PointerStyle ePointerStyle = PointerStyle::Arrow; if ( ImplRowDividerHitTest( aBrowserEvent ) ) ePointerStyle = PointerStyle::VSizeBar; - SetPointer( Pointer( ePointerStyle ) ); + SetPointer( ePointerStyle ); // dragging out of the visible area? if ( rEvt.IsLeft() && diff --git a/svtools/source/contnr/foldertree.cxx b/svtools/source/contnr/foldertree.cxx index 81fb9c8b9789..bd4dc5812c27 100644 --- a/svtools/source/contnr/foldertree.cxx +++ b/svtools/source/contnr/foldertree.cxx @@ -14,6 +14,7 @@ #include <ucbhelper/commandenvironment.hxx> #include <vcl/dialog.hxx> #include <vcl/treelistentry.hxx> +#include <vcl/ptrstyle.hxx> #include <com/sun/star/task/InteractionHandler.hpp> #include "contentenumeration.hxx" #include <bitmaps.hlst> diff --git a/svtools/source/control/hyperlabel.cxx b/svtools/source/control/hyperlabel.cxx index 9a71c82b7e61..1330f82d1ef4 100644 --- a/svtools/source/control/hyperlabel.cxx +++ b/svtools/source/control/hyperlabel.cxx @@ -23,6 +23,7 @@ #include <vcl/event.hxx> #include <vcl/settings.hxx> #include <vcl/tabpage.hxx> +#include <vcl/ptrstyle.hxx> namespace svt diff --git a/svtools/source/control/ruler.cxx b/svtools/source/control/ruler.cxx index 4168aace293d..0792cd61bf7a 100644 --- a/svtools/source/control/ruler.cxx +++ b/svtools/source/control/ruler.cxx @@ -26,6 +26,7 @@ #include <vcl/settings.hxx> #include <vcl/vcllayout.hxx> #include <vcl/virdev.hxx> +#include <vcl/ptrstyle.hxx> #include <sal/log.hxx> #include <svtools/accessibleruler.hxx> @@ -2027,7 +2028,7 @@ void Ruler::MouseMove( const MouseEvent& rMEvt ) mbFormat = true; } - SetPointer( Pointer(ePtrStyle) ); + SetPointer( ePtrStyle ); if (mbFormat) { @@ -2262,21 +2263,21 @@ bool Ruler::StartDocDrag( const MouseEvent& rMEvt, RulerType eDragType ) { if ( ImplDocHitTest( aMousePos, eDragType, &aHitTest ) ) { - Pointer aPtr; + PointerStyle aPtr = PointerStyle::Arrow; if ( aHitTest.bSize ) { if ( mnWinStyle & WB_HORZ ) - aPtr = Pointer( PointerStyle::ESize ); + aPtr = PointerStyle::ESize; else - aPtr = Pointer( PointerStyle::SSize ); + aPtr = PointerStyle::SSize; } else if ( aHitTest.bSizeBar ) { if ( mnWinStyle & WB_HORZ ) - aPtr = Pointer( PointerStyle::HSizeBar ); + aPtr = PointerStyle::HSizeBar; else - aPtr = Pointer( PointerStyle::VSizeBar ); + aPtr = PointerStyle::VSizeBar; } SetPointer( aPtr ); return ImplStartDrag( &aHitTest, nMouseModifier ); diff --git a/svtools/source/control/tabbar.cxx b/svtools/source/control/tabbar.cxx index 9185f903d106..06d566ef3aa5 100644 --- a/svtools/source/control/tabbar.cxx +++ b/svtools/source/control/tabbar.cxx @@ -33,6 +33,7 @@ #include <vcl/commandevent.hxx> #include <vcl/svtaccessiblefactory.hxx> #include <vcl/accessiblefactory.hxx> +#include <vcl/ptrstyle.hxx> #include <svtools/svtresid.hxx> #include <svtools/strings.hrc> #include <limits> @@ -335,7 +336,7 @@ ImplTabSizer::ImplTabSizer( TabBar* pParent, WinBits nWinStyle ) : Window( pParent, nWinStyle & WB_3DLOOK ) , mnStartWidth(0) { - SetPointer(Pointer(PointerStyle::HSizeBar)); + SetPointer(PointerStyle::HSizeBar); SetSizePixel(Size(7 * GetDPIScaleFactor(), 0)); } diff --git a/svtools/source/hatchwindow/ipwin.cxx b/svtools/source/hatchwindow/ipwin.cxx index 7c4b0cf318df..4dd2b5a32eb6 100644 --- a/svtools/source/hatchwindow/ipwin.cxx +++ b/svtools/source/hatchwindow/ipwin.cxx @@ -23,6 +23,7 @@ #include <vcl/event.hxx> #include <vcl/svapp.hxx> #include <vcl/settings.hxx> +#include <vcl/ptrstyle.hxx> #include "ipwin.hxx" #include <hatchwindow.hxx> @@ -483,10 +484,10 @@ void SvResizeWindow::SelectMouse( const Point & rPos ) if( m_nMoveGrab == -1 ) // the first time { m_aOldPointer = GetPointer(); - SetPointer( Pointer( aStyle ) ); + SetPointer( aStyle ); } else - SetPointer( Pointer( aStyle ) ); + SetPointer( aStyle ); } m_nMoveGrab = nGrab; } diff --git a/svtools/source/hatchwindow/ipwin.hxx b/svtools/source/hatchwindow/ipwin.hxx index d7637869cd70..47c033cdc255 100644 --- a/svtools/source/hatchwindow/ipwin.hxx +++ b/svtools/source/hatchwindow/ipwin.hxx @@ -66,7 +66,7 @@ public: class VCLXHatchWindow; class SvResizeWindow : public vcl::Window { - Pointer m_aOldPointer; + PointerStyle m_aOldPointer; short m_nMoveGrab; // last pointer type SvResizeHelper m_aResizer; bool m_bActive; diff --git a/svtools/source/table/mousefunction.cxx b/svtools/source/table/mousefunction.cxx index ca9f088ff339..ce294aae1f40 100644 --- a/svtools/source/table/mousefunction.cxx +++ b/svtools/source/table/mousefunction.cxx @@ -24,6 +24,7 @@ #include <tools/diagnose_ex.h> #include <vcl/window.hxx> +#include <vcl/ptrstyle.hxx> namespace svt { namespace table @@ -40,11 +41,11 @@ namespace svt { namespace table if ( m_nResizingColumn == COL_INVALID ) { // if we hit a column divider, change the mouse pointer accordingly - Pointer aNewPointer( PointerStyle::Arrow ); + PointerStyle aNewPointer( PointerStyle::Arrow ); TableCell const tableCell = i_tableControl.hitTest( aPoint ); if ( ( tableCell.nRow == ROW_COL_HEADERS ) && ( tableCell.eArea == ColumnDivider ) ) { - aNewPointer = Pointer( PointerStyle::HSplit ); + aNewPointer = PointerStyle::HSplit; } i_tableControl.setPointer( aNewPointer ); @@ -54,17 +55,17 @@ namespace svt { namespace table ::Size const tableSize = i_tableControl.getTableSizePixel(); // set proper pointer - Pointer aNewPointer( PointerStyle::Arrow ); + PointerStyle aNewPointer( PointerStyle::Arrow ); ColumnMetrics const & columnMetrics( i_tableControl.getColumnMetrics( m_nResizingColumn ) ); if ( ( aPoint.X() > tableSize.Width() ) || ( aPoint.X() < columnMetrics.nStartPixel ) ) { - aNewPointer = Pointer( PointerStyle::NotAllowed ); + aNewPointer = PointerStyle::NotAllowed; } else { - aNewPointer = Pointer( PointerStyle::HSplit ); + aNewPointer = PointerStyle::HSplit; } i_tableControl.setPointer( aNewPointer ); @@ -151,7 +152,7 @@ namespace svt { namespace table i_tableControl.invalidate( TableArea::All ); } - i_tableControl.setPointer( Pointer() ); + i_tableControl.setPointer( PointerStyle::Arrow ); i_tableControl.releaseMouse(); m_nResizingColumn = COL_INVALID; diff --git a/svtools/source/table/tablecontrol_impl.cxx b/svtools/source/table/tablecontrol_impl.cxx index 752f2816c98b..7c5a8f13ad76 100644 --- a/svtools/source/table/tablecontrol_impl.cxx +++ b/svtools/source/table/tablecontrol_impl.cxx @@ -1745,7 +1745,7 @@ namespace svt { namespace table } - void TableControl_Impl::setPointer( Pointer const & i_pointer ) + void TableControl_Impl::setPointer( PointerStyle i_pointer ) { m_pDataWindow->SetPointer( i_pointer ); } diff --git a/svtools/source/table/tablecontrol_impl.hxx b/svtools/source/table/tablecontrol_impl.hxx index 6696c80ac167..feea3675021a 100644 --- a/svtools/source/table/tablecontrol_impl.hxx +++ b/svtools/source/table/tablecontrol_impl.hxx @@ -253,7 +253,7 @@ namespace svt { namespace table virtual RowPos getCurrentRow() const override; virtual void activateCell( ColPos const i_col, RowPos const i_row ) override; virtual ::Size getTableSizePixel() const override; - virtual void setPointer( Pointer const & i_pointer ) override; + virtual void setPointer( PointerStyle i_pointer ) override; virtual void captureMouse() override; virtual void releaseMouse() override; virtual void invalidate( TableArea const i_what ) override; diff --git a/svx/inc/dragmt3d.hxx b/svx/inc/dragmt3d.hxx index c5cd6db44878..7614ecbd4694 100644 --- a/svx/inc/dragmt3d.hxx +++ b/svx/inc/dragmt3d.hxx @@ -95,7 +95,7 @@ public: bool bFull); virtual void MoveSdrDrag(const Point& rPnt) override; - virtual Pointer GetSdrDragPointer() const override; + virtual PointerStyle GetSdrDragPointer() const override; }; // Derivative of SdrDragMethod for moving 3D sub-objects @@ -113,7 +113,7 @@ public: bool bFull); virtual void MoveSdrDrag(const Point& rPnt) override; - virtual Pointer GetSdrDragPointer() const override; + virtual PointerStyle GetSdrDragPointer() const override; }; diff --git a/svx/source/dialog/ClassificationEditView.cxx b/svx/source/dialog/ClassificationEditView.cxx index ea0002897da5..6ab21075b402 100644 --- a/svx/source/dialog/ClassificationEditView.cxx +++ b/svx/source/dialog/ClassificationEditView.cxx @@ -15,6 +15,7 @@ #include <vcl/event.hxx> #include <vcl/svapp.hxx> #include <vcl/settings.hxx> +#include <vcl/ptrstyle.hxx> #include <svl/itemset.hxx> #include <editeng/wghtitem.hxx> #include <editeng/eeitem.hxx> diff --git a/svx/source/dialog/contwnd.cxx b/svx/source/dialog/contwnd.cxx index 014a10d9e472..5b2d4b601fb6 100644 --- a/svx/source/dialog/contwnd.cxx +++ b/svx/source/dialog/contwnd.cxx @@ -27,6 +27,7 @@ #include <basegfx/polygon/b2dpolygon.hxx> #include <basegfx/polygon/b2dpolypolygontools.hxx> #include <svx/sdrpaintwindow.hxx> +#include <vcl/ptrstyle.hxx> using namespace css; diff --git a/svx/source/dialog/graphctl.cxx b/svx/source/dialog/graphctl.cxx index 12920202fff6..311f3d52ea1a 100644 --- a/svx/source/dialog/graphctl.cxx +++ b/svx/source/dialog/graphctl.cxx @@ -22,6 +22,7 @@ #include <vcl/wrkwin.hxx> #include <vcl/settings.hxx> #include <vcl/builderfactory.hxx> +#include <vcl/ptrstyle.hxx> #include <unotools/syslocale.hxx> #include <rtl/math.hxx> #include <unotools/localedatawrapper.hxx> diff --git a/svx/source/engine3d/dragmt3d.cxx b/svx/source/engine3d/dragmt3d.cxx index 533fec2227bd..616e9182e925 100644 --- a/svx/source/engine3d/dragmt3d.cxx +++ b/svx/source/engine3d/dragmt3d.cxx @@ -33,6 +33,7 @@ #include <svx/sdr/contact/viewcontactofe3dscene.hxx> #include <drawinglayer/geometry/viewinformation3d.hxx> #include <svx/e3dsceneupdater.hxx> +#include <vcl/ptrstyle.hxx> E3dDragMethod::E3dDragMethod ( @@ -437,9 +438,9 @@ void E3dDragRotate::MoveSdrDrag(const Point& rPnt) } } -Pointer E3dDragRotate::GetSdrDragPointer() const +PointerStyle E3dDragRotate::GetSdrDragPointer() const { - return Pointer(PointerStyle::Rotate); + return PointerStyle::Rotate; } // E3dDragMove. This drag method is only required for translations inside @@ -717,9 +718,9 @@ void E3dDragMove::MoveSdrDrag(const Point& rPnt) } } -Pointer E3dDragMove::GetSdrDragPointer() const +PointerStyle E3dDragMove::GetSdrDragPointer() const { - return Pointer(PointerStyle::Move); + return PointerStyle::Move; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/svdraw/svdcrtv.cxx b/svx/source/svdraw/svdcrtv.cxx index 711080113382..4edb4840c306 100644 --- a/svx/source/svdraw/svdcrtv.cxx +++ b/svx/source/svdraw/svdcrtv.cxx @@ -40,6 +40,7 @@ #include <svx/sdr/contact/viewcontact.hxx> #include <svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx> #include <basegfx/matrix/b2dhommatrixtools.hxx> +#include <vcl/ptrstyle.hxx> using namespace com::sun::star; @@ -185,7 +186,7 @@ void SdrCreateView::ImpClearVars() pCurrentCreate=nullptr; pCreatePV=nullptr; b1stPointAsCenter=false; - aCurrentCreatePointer=Pointer(PointerStyle::Cross); + aCurrentCreatePointer=PointerStyle::Cross; bUseIncompatiblePathCreateInterface=false; nAutoCloseDistPix=5; nFreeHandMinDistPix=10; @@ -367,7 +368,7 @@ void SdrCreateView::SetCurrentObj(sal_uInt16 nIdent, SdrInventor nInvent) } else { - aCurrentCreatePointer = Pointer(PointerStyle::Cross); + aCurrentCreatePointer = PointerStyle::Cross; } } diff --git a/svx/source/svdraw/svddrgm1.hxx b/svx/source/svdraw/svddrgm1.hxx index 7e7c2880351b..5323056668e3 100644 --- a/svx/source/svdraw/svddrgm1.hxx +++ b/svx/source/svdraw/svddrgm1.hxx @@ -41,7 +41,7 @@ public: virtual void MoveSdrDrag(const Point& rPnt) override; virtual bool EndSdrDrag(bool bCopy) override; virtual void CancelSdrDrag() override; - virtual Pointer GetSdrDragPointer() const override; + virtual PointerStyle GetSdrDragPointer() const override; }; class SdrDragRotate : public SdrDragMethod @@ -60,7 +60,7 @@ public: virtual bool BeginSdrDrag() override; virtual void MoveSdrDrag(const Point& rPnt) override; virtual bool EndSdrDrag(bool bCopy) override; - virtual Pointer GetSdrDragPointer() const override; + virtual PointerStyle GetSdrDragPointer() const override; virtual basegfx::B2DHomMatrix getCurrentTransformation() override; virtual void applyCurrentTransformationToSdrObject(SdrObject& rTarget) override; @@ -85,7 +85,7 @@ public: virtual bool BeginSdrDrag() override; virtual void MoveSdrDrag(const Point& rPnt) override; virtual bool EndSdrDrag(bool bCopy) override; - virtual Pointer GetSdrDragPointer() const override; + virtual PointerStyle GetSdrDragPointer() const override; virtual basegfx::B2DHomMatrix getCurrentTransformation() override; virtual void applyCurrentTransformationToSdrObject(SdrObject& rTarget) override; @@ -108,7 +108,7 @@ public: virtual bool BeginSdrDrag() override; virtual void MoveSdrDrag(const Point& rPnt) override; virtual bool EndSdrDrag(bool bCopy) override; - virtual Pointer GetSdrDragPointer() const override; + virtual PointerStyle GetSdrDragPointer() const override; virtual basegfx::B2DHomMatrix getCurrentTransformation() override; virtual void applyCurrentTransformationToSdrObject(SdrObject& rTarget) override; @@ -132,7 +132,7 @@ public: virtual bool BeginSdrDrag() override; virtual void MoveSdrDrag(const Point& rPnt) override; virtual bool EndSdrDrag(bool bCopy) override; - virtual Pointer GetSdrDragPointer() const override; + virtual PointerStyle GetSdrDragPointer() const override; virtual void CancelSdrDrag() override; }; @@ -178,7 +178,7 @@ public: virtual bool BeginSdrDrag() override; virtual void MoveSdrDrag(const Point& rPnt) override; virtual bool EndSdrDrag(bool bCopy) override; - virtual Pointer GetSdrDragPointer() const override; + virtual PointerStyle GetSdrDragPointer() const override; virtual void applyCurrentTransformationToSdrObject(SdrObject& rTarget) override; virtual void applyCurrentTransformationToPolyPolygon(basegfx::B2DPolyPolygon& rTarget) override; @@ -208,7 +208,7 @@ public: virtual bool BeginSdrDrag() override; virtual void MoveSdrDrag(const Point& rPnt) override; virtual bool EndSdrDrag(bool bCopy) override; - virtual Pointer GetSdrDragPointer() const override; + virtual PointerStyle GetSdrDragPointer() const override; virtual void applyCurrentTransformationToSdrObject(SdrObject& rTarget) override; virtual void applyCurrentTransformationToPolyPolygon(basegfx::B2DPolyPolygon& rTarget) override; @@ -224,7 +224,7 @@ public: virtual void TakeSdrDragComment(OUString& rStr) const override; virtual bool BeginSdrDrag() override; virtual bool EndSdrDrag(bool bCopy) override; - virtual Pointer GetSdrDragPointer() const override; + virtual PointerStyle GetSdrDragPointer() const override; }; #endif // INCLUDED_SVX_SOURCE_SVDRAW_SVDDRGM1_HXX diff --git a/svx/source/svdraw/svddrgmt.cxx b/svx/source/svdraw/svddrgmt.cxx index 4fd4a177fc2b..ecb81a3e1299 100644 --- a/svx/source/svdraw/svddrgmt.cxx +++ b/svx/source/svdraw/svddrgmt.cxx @@ -24,6 +24,7 @@ #include <o3tl/numeric.hxx> #include <vcl/svapp.hxx> #include <vcl/settings.hxx> +#include <vcl/ptrstyle.hxx> #include <svx/xattr.hxx> #include <svx/xpoly.hxx> #include <svx/svdetc.hxx> @@ -1155,7 +1156,7 @@ void SdrDragMovHdl::CancelSdrDrag() pHM->Touch(); } -Pointer SdrDragMovHdl::GetSdrDragPointer() const +PointerStyle SdrDragMovHdl::GetSdrDragPointer() const { const SdrHdl* pHdl = GetDragHdl(); @@ -1164,7 +1165,7 @@ Pointer SdrDragMovHdl::GetSdrDragPointer() const return pHdl->GetPointer(); } - return Pointer(PointerStyle::RefHand); + return PointerStyle::RefHand; } @@ -1446,7 +1447,7 @@ bool SdrDragObjOwn::EndSdrDrag(bool /*bCopy*/) return bRet; } -Pointer SdrDragObjOwn::GetSdrDragPointer() const +PointerStyle SdrDragObjOwn::GetSdrDragPointer() const { const SdrHdl* pHdl=GetDragHdl(); @@ -1455,7 +1456,7 @@ Pointer SdrDragObjOwn::GetSdrDragPointer() const return pHdl->GetPointer(); } - return Pointer(PointerStyle::Move); + return PointerStyle::Move; } @@ -1714,15 +1715,15 @@ bool SdrDragMove::EndSdrDrag(bool bCopy) return true; } -Pointer SdrDragMove::GetSdrDragPointer() const +PointerStyle SdrDragMove::GetSdrDragPointer() const { if (IsDraggingPoints() || IsDraggingGluePoints()) { - return Pointer(PointerStyle::MovePoint); + return PointerStyle::MovePoint; } else { - return Pointer(PointerStyle::Move); + return PointerStyle::Move; } } @@ -2042,7 +2043,7 @@ bool SdrDragResize::EndSdrDrag(bool bCopy) return true; } -Pointer SdrDragResize::GetSdrDragPointer() const +PointerStyle SdrDragResize::GetSdrDragPointer() const { const SdrHdl* pHdl=GetDragHdl(); @@ -2051,7 +2052,7 @@ Pointer SdrDragResize::GetSdrDragPointer() const return pHdl->GetPointer(); } - return Pointer(PointerStyle::Move); + return PointerStyle::Move; } @@ -2191,9 +2192,9 @@ bool SdrDragRotate::EndSdrDrag(bool bCopy) return true; } -Pointer SdrDragRotate::GetSdrDragPointer() const +PointerStyle SdrDragRotate::GetSdrDragPointer() const { - return Pointer(PointerStyle::Rotate); + return PointerStyle::Rotate; } @@ -2464,12 +2465,12 @@ bool SdrDragShear::EndSdrDrag(bool bCopy) return false; } -Pointer SdrDragShear::GetSdrDragPointer() const +PointerStyle SdrDragShear::GetSdrDragPointer() const { if (bVertical) - return Pointer(PointerStyle::VShear); + return PointerStyle::VShear; else - return Pointer(PointerStyle::HShear); + return PointerStyle::HShear; } @@ -2595,9 +2596,9 @@ bool SdrDragMirror::EndSdrDrag(bool bCopy) return true; } -Pointer SdrDragMirror::GetSdrDragPointer() const +PointerStyle SdrDragMirror::GetSdrDragPointer() const { - return Pointer(PointerStyle::Mirror); + return PointerStyle::Mirror; } @@ -2753,9 +2754,9 @@ void SdrDragGradient::CancelSdrDrag() pIAOHandle->FromIAOToItem(getSdrDragView().GetMarkedObjectList().GetMark(0)->GetMarkedSdrObj(), true, false); } -Pointer SdrDragGradient::GetSdrDragPointer() const +PointerStyle SdrDragGradient::GetSdrDragPointer() const { - return Pointer(PointerStyle::RefHand); + return PointerStyle::RefHand; } @@ -3385,9 +3386,9 @@ bool SdrDragCrook::EndSdrDrag(bool bCopy) return false; } -Pointer SdrDragCrook::GetSdrDragPointer() const +PointerStyle SdrDragCrook::GetSdrDragPointer() const { - return Pointer(PointerStyle::Crook); + return PointerStyle::Crook; } @@ -3515,9 +3516,9 @@ bool SdrDragDistort::EndSdrDrag(bool bCopy) return false; } -Pointer SdrDragDistort::GetSdrDragPointer() const +PointerStyle SdrDragDistort::GetSdrDragPointer() const { - return Pointer(PointerStyle::RefHand); + return PointerStyle::RefHand; } void SdrDragDistort::applyCurrentTransformationToSdrObject(SdrObject& rTarget) @@ -3865,9 +3866,9 @@ bool SdrDragCrop::EndSdrDrag(bool /*bCopy*/) return true; } -Pointer SdrDragCrop::GetSdrDragPointer() const +PointerStyle SdrDragCrop::GetSdrDragPointer() const { - return Pointer(PointerStyle::Crop); + return PointerStyle::Crop; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/svdraw/svdhdl.cxx b/svx/source/svdraw/svdhdl.cxx index f673dba75a72..6c87087c2b44 100644 --- a/svx/source/svdraw/svdhdl.cxx +++ b/svx/source/svdraw/svdhdl.cxx @@ -28,6 +28,7 @@ #include <vcl/window.hxx> #include <vcl/settings.hxx> #include <vcl/virdev.hxx> +#include <vcl/ptrstyle.hxx> #include <tools/poly.hxx> #include <vcl/bitmapaccess.hxx> @@ -950,7 +951,7 @@ bool SdrHdl::IsHdlHit(const Point& rPnt) const return maOverlayGroup.isHitLogic(aPosition); } -Pointer SdrHdl::GetPointer() const +PointerStyle SdrHdl::GetPointer() const { PointerStyle ePtr=PointerStyle::Move; const bool bSize=eKind>=SdrHdlKind::UpperLeft && eKind<=SdrHdlKind::LowerRight; @@ -1016,7 +1017,7 @@ Pointer SdrHdl::GetPointer() const } } } - return Pointer(ePtr); + return ePtr; } bool SdrHdl::IsFocusHdl() const @@ -1489,9 +1490,9 @@ void SdrHdlLine::CreateB2dIAObject() } } -Pointer SdrHdlLine::GetPointer() const +PointerStyle SdrHdlLine::GetPointer() const { - return Pointer(PointerStyle::RefHand); + return PointerStyle::RefHand; } @@ -1682,17 +1683,17 @@ void ImpEdgeHdl::SetLineCode(SdrEdgeLineCode eCode) } } -Pointer ImpEdgeHdl::GetPointer() const +PointerStyle ImpEdgeHdl::GetPointer() const { SdrEdgeObj* pEdge=dynamic_cast<SdrEdgeObj*>( pObj ); if (pEdge==nullptr) return SdrHdl::GetPointer(); if (nObjHdlNum<=1) - return Pointer(PointerStyle::MovePoint); + return PointerStyle::MovePoint; if (IsHorzDrag()) - return Pointer(PointerStyle::ESize); + return PointerStyle::ESize; else - return Pointer(PointerStyle::SSize); + return PointerStyle::SSize; } bool ImpEdgeHdl::IsHorzDrag() const @@ -1779,15 +1780,15 @@ void ImpMeasureHdl::CreateB2dIAObject() } } -Pointer ImpMeasureHdl::GetPointer() const +PointerStyle ImpMeasureHdl::GetPointer() const { switch (nObjHdlNum) { - case 0: case 1: return Pointer(PointerStyle::Hand); - case 2: case 3: return Pointer(PointerStyle::MovePoint); + case 0: case 1: return PointerStyle::Hand; + case 2: case 3: return PointerStyle::MovePoint; case 4: case 5: return SdrHdl::GetPointer(); // will then be rotated appropriately } // switch - return Pointer(PointerStyle::NotAllowed); + return PointerStyle::NotAllowed; } diff --git a/svx/source/svdraw/svdhlpln.cxx b/svx/source/svdraw/svdhlpln.cxx index 1baff3ebd537..d27221fb4014 100644 --- a/svx/source/svdraw/svdhlpln.cxx +++ b/svx/source/svdraw/svdhlpln.cxx @@ -24,14 +24,15 @@ #include <vcl/window.hxx> #include <tools/poly.hxx> #include <vcl/lineinfo.hxx> +#include <vcl/ptrstyle.hxx> -Pointer SdrHelpLine::GetPointer() const +PointerStyle SdrHelpLine::GetPointer() const { switch (eKind) { - case SdrHelpLineKind::Vertical : return Pointer(PointerStyle::ESize); - case SdrHelpLineKind::Horizontal: return Pointer(PointerStyle::SSize); - default : return Pointer(PointerStyle::Move); + case SdrHelpLineKind::Vertical : return PointerStyle::ESize; + case SdrHelpLineKind::Horizontal: return PointerStyle::SSize; + default : return PointerStyle::Move; } // switch } diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx index 04fd58f3c2a5..74170fa2edb4 100644 --- a/svx/source/svdraw/svdobj.cxx +++ b/svx/source/svdraw/svdobj.cxx @@ -53,6 +53,7 @@ #include <vcl/graphictools.hxx> #include <vcl/metaact.hxx> #include <vcl/virdev.hxx> +#include <vcl/ptrstyle.hxx> #include <vector> #include <svx/shapepropertynotifier.hxx> @@ -1376,9 +1377,9 @@ basegfx::B2DPolyPolygon SdrObject::TakeCreatePoly(const SdrDragStat& rDrag) cons return aRetval; } -Pointer SdrObject::GetCreatePointer() const +PointerStyle SdrObject::GetCreatePointer() const { - return Pointer(PointerStyle::Cross); + return PointerStyle::Cross; } // transformations @@ -1775,9 +1776,9 @@ SdrObject* SdrObject::CheckMacroHit(const SdrObjMacroHitRec& rRec) const return nullptr; } -Pointer SdrObject::GetMacroPointer(const SdrObjMacroHitRec&) const +PointerStyle SdrObject::GetMacroPointer(const SdrObjMacroHitRec&) const { - return Pointer(PointerStyle::RefHand); + return PointerStyle::RefHand; } void SdrObject::PaintMacro(OutputDevice& rOut, const tools::Rectangle& , const SdrObjMacroHitRec& ) const diff --git a/svx/source/svdraw/svdocapt.cxx b/svx/source/svdraw/svdocapt.cxx index d57ab18e0dbe..fe71700d3568 100644 --- a/svx/source/svdraw/svdocapt.cxx +++ b/svx/source/svdraw/svdocapt.cxx @@ -58,6 +58,7 @@ #include <svx/xlnwtit.hxx> #include <svx/xpoly.hxx> #include <svx/xpool.hxx> +#include <vcl/ptrstyle.hxx> enum EscDir {LKS,RTS,OBN,UNT}; @@ -586,9 +587,9 @@ basegfx::B2DPolyPolygon SdrCaptionObj::TakeCreatePoly(const SdrDragStat& /*rDrag return aRetval; } -Pointer SdrCaptionObj::GetCreatePointer() const +PointerStyle SdrCaptionObj::GetCreatePointer() const { - return Pointer(PointerStyle::DrawCaption); + return PointerStyle::DrawCaption; } void SdrCaptionObj::NbcMove(const Size& rSiz) diff --git a/svx/source/svdraw/svdocirc.cxx b/svx/source/svdraw/svdocirc.cxx index 94f350e1863c..f31ee2d2f81a 100644 --- a/svx/source/svdraw/svdocirc.cxx +++ b/svx/source/svdraw/svdocirc.cxx @@ -49,6 +49,7 @@ #include <svx/xlnstwit.hxx> #include <svx/xlnwtit.hxx> #include <svx/xpool.hxx> +#include <vcl/ptrstyle.hxx> using namespace com::sun::star; @@ -791,16 +792,16 @@ basegfx::B2DPolyPolygon SdrCircObj::TakeCreatePoly(const SdrDragStat& rDrag) con } } -Pointer SdrCircObj::GetCreatePointer() const +PointerStyle SdrCircObj::GetCreatePointer() const { switch (meCircleKind) { - case OBJ_CIRC: return Pointer(PointerStyle::DrawEllipse); - case OBJ_SECT: return Pointer(PointerStyle::DrawPie); - case OBJ_CARC: return Pointer(PointerStyle::DrawArc); - case OBJ_CCUT: return Pointer(PointerStyle::DrawCircleCut); + case OBJ_CIRC: return PointerStyle::DrawEllipse; + case OBJ_SECT: return PointerStyle::DrawPie; + case OBJ_CARC: return PointerStyle::DrawArc; + case OBJ_CCUT: return PointerStyle::DrawCircleCut; default: break; } // switch - return Pointer(PointerStyle::Cross); + return PointerStyle::Cross; } void SdrCircObj::NbcMove(const Size& aSiz) diff --git a/svx/source/svdraw/svdoedge.cxx b/svx/source/svdraw/svdoedge.cxx index bef5e27ef0be..2755d31167d0 100644 --- a/svx/source/svdraw/svdoedge.cxx +++ b/svx/source/svdraw/svdoedge.cxx @@ -47,6 +47,7 @@ #include <svx/sxenditm.hxx> #include <svx/xpoly.hxx> #include <svx/xpool.hxx> +#include <vcl/ptrstyle.hxx> void SdrObjConnection::ResetVars() { @@ -2129,9 +2130,9 @@ basegfx::B2DPolyPolygon SdrEdgeObj::TakeCreatePoly(const SdrDragStat& /*rStatDra return aRetval; } -Pointer SdrEdgeObj::GetCreatePointer() const +PointerStyle SdrEdgeObj::GetCreatePointer() const { - return Pointer(PointerStyle::DrawConnect); + return PointerStyle::DrawConnect; } bool SdrEdgeObj::ImpFindConnector(const Point& rPt, const SdrPageView& rPV, SdrObjConnection& rCon, const SdrEdgeObj* pThis, OutputDevice* pOut) diff --git a/svx/source/svdraw/svdomeas.cxx b/svx/source/svdraw/svdomeas.cxx index e75ed7b9935a..e9da43ba2cde 100644 --- a/svx/source/svdraw/svdomeas.cxx +++ b/svx/source/svdraw/svdomeas.cxx @@ -69,6 +69,7 @@ #include <svx/xpoly.hxx> #include <unotools/syslocale.hxx> #include <unotools/localedatawrapper.hxx> +#include <vcl/ptrstyle.hxx> SdrMeasureObjGeoData::SdrMeasureObjGeoData() {} @@ -999,9 +1000,9 @@ basegfx::B2DPolyPolygon SdrMeasureObj::TakeCreatePoly(const SdrDragStat& /*rDrag return ImpCalcXPoly(aMPol); } -Pointer SdrMeasureObj::GetCreatePointer() const +PointerStyle SdrMeasureObj::GetCreatePointer() const { - return Pointer(PointerStyle::Cross); + return PointerStyle::Cross; } void SdrMeasureObj::NbcMove(const Size& rSiz) diff --git a/svx/source/svdraw/svdopath.cxx b/svx/source/svdraw/svdopath.cxx index 5146c088c435..fc385efa83a4 100644 --- a/svx/source/svdraw/svdopath.cxx +++ b/svx/source/svdraw/svdopath.cxx @@ -51,6 +51,7 @@ #include <svx/sdr/primitive2d/sdrattributecreator.hxx> #include <basegfx/matrix/b2dhommatrixtools.hxx> #include <svx/sdr/attribute/sdrformtextattribute.hxx> +#include <vcl/ptrstyle.hxx> #include <memory> #include <sal/log.hxx> @@ -516,7 +517,7 @@ public: bool EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd); bool BckCreate(SdrDragStat const & rStat); void BrkCreate(SdrDragStat& rStat); - Pointer GetCreatePointer() const; + PointerStyle GetCreatePointer() const; // helping stuff static bool IsClosed(SdrObjKind eKind) { return eKind==OBJ_POLY || eKind==OBJ_PATHPOLY || eKind==OBJ_PATHFILL || eKind==OBJ_FREEFILL || eKind==OBJ_SPLNFILL; } @@ -1585,23 +1586,23 @@ basegfx::B2DPolyPolygon ImpPathForDragAndCreate::TakeDragPolyPolygon(const SdrDr return aRetval; } -Pointer ImpPathForDragAndCreate::GetCreatePointer() const +PointerStyle ImpPathForDragAndCreate::GetCreatePointer() const { switch (meObjectKind) { - case OBJ_LINE : return Pointer(PointerStyle::DrawLine); - case OBJ_POLY : return Pointer(PointerStyle::DrawPolygon); - case OBJ_PLIN : return Pointer(PointerStyle::DrawPolygon); - case OBJ_PATHLINE: return Pointer(PointerStyle::DrawBezier); - case OBJ_PATHFILL: return Pointer(PointerStyle::DrawBezier); - case OBJ_FREELINE: return Pointer(PointerStyle::DrawFreehand); - case OBJ_FREEFILL: return Pointer(PointerStyle::DrawFreehand); - case OBJ_SPLNLINE: return Pointer(PointerStyle::DrawFreehand); - case OBJ_SPLNFILL: return Pointer(PointerStyle::DrawFreehand); - case OBJ_PATHPOLY: return Pointer(PointerStyle::DrawPolygon); - case OBJ_PATHPLIN: return Pointer(PointerStyle::DrawPolygon); + case OBJ_LINE : return PointerStyle::DrawLine; + case OBJ_POLY : return PointerStyle::DrawPolygon; + case OBJ_PLIN : return PointerStyle::DrawPolygon; + case OBJ_PATHLINE: return PointerStyle::DrawBezier; + case OBJ_PATHFILL: return PointerStyle::DrawBezier; + case OBJ_FREELINE: return PointerStyle::DrawFreehand; + case OBJ_FREEFILL: return PointerStyle::DrawFreehand; + case OBJ_SPLNLINE: return PointerStyle::DrawFreehand; + case OBJ_SPLNFILL: return PointerStyle::DrawFreehand; + case OBJ_PATHPOLY: return PointerStyle::DrawPolygon; + case OBJ_PATHPLIN: return PointerStyle::DrawPolygon; default: break; } // switch - return Pointer(PointerStyle::Cross); + return PointerStyle::Cross; } SdrPathObjGeoData::SdrPathObjGeoData() @@ -2243,7 +2244,7 @@ basegfx::B2DPolyPolygon SdrPathObj::getDragPolyPolygon(const SdrDragStat& rDrag) return aRetval; } -Pointer SdrPathObj::GetCreatePointer() const +PointerStyle SdrPathObj::GetCreatePointer() const { return impGetDAC().GetCreatePointer(); } diff --git a/svx/source/svdraw/svdorect.cxx b/svx/source/svdraw/svdorect.cxx index c01d026e4095..03eae7fe59a6 100644 --- a/svx/source/svdraw/svdorect.cxx +++ b/svx/source/svdraw/svdorect.cxx @@ -43,6 +43,7 @@ #include <svx/sdr/contact/viewcontactofsdrrectobj.hxx> #include <basegfx/polygon/b2dpolygon.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> +#include <vcl/ptrstyle.hxx> using namespace com::sun::star; @@ -466,10 +467,10 @@ basegfx::B2DPolyPolygon SdrRectObj::TakeCreatePoly(const SdrDragStat& rDrag) con return aRetval; } -Pointer SdrRectObj::GetCreatePointer() const +PointerStyle SdrRectObj::GetCreatePointer() const { - if (IsTextFrame()) return Pointer(PointerStyle::DrawText); - return Pointer(PointerStyle::DrawRect); + if (IsTextFrame()) return PointerStyle::DrawText; + return PointerStyle::DrawRect; } void SdrRectObj::NbcMove(const Size& rSiz) diff --git a/svx/source/svdraw/svdotxdr.cxx b/svx/source/svdraw/svdotxdr.cxx index 0a24ccdf5a3b..ae33a01892f9 100644 --- a/svx/source/svdraw/svdotxdr.cxx +++ b/svx/source/svdraw/svdotxdr.cxx @@ -29,6 +29,7 @@ #include <basegfx/polygon/b2dpolygon.hxx> #include <basegfx/range/b2drange.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> +#include <vcl/ptrstyle.hxx> sal_uInt32 SdrTextObj::GetHdlCount() const @@ -239,10 +240,10 @@ basegfx::B2DPolyPolygon SdrTextObj::TakeCreatePoly(const SdrDragStat& rDrag) con return aRetval; } -Pointer SdrTextObj::GetCreatePointer() const +PointerStyle SdrTextObj::GetCreatePointer() const { - if (IsTextFrame()) return Pointer(PointerStyle::DrawText); - return Pointer(PointerStyle::Cross); + if (IsTextFrame()) return PointerStyle::DrawText; + return PointerStyle::Cross; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/svdraw/svdovirt.cxx b/svx/source/svdraw/svdovirt.cxx index 82194cd799b7..c50f17c53e28 100644 --- a/svx/source/svdraw/svdovirt.cxx +++ b/svx/source/svdraw/svdovirt.cxx @@ -529,7 +529,7 @@ SdrObject* SdrVirtObj::CheckMacroHit(const SdrObjMacroHitRec& rRec) const return rRefObj.CheckMacroHit(rRec); // TODO: positioning offset } -Pointer SdrVirtObj::GetMacroPointer(const SdrObjMacroHitRec& rRec) const +PointerStyle SdrVirtObj::GetMacroPointer(const SdrObjMacroHitRec& rRec) const { return rRefObj.GetMacroPointer(rRec); // TODO: positioning offset } diff --git a/svx/source/svdraw/svdsnpv.cxx b/svx/source/svdraw/svdsnpv.cxx index 81292e8be5f7..a3991d9f42e3 100644 --- a/svx/source/svdraw/svdsnpv.cxx +++ b/svx/source/svdraw/svdsnpv.cxx @@ -33,6 +33,7 @@ #include <basegfx/matrix/b2dhommatrix.hxx> #include <svx/sdrpaintwindow.hxx> #include <tools/debug.hxx> +#include <vcl/ptrstyle.hxx> class ImplPageOriginOverlay @@ -546,19 +547,19 @@ void SdrSnapView::BegDragHelpLine(const Point& rPnt, SdrHelpLineKind eNewKind) } } -Pointer SdrSnapView::GetDraggedHelpLinePointer() const +PointerStyle SdrSnapView::GetDraggedHelpLinePointer() const { if(IsDragHelpLine()) { switch(mpHelpLineOverlay->GetHelpLineKind()) { - case SdrHelpLineKind::Vertical : return Pointer(PointerStyle::ESize); - case SdrHelpLineKind::Horizontal: return Pointer(PointerStyle::SSize); - default : return Pointer(PointerStyle::Move); + case SdrHelpLineKind::Vertical : return PointerStyle::ESize; + case SdrHelpLineKind::Horizontal: return PointerStyle::SSize; + default : return PointerStyle::Move; } } - return Pointer(PointerStyle::Move); + return PointerStyle::Move; } void SdrSnapView::MovDragHelpLine(const Point& rPnt) diff --git a/svx/source/svdraw/svdview.cxx b/svx/source/svdraw/svdview.cxx index 0cee85fe96c3..bdddaae54bb9 100644 --- a/svx/source/svdraw/svdview.cxx +++ b/svx/source/svdraw/svdview.cxx @@ -53,6 +53,7 @@ #include <drawinglayer/primitive2d/texthierarchyprimitive2d.hxx> #include <svx/sdr/contact/objectcontactofpageview.hxx> #include <sal/log.hxx> +#include <vcl/ptrstyle.hxx> SdrViewEvent::SdrViewEvent() @@ -944,7 +945,7 @@ bool SdrView::DoMouseEvent(const SdrViewEvent& rVEvt) return bRet; } -Pointer SdrView::GetPreferredPointer(const Point& rMousePos, const OutputDevice* pOut, sal_uInt16 nModifier, bool bLeftDown) const +PointerStyle SdrView::GetPreferredPointer(const Point& rMousePos, const OutputDevice* pOut, sal_uInt16 nModifier, bool bLeftDown) const { // Actions if (IsCreateObj()) @@ -955,7 +956,7 @@ Pointer SdrView::GetPreferredPointer(const Point& rMousePos, const OutputDevice* { return mpCurrentSdrDragMethod->GetSdrDragPointer(); } - if (IsMarkObj() || IsMarkPoints() || IsMarkGluePoints() || IsSetPageOrg()) return Pointer(PointerStyle::Arrow); + if (IsMarkObj() || IsMarkPoints() || IsMarkGluePoints() || IsSetPageOrg()) return PointerStyle::Arrow; if (IsDragHelpLine()) return GetDraggedHelpLinePointer(); if (IsMacroObj()) { SdrObjMacroHitRec aHitRec; @@ -974,13 +975,13 @@ Pointer SdrView::GetPreferredPointer(const Point& rMousePos, const OutputDevice* if(!pOut || IsTextEditInSelectionMode()) { if(pTextEditOutliner->IsVertical()) - return Pointer(PointerStyle::TextVertical); + return PointerStyle::TextVertical; else - return Pointer(PointerStyle::Text); + return PointerStyle::Text; } // Outliner should return something here... Point aPos(pOut->LogicToPixel(rMousePos)); - Pointer aPointer(pTextEditOutlinerView->GetPointer(aPos)); + PointerStyle aPointer(pTextEditOutlinerView->GetPointer(aPos)); if (aPointer==PointerStyle::Arrow) { if(pTextEditOutliner->IsVertical()) @@ -1004,17 +1005,17 @@ Pointer SdrView::GetPreferredPointer(const Point& rMousePos, const OutputDevice* case SdrEventKind::BeginCreateObj: return aCurrentCreatePointer; case SdrEventKind::MarkObj: - return Pointer(PointerStyle::Move); + return PointerStyle::Move; case SdrEventKind::BeginMark: - return Pointer(PointerStyle::Arrow); + return PointerStyle::Arrow; case SdrEventKind::MarkPoint: case SdrEventKind::MarkGluePoint: - return Pointer(PointerStyle::MovePoint); + return PointerStyle::MovePoint; case SdrEventKind::BeginInsertObjPoint: case SdrEventKind::BeginInsertGluePoint: - return Pointer(PointerStyle::Cross); + return PointerStyle::Cross; case SdrEventKind::ExecuteUrl: - return Pointer(PointerStyle::RefHand); + return PointerStyle::RefHand; case SdrEventKind::BeginMacroObj: { SdrObjMacroHitRec aHitRec; @@ -1032,11 +1033,11 @@ Pointer SdrView::GetPreferredPointer(const Point& rMousePos, const OutputDevice* switch(eHit) { case SdrHitKind::Cell: - return Pointer(PointerStyle::Arrow); + return PointerStyle::Arrow; case SdrHitKind::HelpLine : return aVEvt.pPV->GetHelpLines()[aVEvt.nHlplIdx].GetPointer(); case SdrHitKind::Gluepoint: - return Pointer(PointerStyle::MovePoint); + return PointerStyle::MovePoint; case SdrHitKind::TextEdit : case SdrHitKind::TextEditObj: { @@ -1045,9 +1046,9 @@ Pointer SdrView::GetPreferredPointer(const Point& rMousePos, const OutputDevice* { OutlinerParaObject* pParaObj = pText->GetOutlinerParaObject(); if(pParaObj && pParaObj->IsVertical()) - return Pointer(PointerStyle::TextVertical); + return PointerStyle::TextVertical; } - return Pointer(PointerStyle::Text); + return PointerStyle::Text; } default: break; } @@ -1061,13 +1062,13 @@ Pointer SdrView::GetPreferredPointer(const Point& rMousePos, const OutputDevice* bool bVertex=pHdl!=nullptr && pHdl->IsVertexHdl(); bool bMov=eHdl==SdrHdlKind::Move; if (bMov && (meDragMode==SdrDragMode::Move || meDragMode==SdrDragMode::Resize || mbMarkedHitMovesAlways)) { - if (!IsMoveAllowed()) return Pointer(PointerStyle::Arrow); // because double click or drag & drop is possible - return Pointer(PointerStyle::Move); + if (!IsMoveAllowed()) return PointerStyle::Arrow; // because double click or drag & drop is possible + return PointerStyle::Move; } switch (meDragMode) { case SdrDragMode::Rotate: { if ((bCorner || bMov) && !IsRotateAllowed(true)) - return Pointer(PointerStyle::NotAllowed); + return PointerStyle::NotAllowed; // are 3D objects selected? bool b3DObjSelected = false; @@ -1079,19 +1080,19 @@ Pointer SdrView::GetPreferredPointer(const Point& rMousePos, const OutputDevice* // If we have a 3D object, go on despite !IsShearAllowed, // because then we have a rotation instead of a shear. if (bVertex && !IsShearAllowed() && !b3DObjSelected) - return Pointer(PointerStyle::NotAllowed); + return PointerStyle::NotAllowed; if (bMov) - return Pointer(PointerStyle::Rotate); + return PointerStyle::Rotate; } break; case SdrDragMode::Shear: { if (bCorner) { - if (!IsDistortAllowed(true) && !IsDistortAllowed()) return Pointer(PointerStyle::NotAllowed); - else return Pointer(PointerStyle::RefHand); + if (!IsDistortAllowed(true) && !IsDistortAllowed()) return PointerStyle::NotAllowed; + else return PointerStyle::RefHand; } - if (bVertex && !IsShearAllowed()) return Pointer(PointerStyle::NotAllowed); + if (bVertex && !IsShearAllowed()) return PointerStyle::NotAllowed; if (bMov) { - if (!IsMoveAllowed()) return Pointer(PointerStyle::Arrow); // because double click or drag & drop is possible - return Pointer(PointerStyle::Move); + if (!IsMoveAllowed()) return PointerStyle::Arrow; // because double click or drag & drop is possible + return PointerStyle::Move; } } break; case SdrDragMode::Mirror: { @@ -1110,55 +1111,55 @@ Pointer SdrView::GetPreferredPointer(const Point& rMousePos, const OutputDevice* if (!IsMirrorAllowed(true,true)) bNo=true; // any mirroring is forbidden if (!IsMirrorAllowed() && !b45) bNo=true; // mirroring freely is forbidden if (!IsMirrorAllowed(true) && !b90) bNo=true; // mirroring horizontally/vertically is allowed - if (bNo) return Pointer(PointerStyle::NotAllowed); + if (bNo) return PointerStyle::NotAllowed; if (b90) { - return Pointer(PointerStyle::Mirror); + return PointerStyle::Mirror; } - return Pointer(PointerStyle::Mirror); + return PointerStyle::Mirror; } } break; case SdrDragMode::Transparence: { if(!IsTransparenceAllowed()) - return Pointer(PointerStyle::NotAllowed); + return PointerStyle::NotAllowed; - return Pointer(PointerStyle::RefHand); + return PointerStyle::RefHand; } case SdrDragMode::Gradient: { if(!IsGradientAllowed()) - return Pointer(PointerStyle::NotAllowed); + return PointerStyle::NotAllowed; - return Pointer(PointerStyle::RefHand); + return PointerStyle::RefHand; } case SdrDragMode::Crook: { if (bCorner || bVertex || bMov) { - if (!IsCrookAllowed(true) && !IsCrookAllowed()) return Pointer(PointerStyle::NotAllowed); - return Pointer(PointerStyle::Crook); + if (!IsCrookAllowed(true) && !IsCrookAllowed()) return PointerStyle::NotAllowed; + return PointerStyle::Crook; } break; } case SdrDragMode::Crop: { - return Pointer(PointerStyle::Crop); + return PointerStyle::Crop; } default: { - if ((bCorner || bVertex) && !IsResizeAllowed(true)) return Pointer(PointerStyle::NotAllowed); + if ((bCorner || bVertex) && !IsResizeAllowed(true)) return PointerStyle::NotAllowed; } } if (pHdl!=nullptr) return pHdl->GetPointer(); if (bMov) { - if (!IsMoveAllowed()) return Pointer(PointerStyle::Arrow); // because double click or drag & drop is possible - return Pointer(PointerStyle::Move); + if (!IsMoveAllowed()) return PointerStyle::Arrow; // because double click or drag & drop is possible + return PointerStyle::Move; } } if (meEditMode==SdrViewEditMode::Create) return aCurrentCreatePointer; - return Pointer(PointerStyle::Arrow); + return PointerStyle::Arrow; } #define STR_NOTHING "nothing" diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx index f3ba86591d18..91e694b5e591 100644 --- a/svx/source/table/svdotable.cxx +++ b/svx/source/table/svdotable.cxx @@ -23,6 +23,7 @@ #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/container/XIndexAccess.hpp> #include <vcl/canvastools.hxx> +#include <vcl/ptrstyle.hxx> #include <com/sun/star/style/XStyle.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <basegfx/polygon/b2dpolygontools.hxx> @@ -2345,9 +2346,9 @@ basegfx::B2DPolyPolygon SdrTableObj::TakeCreatePoly(const SdrDragStat& rDrag) co } -Pointer SdrTableObj::GetCreatePointer() const +PointerStyle SdrTableObj::GetCreatePointer() const { - return Pointer(PointerStyle::Cross); + return PointerStyle::Cross; } diff --git a/svx/source/table/tablehandles.cxx b/svx/source/table/tablehandles.cxx index fb1bd0d930b3..e6ab5304f16d 100644 --- a/svx/source/table/tablehandles.cxx +++ b/svx/source/table/tablehandles.cxx @@ -24,6 +24,7 @@ #include <vcl/outdev.hxx> #include <vcl/canvastools.hxx> #include <vcl/hatch.hxx> +#include <vcl/ptrstyle.hxx> #include <basegfx/polygon/b2dpolygon.hxx> #include <basegfx/polygon/b2dpolypolygontools.hxx> #include <basegfx/range/b2drectangle.hxx> @@ -78,7 +79,7 @@ void TableEdgeHdl::SetEdge( sal_Int32 nEdge, sal_Int32 nStart, sal_Int32 nEnd, T } } -Pointer TableEdgeHdl::GetPointer() const +PointerStyle TableEdgeHdl::GetPointer() const { if( mbHorizontal ) return PointerStyle::VSplit; @@ -251,7 +252,7 @@ TableBorderHdl::TableBorderHdl( { } -Pointer TableBorderHdl::GetPointer() const +PointerStyle TableBorderHdl::GetPointer() const { return PointerStyle::Move; } diff --git a/svx/source/table/tablehandles.hxx b/svx/source/table/tablehandles.hxx index c09cc2253b29..c436fed56abd 100644 --- a/svx/source/table/tablehandles.hxx +++ b/svx/source/table/tablehandles.hxx @@ -47,7 +47,7 @@ public: sal_Int32 GetValidDragOffset( const SdrDragStat& rDrag ) const; - virtual Pointer GetPointer() const override; + virtual PointerStyle GetPointer() const override; void SetEdge( sal_Int32 nEdge, sal_Int32 nStart, sal_Int32 nEnd, TableEdgeState nState ); @@ -73,7 +73,7 @@ public: const tools::Rectangle& rRect, bool bAnimate); - virtual Pointer GetPointer() const override; + virtual PointerStyle GetPointer() const override; bool getAnimate() const { return mbAnimate; } protected: diff --git a/sw/inc/pch/precompiled_msword.hxx b/sw/inc/pch/precompiled_msword.hxx index 8e68fe7adce1..8635a2062a7d 100644 --- a/sw/inc/pch/precompiled_msword.hxx +++ b/sw/inc/pch/precompiled_msword.hxx @@ -155,7 +155,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/salgtype.hxx> diff --git a/sw/inc/pch/precompiled_swui.hxx b/sw/inc/pch/precompiled_swui.hxx index b303c9435318..f78a904d287d 100644 --- a/sw/inc/pch/precompiled_swui.hxx +++ b/sw/inc/pch/precompiled_swui.hxx @@ -171,7 +171,6 @@ #include <vcl/outdev.hxx> #include <vcl/outdevmap.hxx> #include <vcl/outdevstate.hxx> -#include <vcl/pointr.hxx> #include <vcl/print.hxx> #include <vcl/prntypes.hxx> #include <vcl/ptrstyle.hxx> diff --git a/sw/inc/pch/precompiled_vbaswobj.hxx b/sw/inc/pch/precompiled_vbaswobj.hxx index 0ad59d9dee78..14c103107a75 100644 --- a/sw/inc/pch/precompiled_vbaswobj.hxx +++ b/sw/inc/pch/precompiled_vbaswobj.hxx @@ -163,7 +163,6 @@ #include <vcl/outdev.hxx> #include <vcl/outdevmap.hxx> #include <vcl/outdevstate.hxx> -#include <vcl/pointr.hxx> #include <vcl/print.hxx> #include <vcl/prntypes.hxx> #include <vcl/ptrstyle.hxx> diff --git a/sw/inc/unotxdoc.hxx b/sw/inc/unotxdoc.hxx index ae3fb79aa936..0ceb70b3f888 100644 --- a/sw/inc/unotxdoc.hxx +++ b/sw/inc/unotxdoc.hxx @@ -434,7 +434,7 @@ public: /// @see vcl::ITiledRenderable::setClientZoom. virtual void setClientZoom(int nTilePixelWidth_, int nTilePixelHeight_, int nTileTwipWidth_, int nTileTwipHeight_) override; /// @see vcl::ITiledRenderable::getPointer(). - virtual Pointer getPointer() override; + virtual PointerStyle getPointer() override; /// @see vcl::ITiledRenderable::getTrackedChanges(). OUString getTrackedChanges() override; /// @see vcl::ITiledRenderable::getTrackedChangeAuthors(). diff --git a/sw/source/core/draw/dflyobj.cxx b/sw/source/core/draw/dflyobj.cxx index a78d78e51433..b7f5a30de5af 100644 --- a/sw/source/core/draw/dflyobj.cxx +++ b/sw/source/core/draw/dflyobj.cxx @@ -25,6 +25,7 @@ #include <editeng/opaqitem.hxx> #include <svx/svdpage.hxx> #include <vcl/svapp.hxx> +#include <vcl/ptrstyle.hxx> #include <fmtclds.hxx> #include <fmtornt.hxx> @@ -1229,10 +1230,10 @@ void SwVirtFlyDrawObj::addCropHandles(SdrHdlList& rTarget) const // Macro -Pointer SwVirtFlyDrawObj::GetMacroPointer( +PointerStyle SwVirtFlyDrawObj::GetMacroPointer( const SdrObjMacroHitRec& ) const { - return Pointer( PointerStyle::RefHand ); + return PointerStyle::RefHand; } bool SwVirtFlyDrawObj::HasMacro() const diff --git a/sw/source/core/inc/dflyobj.hxx b/sw/source/core/inc/dflyobj.hxx index f7f744a5fc02..30e27cf5f97c 100644 --- a/sw/source/core/inc/dflyobj.hxx +++ b/sw/source/core/inc/dflyobj.hxx @@ -130,7 +130,7 @@ public: // if an URL is attached to a graphic than this is a macro object virtual bool HasMacro() const override; virtual SdrObject* CheckMacroHit (const SdrObjMacroHitRec& rRec) const override; - virtual Pointer GetMacroPointer (const SdrObjMacroHitRec& rRec) const override; + virtual PointerStyle GetMacroPointer (const SdrObjMacroHitRec& rRec) const override; // RotGrfFlyFrame: If true, this SdrObject supports only limited rotation. virtual bool HasLimitedRotation() const override; diff --git a/sw/source/ui/vba/vbasystem.cxx b/sw/source/ui/vba/vbasystem.cxx index 2ee7a68d8a1d..3be9571f239c 100644 --- a/sw/source/ui/vba/vbasystem.cxx +++ b/sw/source/ui/vba/vbasystem.cxx @@ -200,28 +200,24 @@ SwVbaSystem::setCursor( sal_Int32 _cursor ) { case word::WdCursorType::wdCursorNorthwestArrow: { - const Pointer& rPointer( PointerStyle::Arrow ); - setCursorHelper( getCurrentWordDoc(mxContext), rPointer, false ); + setCursorHelper( getCurrentWordDoc(mxContext), PointerStyle::Arrow, false ); break; } case word::WdCursorType::wdCursorWait: { - const Pointer& rPointer( PointerStyle::Wait ); //It will set the edit window, toobar and statusbar's mouse pointer. - setCursorHelper( getCurrentWordDoc(mxContext), rPointer, true ); + setCursorHelper( getCurrentWordDoc(mxContext), PointerStyle::Wait, true ); break; } case word::WdCursorType::wdCursorIBeam: { - const Pointer& rPointer( PointerStyle::Text ); //It will set the edit window, toobar and statusbar's mouse pointer. - setCursorHelper( getCurrentWordDoc( mxContext ), rPointer, true ); + setCursorHelper( getCurrentWordDoc( mxContext ), PointerStyle::Text, true ); break; } case word::WdCursorType::wdCursorNormal: { - const Pointer& rPointer( PointerStyle::Null ); - setCursorHelper( getCurrentWordDoc( mxContext ), rPointer, false ); + setCursorHelper( getCurrentWordDoc( mxContext ), PointerStyle::Null, false ); break; } default: diff --git a/sw/source/uibase/docvw/AnnotationWin2.cxx b/sw/source/uibase/docvw/AnnotationWin2.cxx index 380831b966c8..978482343e81 100644 --- a/sw/source/uibase/docvw/AnnotationWin2.cxx +++ b/sw/source/uibase/docvw/AnnotationWin2.cxx @@ -60,6 +60,7 @@ #include <vcl/svapp.hxx> #include <vcl/menubtn.hxx> #include <vcl/settings.hxx> +#include <vcl/ptrstyle.hxx> #include <edtwin.hxx> #include <view.hxx> @@ -444,7 +445,7 @@ void SwAnnotationWin::InitControls() mpSidebarTextControl = VclPtr<SidebarTextControl>::Create( *this, WB_NODIALOGCONTROL, mrView, mrMgr ); - mpSidebarTextControl->SetPointer(Pointer(PointerStyle::Text)); + mpSidebarTextControl->SetPointer(PointerStyle::Text); // window controls for author and date mpMetadataAuthor = VclPtr<Edit>::Create( this, 0 ); diff --git a/sw/source/uibase/docvw/edtwin.cxx b/sw/source/uibase/docvw/edtwin.cxx index 494d0ad575cb..9d947f235f38 100644 --- a/sw/source/uibase/docvw/edtwin.cxx +++ b/sw/source/uibase/docvw/edtwin.cxx @@ -35,6 +35,7 @@ #include <vcl/help.hxx> #include <vcl/graph.hxx> #include <vcl/weld.hxx> +#include <vcl/ptrstyle.hxx> #include <sot/storage.hxx> #include <svl/macitem.hxx> #include <unotools/securityoptions.hxx> @@ -3536,7 +3537,7 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt) // don't start a selection when an // URL field or a graphic is clicked bool bSttSelect = rSh.HasSelection() || - Pointer(PointerStyle::RefHand) != GetPointer(); + PointerStyle::RefHand != GetPointer(); if( !bSttSelect ) { diff --git a/sw/source/uibase/docvw/srcedtw.cxx b/sw/source/uibase/docvw/srcedtw.cxx index 1564e969b1a2..d15b9314cba8 100644 --- a/sw/source/uibase/docvw/srcedtw.cxx +++ b/sw/source/uibase/docvw/srcedtw.cxx @@ -31,6 +31,7 @@ #include <vcl/textview.hxx> #include <svx/svxids.hrc> #include <vcl/scrbar.hxx> +#include <vcl/ptrstyle.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/app.hxx> #include <svtools/htmltokn.h> @@ -493,7 +494,7 @@ void SwSrcEditWindow::CreateTextEngine() const Color &rCol = GetSettings().GetStyleSettings().GetWindowColor(); m_pOutWin = VclPtr<TextViewOutWin>::Create(this, 0); m_pOutWin->SetBackground(Wallpaper(rCol)); - m_pOutWin->SetPointer(Pointer(PointerStyle::Text)); + m_pOutWin->SetPointer(PointerStyle::Text); m_pOutWin->Show(); // create Scrollbars diff --git a/sw/source/uibase/ribbar/conform.cxx b/sw/source/uibase/ribbar/conform.cxx index c7ecb91f0903..88fefd1fefd9 100644 --- a/sw/source/uibase/ribbar/conform.cxx +++ b/sw/source/uibase/ribbar/conform.cxx @@ -20,6 +20,7 @@ #include <svx/fmglob.hxx> #include <svx/svdview.hxx> #include <svx/fmshell.hxx> +#include <vcl/ptrstyle.hxx> #include <swmodule.hxx> #include <view.hxx> @@ -64,7 +65,7 @@ bool ConstFormControl::MouseButtonDown(const MouseEvent& rMEvt) g_bNoInterrupt = true; m_pWin->CaptureMouse(); - m_pWin->SetPointer(Pointer(PointerStyle::DrawRect)); + m_pWin->SetPointer(PointerStyle::DrawRect); m_aStartPos = m_pWin->PixelToLogic(rMEvt.GetPosPixel()); bReturn = m_pSh->BeginCreate( static_cast< sal_uInt16 >(m_pWin->GetSdrDrawMode()), SdrInventor::FmForm, m_aStartPos); @@ -84,7 +85,7 @@ void ConstFormControl::Activate(const sal_uInt16 nSlotId) SwDrawBase::Activate(nSlotId); m_pSh->GetDrawView()->SetCurrentObj(nSlotId); - m_pWin->SetPointer(Pointer(PointerStyle::DrawRect)); + m_pWin->SetPointer(PointerStyle::DrawRect); } void ConstFormControl::CreateDefaultObject() diff --git a/sw/source/uibase/ribbar/drawbase.cxx b/sw/source/uibase/ribbar/drawbase.cxx index 351cccb629f7..fd4f4018be23 100644 --- a/sw/source/uibase/ribbar/drawbase.cxx +++ b/sw/source/uibase/ribbar/drawbase.cxx @@ -475,9 +475,8 @@ void SwDrawBase::SetDrawPointer() SdrView *pSdrView = m_pSh->GetDrawView(); Point aPnt(m_pWin->OutputToScreenPixel(m_pWin->GetPointerPosPixel())); aPnt = m_pWin->PixelToLogic(m_pWin->ScreenToOutputPixel(aPnt)); - const Pointer aPointTyp = pSdrView->GetPreferredPointer(aPnt, m_pSh->GetOut()); - const Pointer aDrawPt(aPointTyp); - m_pWin->SetPointer(aDrawPt); + PointerStyle aPointTyp = pSdrView->GetPreferredPointer(aPnt, m_pSh->GetOut()); + m_pWin->SetPointer(aPointTyp); } // If necessary switch into selection mode diff --git a/sw/source/uibase/uiview/viewdraw.cxx b/sw/source/uibase/uiview/viewdraw.cxx index ca7884c5cf2b..00b722710caa 100644 --- a/sw/source/uibase/uiview/viewdraw.cxx +++ b/sw/source/uibase/uiview/viewdraw.cxx @@ -47,6 +47,7 @@ #include <svx/fmglob.hxx> #include <sfx2/dispatch.hxx> #include <svx/svdoutl.hxx> +#include <vcl/ptrstyle.hxx> #include <view.hxx> #include <wrtsh.hxx> @@ -423,7 +424,7 @@ void SwView::ExitDraw() GetViewFrame()->GetBindings().Invalidate(SID_INSERT_DRAW); } - GetEditWin().SetPointer(Pointer(PointerStyle::Text)); + GetEditWin().SetPointer(PointerStyle::Text); } } } diff --git a/sw/source/uibase/uno/unotxdoc.cxx b/sw/source/uibase/uno/unotxdoc.cxx index 934072fd0cf9..18da3684b4e1 100644 --- a/sw/source/uibase/uno/unotxdoc.cxx +++ b/sw/source/uibase/uno/unotxdoc.cxx @@ -3295,13 +3295,13 @@ void SwXTextDocument::setClientZoom(int nTilePixelWidth_, int /*nTilePixelHeight } } -Pointer SwXTextDocument::getPointer() +PointerStyle SwXTextDocument::getPointer() { SolarMutexGuard aGuard; SwWrtShell* pWrtShell = pDocShell->GetWrtShell(); if (!pWrtShell) - return Pointer(); + return PointerStyle::Arrow; return pWrtShell->GetView().GetEditWin().GetPointer(); } diff --git a/toolkit/source/awt/vclxpointer.cxx b/toolkit/source/awt/vclxpointer.cxx index 19cc2735f963..41c98b967217 100644 --- a/toolkit/source/awt/vclxpointer.cxx +++ b/toolkit/source/awt/vclxpointer.cxx @@ -37,14 +37,14 @@ void VCLXPointer::setType( sal_Int32 nType ) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); - maPointer = Pointer( static_cast<PointerStyle>(nType) ); + maPointer = static_cast<PointerStyle>(nType); } sal_Int32 VCLXPointer::getType() { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); - return static_cast<sal_Int32>(maPointer.GetStyle()); + return static_cast<sal_Int32>(maPointer); } OUString VCLXPointer::getImplementationName() 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 ); } } diff --git a/vcl/inc/window.h b/vcl/inc/window.h index 5dec19b7dc47..ecc28c7dcc98 100644 --- a/vcl/inc/window.h +++ b/vcl/inc/window.h @@ -248,7 +248,7 @@ public: css::uno::WeakReference< css::rendering::XCanvas > mxCanvas; vcl::Cursor* mpCursor; - Pointer maPointer; + PointerStyle maPointer; Fraction maZoom; OUString maText; std::unique_ptr<vcl::Font> diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx index bd5c6c8c55fc..d9d9d3d9730d 100644 --- a/vcl/source/control/edit.cxx +++ b/vcl/source/control/edit.cxx @@ -28,6 +28,7 @@ #include <vcl/svapp.hxx> #include <vcl/settings.hxx> #include <vcl/uitest/uiobject.hxx> +#include <vcl/ptrstyle.hxx> #include <window.h> #include <svdata.hxx> @@ -323,7 +324,7 @@ void Edit::ImplInit(vcl::Window* pParent, WinBits nStyle) SetCursor( new vcl::Cursor ); - SetPointer( Pointer( PointerStyle::Text ) ); + SetPointer( PointerStyle::Text ); uno::Reference< datatransfer::dnd::XDragGestureListener> xDGL( mxDnDListener, uno::UNO_QUERY ); uno::Reference< datatransfer::dnd::XDragGestureRecognizer > xDGR = GetDragGestureRecognizer(); diff --git a/vcl/source/control/fixedhyper.cxx b/vcl/source/control/fixedhyper.cxx index 15fb85ad35a0..9905327a72f7 100644 --- a/vcl/source/control/fixedhyper.cxx +++ b/vcl/source/control/fixedhyper.cxx @@ -22,6 +22,7 @@ #include <vcl/settings.hxx> #include <vcl/svapp.hxx> #include <vcl/weld.hxx> +#include <vcl/ptrstyle.hxx> #include <comphelper/anytostring.hxx> #include <comphelper/processfactory.hxx> #include <cppuhelper/exc_hlp.hxx> diff --git a/vcl/source/edit/vclmedit.cxx b/vcl/source/edit/vclmedit.cxx index 3ba002e6cdff..77a168e9ef14 100644 --- a/vcl/source/edit/vclmedit.cxx +++ b/vcl/source/edit/vclmedit.cxx @@ -28,6 +28,8 @@ #include <vcl/vclmedit.hxx> #include <vcl/xtextedt.hxx> #include <vcl/textview.hxx> +#include <vcl/ptrstyle.hxx> + #include <svl/undo.hxx> #include <svl/lstner.hxx> #include <vcl/uitest/uiobject.hxx> @@ -672,7 +674,7 @@ TextWindow::TextWindow(Edit* pParent) mbActivePopup = false; mbSelectOnTab = true; - SetPointer( Pointer( PointerStyle::Text ) ); + SetPointer( PointerStyle::Text ); mpExtTextEngine.reset(new ExtTextEngine); mpExtTextEngine->SetMaxTextLen(EDIT_NOLIMIT); diff --git a/vcl/source/treelist/headbar.cxx b/vcl/source/treelist/headbar.cxx index 32a0316dbbd6..3eaaba9ef76c 100644 --- a/vcl/source/treelist/headbar.cxx +++ b/vcl/source/treelist/headbar.cxx @@ -27,6 +27,8 @@ #include <vcl/settings.hxx> #include <vcl/commandevent.hxx> #include <vcl/event.hxx> +#include <vcl/ptrstyle.hxx> + #include <com/sun/star/accessibility/AccessibleRole.hpp> #include <com/sun/star/accessibility/XAccessible.hpp> @@ -776,8 +778,7 @@ void HeaderBar::ImplEndDrag( bool bCancel ) { if ( mbItemDrag ) { - Pointer aPointer( PointerStyle::Arrow ); - SetPointer( aPointer ); + SetPointer( PointerStyle::Arrow ); if ( (mnItemDragPos != nPos) && (mnItemDragPos != HEADERBAR_ITEM_NOTFOUND) ) { @@ -850,8 +851,7 @@ void HeaderBar::MouseMove( const MouseEvent& rMEvt ) if ( nHitTest & HEAD_HITTEST_DIVIDER ) eStyle = PointerStyle::HSizeBar; - Pointer aPtr( eStyle ); - SetPointer( aPtr ); + SetPointer( eStyle ); } void HeaderBar::Tracking( const TrackingEvent& rTEvt ) diff --git a/vcl/source/window/brdwin.cxx b/vcl/source/window/brdwin.cxx index 549db302ba9f..6315b5dbc918 100644 --- a/vcl/source/window/brdwin.cxx +++ b/vcl/source/window/brdwin.cxx @@ -37,6 +37,7 @@ #include <vcl/metric.hxx> #include <vcl/settings.hxx> #include <vcl/toolbox.hxx> +#include <vcl/ptrstyle.hxx> using namespace ::com::sun::star::uno; @@ -283,7 +284,7 @@ void ImplBorderWindowView::ImplMouseMove( ImplBorderFrameData* pData, const Mous else if ( nHitTest & BorderWindowHitTest::Title && pData->mnTitleType == BorderWindowTitleType::Tearoff && !rMEvt.IsLeaveWindow() ) ePtrStyle = PointerStyle::Move; - pData->mpBorderWindow->SetPointer( Pointer( ePtrStyle ) ); + pData->mpBorderWindow->SetPointer( ePtrStyle ); if( pData->mnCloseState != oldCloseState ) pData->mpBorderWindow->Invalidate( pData->maCloseRect ); @@ -1124,7 +1125,7 @@ bool ImplStdBorderWindowView::Tracking( const TrackingEvent& rTEvt ) if ( maFrameData.mnHitTest & BorderWindowHitTest::Title ) { - maFrameData.mpBorderWindow->SetPointer( Pointer( PointerStyle::Move ) ); + maFrameData.mpBorderWindow->SetPointer( PointerStyle::Move ); Point aPos = pBorderWindow->GetPosPixel(); aPos.AdjustX(aMousePos.X() ); diff --git a/vcl/source/window/mouse.cxx b/vcl/source/window/mouse.cxx index f0297d26a1e4..c0e5a385b626 100644 --- a/vcl/source/window/mouse.cxx +++ b/vcl/source/window/mouse.cxx @@ -97,7 +97,7 @@ PointerStyle Window::ImplGetMousePointer() const bool bWait = false; if ( IsEnabled() && IsInputEnabled() && ! IsInModalMode() ) - ePointerStyle = GetPointer().GetStyle(); + ePointerStyle = GetPointer(); else ePointerStyle = PointerStyle::Arrow; @@ -119,7 +119,7 @@ PointerStyle Window::ImplGetMousePointer() const else { if ( pWindow->mpWindowImpl->mbChildPtrOverwrite ) - ePointerStyle = pWindow->GetPointer().GetStyle(); + ePointerStyle = pWindow->GetPointer(); } } @@ -472,12 +472,12 @@ bool Window::IsMouseCaptured() const return (this == ImplGetSVData()->maWinData.mpCaptureWin); } -void Window::SetPointer( const Pointer& rPointer ) +void Window::SetPointer( PointerStyle nPointer ) { - if ( mpWindowImpl->maPointer == rPointer ) + if ( mpWindowImpl->maPointer == nPointer ) return; - mpWindowImpl->maPointer = rPointer; + mpWindowImpl->maPointer = nPointer; // possibly immediately move pointer if ( !mpWindowImpl->mpFrameData->mbInMouseMove && ImplTestMousePointerSet() ) @@ -485,10 +485,10 @@ void Window::SetPointer( const Pointer& rPointer ) if (VclPtr<vcl::Window> pWin = GetParentWithLOKNotifier()) { - Pointer aPointer = GetPointer(); + PointerStyle aPointer = GetPointer(); // We don't map all possible pointers hence we need a default OString aPointerString = "default"; - auto aIt = vcl::gaLOKPointerMap.find(aPointer.GetStyle()); + auto aIt = vcl::gaLOKPointerMap.find(aPointer); if (aIt != vcl::gaLOKPointerMap.end()) { aPointerString = aIt->second; diff --git a/vcl/source/window/scrwnd.cxx b/vcl/source/window/scrwnd.cxx index b5aec1cfb009..e81ad0205cca 100644 --- a/vcl/source/window/scrwnd.cxx +++ b/vcl/source/window/scrwnd.cxx @@ -28,6 +28,7 @@ #include <vcl/timer.hxx> #include <vcl/commandevent.hxx> #include <vcl/event.hxx> +#include <vcl/ptrstyle.hxx> #include <sal/log.hxx> #include <math.h> diff --git a/vcl/source/window/split.cxx b/vcl/source/window/split.cxx index 5955ea174ab8..facd6fdd7603 100644 --- a/vcl/source/window/split.cxx +++ b/vcl/source/window/split.cxx @@ -27,6 +27,7 @@ #include <vcl/gradient.hxx> #include <vcl/lineinfo.hxx> #include <vcl/settings.hxx> +#include <vcl/ptrstyle.hxx> #include <rtl/instance.hxx> @@ -69,7 +70,7 @@ void Splitter::ImplInitHorVer(bool bNew) SetSizePixel( Size( rSettings.GetScrollBarSize(), StyleSettings::GetSplitSize() ) ); } - SetPointer( Pointer( ePointerStyle ) ); + SetPointer( ePointerStyle ); } void Splitter::ImplInit( vcl::Window* pParent, WinBits nWinStyle ) diff --git a/vcl/source/window/splitwin.cxx b/vcl/source/window/splitwin.cxx index f2201341d781..080a6ae38a7a 100644 --- a/vcl/source/window/splitwin.cxx +++ b/vcl/source/window/splitwin.cxx @@ -30,6 +30,7 @@ #include <vcl/help.hxx> #include <vcl/splitwin.hxx> #include <vcl/settings.hxx> +#include <vcl/ptrstyle.hxx> #include <vcl/vclenum.hxx> @@ -1849,9 +1850,7 @@ void SplitWindow::ImplStartSplit( const MouseEvent& rMEvt ) else if ( mnSplitTest & SPLIT_VERT ) eStyle = PointerStyle::VSplit; - Pointer aPtr( eStyle ); - SetPointer( aPtr ); - + SetPointer( eStyle ); } void SplitWindow::StartSplit() @@ -1946,9 +1945,7 @@ void SplitWindow::MouseMove( const MouseEvent& rMEvt ) } } - Pointer aPtr( eStyle ); - SetPointer( aPtr ); - + SetPointer( eStyle ); } void SplitWindow::Tracking( const TrackingEvent& rTEvt ) diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx index ae3ce232557d..c324b3fd19c7 100644 --- a/vcl/source/window/toolbox.cxx +++ b/vcl/source/window/toolbox.cxx @@ -31,6 +31,7 @@ #include <vcl/menu.hxx> #include <vcl/settings.hxx> #include <vcl/vclstatuslistener.hxx> +#include <vcl/ptrstyle.hxx> #include <tools/poly.hxx> #include <svl/imageitm.hxx> @@ -3374,8 +3375,7 @@ void ToolBox::MouseMove( const MouseEvent& rMEvt ) if ( meLastStyle != eStyle ) { meLastStyle = eStyle; - Pointer aPtr( eStyle ); - SetPointer( aPtr ); + SetPointer( eStyle ); } DockingWindow::MouseMove( rMEvt ); diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx index 3d5b1b16368c..66df5fa5781f 100644 --- a/vcl/source/window/window2.cxx +++ b/vcl/source/window/window2.cxx @@ -1220,7 +1220,7 @@ void Window::SetCreatedWithToolkit( bool b ) mpWindowImpl->mbCreatedWithToolkit = b; } -const Pointer& Window::GetPointer() const +PointerStyle Window::GetPointer() const { return mpWindowImpl->maPointer; } diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx index 8fdfdede0bcd..dccd084f668d 100644 --- a/vcl/source/window/winproc.cxx +++ b/vcl/source/window/winproc.cxx @@ -40,6 +40,7 @@ #include <vcl/virdev.hxx> #include <vcl/lazydelete.hxx> #include <vcl/uitest/logger.hxx> +#include <vcl/ptrstyle.hxx> #include <svdata.hxx> #include <salwtype.hxx> diff --git a/vcl/win/window/salframe.cxx b/vcl/win/window/salframe.cxx index 27b55ffffa2e..c6d4d9057981 100644 --- a/vcl/win/window/salframe.cxx +++ b/vcl/win/window/salframe.cxx @@ -51,6 +51,7 @@ #include <vcl/window.hxx> #include <vcl/wrkwin.hxx> #include <vcl/svapp.hxx> +#include <vcl/ptrstyle.hxx> #include <win/wincomp.hxx> #include <win/salids.hrc> diff --git a/xmlsecurity/inc/pch/precompiled_xmlsecurity.hxx b/xmlsecurity/inc/pch/precompiled_xmlsecurity.hxx index 81df67f7eee4..548a231f7e4f 100644 --- a/xmlsecurity/inc/pch/precompiled_xmlsecurity.hxx +++ b/xmlsecurity/inc/pch/precompiled_xmlsecurity.hxx @@ -151,7 +151,6 @@ #include <vcl/outdev.hxx> #include <vcl/outdevmap.hxx> #include <vcl/outdevstate.hxx> -#include <vcl/pointr.hxx> #include <vcl/ptrstyle.hxx> #include <vcl/quickselectionengine.hxx> #include <vcl/region.hxx> |