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 /svx | |
parent | ad6d9bce1126997750d3c3c2606d28164d63d1d8 (diff) |
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>
Diffstat (limited to 'svx')
24 files changed, 163 insertions, 143 deletions
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: |