summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/avmedia/mediawindow.hxx4
-rw-r--r--include/editeng/editview.hxx4
-rw-r--r--include/editeng/outliner.hxx4
-rw-r--r--include/svx/svdcrtv.hxx2
-rw-r--r--include/svx/svddrgmt.hxx8
-rw-r--r--include/svx/svdhdl.hxx10
-rw-r--r--include/svx/svdhlpln.hxx5
-rw-r--r--include/svx/svdobj.hxx6
-rw-r--r--include/svx/svdocapt.hxx2
-rw-r--r--include/svx/svdocirc.hxx2
-rw-r--r--include/svx/svdoedge.hxx2
-rw-r--r--include/svx/svdomeas.hxx2
-rw-r--r--include/svx/svdopath.hxx2
-rw-r--r--include/svx/svdorect.hxx2
-rw-r--r--include/svx/svdotable.hxx2
-rw-r--r--include/svx/svdotext.hxx2
-rw-r--r--include/svx/svdovirt.hxx2
-rw-r--r--include/svx/svdsnpv.hxx2
-rw-r--r--include/svx/svdview.hxx2
-rw-r--r--include/toolkit/awt/vclxpointer.hxx6
-rw-r--r--include/vbahelper/vbahelper.hxx3
-rw-r--r--include/vcl/ITiledRenderable.hxx3
-rw-r--r--include/vcl/fixedhyper.hxx2
-rw-r--r--include/vcl/pointr.hxx46
-rw-r--r--include/vcl/window.hxx6
25 files changed, 40 insertions, 91 deletions
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();
generated by cgit (git 2.34.1) at 2025-01-17 08:22:37 +0000