avmedia/source/viewer/mediawindow_impl.cxx | 8
basctl/source/basicide/baside2b.cxx | 2
chart2/source/controller/main/ChartController_Window.cxx | 54 +-
chart2/source/controller/main/DragMethod_Base.cxx | 4
dbaccess/source/ui/querydesign/JoinTableView.cxx | 4
dbaccess/source/ui/querydesign/TableWindow.cxx | 8
editeng/source/editeng/impedit.hxx | 10
editeng/source/outliner/outlvw.cxx | 8
extensions/source/propctrlr/standardcontrol.cxx | 4
include/vbahelper/vbahelper.hxx | 2
include/vcl/pointr.hxx | 2
include/vcl/ptrstyle.hxx | 200 ++++-----
reportdesign/source/ui/report/dlgedfunc.cxx | 4
sc/source/ui/app/inputwin.cxx | 6
sc/source/ui/dbgui/csvruler.cxx | 2
sc/source/ui/dbgui/scuiasciiopt.cxx | 8
sc/source/ui/drawfunc/fuconarc.cxx | 8
sc/source/ui/drawfunc/fuconcustomshape.cxx | 2
sc/source/ui/drawfunc/fuconpol.cxx | 2
sc/source/ui/drawfunc/fuconrec.cxx | 10
sc/source/ui/drawfunc/fuconstr.cxx | 2
sc/source/ui/drawfunc/fuconuno.cxx | 2
sc/source/ui/drawfunc/fudraw.cxx | 14
sc/source/ui/drawfunc/futext.cxx | 2
sc/source/ui/formdlg/privsplt.cxx | 4
sc/source/ui/inc/preview.hxx | 4
sc/source/ui/miscdlgs/acredlin.cxx | 26 -
sc/source/ui/miscdlgs/conflictsdlg.cxx | 8
sc/source/ui/miscdlgs/instbdlg.cxx | 2
sc/source/ui/pagedlg/tphfedit.cxx | 2
sc/source/ui/vba/vbaapplication.cxx | 14
sc/source/ui/view/formatsh.cxx | 4
sc/source/ui/view/gridwin.cxx | 48 +-
sc/source/ui/view/gridwin2.cxx | 12
sc/source/ui/view/gridwin3.cxx | 2
sc/source/ui/view/hdrcont.cxx | 8
sc/source/ui/view/preview.cxx | 102 ++---
sc/source/ui/view/tabsplit.cxx | 6
sc/source/ui/view/tabview5.cxx | 2
sd/source/ui/annotations/annotationwindow.cxx | 2
sd/source/ui/func/fuconuno.cxx | 2
sd/source/ui/func/fudraw.cxx | 14
sd/source/ui/func/fudspord.cxx | 2
sd/source/ui/func/fuformatpaintbrush.cxx | 6
sd/source/ui/func/fuzoom.cxx | 8
sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx | 2
sd/source/ui/view/viewoverlaymanager.cxx | 2
sfx2/source/control/recentdocsviewitem.cxx | 2
svtools/source/brwbox/brwbox2.cxx | 4
svtools/source/brwbox/datwin.cxx | 4
svtools/source/control/headbar.cxx | 6
svtools/source/control/hyperlabel.cxx | 4
svtools/source/control/ruler.cxx | 26 -
svtools/source/control/tabbar.cxx | 2
svtools/source/hatchwindow/ipwin.cxx | 10
svtools/source/table/mousefunction.cxx | 10
svtools/source/toolpanel/toolpaneldrawer.cxx | 2
svx/source/dialog/contwnd.cxx | 2
svx/source/dialog/graphctl.cxx | 2
svx/source/engine3d/dragmt3d.cxx | 4
svx/source/svdraw/svdcrtv.cxx | 6
svx/source/svdraw/svddrgmt.cxx | 26 -
svx/source/svdraw/svdhdl.cxx | 70 +--
svx/source/svdraw/svdhlpln.cxx | 6
svx/source/svdraw/svdobj.cxx | 4
svx/source/svdraw/svdocapt.cxx | 2
svx/source/svdraw/svdocirc.cxx | 10
svx/source/svdraw/svdoedge.cxx | 2
svx/source/svdraw/svdomeas.cxx | 2
svx/source/svdraw/svdopath.cxx | 24 -
svx/source/svdraw/svdorect.cxx | 4
svx/source/svdraw/svdotxdr.cxx | 4
svx/source/svdraw/svdsnpv.cxx | 8
svx/source/svdraw/svdview.cxx | 80 +--
svx/source/table/svdotable.cxx | 2
svx/source/table/tablehandles.cxx | 6
sw/source/core/draw/dflyobj.cxx | 2
sw/source/ui/vba/vbasystem.cxx | 18
sw/source/uibase/docvw/SidebarWin.cxx | 2
sw/source/uibase/docvw/edtwin.cxx | 68 +--
sw/source/uibase/docvw/srcedtw.cxx | 2
sw/source/uibase/ribbar/conform.cxx | 4
sw/source/uibase/uiview/viewdraw.cxx | 2
vbahelper/source/msforms/vbacontrol.cxx | 36 -
vbahelper/source/vbahelper/vbahelper.cxx | 4
vcl/inc/osx/saldata.hxx | 3
vcl/inc/unx/gtk/gtkdata.hxx | 3
vcl/inc/unx/saldisp.hxx | 5
vcl/osx/saldata.cxx | 205 +++++-----
vcl/osx/salframe.cxx | 40 -
vcl/source/control/edit.cxx | 4
vcl/source/control/fixedhyper.cxx | 2
vcl/source/edit/vclmedit.cxx | 2
vcl/source/window/brdwin.cxx | 20
vcl/source/window/mouse.cxx | 6
vcl/source/window/scrwnd.cxx | 48 +-
vcl/source/window/split.cxx | 4
vcl/source/window/splitwin.cxx | 12
vcl/source/window/toolbox.cxx | 18
vcl/source/window/winproc.cxx | 4
vcl/unx/generic/app/saldisp.cxx | 203 ++++------
vcl/unx/generic/window/salframe.cxx | 2
vcl/unx/gtk/app/gtkdata.cxx | 221 +++++------
vcl/unx/gtk/window/gtksalframe.cxx | 2
vcl/win/source/window/salframe.cxx | 13
105 files changed, 964 insertions(+), 975 deletions(-)
New commits:
commit e929194317a7debb1c5467282230cbbabe61a710
Author: Noel Grandin <n...@peralex.com>
Date: Wed May 20 14:05:50 2015 +0200
convert POINTER constants to scoped enum
Change-Id: Iea29ce5fd6c620535197d3ca8538335078430e19
Reviewed-on: https://gerrit.libreoffice.org/15825
Reviewed-by: Noel Grandin <noelgran...@gmail.com>
Tested-by: Noel Grandin <noelgran...@gmail.com>
diff --git a/avmedia/source/viewer/mediawindow_impl.cxx
b/avmedia/source/viewer/mediawindow_impl.cxx
index 9f0591b..1a67024 100644
--- a/avmedia/source/viewer/mediawindow_impl.cxx
+++ b/avmedia/source/viewer/mediawindow_impl.cxx
@@ -563,16 +563,16 @@ void MediaWindowImpl::setPointer(const Pointer& rPointer)
switch (rPointer.GetStyle())
{
- case POINTER_CROSS:
+ case PointerStyle::Cross:
nPointer = awt::SystemPointer::CROSS;
break;
- case POINTER_HAND:
+ case PointerStyle::Hand:
nPointer = awt::SystemPointer::HAND;
break;
- case POINTER_MOVE:
+ case PointerStyle::Move:
nPointer = awt::SystemPointer::MOVE;
break;
- case POINTER_WAIT:
+ case PointerStyle::Wait:
nPointer = awt::SystemPointer::WAIT;
break;
default:
diff --git a/basctl/source/basicide/baside2b.cxx
b/basctl/source/basicide/baside2b.cxx
index fe617dd..2c98fde 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -230,7 +230,7 @@ EditorWindow::EditorWindow (vcl::Window* pParent,
ModulWindow* pModulWindow) :
pCodeCompleteWnd(VclPtr<CodeCompleteWindow>::Create(this))
{
SetBackground(Wallpaper(GetSettings().GetStyleSettings().GetFieldColor()));
- SetPointer( Pointer( POINTER_TEXT ) );
+ SetPointer( Pointer( PointerStyle::Text ) );
SetHelpId( HID_BASICIDE_EDITORWINDOW );
listener_ = new ChangesListener(*this);
diff --git a/chart2/source/controller/main/ChartController_Window.cxx
b/chart2/source/controller/main/ChartController_Window.cxx
index 8d8a22c..114f7e6 100644
--- a/chart2/source/controller/main/ChartController_Window.cxx
+++ b/chart2/source/controller/main/ChartController_Window.cxx
@@ -1864,25 +1864,25 @@ void ChartController::impl_SetMousePointer( const
MouseEvent & rEvent )
switch( aPointer.GetStyle())
{
- case POINTER_NSIZE:
- case POINTER_SSIZE:
- case POINTER_WSIZE:
- case POINTER_ESIZE:
- case POINTER_NWSIZE:
- case POINTER_NESIZE:
- case POINTER_SWSIZE:
- case POINTER_SESIZE:
+ case PointerStyle::NSize:
+ case PointerStyle::SSize:
+ case PointerStyle::WSize:
+ case PointerStyle::ESize:
+ case PointerStyle::NWSize:
+ case PointerStyle::NESize:
+ case PointerStyle::SWSize:
+ case PointerStyle::SESize:
if( ! m_aSelection.isResizeableObjectSelected() )
bForceArrowPointer = true;
break;
- case POINTER_MOVE:
+ case PointerStyle::Move:
if ( !aOID.isDragableObject() )
bForceArrowPointer = true;
break;
- case POINTER_MOVEPOINT:
- case POINTER_MOVEBEZIERWEIGHT:
+ case PointerStyle::MovePoint:
+ case PointerStyle::MoveBezierWeight:
// there is no point-editing in a chart
- // the POINTER_MOVEBEZIERWEIGHT appears in 3d data points
+ // the PointerStyle::MoveBezierWeight appears in 3d data points
bForceArrowPointer = true;
break;
default:
@@ -1890,7 +1890,7 @@ void ChartController::impl_SetMousePointer( const
MouseEvent & rEvent )
}
if( bForceArrowPointer )
- m_pChartWindow->SetPointer( Pointer( POINTER_ARROW ));
+ m_pChartWindow->SetPointer( Pointer( PointerStyle::Arrow ));
else
m_pChartWindow->SetPointer( aPointer );
@@ -1901,44 +1901,44 @@ void ChartController::impl_SetMousePointer( const
MouseEvent & rEvent )
if ( m_eDrawMode == CHARTDRAW_INSERT &&
( !m_pDrawViewWrapper->IsMarkedHit( aMousePos ) ||
!m_aSelection.isDragableObjectSelected() ) )
{
- PointerStyle ePointerStyle = POINTER_DRAW_RECT;
+ PointerStyle ePointerStyle = PointerStyle::DrawRect;
SdrObjKind eKind = static_cast< SdrObjKind >(
m_pDrawViewWrapper->GetCurrentObjIdentifier() );
switch ( eKind )
{
case OBJ_LINE:
{
- ePointerStyle = POINTER_DRAW_LINE;
+ ePointerStyle = PointerStyle::DrawLine;
}
break;
case OBJ_RECT:
case OBJ_CUSTOMSHAPE:
{
- ePointerStyle = POINTER_DRAW_RECT;
+ ePointerStyle = PointerStyle::DrawRect;
}
break;
case OBJ_CIRC:
{
- ePointerStyle = POINTER_DRAW_ELLIPSE;
+ ePointerStyle = PointerStyle::DrawEllipse;
}
break;
case OBJ_FREELINE:
{
- ePointerStyle = POINTER_DRAW_POLYGON;
+ ePointerStyle = PointerStyle::DrawPolygon;
}
break;
case OBJ_TEXT:
{
- ePointerStyle = POINTER_DRAW_TEXT;
+ ePointerStyle = PointerStyle::DrawText;
}
break;
case OBJ_CAPTION:
{
- ePointerStyle = POINTER_DRAW_CAPTION;
+ ePointerStyle = PointerStyle::DrawCaption;
}
break;
default:
{
- ePointerStyle = POINTER_DRAW_RECT;
+ ePointerStyle = PointerStyle::DrawRect;
}
break;
}
@@ -1954,7 +1954,7 @@ void ChartController::impl_SetMousePointer( const
MouseEvent & rEvent )
{
if( aHitObjectCID.equals(m_aSelection.getSelectedCID()) )
{
- m_pChartWindow->SetPointer( Pointer( POINTER_ARROW ));
+ m_pChartWindow->SetPointer( Pointer( PointerStyle::Arrow ));
return;
}
}
@@ -1962,14 +1962,14 @@ void ChartController::impl_SetMousePointer( const
MouseEvent & rEvent )
if( aHitObjectCID.isEmpty() )
{
//additional shape was hit
- m_pChartWindow->SetPointer( POINTER_MOVE );
+ m_pChartWindow->SetPointer( PointerStyle::Move );
}
else if( ObjectIdentifier::isDragableObject( aHitObjectCID ) )
{
if( (m_eDragMode == SDRDRAG_ROTATE)
&& SelectionHelper::isRotateableObject( aHitObjectCID
, getModel() ) )
- m_pChartWindow->SetPointer( Pointer( POINTER_ROTATE ) );
+ m_pChartWindow->SetPointer( Pointer( PointerStyle::Rotate ) );
else
{
ObjectType eHitObjectType = ObjectIdentifier::getObjectType(
aHitObjectCID );
@@ -1978,15 +1978,15 @@ void ChartController::impl_SetMousePointer( const
MouseEvent & rEvent )
if(
!ObjectIdentifier::areSiblings(aHitObjectCID,m_aSelection.getSelectedCID())
&&
!ObjectIdentifier::areIdenticalObjects(aHitObjectCID,m_aSelection.getSelectedCID())
)
{
- m_pChartWindow->SetPointer( Pointer( POINTER_ARROW ));
+ m_pChartWindow->SetPointer( Pointer( PointerStyle::Arrow
));
return;
}
}
- m_pChartWindow->SetPointer( POINTER_MOVE );
+ m_pChartWindow->SetPointer( PointerStyle::Move );
}
}
else
- m_pChartWindow->SetPointer( Pointer( POINTER_ARROW ));
+ m_pChartWindow->SetPointer( Pointer( PointerStyle::Arrow ));
}
} //namespace chart
diff --git a/chart2/source/controller/main/DragMethod_Base.cxx
b/chart2/source/controller/main/DragMethod_Base.cxx
index f0213a9..d333197 100644
--- a/chart2/source/controller/main/DragMethod_Base.cxx
+++ b/chart2/source/controller/main/DragMethod_Base.cxx
@@ -71,9 +71,9 @@ void DragMethod_Base::TakeSdrDragComment(OUString& rStr) const
Pointer DragMethod_Base::GetSdrDragPointer() const
{
if( IsDraggingPoints() || IsDraggingGluePoints() )
- return Pointer(POINTER_MOVEPOINT);
+ return Pointer(PointerStyle::MovePoint);
else
- return Pointer(POINTER_MOVE);
+ return Pointer(PointerStyle::Move);
}
} //namespace chart
diff --git a/dbaccess/source/ui/querydesign/JoinTableView.cxx
b/dbaccess/source/ui/querydesign/JoinTableView.cxx
index e444861..571067e 100644
--- a/dbaccess/source/ui/querydesign/JoinTableView.cxx
+++ b/dbaccess/source/ui/querydesign/JoinTableView.cxx
@@ -619,7 +619,7 @@ void OJoinTableView::BeginChildMove( OTableWindow* pTabWin,
const Point& rMouseP
return;
m_pDragWin = pTabWin;
- SetPointer(Pointer(POINTER_MOVE));
+ SetPointer(Pointer(PointerStyle::Move));
Point aMousePos = ScreenToOutputPixel( rMousePos );
m_aDragOffset = aMousePos - pTabWin->GetPosPixel();
m_pDragWin->SetZOrder(NULL, WINDOW_ZORDER_FIRST);
@@ -767,7 +767,7 @@ void OJoinTableView::Tracking( const TrackingEvent& rTEvt )
m_pDragWin->GrabFocus();
}
m_pDragWin = NULL;
- SetPointer(Pointer(POINTER_ARROW));
+ SetPointer(Pointer(PointerStyle::Arrow));
}
// else we handle the resizing
else if( m_pSizingWin )
diff --git a/dbaccess/source/ui/querydesign/TableWindow.cxx
b/dbaccess/source/ui/querydesign/TableWindow.cxx
index 971ff21..8448027 100644
--- a/dbaccess/source/ui/querydesign/TableWindow.cxx
+++ b/dbaccess/source/ui/querydesign/TableWindow.cxx
@@ -420,22 +420,22 @@ void OTableWindow::MouseMove( const MouseEvent& rEvt )
{
case SIZING_TOP:
case SIZING_BOTTOM:
- aPointer = Pointer( POINTER_SSIZE );
+ aPointer = Pointer( PointerStyle::SSize );
break;
case SIZING_LEFT:
case SIZING_RIGHT:
- aPointer = Pointer( POINTER_ESIZE );
+ aPointer = Pointer( PointerStyle::ESize );
break;
case SIZING_LEFT+SIZING_TOP:
case SIZING_RIGHT+SIZING_BOTTOM:
- aPointer = Pointer( POINTER_SESIZE );
+ aPointer = Pointer( PointerStyle::SESize );
break;
case SIZING_RIGHT+SIZING_TOP:
case SIZING_LEFT+SIZING_BOTTOM:
- aPointer = Pointer( POINTER_NESIZE );
+ aPointer = Pointer( PointerStyle::NESize );
break;
}
diff --git a/editeng/source/editeng/impedit.hxx
b/editeng/source/editeng/impedit.hxx
index 93f2b8f..c6186b9 100644
--- a/editeng/source/editeng/impedit.hxx
+++ b/editeng/source/editeng/impedit.hxx
@@ -1189,19 +1189,19 @@ inline const Pointer& ImpEditView::GetPointer()
{
if ( !pPointer )
{
- pPointer = new Pointer( IsVertical() ? POINTER_TEXT_VERTICAL :
POINTER_TEXT );
+ pPointer = new Pointer( IsVertical() ? PointerStyle::TextVertical :
PointerStyle::Text );
return *pPointer;
}
- if(POINTER_TEXT == pPointer->GetStyle() && IsVertical())
+ if(PointerStyle::Text == pPointer->GetStyle() && IsVertical())
{
delete pPointer;
- pPointer = new Pointer(POINTER_TEXT_VERTICAL);
+ pPointer = new Pointer(PointerStyle::TextVertical);
}
- else if(POINTER_TEXT_VERTICAL == pPointer->GetStyle() && !IsVertical())
+ else if(PointerStyle::TextVertical == pPointer->GetStyle() &&
!IsVertical())
{
delete pPointer;
- pPointer = new Pointer(POINTER_TEXT);
+ pPointer = new Pointer(PointerStyle::Text);
}
return *pPointer;
diff --git a/editeng/source/outliner/outlvw.cxx
b/editeng/source/outliner/outlvw.cxx
index 7e5450d..92f9678 100644
--- a/editeng/source/outliner/outlvw.cxx
+++ b/editeng/source/outliner/outlvw.cxx
@@ -734,18 +734,18 @@ Pointer OutlinerView::GetPointer( const Point& rPosPixel )
MouseTarget eTarget;
ImpCheckMousePos( rPosPixel, eTarget );
- PointerStyle ePointerStyle = POINTER_ARROW;
+ PointerStyle ePointerStyle = PointerStyle::Arrow;
if ( eTarget == MouseTarget::Text )
{
- ePointerStyle = GetOutliner()->IsVertical() ? POINTER_TEXT_VERTICAL :
POINTER_TEXT;
+ ePointerStyle = GetOutliner()->IsVertical() ?
PointerStyle::TextVertical : PointerStyle::Text;
}
else if ( eTarget == MouseTarget::Hypertext )
{
- ePointerStyle = POINTER_REFHAND;
+ ePointerStyle = PointerStyle::RefHand;
}
else if ( eTarget == MouseTarget::Bullet )
{
- ePointerStyle = POINTER_MOVE;
+ ePointerStyle = PointerStyle::Move;
}
return Pointer( ePointerStyle );
diff --git a/extensions/source/propctrlr/standardcontrol.cxx
b/extensions/source/propctrlr/standardcontrol.cxx
index 2f14daf..03db0ce 100644
--- a/extensions/source/propctrlr/standardcontrol.cxx
+++ b/extensions/source/propctrlr/standardcontrol.cxx
@@ -349,12 +349,12 @@ namespace pcr
{
Edit::MouseMove( rMEvt );
- PointerStyle ePointerStyle( POINTER_TEXT );
+ PointerStyle ePointerStyle( PointerStyle::Text );
if ( !rMEvt.IsLeaveWindow() )
{
if ( impl_textHitTest( rMEvt.GetPosPixel() ) )
- ePointerStyle = POINTER_REFHAND;
+ ePointerStyle = PointerStyle::RefHand;
}
SetPointer( Pointer( ePointerStyle ) );
diff --git a/include/vbahelper/vbahelper.hxx b/include/vbahelper/vbahelper.hxx
index d4a0de1..bf413ba 100644
--- a/include/vbahelper/vbahelper.hxx
+++ b/include/vbahelper/vbahelper.hxx
@@ -104,7 +104,7 @@ namespace ooo
VBAHELPER_DLLPUBLIC double PixelsToPoints( const css::uno::Reference<
css::awt::XDevice >& xDevice, double fPixels, bool bVertical);
VBAHELPER_DLLPUBLIC sal_Int32 PointsToHmm( double fPoints );
VBAHELPER_DLLPUBLIC double HmmToPoints( sal_Int32 nHmm );
- VBAHELPER_DLLPUBLIC sal_Int32 getPointerStyle( const
css::uno::Reference< css::frame::XModel >& );
+ 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 setDefaultPropByIntrospection( const
css::uno::Any& aObj, const css::uno::Any& aValue ) throw (
css::uno::RuntimeException );
VBAHELPER_DLLPUBLIC css::uno::Any getPropertyValue( const
css::uno::Sequence< css::beans::PropertyValue >& aProp, const OUString& aName );
diff --git a/include/vcl/pointr.hxx b/include/vcl/pointr.hxx
index 7517397..c82fb22 100644
--- a/include/vcl/pointr.hxx
+++ b/include/vcl/pointr.hxx
@@ -31,7 +31,7 @@ class VCL_DLLPUBLIC Pointer
public:
Pointer()
- { meStyle = POINTER_ARROW; }
+ { meStyle = PointerStyle::Arrow; }
Pointer( PointerStyle eStyle )
{ meStyle = eStyle; }
diff --git a/include/vcl/ptrstyle.hxx b/include/vcl/ptrstyle.hxx
index ece5af2..d63d44b 100644
--- a/include/vcl/ptrstyle.hxx
+++ b/include/vcl/ptrstyle.hxx
@@ -20,108 +20,104 @@
#ifndef INCLUDED_VCL_PTRSTYLE_HXX
#define INCLUDED_VCL_PTRSTYLE_HXX
-typedef sal_uInt16 PointerStyle;
-
-#define POINTER_ARROW ((PointerStyle)0)
-#define POINTER_NULL ((PointerStyle)1)
-#define POINTER_WAIT ((PointerStyle)2)
-#define POINTER_TEXT ((PointerStyle)3)
-#define POINTER_HELP ((PointerStyle)4)
-#define POINTER_CROSS ((PointerStyle)5)
-#define POINTER_MOVE ((PointerStyle)6)
-#define POINTER_NSIZE ((PointerStyle)7)
-#define POINTER_SSIZE ((PointerStyle)8)
-#define POINTER_WSIZE ((PointerStyle)9)
-#define POINTER_ESIZE ((PointerStyle)10)
-#define POINTER_NWSIZE ((PointerStyle)11)
-#define POINTER_NESIZE ((PointerStyle)12)
-#define POINTER_SWSIZE ((PointerStyle)13)
-#define POINTER_SESIZE ((PointerStyle)14)
-#define POINTER_WINDOW_NSIZE ((PointerStyle)15)
-#define POINTER_WINDOW_SSIZE ((PointerStyle)16)
-#define POINTER_WINDOW_WSIZE ((PointerStyle)17)
-#define POINTER_WINDOW_ESIZE ((PointerStyle)18)
-#define POINTER_WINDOW_NWSIZE ((PointerStyle)19)
-#define POINTER_WINDOW_NESIZE ((PointerStyle)20)
-#define POINTER_WINDOW_SWSIZE ((PointerStyle)21)
-#define POINTER_WINDOW_SESIZE ((PointerStyle)22)
-#define POINTER_HSPLIT ((PointerStyle)23)
-#define POINTER_VSPLIT ((PointerStyle)24)
-#define POINTER_HSIZEBAR ((PointerStyle)25)
-#define POINTER_VSIZEBAR ((PointerStyle)26)
-#define POINTER_HAND ((PointerStyle)27)
-#define POINTER_REFHAND ((PointerStyle)28)
-#define POINTER_PEN ((PointerStyle)29)
-#define POINTER_MAGNIFY ((PointerStyle)30)
-#define POINTER_FILL ((PointerStyle)31)
-#define POINTER_ROTATE ((PointerStyle)32)
-#define POINTER_HSHEAR ((PointerStyle)33)
-#define POINTER_VSHEAR ((PointerStyle)34)
-#define POINTER_MIRROR ((PointerStyle)35)
-#define POINTER_CROOK ((PointerStyle)36)
-#define POINTER_CROP ((PointerStyle)37)
-#define POINTER_MOVEPOINT ((PointerStyle)38)
-#define POINTER_MOVEBEZIERWEIGHT ((PointerStyle)39)
-#define POINTER_MOVEDATA ((PointerStyle)40)
-#define POINTER_COPYDATA ((PointerStyle)41)
-#define POINTER_LINKDATA ((PointerStyle)42)
-#define POINTER_MOVEDATALINK ((PointerStyle)43)
-#define POINTER_COPYDATALINK ((PointerStyle)44)
-#define POINTER_MOVEFILE ((PointerStyle)45)
-#define POINTER_COPYFILE ((PointerStyle)46)
-#define POINTER_LINKFILE ((PointerStyle)47)
-#define POINTER_MOVEFILELINK ((PointerStyle)48)
-#define POINTER_COPYFILELINK ((PointerStyle)49)
-#define POINTER_MOVEFILES ((PointerStyle)50)
-#define POINTER_COPYFILES ((PointerStyle)51)
-#define POINTER_NOTALLOWED ((PointerStyle)52)
-#define POINTER_DRAW_LINE ((PointerStyle)53)
-#define POINTER_DRAW_RECT ((PointerStyle)54)
-#define POINTER_DRAW_POLYGON ((PointerStyle)55)
-#define POINTER_DRAW_BEZIER ((PointerStyle)56)
-#define POINTER_DRAW_ARC ((PointerStyle)57)
-#define POINTER_DRAW_PIE ((PointerStyle)58)
-#define POINTER_DRAW_CIRCLECUT ((PointerStyle)59)
-#define POINTER_DRAW_ELLIPSE ((PointerStyle)60)
-#define POINTER_DRAW_FREEHAND ((PointerStyle)61)
-#define POINTER_DRAW_CONNECT ((PointerStyle)62)
-#define POINTER_DRAW_TEXT ((PointerStyle)63)
-#define POINTER_DRAW_CAPTION ((PointerStyle)64)
-#define POINTER_CHART ((PointerStyle)65)
-#define POINTER_DETECTIVE ((PointerStyle)66)
-#define POINTER_PIVOT_COL ((PointerStyle)67)
-#define POINTER_PIVOT_ROW ((PointerStyle)68)
-#define POINTER_PIVOT_FIELD ((PointerStyle)69)
-#define POINTER_CHAIN ((PointerStyle)70)
-#define POINTER_CHAIN_NOTALLOWED ((PointerStyle)71)
-#define POINTER_TIMEEVENT_MOVE ((PointerStyle)72)
-#define POINTER_TIMEEVENT_SIZE ((PointerStyle)73)
-#define POINTER_AUTOSCROLL_N ((PointerStyle)74)
-#define POINTER_AUTOSCROLL_S ((PointerStyle)75)
-#define POINTER_AUTOSCROLL_W ((PointerStyle)76)
-#define POINTER_AUTOSCROLL_E ((PointerStyle)77)
-#define POINTER_AUTOSCROLL_NW ((PointerStyle)78)
-#define POINTER_AUTOSCROLL_NE ((PointerStyle)79)
-#define POINTER_AUTOSCROLL_SW ((PointerStyle)80)
-#define POINTER_AUTOSCROLL_SE ((PointerStyle)81)
-#define POINTER_AUTOSCROLL_NS ((PointerStyle)82)
-#define POINTER_AUTOSCROLL_WE ((PointerStyle)83)
-#define POINTER_AUTOSCROLL_NSWE ((PointerStyle)84)
-#define POINTER_AIRBRUSH ((PointerStyle)85)
-#define POINTER_TEXT_VERTICAL ((PointerStyle)86)
-#define POINTER_PIVOT_DELETE ((PointerStyle)87)
-
-// #i32329#
-#define POINTER_TAB_SELECT_S ((PointerStyle)88)
-#define POINTER_TAB_SELECT_E ((PointerStyle)89)
-#define POINTER_TAB_SELECT_SE ((PointerStyle)90)
-#define POINTER_TAB_SELECT_W ((PointerStyle)91)
-#define POINTER_TAB_SELECT_SW ((PointerStyle)92)
-
-// #i20119#
-#define POINTER_PAINTBRUSH ((PointerStyle)93)
-
-#define POINTER_COUNT 94
+enum class PointerStyle
+{
+ Arrow = 0,
+ Null = 1,
+ Wait = 2,
+ Text = 3,
+ Help = 4,
+ Cross = 5,
+ Move = 6,
+ NSize = 7,
+ SSize = 8,
+ WSize = 9,
+ ESize = 10,
+ NWSize = 11,
+ NESize = 12,
+ SWSize = 13,
+ SESize = 14,
+ WindowNSize = 15,
+ WindowSSize = 16,
+ WindowWSize = 17,
+ WindowESize = 18,
+ WindowNWSize = 19,
+ WindowNESize = 20,
+ WindowSWSize = 21,
+ WindowSESize = 22,
+ HSplit = 23,
+ VSplit = 24,
+ HSizeBar = 25,
+ VSizeBar = 26,
+ Hand = 27,
+ RefHand = 28,
+ Pen = 29,
+ Magnify = 30,
+ Fill = 31,
+ Rotate = 32,
+ HShear = 33,
+ VShear = 34,
+ Mirror = 35,
+ Crook = 36,
+ Crop = 37,
+ MovePoint = 38,
+ MoveBezierWeight = 39,
+ MoveData = 40,
+ CopyData = 41,
+ LinkData = 42,
+ MoveDataLink = 43,
+ CopyDataLink = 44,
+ MoveFile = 45,
+ CopyFile = 46,
+ LinkFile = 47,
+ MoveFileLink = 48,
+ CopyFileLink = 49,
+ MoveFiles = 50,
+ CopyFiles = 51,
+ NotAllowed = 52,
+ DrawLine = 53,
+ DrawRect = 54,
+ DrawPolygon = 55,
+ DrawBezier = 56,
+ DrawArc = 57,
+ DrawPie = 58,
+ DrawCircleCut = 59,
+ DrawEllipse = 60,
+ DrawFreehand = 61,
+ DrawConnect = 62,
+ DrawText = 63,
+ DrawCaption = 64,
+ Chart = 65,
+ Detective = 66,
+ PivotCol = 67,
+ PivotRow = 68,
+ PivotField = 69,
+ Chain = 70,
+ ChainNotAllowed = 71,
+ TimeEventMove = 72,
+ TimeEventSize = 73,
+ AutoScrollN = 74,
+ AutoScrollS = 75,
+ AutoScrollW = 76,
+ AutoScrollE = 77,
+ AutoScrollNW = 78,
+ AutoScrollNE = 79,
+ AutoScrollSW = 80,
+ AutoScrollSE = 81,
+ AutoScrollNS = 82,
+ AutoScrollWE = 83,
+ AutoScrollNSWE = 84,
+ Airbrush = 85,
+ TextVertical = 86,
+ PivotDelete = 87,
+ TabSelectS = 88,
+ TabSelectE = 89,
+ TabSelectSE = 90,
+ TabSelectW = 91,
+ TabSelectSW = 92,
+ Paintbrush = 93,
+ LAST = Paintbrush,
+};
#endif // INCLUDED_VCL_PTRSTYLE_HXX
diff --git a/reportdesign/source/ui/report/dlgedfunc.cxx
b/reportdesign/source/ui/report/dlgedfunc.cxx
index 6182625..6b7791a 100644
--- a/reportdesign/source/ui/report/dlgedfunc.cxx
+++ b/reportdesign/source/ui/report/dlgedfunc.cxx
@@ -631,14 +631,14 @@ bool DlgEdFunc::setMovementPointer(const MouseEvent&
rMEvt)
{
bool bIsSetPoint = isRectangleHit(rMEvt);
if ( bIsSetPoint )
- m_pParent->SetPointer( Pointer(POINTER_NOTALLOWED));
+ m_pParent->SetPointer( Pointer(PointerStyle::NotAllowed));
else
{
bool bCtrlKey = rMEvt.IsMod1();
(void)bCtrlKey;
if (bCtrlKey)
{
- m_pParent->SetPointer( Pointer(POINTER_MOVEDATALINK ));
+ m_pParent->SetPointer( Pointer(PointerStyle::MoveDataLink ));
bIsSetPoint = true;
}
}
diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index d7ae24e..53767d8 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -830,9 +830,9 @@ void ScInputWindow::MouseMove( const MouseEvent& rMEvt )
ScInputBarGroup* pGroupBar = dynamic_cast< ScInputBarGroup* > (
pRuntimeWindow.get() );
if ( bInResize || IsPointerAtResizePos() )
- SetPointer( Pointer( POINTER_WINDOW_SSIZE ) );
+ SetPointer( Pointer( PointerStyle::WindowSSize ) );
else
- SetPointer( Pointer( POINTER_ARROW ) );
+ SetPointer( Pointer( PointerStyle::Arrow ) );
if ( bInResize )
{
@@ -1492,7 +1492,7 @@ ScTextWnd::ScTextWnd( vcl::Window* pParent,
ScTabViewShell* pViewSh )
SetBackground(aBgColor);
SetLineColor(COL_BLACK);
SetMapMode(MAP_TWIP);
- SetPointer(POINTER_TEXT);
+ SetPointer(PointerStyle::Text);
SetFont(aTextFont);
}
diff --git a/sc/source/ui/dbgui/csvruler.cxx b/sc/source/ui/dbgui/csvruler.cxx
index a8f172a..fb13963 100644
--- a/sc/source/ui/dbgui/csvruler.cxx
+++ b/sc/source/ui/dbgui/csvruler.cxx
@@ -649,7 +649,7 @@ void ScCsvRuler::ImplDrawTrackingRect()
void ScCsvRuler::ImplSetMousePointer( sal_Int32 nPos )
{
- SetPointer( Pointer( HasSplit( nPos ) ? POINTER_HSPLIT : POINTER_ARROW ) );
+ SetPointer( Pointer( HasSplit( nPos ) ? PointerStyle::HSplit :
PointerStyle::Arrow ) );
}
// accessibility ==============================================================
diff --git a/sc/source/ui/dbgui/scuiasciiopt.cxx
b/sc/source/ui/dbgui/scuiasciiopt.cxx
index e63ac13..5f990a9 100644
--- a/sc/source/ui/dbgui/scuiasciiopt.cxx
+++ b/sc/source/ui/dbgui/scuiasciiopt.cxx
@@ -664,12 +664,12 @@ IMPL_LINK( ScImportAsciiDlg, RbSepFixHdl, RadioButton*,
pButton )
if( (pButton == pRbFixed) || (pButton == pRbSeparated) )
{
- SetPointer( Pointer( POINTER_WAIT ) );
+ SetPointer( Pointer( PointerStyle::Wait ) );
if( pRbFixed->IsChecked() )
mpTableBox->SetFixedWidthMode();
else
mpTableBox->SetSeparatorsMode();
- SetPointer( Pointer( POINTER_ARROW ) );
+ SetPointer( Pointer( PointerStyle::Arrow ) );
SetupSeparatorCtrls();
}
@@ -707,7 +707,7 @@ IMPL_LINK( ScImportAsciiDlg, CharSetHdl,
SvxTextEncodingBox*, pCharSetBox )
if( (pCharSetBox == pLbCharSet) && (pCharSetBox->GetSelectEntryCount() ==
1) )
{
- SetPointer( Pointer( POINTER_WAIT ) );
+ SetPointer( Pointer( PointerStyle::Wait ) );
rtl_TextEncoding eOldCharSet = meCharSet;
SetSelectedCharSet();
// switching char-set invalidates 8bit -> String conversions
@@ -715,7 +715,7 @@ IMPL_LINK( ScImportAsciiDlg, CharSetHdl,
SvxTextEncodingBox*, pCharSetBox )
UpdateVertical();
mpTableBox->Execute( CSVCMD_NEWCELLTEXTS );
- SetPointer( Pointer( POINTER_ARROW ) );
+ SetPointer( Pointer( PointerStyle::Arrow ) );
}
return 0;
}
diff --git a/sc/source/ui/drawfunc/fuconarc.cxx
b/sc/source/ui/drawfunc/fuconarc.cxx
index f1994f1..c916a51 100644
--- a/sc/source/ui/drawfunc/fuconarc.cxx
+++ b/sc/source/ui/drawfunc/fuconarc.cxx
@@ -136,22 +136,22 @@ void FuConstArc::Activate()
switch (aSfxRequest.GetSlot() )
{
case SID_DRAW_ARC:
- aNewPointer = Pointer( POINTER_DRAW_ARC );
+ aNewPointer = Pointer( PointerStyle::DrawArc );
aObjKind = OBJ_CARC;
break;
case SID_DRAW_PIE:
- aNewPointer = Pointer( POINTER_DRAW_PIE );
+ aNewPointer = Pointer( PointerStyle::DrawPie );
aObjKind = OBJ_SECT;
break;
case SID_DRAW_CIRCLECUT:
- aNewPointer = Pointer( POINTER_DRAW_CIRCLECUT );
+ aNewPointer = Pointer( PointerStyle::DrawCircleCut );
aObjKind = OBJ_CCUT;
break;
default:
- aNewPointer = Pointer( POINTER_CROSS );
+ aNewPointer = Pointer( PointerStyle::Cross );
aObjKind = OBJ_CARC;
break;
}
diff --git a/sc/source/ui/drawfunc/fuconcustomshape.cxx
b/sc/source/ui/drawfunc/fuconcustomshape.cxx
index e64b107..d48f6da 100644
--- a/sc/source/ui/drawfunc/fuconcustomshape.cxx
+++ b/sc/source/ui/drawfunc/fuconcustomshape.cxx
@@ -155,7 +155,7 @@ void FuConstCustomShape::Activate()
{
pView->SetCurrentObj( OBJ_CUSTOMSHAPE, SdrInventor );
- aNewPointer = Pointer( POINTER_DRAW_RECT );
+ aNewPointer = Pointer( PointerStyle::DrawRect );
aOldPointer = pWindow->GetPointer();
pViewShell->SetActivePointer( aNewPointer );
diff --git a/sc/source/ui/drawfunc/fuconpol.cxx
b/sc/source/ui/drawfunc/fuconpol.cxx
index 33a456f..2132b08 100644
--- a/sc/source/ui/drawfunc/fuconpol.cxx
+++ b/sc/source/ui/drawfunc/fuconpol.cxx
@@ -206,7 +206,7 @@ void FuConstPolygon::Activate()
FuConstruct::Activate();
- aNewPointer = Pointer( POINTER_DRAW_POLYGON );
+ aNewPointer = Pointer( PointerStyle::DrawPolygon );
aOldPointer = pWindow->GetPointer();
pViewShell->SetActivePointer( aNewPointer );
}
diff --git a/sc/source/ui/drawfunc/fuconrec.cxx
b/sc/source/ui/drawfunc/fuconrec.cxx
index d0282f2..e933227 100644
--- a/sc/source/ui/drawfunc/fuconrec.cxx
+++ b/sc/source/ui/drawfunc/fuconrec.cxx
@@ -169,28 +169,28 @@ void FuConstRectangle::Activate()
switch (aSfxRequest.GetSlot() )
{
case SID_DRAW_LINE:
- aNewPointer = Pointer( POINTER_DRAW_LINE );
+ aNewPointer = Pointer( PointerStyle::DrawLine );
aObjKind = OBJ_LINE;
break;
case SID_DRAW_RECT:
- aNewPointer = Pointer( POINTER_DRAW_RECT );
+ aNewPointer = Pointer( PointerStyle::DrawRect );
aObjKind = OBJ_RECT;
break;
case SID_DRAW_ELLIPSE:
- aNewPointer = Pointer( POINTER_DRAW_ELLIPSE );
+ aNewPointer = Pointer( PointerStyle::DrawEllipse );
aObjKind = OBJ_CIRC;
break;
case SID_DRAW_CAPTION:
case SID_DRAW_CAPTION_VERTICAL:
- aNewPointer = Pointer( POINTER_DRAW_CAPTION );
+ aNewPointer = Pointer( PointerStyle::DrawCaption );
aObjKind = OBJ_CAPTION;
break;
default:
- aNewPointer = Pointer( POINTER_CROSS );
+ aNewPointer = Pointer( PointerStyle::Cross );
aObjKind = OBJ_RECT;
break;
}
diff --git a/sc/source/ui/drawfunc/fuconstr.cxx
b/sc/source/ui/drawfunc/fuconstr.cxx
index 94a86b5..34002b8 100644
--- a/sc/source/ui/drawfunc/fuconstr.cxx
+++ b/sc/source/ui/drawfunc/fuconstr.cxx
@@ -193,7 +193,7 @@ bool FuConstruct::MouseMove(const MouseEvent& rMEvt)
}
else if ( pView->IsMarkedHit(aPnt) )
{
- pViewShell->SetActivePointer(Pointer(POINTER_MOVE));
+ pViewShell->SetActivePointer(Pointer(PointerStyle::Move));
}
else
{
diff --git a/sc/source/ui/drawfunc/fuconuno.cxx
b/sc/source/ui/drawfunc/fuconuno.cxx
index 83e8c18..3c9828d4 100644
--- a/sc/source/ui/drawfunc/fuconuno.cxx
+++ b/sc/source/ui/drawfunc/fuconuno.cxx
@@ -138,7 +138,7 @@ void FuConstUnoControl::Activate()
{
pView->SetCurrentObj( nIdentifier, nInventor );
- aNewPointer = Pointer( POINTER_DRAW_RECT );
+ aNewPointer = Pointer( PointerStyle::DrawRect );
aOldPointer = pWindow->GetPointer();
pViewShell->SetActivePointer( aNewPointer );
diff --git a/sc/source/ui/drawfunc/fudraw.cxx b/sc/source/ui/drawfunc/fudraw.cxx
index 25bfd25..2817e52 100644
--- a/sc/source/ui/drawfunc/fudraw.cxx
+++ b/sc/source/ui/drawfunc/fudraw.cxx
@@ -50,8 +50,8 @@
FuDraw::FuDraw(ScTabViewShell* pViewSh, vcl::Window* pWin, ScDrawView* pViewP,
SdrModel* pDoc, SfxRequest& rReq) :
FuPoor (pViewSh, pWin, pViewP, pDoc, rReq),
- aNewPointer ( POINTER_ARROW ),
- aOldPointer ( POINTER_ARROW )
+ aNewPointer ( PointerStyle::Arrow ),
+ aOldPointer ( PointerStyle::Arrow )
{
}
@@ -748,7 +748,7 @@ void FuDraw::ForcePointer(const MouseEvent* pMEvt)
if ( pView->IsTextEdit() )
{
- pViewShell->SetActivePointer(Pointer(POINTER_TEXT)); //
can't be ?
+ pViewShell->SetActivePointer(Pointer(PointerStyle::Text));
// can't be ?
}
else if ( pHdl )
{
@@ -757,13 +757,13 @@ void FuDraw::ForcePointer(const MouseEvent* pMEvt)
}
else if ( pView->IsMarkedHit(aPnt) )
{
- pViewShell->SetActivePointer( Pointer(POINTER_MOVE) );
+ pViewShell->SetActivePointer( Pointer(PointerStyle::Move) );
}
else if ( !bAlt && ( !pMEvt || !pMEvt->GetButtons() )
&& lcl_UrlHit( pView, aPosPixel, pWindow ) )
{
// could be suppressed with ALT
- pWindow->SetPointer( Pointer( POINTER_REFHAND ) ); //
Text-URL / ImageMap
+ pWindow->SetPointer( Pointer( PointerStyle::RefHand ) );
// Text-URL / ImageMap
}
else if ( !bAlt && pView->PickObj(aPnt, pView->getHitTolLog(), pObj,
pPV, SdrSearchOptions::PICKMACRO) )
{
@@ -772,9 +772,9 @@ void FuDraw::ForcePointer(const MouseEvent* pMEvt)
pViewShell->SetActivePointer( pObj->GetMacroPointer(aHitRec) );
}
else if ( !bAlt && pInfo && (!pInfo->GetMacro().isEmpty() ||
!pInfo->GetHlink().isEmpty()) )
- pWindow->SetPointer( Pointer( POINTER_REFHAND ) );
+ pWindow->SetPointer( Pointer( PointerStyle::RefHand ) );
else if ( IsDetectiveHit( aPnt ) )
- pViewShell->SetActivePointer( Pointer( POINTER_DETECTIVE ) );
+ pViewShell->SetActivePointer( Pointer( PointerStyle::Detective ) );
else
pViewShell->SetActivePointer( aNewPointer ); //! in
Gridwin?
}
diff --git a/sc/source/ui/drawfunc/futext.cxx b/sc/source/ui/drawfunc/futext.cxx
index 17d5095..4bec72d 100644
--- a/sc/source/ui/drawfunc/futext.cxx
+++ b/sc/source/ui/drawfunc/futext.cxx
@@ -596,7 +596,7 @@ void FuText::Activate()
pView->SetCreateMode();
}
- aNewPointer = Pointer(POINTER_TEXT);
+ aNewPointer = Pointer(PointerStyle::Text);
aOldPointer = pWindow->GetPointer();
pViewShell->SetActivePointer( aNewPointer );
diff --git a/sc/source/ui/formdlg/privsplt.cxx
b/sc/source/ui/formdlg/privsplt.cxx
index 779b6cd..e568ed5 100644
--- a/sc/source/ui/formdlg/privsplt.cxx
+++ b/sc/source/ui/formdlg/privsplt.cxx
@@ -56,11 +56,11 @@ ScPrivatSplit::ScPrivatSplit(vcl::Window* pParent, const
ResId& rResId,
aMovingFlag=false;
if(eScSplit==SC_SPLIT_HORZ)
{
- aWinPointer=Pointer(POINTER_HSPLIT);
+ aWinPointer=Pointer(PointerStyle::HSplit);
}
else
{
- aWinPointer=Pointer(POINTER_VSPLIT);
+ aWinPointer=Pointer(PointerStyle::VSplit);
}
SetPointer(aWinPointer);
}
diff --git a/sc/source/ui/inc/preview.hxx b/sc/source/ui/inc/preview.hxx
index 13d5ba5..a4ca81b 100644
--- a/sc/source/ui/inc/preview.hxx
+++ b/sc/source/ui/inc/preview.hxx
@@ -132,8 +132,8 @@ public:
bool GetPageMargins() const { return bPageMargin; }
void SetPageMargins( bool bVal ) { bPageMargin = bVal; }
- void DrawInvert( long nDragPos, sal_uInt16 nFlags );
- void DragMove( long nDragMovePos, sal_uInt16 nFlags );
+ void DrawInvert( long nDragPos, PointerStyle nFlags );
+ void DragMove( long nDragMovePos, PointerStyle nFlags );
const ScPreviewLocationData& GetLocationData();
diff --git a/sc/source/ui/miscdlgs/acredlin.cxx
b/sc/source/ui/miscdlgs/acredlin.cxx
index 01d8e41..4312492 100644
--- a/sc/source/ui/miscdlgs/acredlin.cxx
+++ b/sc/source/ui/miscdlgs/acredlin.cxx
@@ -774,7 +774,7 @@ void ScAcceptChgDlg::UpdateView()
const ScChangeAction* pScChangeAction=NULL;
bAcceptEnableFlag=true;
bRejectEnableFlag=true;
- SetPointer(Pointer(POINTER_WAIT));
+ SetPointer(Pointer(PointerStyle::Wait));
pTheView->SetUpdateMode(false);
bool bFilterFlag = pTPFilter->IsDate() || pTPFilter->IsRange() ||
pTPFilter->IsAuthor() || pTPFilter->IsComment();
@@ -859,7 +859,7 @@ void ScAcceptChgDlg::UpdateView()
pParent->EnableChildrenOnDemand(true);
}
pTheView->SetUpdateMode(true);
- SetPointer(Pointer(POINTER_ARROW));
+ SetPointer(Pointer(PointerStyle::Arrow));
SvTreeListEntry* pEntry=pTheView->First();
if(pEntry!=NULL)
pTheView->Select(pEntry);
@@ -940,7 +940,7 @@ IMPL_LINK( ScAcceptChgDlg, FilterHandle, SvxTPFilter*, pRef
)
IMPL_LINK( ScAcceptChgDlg, RejectHandle, SvxTPView*, pRef )
{
- SetPointer(Pointer(POINTER_WAIT));
+ SetPointer(Pointer(PointerStyle::Wait));
bIgnoreMsg=true;
ScChangeTrack* pChanges=pDoc->GetChangeTrack();
@@ -971,14 +971,14 @@ IMPL_LINK( ScAcceptChgDlg, RejectHandle, SvxTPView*, pRef
)
ClearView();
UpdateView();
}
- SetPointer(Pointer(POINTER_ARROW));
+ SetPointer(Pointer(PointerStyle::Arrow));
bIgnoreMsg=false;
return 0;
}
IMPL_LINK( ScAcceptChgDlg, AcceptHandle, SvxTPView*, pRef )
{
- SetPointer(Pointer(POINTER_WAIT));
+ SetPointer(Pointer(PointerStyle::Wait));
ScChangeTrack* pChanges=pDoc->GetChangeTrack();
bIgnoreMsg=true;
@@ -1057,7 +1057,7 @@ void ScAcceptChgDlg::AcceptFiltered()
IMPL_LINK_NOARG(ScAcceptChgDlg, RejectAllHandle)
{
- SetPointer(Pointer(POINTER_WAIT));
+ SetPointer(Pointer(PointerStyle::Wait));
bIgnoreMsg=true;
ScChangeTrack* pChanges=pDoc->GetChangeTrack();
if(pChanges!=NULL)
@@ -1077,7 +1077,7 @@ IMPL_LINK_NOARG(ScAcceptChgDlg, RejectAllHandle)
ClearView();
UpdateView();
}
- SetPointer(Pointer(POINTER_ARROW));
+ SetPointer(Pointer(PointerStyle::Arrow));
bIgnoreMsg=false;
@@ -1086,7 +1086,7 @@ IMPL_LINK_NOARG(ScAcceptChgDlg, RejectAllHandle)
IMPL_LINK_NOARG(ScAcceptChgDlg, AcceptAllHandle)
{
- SetPointer(Pointer(POINTER_WAIT));
+ SetPointer(Pointer(PointerStyle::Wait));
bIgnoreMsg=true;
ScChangeTrack* pChanges=pDoc->GetChangeTrack();
@@ -1105,7 +1105,7 @@ IMPL_LINK_NOARG(ScAcceptChgDlg, AcceptAllHandle)
UpdateView();
}
bIgnoreMsg=false;
- SetPointer(Pointer(POINTER_ARROW));
+ SetPointer(Pointer(PointerStyle::Arrow));
return 0;
}
@@ -1351,7 +1351,7 @@ bool ScAcceptChgDlg::Expand(
IMPL_LINK( ScAcceptChgDlg, ExpandingHandle, SvxRedlinTable*, pTable )
{
ScChangeTrack* pChanges=pDoc->GetChangeTrack();
- SetPointer(Pointer(POINTER_WAIT));
+ SetPointer(Pointer(PointerStyle::Wait));
if(pTable!=NULL && pChanges!=NULL)
{
ScChangeActionMap aActionMap;
@@ -1410,7 +1410,7 @@ IMPL_LINK( ScAcceptChgDlg, ExpandingHandle,
SvxRedlinTable*, pTable )
}
}
- SetPointer(Pointer(POINTER_ARROW));
+ SetPointer(Pointer(PointerStyle::Arrow));
return (sal_uLong) true;
}
@@ -1422,7 +1422,7 @@ void ScAcceptChgDlg::AppendChanges(ScChangeTrack*
pChanges,sal_uLong nStartActio
SvTreeListEntry* pParent=NULL;
bAcceptEnableFlag=true;
bRejectEnableFlag=true;
- SetPointer(Pointer(POINTER_WAIT));
+ SetPointer(Pointer(PointerStyle::Wait));
pTheView->SetUpdateMode(false);
bool bTheFlag = false;
@@ -1488,7 +1488,7 @@ void ScAcceptChgDlg::AppendChanges(ScChangeTrack*
pChanges,sal_uLong nStartActio
pTPView->EnableRejectAll(bTheFlag);
pTheView->SetUpdateMode(true);
- SetPointer(Pointer(POINTER_ARROW));
+ SetPointer(Pointer(PointerStyle::Arrow));
}
}
diff --git a/sc/source/ui/miscdlgs/conflictsdlg.cxx
b/sc/source/ui/miscdlgs/conflictsdlg.cxx
index a7c4644..23704b3 100644
--- a/sc/source/ui/miscdlgs/conflictsdlg.cxx
+++ b/sc/source/ui/miscdlgs/conflictsdlg.cxx
@@ -620,11 +620,11 @@ void ScConflictsDlg::KeepHandler( bool bMine )
{
return;
}
- SetPointer( Pointer( POINTER_WAIT ) );
+ SetPointer( Pointer( PointerStyle::Wait ) );
ScConflictAction eConflictAction = ( bMine ? SC_CONFLICT_ACTION_KEEP_MINE
: SC_CONFLICT_ACTION_KEEP_OTHER );
SetConflictAction( pRootEntry, eConflictAction );
m_pLbConflicts->RemoveEntry( pRootEntry );
- SetPointer( Pointer( POINTER_ARROW ) );
+ SetPointer( Pointer( PointerStyle::Arrow ) );
if ( m_pLbConflicts->GetEntryCount() == 0 )
{
EndDialog( RET_OK );
@@ -639,7 +639,7 @@ void ScConflictsDlg::KeepAllHandler( bool bMine )
{
return;
}
- SetPointer( Pointer( POINTER_WAIT ) );
+ SetPointer( Pointer( PointerStyle::Wait ) );
ScConflictAction eConflictAction = ( bMine ? SC_CONFLICT_ACTION_KEEP_MINE
: SC_CONFLICT_ACTION_KEEP_OTHER );
while ( pRootEntry )
{
@@ -649,7 +649,7 @@ void ScConflictsDlg::KeepAllHandler( bool bMine )
m_pLbConflicts->SetUpdateMode( false );
m_pLbConflicts->Clear();
m_pLbConflicts->SetUpdateMode( true );
- SetPointer( Pointer( POINTER_ARROW ) );
+ SetPointer( Pointer( PointerStyle::Arrow ) );
EndDialog( RET_OK );
}
diff --git a/sc/source/ui/miscdlgs/instbdlg.cxx
b/sc/source/ui/miscdlgs/instbdlg.cxx
index 13e3c3b..fd92d08 100644
--- a/sc/source/ui/miscdlgs/instbdlg.cxx
+++ b/sc/source/ui/miscdlgs/instbdlg.cxx
@@ -342,7 +342,7 @@ IMPL_LINK( ScInsertTableDlg, DialogClosedHdl,
sfx2::FileDialogHelper*, _pFileDlg
aDocShTablesRef = pDocShTables;
Pointer aOldPtr( GetPointer() );
- SetPointer( Pointer( POINTER_WAIT ) );
+ SetPointer( Pointer( PointerStyle::Wait ) );
pDocShTables->DoLoad( pMed );
SetPointer( aOldPtr );
diff --git a/sc/source/ui/pagedlg/tphfedit.cxx
b/sc/source/ui/pagedlg/tphfedit.cxx
index dd8cb95..a448183 100644
--- a/sc/source/ui/pagedlg/tphfedit.cxx
+++ b/sc/source/ui/pagedlg/tphfedit.cxx
@@ -80,7 +80,7 @@ ScEditWindow::ScEditWindow( vcl::Window* pParent, WinBits
nBits, ScEditWindowLoc
Color aBgColor = rStyleSettings.GetWindowColor();
SetMapMode( MAP_TWIP );
- SetPointer( POINTER_TEXT );
+ SetPointer( PointerStyle::Text );
SetBackground( aBgColor );
Size aSize( GetOutputSize() );
diff --git a/sc/source/ui/vba/vbaapplication.cxx
b/sc/source/ui/vba/vbaapplication.cxx
index d496dce..cc51da6 100644
--- a/sc/source/ui/vba/vbaapplication.cxx
+++ b/sc/source/ui/vba/vbaapplication.cxx
@@ -631,17 +631,17 @@ ScVbaApplication::GoTo( const uno::Any& Reference, const
uno::Any& Scroll ) thro
sal_Int32 SAL_CALL
ScVbaApplication::getCursor() throw (uno::RuntimeException, std::exception)
{
- sal_Int32 nPointerStyle = getPointerStyle(getCurrentDocument());
+ PointerStyle nPointerStyle = getPointerStyle(getCurrentDocument());
switch( nPointerStyle )
{
- case POINTER_ARROW:
+ case PointerStyle::Arrow:
return excel::XlMousePointer::xlNorthwestArrow;
- case POINTER_NULL:
+ case PointerStyle::Null:
return excel::XlMousePointer::xlDefault;
- case POINTER_WAIT:
+ case PointerStyle::Wait:
return excel::XlMousePointer::xlWait;
- case POINTER_TEXT:
+ case PointerStyle::Text:
return excel::XlMousePointer::xlIBeam;
default:
return excel::XlMousePointer::xlDefault;
@@ -658,7 +658,7 @@ ScVbaApplication::setCursor( sal_Int32 _cursor ) throw
(uno::RuntimeException, s
{
case excel::XlMousePointer::xlNorthwestArrow:
{
- const Pointer& rPointer( POINTER_ARROW );
+ const Pointer& rPointer( PointerStyle::Arrow );
setCursorHelper( xModel, rPointer, false );
break;
}
@@ -672,7 +672,7 @@ ScVbaApplication::setCursor( sal_Int32 _cursor ) throw
(uno::RuntimeException, s
}
case excel::XlMousePointer::xlDefault:
{
- const Pointer& rPointer( POINTER_NULL );
+ const Pointer& rPointer( PointerStyle::Null );
setCursorHelper( xModel, rPointer, false );
break;
}
diff --git a/sc/source/ui/view/formatsh.cxx b/sc/source/ui/view/formatsh.cxx
index b987c53..586a236 100644
--- a/sc/source/ui/view/formatsh.cxx
+++ b/sc/source/ui/view/formatsh.cxx
@@ -465,13 +465,13 @@ void ScFormatShell::ExecuteStyle( SfxRequest& rReq )
if ( !bWaterCan && pStyleSheet )
{
pScMod->SetWaterCan( true );
- pTabViewShell->SetActivePointer( Pointer(POINTER_FILL) );
+ pTabViewShell->SetActivePointer(
Pointer(PointerStyle::Fill) );
rReq.Done();
}
else
{
pScMod->SetWaterCan( false );
- pTabViewShell->SetActivePointer( Pointer(POINTER_ARROW) );
+ pTabViewShell->SetActivePointer(
Pointer(PointerStyle::Arrow) );
rReq.Done();
}
}
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 2228a66..9eb4dfc 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -1598,7 +1598,7 @@ bool ScGridWindow::TestMouse( const MouseEvent& rMEvt,
bool bAction )
Point aMousePos = rMEvt.GetPosPixel();
if (mpAutoFillRect->IsInside(aMousePos))
{
- SetPointer( Pointer( POINTER_CROSS ) ); //! dickeres
Kreuz ?
+ SetPointer( Pointer( PointerStyle::Cross ) ); //!
dickeres Kreuz ?
if (bAction)
{
SCCOL nX = aMarkRange.aEnd.Col();
@@ -1642,7 +1642,7 @@ bool ScGridWindow::TestMouse( const MouseEvent& rMEvt,
bool bAction )
aMousePos.Y() >= aEndPos.Y()-3 &&
aMousePos.Y() <= aEndPos.Y()+1 );
if ( bTop || bBottom )
{
- SetPointer( Pointer( POINTER_CROSS ) );
+ SetPointer( Pointer( PointerStyle::Cross ) );
if (bAction)
{
sal_uInt8 nMode = bTop ? SC_FILL_EMBED_LT :
SC_FILL_EMBED_RB;
@@ -2068,7 +2068,7 @@ void ScGridWindow::HandleMouseButtonDown( const
MouseEvent& rMEvt, MouseEventSta
if ( !bAlt && rMEvt.IsLeft() &&
GetEditUrl(rMEvt.GetPosPixel()) ) // Klick auf Link:
Cursor nicht bewegen
{
- SetPointer( Pointer( POINTER_REFHAND ) );
+ SetPointer( Pointer( PointerStyle::RefHand ) );
nMouseStatus = SC_GM_URLDOWN; // auch nur dann beim
ButtonUp ausfuehren
return;
}
@@ -2177,7 +2177,7 @@ void ScGridWindow::MouseButtonUp( const MouseEvent& rMEvt
)
{
RFMouseMove( rMEvt, true ); // Range wieder richtigherum
bRFMouse = false;
- SetPointer( Pointer( POINTER_ARROW ) );
+ SetPointer( Pointer( PointerStyle::Arrow ) );
ReleaseMouse();
return;
}
@@ -2186,7 +2186,7 @@ void ScGridWindow::MouseButtonUp( const MouseEvent& rMEvt
)
{
PagebreakMove( rMEvt, true );
nPagebreakMouse = SC_PD_NONE;
- SetPointer( Pointer( POINTER_ARROW ) );
+ SetPointer( Pointer( PointerStyle::Arrow ) );
ReleaseMouse();
return;
}
@@ -2217,7 +2217,7 @@ void ScGridWindow::MouseButtonUp( const MouseEvent& rMEvt
)
rMark.SetMarking(false);
- SetPointer( Pointer( POINTER_ARROW ) );
+ SetPointer( Pointer( PointerStyle::Arrow ) );
if (pViewData->IsFillMode() ||
( pViewData->GetFillMode() == SC_FILL_MATRIX && rMEvt.IsMod1() ))
@@ -2615,7 +2615,7 @@ void ScGridWindow::MouseMove( const MouseEvent& rMEvt )
if ( pViewData->GetViewShell()->IsAuditShell() ) //
Detektiv-Fuell-Modus
{
- SetPointer( Pointer( POINTER_FILL ) );
+ SetPointer( Pointer( PointerStyle::Fill ) );
return;
}
@@ -2687,18 +2687,18 @@ void ScGridWindow::MouseMove( const MouseEvent& rMEvt )
// Field can only be URL field
bool bAlt = rMEvt.IsMod2();
if ( !bAlt && !nButtonDown && pEditView &&
pEditView->GetFieldUnderMousePointer() )
- SetPointer( Pointer( POINTER_REFHAND ) );
+ SetPointer( Pointer( PointerStyle::RefHand ) );
else if ( pEditView && pEditView->GetEditEngine()->IsVertical() )
- SetPointer( Pointer( POINTER_TEXT_VERTICAL ) );
+ SetPointer( Pointer( PointerStyle::TextVertical ) );
else
- SetPointer( Pointer( POINTER_TEXT ) );
+ SetPointer( Pointer( PointerStyle::Text ) );
return;
}
}
bool bWater = SC_MOD()->GetIsWaterCan() ||
pViewData->GetView()->HasPaintBrush();
if (bWater)
- SetPointer( Pointer(POINTER_FILL) );
+ SetPointer( Pointer(PointerStyle::Fill) );
if (!bWater)
{
@@ -2710,9 +2710,9 @@ void ScGridWindow::MouseMove( const MouseEvent& rMEvt )
if ( HitRangeFinder( rMEvt.GetPosPixel(), rCorner ) )
{
if (rCorner != NONE)
- SetPointer( Pointer( POINTER_CROSS ) );
+ SetPointer( Pointer( PointerStyle::Cross ) );
else
- SetPointer( Pointer( POINTER_HAND ) );
+ SetPointer( Pointer( PointerStyle::Hand ) );
bCross = true;
}
@@ -2722,26 +2722,26 @@ void ScGridWindow::MouseMove( const MouseEvent& rMEvt )
if ( !nButtonDown && pViewData->IsPagebreakMode() &&
( nBreakType = HitPageBreak( rMEvt.GetPosPixel() ) ) != 0 )
{
- PointerStyle eNew = POINTER_ARROW;
+ PointerStyle eNew = PointerStyle::Arrow;
switch ( nBreakType )
{
case SC_PD_RANGE_L:
case SC_PD_RANGE_R:
case SC_PD_BREAK_H:
- eNew = POINTER_ESIZE;
+ eNew = PointerStyle::ESize;
break;
case SC_PD_RANGE_T:
case SC_PD_RANGE_B:
case SC_PD_BREAK_V:
- eNew = POINTER_SSIZE;
+ eNew = PointerStyle::SSize;
break;
case SC_PD_RANGE_TL:
case SC_PD_RANGE_BR:
- eNew = POINTER_SESIZE;
+ eNew = PointerStyle::SESize;
break;
case SC_PD_RANGE_TR:
case SC_PD_RANGE_BL:
- eNew = POINTER_NESIZE;
+ eNew = PointerStyle::NESize;
break;
}
SetPointer( Pointer( eNew ) );
@@ -2756,7 +2756,7 @@ void ScGridWindow::MouseMove( const MouseEvent& rMEvt )
if ( nButtonDown && pViewData->IsAnyFillMode() )
{
- SetPointer( Pointer( POINTER_CROSS ) );
+ SetPointer( Pointer( PointerStyle::Cross ) );
bCross = true;
nScFillModeMouseModifier = rMEvt.GetModifier(); // ausgewertet bei
AutoFill und Matrix
}
@@ -2766,10 +2766,10 @@ void ScGridWindow::MouseMove( const MouseEvent& rMEvt )
bool bAlt = rMEvt.IsMod2();
if (bEditMode) // Edit-Mode muss
zuerst kommen!
- SetPointer( Pointer( POINTER_ARROW ) );
+ SetPointer( Pointer( PointerStyle::Arrow ) );
else if ( !bAlt && !nButtonDown &&
GetEditUrl(rMEvt.GetPosPixel()) )
- SetPointer( Pointer( POINTER_REFHAND ) );
+ SetPointer( Pointer( PointerStyle::RefHand ) );
else if ( DrawMouseMove(rMEvt) ) // setzt Pointer um
return;
}
@@ -2889,7 +2889,7 @@ void ScGridWindow::Tracking( const TrackingEvent& rTEvt )
nPagebreakMouse = SC_PD_NONE;
}
- SetPointer( Pointer( POINTER_ARROW ) );
+ SetPointer( Pointer( PointerStyle::Arrow ) );
StopMarking();
MouseButtonUp( rMEvt ); // mit Status SC_GM_IGNORE aus
StopMarking
@@ -5146,9 +5146,9 @@ void ScGridWindow::RFMouseMove( const MouseEvent& rMEvt,
bool bUp )
// Mauszeiger
if (bRFSize)
- SetPointer( Pointer( POINTER_CROSS ) );
+ SetPointer( Pointer( PointerStyle::Cross ) );
else
- SetPointer( Pointer( POINTER_HAND ) );
+ SetPointer( Pointer( PointerStyle::Hand ) );
// Scrolling
diff --git a/sc/source/ui/view/gridwin2.cxx b/sc/source/ui/view/gridwin2.cxx
index 03e2150..cd7d66d 100644
--- a/sc/source/ui/view/gridwin2.cxx
+++ b/sc/source/ui/view/gridwin2.cxx
@@ -293,16 +293,16 @@ void ScGridWindow::DPTestMouse( const MouseEvent& rMEvt,
bool bMove )
if (bMove) // set mouse pointer
{
- PointerStyle ePointer = POINTER_PIVOT_DELETE;
+ PointerStyle ePointer = PointerStyle::PivotDelete;
if ( !bAllowed )
- ePointer = POINTER_NOTALLOWED;
+ ePointer = PointerStyle::NotAllowed;
else if ( bHasRange )
switch (nOrient)
{
- case DataPilotFieldOrientation_COLUMN: ePointer =
POINTER_PIVOT_COL; break;
- case DataPilotFieldOrientation_ROW: ePointer =
POINTER_PIVOT_ROW; break;
+ case DataPilotFieldOrientation_COLUMN: ePointer =
PointerStyle::PivotCol; break;
+ case DataPilotFieldOrientation_ROW: ePointer =
PointerStyle::PivotRow; break;
case DataPilotFieldOrientation_PAGE:
- case DataPilotFieldOrientation_DATA: ePointer =
POINTER_PIVOT_FIELD; break;
+ case DataPilotFieldOrientation_DATA: ePointer =
PointerStyle::PivotField; break;
}
SetPointer( ePointer );
}
@@ -640,7 +640,7 @@ void ScGridWindow::DPMouseButtonUp( const MouseEvent& rMEvt
)
ReleaseMouse();
DPTestMouse( rMEvt, false );
- SetPointer( Pointer( POINTER_ARROW ) );
+ SetPointer( Pointer( PointerStyle::Arrow ) );
}
void ScGridWindow::UpdateDragRect( bool bShowRange, const Rectangle& rPosRect )
diff --git a/sc/source/ui/view/gridwin3.cxx b/sc/source/ui/view/gridwin3.cxx
index 2ebc698..b1e7b6f 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( POINTER_ARROW ) );
+ SetPointer( Pointer( PointerStyle::Arrow ) );
return false;
}
}
diff --git a/sc/source/ui/view/hdrcont.cxx b/sc/source/ui/view/hdrcont.cxx
index fe37b96..1b094cb 100644
--- a/sc/source/ui/view/hdrcont.cxx
+++ b/sc/source/ui/view/hdrcont.cxx
@@ -663,7 +663,7 @@ void ScHeaderControl::MouseButtonDown( const MouseEvent&
rMEvt )
if ( nClicks && nClicks%2==0 )
{
SetEntrySize( nDragNo, HDR_SIZE_OPTIMUM );
- SetPointer( Pointer( POINTER_ARROW ) );
+ SetPointer( Pointer( PointerStyle::Arrow ) );
}
else
{
@@ -763,7 +763,7 @@ void ScHeaderControl::MouseMove( const MouseEvent& rMEvt )
{
if ( IsDisabled() )
{
- SetPointer( Pointer( POINTER_ARROW ) );
+ SetPointer( Pointer( PointerStyle::Arrow ) );
return;
}
@@ -787,9 +787,9 @@ void ScHeaderControl::MouseMove( const MouseEvent& rMEvt )
(void)GetMousePos( rMEvt, bIsBorder );
if ( bIsBorder && rMEvt.GetButtons()==0 && ResizeAllowed() )
- SetPointer( Pointer( bVertical ? POINTER_VSIZEBAR :
POINTER_HSIZEBAR ) );
+ SetPointer( Pointer( bVertical ? PointerStyle::VSizeBar :
PointerStyle::HSizeBar ) );
else
- SetPointer( Pointer( POINTER_ARROW ) );
+ SetPointer( Pointer( PointerStyle::Arrow ) );
if (!bIgnoreMove)
pSelEngine->SelMouseMove( rMEvt );
diff --git a/sc/source/ui/view/preview.cxx b/sc/source/ui/view/preview.cxx
index 0feb97d..54c1864 100644
--- a/sc/source/ui/view/preview.cxx
+++ b/sc/source/ui/view/preview.cxx
@@ -544,17 +544,17 @@ void ScPreview::DoPrint( ScPreviewLocationData*
pFillLocation )
{
SetMapMode(aMMMode);
SetLineColor( COL_BLACK );
- DrawInvert( (long)( nTopMargin - aOffset.Y() ), POINTER_VSIZEBAR );
- DrawInvert( (long)(nPageEndY - nBottomMargin ), POINTER_VSIZEBAR );
- DrawInvert( (long)( nLeftMargin - aOffset.X() ), POINTER_HSIZEBAR
);
- DrawInvert( (long)( nPageEndX - nRightMargin ) , POINTER_HSIZEBAR
);
+ DrawInvert( (long)( nTopMargin - aOffset.Y() ),
PointerStyle::VSizeBar );
+ DrawInvert( (long)(nPageEndY - nBottomMargin ),
PointerStyle::VSizeBar );
+ DrawInvert( (long)( nLeftMargin - aOffset.X() ),
PointerStyle::HSizeBar );
+ DrawInvert( (long)( nPageEndX - nRightMargin ) ,
PointerStyle::HSizeBar );
if( bHeaderOn )
{
- DrawInvert( nHeaderHeight - aOffset.Y(), POINTER_VSIZEBAR );
+ DrawInvert( nHeaderHeight - aOffset.Y(),
PointerStyle::VSizeBar );
}
if( bFooterOn )
{
- DrawInvert( nPageEndY - nFooterHeight, POINTER_VSIZEBAR );
+ DrawInvert( nPageEndY - nFooterHeight, PointerStyle::VSizeBar
);
}
SetMapMode( MapMode( MAP_PIXEL ) );
@@ -974,53 +974,53 @@ void ScPreview::MouseButtonDown( const MouseEvent& rMEvt )
CaptureMouse();
- if( rMEvt.IsLeft() && GetPointer() == POINTER_HSIZEBAR )
+ if( rMEvt.IsLeft() && GetPointer() == PointerStyle::HSizeBar )
{
SetMapMode( aMMMode );
if( bLeftRulerChange )
{
- DrawInvert( aButtonDownChangePoint.X(), POINTER_HSIZEBAR );
+ DrawInvert( aButtonDownChangePoint.X(), PointerStyle::HSizeBar );
bLeftRulerMove = true;
bRightRulerMove = false;
}
else if( bRightRulerChange )
{
- DrawInvert( aButtonDownChangePoint.X(), POINTER_HSIZEBAR );
+ DrawInvert( aButtonDownChangePoint.X(), PointerStyle::HSizeBar );
bLeftRulerMove = false;
bRightRulerMove = true;
}
}
- if( rMEvt.IsLeft() && GetPointer() == POINTER_VSIZEBAR )
+ if( rMEvt.IsLeft() && GetPointer() == PointerStyle::VSizeBar )
{
SetMapMode( aMMMode );
if( bTopRulerChange )
{
- DrawInvert( aButtonDownChangePoint.Y(), POINTER_VSIZEBAR );
+ DrawInvert( aButtonDownChangePoint.Y(), PointerStyle::VSizeBar );
bTopRulerMove = true;
bBottomRulerMove = false;
}
else if( bBottomRulerChange )
{
- DrawInvert( aButtonDownChangePoint.Y(), POINTER_VSIZEBAR );
+ DrawInvert( aButtonDownChangePoint.Y(), PointerStyle::VSizeBar );
bTopRulerMove = false;
bBottomRulerMove = true;
}
else if( bHeaderRulerChange )
{
- DrawInvert( aButtonDownChangePoint.Y(), POINTER_VSIZEBAR );
+ DrawInvert( aButtonDownChangePoint.Y(), PointerStyle::VSizeBar );
bHeaderRulerMove = true;
bFooterRulerMove = false;
}
else if( bFooterRulerChange )
{
- DrawInvert( aButtonDownChangePoint.Y(), POINTER_VSIZEBAR );
+ DrawInvert( aButtonDownChangePoint.Y(), PointerStyle::VSizeBar );
bHeaderRulerMove = false;
bFooterRulerMove = true;
}
}
- if( rMEvt.IsLeft() && GetPointer() == POINTER_HSPLIT )
+ if( rMEvt.IsLeft() && GetPointer() == PointerStyle::HSplit )
{
Point aNowPt = rMEvt.GetPosPixel();
SCCOL i = 0;
@@ -1037,11 +1037,11 @@ void ScPreview::MouseButtonDown( const MouseEvent&
rMEvt )
SetMapMode( aMMMode );
if( nColNumberButttonDown == aPageArea.aStart.Col() )
- DrawInvert( PixelToLogic( Point( nLeftPosition, 0 ),aMMMode ).X()
,POINTER_HSPLIT );
+ DrawInvert( PixelToLogic( Point( nLeftPosition, 0 ),aMMMode ).X()
,PointerStyle::HSplit );
else
- DrawInvert( PixelToLogic( Point( nRight[ nColNumberButttonDown-1
], 0 ),aMMMode ).X() ,POINTER_HSPLIT );
+ DrawInvert( PixelToLogic( Point( nRight[ nColNumberButttonDown-1
], 0 ),aMMMode ).X() ,PointerStyle::HSplit );
- DrawInvert( aButtonDownChangePoint.X(), POINTER_HSPLIT );
+ DrawInvert( aButtonDownChangePoint.X(), PointerStyle::HSplit );
bColRulerMove = true;
}
}
@@ -1057,9 +1057,9 @@ void ScPreview::MouseButtonUp( const MouseEvent& rMEvt )
long nWidth = (long) lcl_GetDocPageSize(&pDocShell->GetDocument(),
nTab).Width();
long nHeight = (long) lcl_GetDocPageSize(&pDocShell->GetDocument(),
nTab).Height();
- if( rMEvt.IsLeft() && GetPointer() == POINTER_HSIZEBAR )
+ if( rMEvt.IsLeft() && GetPointer() == PointerStyle::HSizeBar )
{
- SetPointer( Pointer( POINTER_ARROW ) );
+ SetPointer( Pointer( PointerStyle::Arrow ) );
ScDocument& rDoc = pDocShell->GetDocument();
OUString aOldName = rDoc.GetPageStyle( nTab );
@@ -1096,7 +1096,7 @@ void ScPreview::MouseButtonUp( const MouseEvent& rMEvt )
else if( aButtonDownPt.X() == aButtonUpPt.X() )
{
bMoveRulerAction = false;
- DrawInvert( aButtonUpPt.X(), POINTER_HSIZEBAR );
+ DrawInvert( aButtonUpPt.X(), PointerStyle::HSizeBar );
}
if( bMoveRulerAction )
{
@@ -1140,9 +1140,9 @@ void ScPreview::MouseButtonUp( const MouseEvent& rMEvt )
bRightRulerMove = false;
}
- if( rMEvt.IsLeft() && GetPointer() == POINTER_VSIZEBAR )
+ if( rMEvt.IsLeft() && GetPointer() == PointerStyle::VSizeBar )
{
- SetPointer( POINTER_ARROW );
+ SetPointer( PointerStyle::Arrow );
bool bMoveRulerAction = true;
if( ( bTopRulerChange || bBottomRulerChange || bHeaderRulerChange
|| bFooterRulerChange ) && ( aButtonUpPt.Y() <= ( 0 - aOffset.Y() ) ||
aButtonUpPt.Y() > nHeight * HMM_PER_TWIPS -aOffset.Y() ) )
@@ -1153,7 +1153,7 @@ void ScPreview::MouseButtonUp( const MouseEvent& rMEvt )
else if( aButtonDownPt.Y() == aButtonUpPt.Y() )
{
bMoveRulerAction = false;
- DrawInvert( aButtonUpPt.Y(), POINTER_VSIZEBAR );
+ DrawInvert( aButtonUpPt.Y(), PointerStyle::VSizeBar );
}
if( bMoveRulerAction )
{
@@ -1245,9 +1245,9 @@ void ScPreview::MouseButtonUp( const MouseEvent& rMEvt )
bHeaderRulerMove = false;
bFooterRulerMove = false;
}
- if( rMEvt.IsLeft() && GetPointer() == POINTER_HSPLIT )
+ if( rMEvt.IsLeft() && GetPointer() == PointerStyle::HSplit )
{
- SetPointer(POINTER_ARROW);
+ SetPointer(PointerStyle::Arrow);
ScDocument& rDoc = pDocShell->GetDocument();
bool bLayoutRTL = rDoc.IsLayoutRTL( nTab );
bool bMoveRulerAction = true;
@@ -1255,10 +1255,10 @@ void ScPreview::MouseButtonUp( const MouseEvent& rMEvt )
{
bMoveRulerAction = false;
if( nColNumberButttonDown == aPageArea.aStart.Col() )
- DrawInvert( PixelToLogic( Point( nLeftPosition, 0
),aMMMode ).X() ,POINTER_HSPLIT );
+ DrawInvert( PixelToLogic( Point( nLeftPosition, 0
),aMMMode ).X() ,PointerStyle::HSplit );
else
- DrawInvert( PixelToLogic( Point( nRight[
nColNumberButttonDown-1 ], 0 ),aMMMode ).X() ,POINTER_HSPLIT );
- DrawInvert( aButtonUpPt.X(), POINTER_HSPLIT );
+ DrawInvert( PixelToLogic( Point( nRight[
nColNumberButttonDown-1 ], 0 ),aMMMode ).X() ,PointerStyle::HSplit );
+ DrawInvert( aButtonUpPt.X(), PointerStyle::HSplit );
}
if( bMoveRulerAction )
{
@@ -1362,7 +1362,7 @@ void ScPreview::MouseMove( const MouseEvent& rMEvt )
&& !bTopRulerMove && !bBottomRulerMove && !bHeaderRulerMove &&
!bFooterRulerMove )
{
bOnColRulerChange = true;
- if( !rMEvt.GetButtons() && GetPointer() == POINTER_HSPLIT )
+ if( !rMEvt.GetButtons() && GetPointer() == PointerStyle::HSplit )
nColNumberButttonDown = i;
break;
}
@@ -1415,31 +1415,31 @@ void ScPreview::MouseMove( const MouseEvent& rMEvt )
{
if( bOnColRulerChange || bColRulerMove )
{
- SetPointer( Pointer( POINTER_HSPLIT ) );
+ SetPointer( Pointer( PointerStyle::HSplit ) );
if( bColRulerMove )
{
if( aMouseMovePoint.X() > -aOffset.X() &&
aMouseMovePoint.X() < nWidth * HMM_PER_TWIPS - aOffset.X() )
- DragMove( aMouseMovePoint.X(), POINTER_HSPLIT );
+ DragMove( aMouseMovePoint.X(), PointerStyle::HSplit );
}
}
else
{
if( bLeftRulerChange && !bTopRulerMove && !bBottomRulerMove &&
!bHeaderRulerMove && !bFooterRulerMove )
{
- SetPointer( Pointer( POINTER_HSIZEBAR ) );
+ SetPointer( Pointer( PointerStyle::HSizeBar ) );
if( bLeftRulerMove )
{
if( aMouseMovePoint.X() > -aOffset.X() &&
aMouseMovePoint.X() < nWidth * HMM_PER_TWIPS - aOffset.X() )
- DragMove( aMouseMovePoint.X(), POINTER_HSIZEBAR );
+ DragMove( aMouseMovePoint.X(),
PointerStyle::HSizeBar );
}
}
else if( bRightRulerChange && !bTopRulerMove &&
!bBottomRulerMove && !bHeaderRulerMove && !bFooterRulerMove )
{
- SetPointer( Pointer( POINTER_HSIZEBAR ) );
+ SetPointer( Pointer( PointerStyle::HSizeBar ) );
if( bRightRulerMove )
{
if( aMouseMovePoint.X() > -aOffset.X() &&
aMouseMovePoint.X() < nWidth * HMM_PER_TWIPS - aOffset.X() )
- DragMove( aMouseMovePoint.X(), POINTER_HSIZEBAR );
+ DragMove( aMouseMovePoint.X(),
PointerStyle::HSizeBar );
}
}
}
@@ -1454,43 +1454,43 @@ void ScPreview::MouseMove( const MouseEvent& rMEvt )
{
if( bTopRulerChange )
{
- SetPointer( Pointer( POINTER_VSIZEBAR ) );
+ SetPointer( Pointer( PointerStyle::VSizeBar ) );
if( bTopRulerMove )
{
if( aMouseMovePoint.Y() > -aOffset.Y() &&
aMouseMovePoint.Y() < nHeight * HMM_PER_TWIPS - aOffset.Y() )
- DragMove( aMouseMovePoint.Y(), POINTER_VSIZEBAR );
+ DragMove( aMouseMovePoint.Y(),
PointerStyle::VSizeBar );
}
}
else if( bBottomRulerChange )
{
- SetPointer( Pointer( POINTER_VSIZEBAR ) );
+ SetPointer( Pointer( PointerStyle::VSizeBar ) );
if( bBottomRulerMove )
{
if( aMouseMovePoint.Y() > -aOffset.Y() &&
aMouseMovePoint.Y() < nHeight * HMM_PER_TWIPS - aOffset.Y() )
- DragMove( aMouseMovePoint.Y(), POINTER_VSIZEBAR );
+ DragMove( aMouseMovePoint.Y(),
PointerStyle::VSizeBar );
}
}
else if( bHeaderRulerChange )
{
- SetPointer( Pointer( POINTER_VSIZEBAR ) );
+ SetPointer( Pointer( PointerStyle::VSizeBar ) );
if( bHeaderRulerMove )
{
if( aMouseMovePoint.Y() > -aOffset.Y() &&
aMouseMovePoint.Y() < nHeight * HMM_PER_TWIPS - aOffset.Y() )
- DragMove( aMouseMovePoint.Y(), POINTER_VSIZEBAR );
+ DragMove( aMouseMovePoint.Y(),
PointerStyle::VSizeBar );
}
}
else if( bFooterRulerChange )
{
- SetPointer( Pointer( POINTER_VSIZEBAR ) );
+ SetPointer( Pointer( PointerStyle::VSizeBar ) );
if( bFooterRulerMove )
{
if( aMouseMovePoint.Y() > -aOffset.Y() &&
aMouseMovePoint.Y() < nHeight * HMM_PER_TWIPS - aOffset.Y() )
- DragMove( aMouseMovePoint.Y(), POINTER_VSIZEBAR );
+ DragMove( aMouseMovePoint.Y(),
PointerStyle::VSizeBar );
}
}
}
else
- SetPointer( Pointer( POINTER_ARROW ) );
+ SetPointer( Pointer( PointerStyle::Arrow ) );
}
}
}
@@ -1533,14 +1533,14 @@
com::sun::star::uno::Reference<com::sun::star::accessibility::XAccessible> ScPre
return xAcc;
}
-void ScPreview::DragMove( long nDragMovePos, sal_uInt16 nFlags )
+void ScPreview::DragMove( long nDragMovePos, PointerStyle nFlags )
{
Fraction aPreviewZoom( nZoom, 100 );
Fraction aHorPrevZoom( (long)( 100 * nZoom / pDocShell->GetOutputFactor()
), 10000 );
MapMode aMMMode( MAP_100TH_MM, Point(), aHorPrevZoom, aPreviewZoom );
SetMapMode( aMMMode );
long nPos = nDragMovePos;
- if( nFlags == POINTER_HSIZEBAR || nFlags == POINTER_HSPLIT )
+ if( nFlags == PointerStyle::HSizeBar || nFlags == PointerStyle::HSplit )
{
if( nDragMovePos != aButtonDownChangePoint.X() )
{
@@ -1549,7 +1549,7 @@ void ScPreview::DragMove( long nDragMovePos, sal_uInt16
nFlags )
DrawInvert( aButtonDownChangePoint.X(), nFlags );
}
}
- else if( nFlags == POINTER_VSIZEBAR )
+ else if( nFlags == PointerStyle::VSizeBar )
{
if( nDragMovePos != aButtonDownChangePoint.Y() )
{
@@ -1560,16 +1560,16 @@ void ScPreview::DragMove( long nDragMovePos, sal_uInt16
nFlags )
}
}
-void ScPreview::DrawInvert( long nDragPos, sal_uInt16 nFlags )
+void ScPreview::DrawInvert( long nDragPos, PointerStyle nFlags )
{
long nHeight = (long) lcl_GetDocPageSize( &pDocShell->GetDocument(), nTab
).Height();
long nWidth = (long) lcl_GetDocPageSize( &pDocShell->GetDocument(), nTab
).Width();
- if( nFlags == POINTER_HSIZEBAR || nFlags == POINTER_HSPLIT )
+ if( nFlags == PointerStyle::HSizeBar || nFlags == PointerStyle::HSplit )
{
Rectangle aRect( nDragPos, -aOffset.Y(), nDragPos + 1,(long)( (
nHeight * HMM_PER_TWIPS ) - aOffset.Y()));
Invert( aRect,INVERT_50 );
}
- else if( nFlags == POINTER_VSIZEBAR )
+ else if( nFlags == PointerStyle::VSizeBar )
{
Rectangle aRect( -aOffset.X(), nDragPos,(long)( ( nWidth *
HMM_PER_TWIPS ) - aOffset.X() ), nDragPos + 1 );
Invert( aRect,INVERT_50 );
diff --git a/sc/source/ui/view/tabsplit.cxx b/sc/source/ui/view/tabsplit.cxx
index 0a57100..2ba86b5 100644
--- a/sc/source/ui/view/tabsplit.cxx
+++ b/sc/source/ui/view/tabsplit.cxx
@@ -47,11 +47,11 @@ void ScTabSplitter::SetFixed(bool bSet)
{
bFixed = bSet;
if (bSet)
- SetPointer(POINTER_ARROW);
+ SetPointer(PointerStyle::Arrow);
else if (IsHorizontal())
- SetPointer(POINTER_HSPLIT);
+ SetPointer(PointerStyle::HSplit);
else
- SetPointer(POINTER_VSPLIT);
+ SetPointer(PointerStyle::VSplit);
}
void ScTabSplitter::Paint( vcl::RenderContext& rRenderContext, const
Rectangle& rRect )
diff --git a/sc/source/ui/view/tabview5.cxx b/sc/source/ui/view/tabview5.cxx
index 07262e1..7f45085 100644
--- a/sc/source/ui/view/tabview5.cxx
+++ b/sc/source/ui/view/tabview5.cxx
@@ -610,7 +610,7 @@ void ScTabView::ResetBrushDocument()
if ( HasPaintBrush() )
{
SetBrushDocument( NULL, false );
- SetActivePointer( Pointer( POINTER_ARROW ) ); // switch pointers
also when ended with escape key
+ SetActivePointer( Pointer( PointerStyle::Arrow ) ); // switch
pointers also when ended with escape key
}
}
diff --git a/sd/source/ui/annotations/annotationwindow.cxx
b/sd/source/ui/annotations/annotationwindow.cxx
index 1b08e48..bcad03d 100644
--- a/sd/source/ui/annotations/annotationwindow.cxx
+++ b/sd/source/ui/annotations/annotationwindow.cxx
@@ -308,7 +308,7 @@ void AnnotationWindow::InitControls()
{
// actual window which holds the user text
mpTextWindow = VclPtr<AnnotationTextWindow>::Create(this,
WB_NODIALOGCONTROL);
- mpTextWindow->SetPointer(Pointer(POINTER_TEXT));
+ mpTextWindow->SetPointer(Pointer(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 74dac4c..df90188 100644
--- a/sd/source/ui/func/fuconuno.cxx
+++ b/sd/source/ui/func/fuconuno.cxx
@@ -131,7 +131,7 @@ void FuConstructUnoControl::Activate()
{
mpView->SetCurrentObj( nIdentifier, nInventor );
- aNewPointer = Pointer(POINTER_DRAW_RECT);
+ aNewPointer = Pointer(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 013a511..a00a513 100644
--- a/sd/source/ui/func/fudraw.cxx
+++ b/sd/source/ui/func/fudraw.cxx
@@ -511,7 +511,7 @@ void FuDraw::ForcePointer(const MouseEvent* pMEvt)
{
// water can mode
bDefPointer = false;
- mpWindow->SetPointer(Pointer(POINTER_FILL));
+ mpWindow->SetPointer(Pointer(PointerStyle::Fill));
}
}
else
@@ -522,7 +522,7 @@ void FuDraw::ForcePointer(const MouseEvent* pMEvt)
{
// water can mode
bDefPointer = false;
- mpWindow->SetPointer(Pointer(POINTER_FILL));
+ mpWindow->SetPointer(Pointer(PointerStyle::Fill));
}
else if (!pHdl &&
mpViewShell->GetViewFrame()->HasChildWindow(SvxBmpMaskChildWindow::GetChildWindowId()))
@@ -533,7 +533,7 @@ void FuDraw::ForcePointer(const MouseEvent* pMEvt)
if (pMask && pMask->IsEyedropping())
{
bDefPointer = false;
- mpWindow->SetPointer(Pointer(POINTER_REFHAND));
+ mpWindow->SetPointer(Pointer(PointerStyle::RefHand));
}
}
else if (!mpView->IsAction())
@@ -559,7 +559,7 @@ void FuDraw::ForcePointer(const MouseEvent* pMEvt)
SdrObject* pObject = rMarkList.GetMark(0)->GetMarkedSdrObj();
if ((pObject->ISA(E3dObject)) && (rMarkList.GetMarkCount() ==
1))
{
- mpWindow->SetPointer(Pointer(POINTER_ROTATE));
+ mpWindow->SetPointer(Pointer(PointerStyle::Rotate));
bDefPointer = false; // Otherwise it'll be calles Joes
routine and the mousepointer will reconfigurate again
}
}
@@ -584,7 +584,7 @@ void FuDraw::ForcePointer(const MouseEvent* pMEvt)
{
pObj = NULL;
bDefPointer = false;
- mpWindow->SetPointer(Pointer(POINTER_ARROW));
+ mpWindow->SetPointer(Pointer(PointerStyle::Arrow));
}
}
@@ -680,7 +680,7 @@ bool FuDraw::SetPointer(SdrObject* pObj, const Point& rPos)
{
// Animation object
bSet = true;
- mpWindow->SetPointer(Pointer(POINTER_REFHAND));
+ mpWindow->SetPointer(Pointer(PointerStyle::RefHand));
}
}
else if (bImageMapInfo &&
@@ -690,7 +690,7 @@ bool FuDraw::SetPointer(SdrObject* pObj, const Point& rPos)
* ImageMap
******************************************************/
bSet = true;
- mpWindow->SetPointer(Pointer(POINTER_REFHAND));
+ mpWindow->SetPointer(Pointer(PointerStyle::RefHand));
}
}
}
diff --git a/sd/source/ui/func/fudspord.cxx b/sd/source/ui/func/fudspord.cxx
index c8b70fe..3f4f3a1 100644
--- a/sd/source/ui/func/fudspord.cxx
+++ b/sd/source/ui/func/fudspord.cxx
@@ -125,7 +125,7 @@ bool FuDisplayOrder::MouseButtonUp(const MouseEvent& rMEvt)
void FuDisplayOrder::Activate()
{
maPtr = mpWindow->GetPointer();
- mpWindow->SetPointer( Pointer( POINTER_REFHAND ) );
+ mpWindow->SetPointer( Pointer( PointerStyle::RefHand ) );
}
void FuDisplayOrder::Deactivate()
diff --git a/sd/source/ui/func/fuformatpaintbrush.cxx
b/sd/source/ui/func/fuformatpaintbrush.cxx
index 5177664..380bcef 100644
--- a/sd/source/ui/func/fuformatpaintbrush.cxx
+++ b/sd/source/ui/func/fuformatpaintbrush.cxx
@@ -155,7 +155,7 @@ bool FuFormatPaintBrush::MouseMove(const MouseEvent& rMEvt)
if ( mpView->IsTextEdit() )
{
bReturn = FuText::MouseMove( rMEvt );
- mpWindow->SetPointer(Pointer(POINTER_FILL));
+ mpWindow->SetPointer(Pointer(PointerStyle::Fill));
}
else
{
@@ -165,9 +165,9 @@ bool FuFormatPaintBrush::MouseMove(const MouseEvent& rMEvt)
bool bOverMarkableObject = mpView->PickObj(
mpWindow->PixelToLogic( rMEvt.GetPosPixel() ),nHitLog, pObj, pPV,
SdrSearchOptions::PICKMARKABLE);
if(bOverMarkableObject &&
HasContentForThisType(pObj->GetObjInventor(),pObj->GetObjIdentifier()) )
- mpWindow->SetPointer(Pointer(POINTER_FILL));
+ mpWindow->SetPointer(Pointer(PointerStyle::Fill));
else
- mpWindow->SetPointer(Pointer(POINTER_ARROW));
+ mpWindow->SetPointer(Pointer(PointerStyle::Arrow));
}
}
return bReturn;
diff --git a/sd/source/ui/func/fuzoom.cxx b/sd/source/ui/func/fuzoom.cxx
index daf1f16..782c32e5 100644
--- a/sd/source/ui/func/fuzoom.cxx
+++ b/sd/source/ui/func/fuzoom.cxx
@@ -91,9 +91,9 @@ bool FuZoom::MouseButtonDown(const MouseEvent& rMEvt)
bool FuZoom::MouseMove(const MouseEvent& rMEvt)
{
if (rMEvt.IsShift())
- mpWindow->SetPointer(Pointer(POINTER_HAND));
+ mpWindow->SetPointer(Pointer(PointerStyle::Hand));
else if (nSlotId != SID_ZOOM_PANNING)
- mpWindow->SetPointer(Pointer(POINTER_MAGNIFY));
+ mpWindow->SetPointer(Pointer(PointerStyle::Magnify));
if (bStartDrag)
{
@@ -198,11 +198,11 @@ void FuZoom::Activate()
if (nSlotId == SID_ZOOM_PANNING)
{
- mpWindow->SetPointer(Pointer(POINTER_HAND));
+ mpWindow->SetPointer(Pointer(PointerStyle::Hand));
}
else
{
- mpWindow->SetPointer(Pointer(POINTER_MAGNIFY));
+ mpWindow->SetPointer(Pointer(PointerStyle::Magnify));
}
}
diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
index efadfa3..7a45682 100644
--- a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
@@ -1289,7 +1289,7 @@ MultiSelectionModeHandler::MultiSelectionModeHandler (
void MultiSelectionModeHandler::Initialize(const sal_uInt32 nEventCode)
{
#endif
- const Pointer aSelectionPointer (POINTER_TEXT);
+ const Pointer aSelectionPointer (PointerStyle::Text);
mrSlideSorter.GetContentWindow()->SetPointer(aSelectionPointer);
SetSelectionModeFromModifier(nEventCode);
}
diff --git a/sd/source/ui/view/viewoverlaymanager.cxx
b/sd/source/ui/view/viewoverlaymanager.cxx
index 333d338..11ac62b 100644
--- a/sd/source/ui/view/viewoverlaymanager.cxx
+++ b/sd/source/ui/view/viewoverlaymanager.cxx
@@ -270,7 +270,7 @@ bool ImageButtonHdl::isMarkable() const
Pointer ImageButtonHdl::GetPointer() const
{
- return Pointer( POINTER_ARROW );
+ return Pointer( PointerStyle::Arrow );
}
ChangePlaceholderTag::ChangePlaceholderTag( ::sd::View& rView, SdrObject&
rPlaceholderObj )
diff --git a/sfx2/source/control/recentdocsviewitem.cxx
b/sfx2/source/control/recentdocsviewitem.cxx
index 69c4a54..0165b8b 100644
--- a/sfx2/source/control/recentdocsviewitem.cxx
+++ b/sfx2/source/control/recentdocsviewitem.cxx
@@ -180,7 +180,7 @@ void RecentDocsViewItem::MouseButtonUp(const MouseEvent&
rMEvt)
void RecentDocsViewItem::OpenDocument()
{
// show busy mouse pointer
- mrParent.SetPointer(Pointer(POINTER_WAIT));
+ mrParent.SetPointer(Pointer(PointerStyle::Wait));
Reference<frame::XDispatch> xDispatch;
Reference<frame::XDispatchProvider> xDispatchProvider;
diff --git a/svtools/source/brwbox/brwbox2.cxx
b/svtools/source/brwbox/brwbox2.cxx
index dc1e921..1fa03aa 100644
--- a/svtools/source/brwbox/brwbox2.cxx
+++ b/svtools/source/brwbox/brwbox2.cxx
@@ -1423,7 +1423,7 @@ void BrowseBox::MouseButtonDown( const MouseEvent& rEvt )
bResizing = true;
nResizeCol = nCol;
nDragX = nResizeX = rEvtPos.X();
- SetPointer( Pointer( POINTER_HSPLIT ) );
+ SetPointer( Pointer( PointerStyle::HSplit ) );
CaptureMouse();
pDataWin->DrawLine( Point( nDragX, 0 ),
Point( nDragX, pDataWin->GetSizePixel().Height() ) );
@@ -1472,7 +1472,7 @@ void BrowseBox::MouseMove( const MouseEvent& rEvt )
if ( bResizing || ( pCol->GetId() &&
std::abs( ((long) nR ) - rEvt.GetPosPixel().X() ) <
MIN_COLUMNWIDTH ) )
{
- aNewPointer = Pointer( POINTER_HSPLIT );
+ aNewPointer = Pointer( PointerStyle::HSplit );
if ( bResizing )
{
// delete old auxiliary line
diff --git a/svtools/source/brwbox/datwin.cxx b/svtools/source/brwbox/datwin.cxx
index 74f2f25..4d037e2 100644
--- a/svtools/source/brwbox/datwin.cxx
+++ b/svtools/source/brwbox/datwin.cxx
@@ -482,9 +482,9 @@ void BrowserDataWin::MouseMove( const MouseEvent& rEvt )
GetParent()->MouseMove( aBrowserEvent );
// pointer shape
- PointerStyle ePointerStyle = POINTER_ARROW;
+ PointerStyle ePointerStyle = PointerStyle::Arrow;
if ( ImplRowDividerHitTest( aBrowserEvent ) )
- ePointerStyle = POINTER_VSIZEBAR;
+ ePointerStyle = PointerStyle::VSizeBar;
SetPointer( Pointer( ePointerStyle ) );
// dragging out of the visible area?
diff --git a/svtools/source/control/headbar.cxx
b/svtools/source/control/headbar.cxx
index 8bde905..87e9f58 100644
--- a/svtools/source/control/headbar.cxx
+++ b/svtools/source/control/headbar.cxx
@@ -831,7 +831,7 @@ void HeaderBar::ImplEndDrag( bool bCancel )
{
if ( mbItemDrag )
{
- Pointer aPointer( POINTER_ARROW );
+ Pointer aPointer( PointerStyle::Arrow );
SetPointer( aPointer );
if ( (mnItemDragPos != nPos) &&
(mnItemDragPos != HEADERBAR_ITEM_NOTFOUND) )
@@ -900,11 +900,11 @@ void HeaderBar::MouseMove( const MouseEvent& rMEvt )
{
long nTemp1;
sal_uInt16 nTemp2;
- PointerStyle eStyle = POINTER_ARROW;
+ PointerStyle eStyle = PointerStyle::Arrow;
sal_uInt16 nHitTest = ImplHitTest( rMEvt.GetPosPixel(), nTemp1,
nTemp2 );
if ( nHitTest & HEAD_HITTEST_DIVIDER )
- eStyle = POINTER_HSIZEBAR;
+ eStyle = PointerStyle::HSizeBar;
Pointer aPtr( eStyle );
SetPointer( aPtr );
}
diff --git a/svtools/source/control/hyperlabel.cxx
b/svtools/source/control/hyperlabel.cxx
index fa82623..1814bc0 100644
--- a/svtools/source/control/hyperlabel.cxx
+++ b/svtools/source/control/hyperlabel.cxx
@@ -115,7 +115,7 @@ namespace svt
{
aFont.SetUnderline(UNDERLINE_SINGLE);
m_pImpl->m_bHyperMode = true;
- SetPointer( POINTER_REFHAND );
+ SetPointer( PointerStyle::RefHand );
SetControlFont( aFont);
SetTextColor( aColor);
@@ -125,7 +125,7 @@ namespace svt
{
m_pImpl->m_bHyperMode = false;
aFont.SetUnderline(UNDERLINE_NONE);
- SetPointer( POINTER_ARROW );
+ SetPointer( PointerStyle::Arrow );
SetControlFont( aFont);
SetTextColor( aColor);
}
diff --git a/svtools/source/control/ruler.cxx b/svtools/source/control/ruler.cxx
index b6ff5aa..83c78b6 100644
--- a/svtools/source/control/ruler.cxx
+++ b/svtools/source/control/ruler.cxx
@@ -2088,7 +2088,7 @@ void Ruler::MouseButtonDown( const MouseEvent& rMEvt )
void Ruler::MouseMove( const MouseEvent& rMEvt )
{
- PointerStyle ePtrStyle = POINTER_ARROW;
+ PointerStyle ePtrStyle = PointerStyle::Arrow;
mxCurrentHitTest.reset(new RulerSelection);
@@ -2103,28 +2103,28 @@ void Ruler::MouseMove( const MouseEvent& rMEvt )
if (mnWinStyle & WB_HORZ)
{
if (mxCurrentHitTest->mnDragSize == RULER_DRAGSIZE_1)
- ePtrStyle = POINTER_TAB_SELECT_W;
+ ePtrStyle = PointerStyle::TabSelectW;
else if (mxCurrentHitTest->mnDragSize == RULER_DRAGSIZE_2)
- ePtrStyle = POINTER_TAB_SELECT_E;
+ ePtrStyle = PointerStyle::TabSelectE;
else
- ePtrStyle = POINTER_ESIZE;
+ ePtrStyle = PointerStyle::ESize;
}
else
{
if (mxCurrentHitTest->mnDragSize == RULER_DRAGSIZE_1)
- ePtrStyle = POINTER_WINDOW_NSIZE;
+ ePtrStyle = PointerStyle::WindowNSize;
else if (mxCurrentHitTest->mnDragSize == RULER_DRAGSIZE_2)
- ePtrStyle = POINTER_WINDOW_SSIZE;
+ ePtrStyle = PointerStyle::WindowSSize;
else
- ePtrStyle = POINTER_SSIZE;
+ ePtrStyle = PointerStyle::SSize;
}
}
else if (mxCurrentHitTest->bSizeBar)
{
if (mnWinStyle & WB_HORZ)
- ePtrStyle = POINTER_HSIZEBAR;
+ ePtrStyle = PointerStyle::HSizeBar;
else
- ePtrStyle = POINTER_VSIZEBAR;
+ ePtrStyle = PointerStyle::VSizeBar;
}
}
@@ -2379,16 +2379,16 @@ bool Ruler::StartDocDrag( const MouseEvent& rMEvt,
RulerType eDragType )
if ( aHitTest.bSize )
{
if ( mnWinStyle & WB_HORZ )
- aPtr = Pointer( POINTER_ESIZE );
+ aPtr = Pointer( PointerStyle::ESize );
else
- aPtr = Pointer( POINTER_SSIZE );
+ aPtr = Pointer( PointerStyle::SSize );
}
else if ( aHitTest.bSizeBar )
{
if ( mnWinStyle & WB_HORZ )
- aPtr = Pointer( POINTER_HSIZEBAR );
+ aPtr = Pointer( PointerStyle::HSizeBar );
else
- aPtr = Pointer( POINTER_VSIZEBAR );
+ aPtr = Pointer( PointerStyle::VSizeBar );
}
SetPointer( aPtr );
return ImplStartDrag( &aHitTest, nMouseModifier );
diff --git a/svtools/source/control/tabbar.cxx
b/svtools/source/control/tabbar.cxx
index 7df57d1..a0a0fe3 100644
--- a/svtools/source/control/tabbar.cxx
+++ b/svtools/source/control/tabbar.cxx
@@ -333,7 +333,7 @@ ImplTabSizer::ImplTabSizer( TabBar* pParent, WinBits
nWinStyle )
, mnStartWidth(0)
{
sal_Int32 nScaleFactor = GetDPIScaleFactor();
- SetPointer(Pointer(POINTER_HSIZEBAR));
+ SetPointer(Pointer(PointerStyle::HSizeBar));
SetSizePixel(Size(7 * nScaleFactor, 0));
}
diff --git a/svtools/source/hatchwindow/ipwin.cxx
b/svtools/source/hatchwindow/ipwin.cxx
index a04dd8f..62ea003 100644
--- a/svtools/source/hatchwindow/ipwin.cxx
+++ b/svtools/source/hatchwindow/ipwin.cxx
@@ -498,15 +498,15 @@ void SvResizeWindow::SelectMouse( const Point & rPos )
SetPointer( m_aOldPointer );
else
{
- PointerStyle aStyle = POINTER_MOVE;
+ PointerStyle aStyle = PointerStyle::Move;
if( nGrab == 3 )
- aStyle = POINTER_ESIZE;
+ aStyle = PointerStyle::ESize;
else if( nGrab == 2 )
- aStyle = POINTER_NESIZE;
+ aStyle = PointerStyle::NESize;
else if( nGrab == 1 )
- aStyle = POINTER_SSIZE;
+ aStyle = PointerStyle::SSize;
else if( nGrab == 0 )
- aStyle = POINTER_SESIZE;
+ aStyle = PointerStyle::SESize;
if( m_nMoveGrab == -1 ) // the first time
{
m_aOldPointer = GetPointer();
diff --git a/svtools/source/table/mousefunction.cxx
b/svtools/source/table/mousefunction.cxx
index dcd55b0..5a17fbc 100644
--- a/svtools/source/table/mousefunction.cxx
+++ b/svtools/source/table/mousefunction.cxx
@@ -40,11 +40,11 @@ namespace svt { namespace table
if ( m_nResizingColumn == COL_INVALID )
{
// if we hit a column divider, change the mosue pointer accordingly
- Pointer aNewPointer( POINTER_ARROW );
+ Pointer aNewPointer( PointerStyle::Arrow );
TableCell const tableCell = i_tableControl.hitTest( aPoint );
if ( ( tableCell.nRow == ROW_COL_HEADERS ) && ( tableCell.eArea ==
ColumnDivider ) )
{
- aNewPointer = Pointer( POINTER_HSPLIT );
+ aNewPointer = Pointer( PointerStyle::HSplit );
}
i_tableControl.setPointer( aNewPointer );
@@ -54,17 +54,17 @@ namespace svt { namespace table
::Size const tableSize = i_tableControl.getTableSizePixel();
// set proper pointer
- Pointer aNewPointer( POINTER_ARROW );
+ Pointer aNewPointer( PointerStyle::Arrow );
ColumnMetrics const & columnMetrics( i_tableControl.getColumnMetrics(
m_nResizingColumn ) );
if ( ( aPoint.X() > tableSize.Width() )
|| ( aPoint.X() < columnMetrics.nStartPixel )
)
{
- aNewPointer = Pointer( POINTER_NOTALLOWED );
+ aNewPointer = Pointer( PointerStyle::NotAllowed );
}
else
{
- aNewPointer = Pointer( POINTER_HSPLIT );
+ aNewPointer = Pointer( PointerStyle::HSplit );
}
i_tableControl.setPointer( aNewPointer );
diff --git a/svtools/source/toolpanel/toolpaneldrawer.cxx
b/svtools/source/toolpanel/toolpaneldrawer.cxx
index 85ce017..4fc0d97 100644
--- a/svtools/source/toolpanel/toolpaneldrawer.cxx
+++ b/svtools/source/toolpanel/toolpaneldrawer.cxx
@@ -75,7 +75,7 @@ namespace svt
{
EnableMapMode( false );
SetBackground( Wallpaper() );
- SetPointer( POINTER_REFHAND );
+ SetPointer( PointerStyle::RefHand );
SetAccessibleRole( AccessibleRole::LIST_ITEM );
diff --git a/svx/source/dialog/contwnd.cxx b/svx/source/dialog/contwnd.cxx
index 691dc73..742e7c1 100644
--- a/svx/source/dialog/contwnd.cxx
+++ b/svx/source/dialog/contwnd.cxx
@@ -164,7 +164,7 @@ void ContourWindow::MouseMove( const MouseEvent& rMEvt )
if ( aPipetteLink.IsSet() && Rectangle( Point(), GetGraphicSize()
).IsInside( aLogPt ) )
{
- SetPointer( POINTER_REFHAND );
+ SetPointer( PointerStyle::RefHand );
aPipetteLink.Call( this );
}
}
diff --git a/svx/source/dialog/graphctl.cxx b/svx/source/dialog/graphctl.cxx
index 5d690ed..17dcc15 100644
--- a/svx/source/dialog/graphctl.cxx
+++ b/svx/source/dialog/graphctl.cxx
@@ -653,7 +653,7 @@ void GraphCtrl::MouseMove(const MouseEvent& rMEvt)
!pView->PickHandle( aLogPos ) &&
!pView->IsInsObjPoint() )
{
- SetPointer( POINTER_CROSS );
+ SetPointer( PointerStyle::Cross );
}
else
SetPointer( pView->GetPreferredPointer( aLogPos, this ) );
diff --git a/svx/source/engine3d/dragmt3d.cxx b/svx/source/engine3d/dragmt3d.cxx
index 64ba176..7e090c3 100644
--- a/svx/source/engine3d/dragmt3d.cxx
+++ b/svx/source/engine3d/dragmt3d.cxx
@@ -425,7 +425,7 @@ void E3dDragRotate::MoveSdrDrag(const Point& rPnt)
Pointer E3dDragRotate::GetSdrDragPointer() const
{
- return Pointer(POINTER_ROTATE);
+ return Pointer(PointerStyle::Rotate);
}
// E3dDragMove. This drag method is only required for translations inside
@@ -697,7 +697,7 @@ void E3dDragMove::MoveSdrDrag(const Point& rPnt)
Pointer E3dDragMove::GetSdrDragPointer() const
{
- return Pointer(POINTER_MOVE);
+ return Pointer(PointerStyle::Move);
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/svdraw/svdcrtv.cxx b/svx/source/svdraw/svdcrtv.cxx
index 0c9db46..cd9f888 100644
--- a/svx/source/svdraw/svdcrtv.cxx
+++ b/svx/source/svdraw/svdcrtv.cxx
@@ -201,7 +201,7 @@ void SdrCreateView::ImpClearVars()
pCreatePV=NULL;
bAutoTextEdit=false;
b1stPointAsCenter=false;
- aAktCreatePointer=Pointer(POINTER_CROSS);
+ aAktCreatePointer=Pointer(PointerStyle::Cross);
bUseIncompatiblePathCreateInterface=false;
bAutoClosePolys=true;
nAutoCloseDistPix=5;
@@ -370,7 +370,7 @@ void SdrCreateView::SetCurrentObj(sal_uInt16 nIdent,
sal_uInt32 nInvent)
{
// Here the correct pointer needs to be used
// if the default is set to vertical writing
- aAktCreatePointer = POINTER_TEXT;
+ aAktCreatePointer = PointerStyle::Text;
}
else
aAktCreatePointer = pObj->GetCreatePointer();
@@ -379,7 +379,7 @@ void SdrCreateView::SetCurrentObj(sal_uInt16 nIdent,
sal_uInt32 nInvent)
}
else
{
- aAktCreatePointer = Pointer(POINTER_CROSS);
+ aAktCreatePointer = Pointer(PointerStyle::Cross);
}
}
diff --git a/svx/source/svdraw/svddrgmt.cxx b/svx/source/svdraw/svddrgmt.cxx
index 884a05f..fd0077d 100644
--- a/svx/source/svdraw/svddrgmt.cxx
+++ b/svx/source/svdraw/svddrgmt.cxx
@@ -1176,7 +1176,7 @@ Pointer SdrDragMovHdl::GetSdrDragPointer() const
return pHdl->GetPointer();
}
- return Pointer(POINTER_REFHAND);
+ return Pointer(PointerStyle::RefHand);
}
@@ -1483,7 +1483,7 @@ Pointer SdrDragObjOwn::GetSdrDragPointer() const
return pHdl->GetPointer();
}
- return Pointer(POINTER_MOVE);
+ return Pointer(PointerStyle::Move);
}
@@ -1757,11 +1757,11 @@ Pointer SdrDragMove::GetSdrDragPointer() const
{
if (IsDraggingPoints() || IsDraggingGluePoints())
{
- return Pointer(POINTER_MOVEPOINT);
+ return Pointer(PointerStyle::MovePoint);
}
else
{
- return Pointer(POINTER_MOVE);
+ return Pointer(PointerStyle::Move);
}
}
@@ -2099,7 +2099,7 @@ Pointer SdrDragResize::GetSdrDragPointer() const
return pHdl->GetPointer();
}
- return Pointer(POINTER_MOVE);
+ return Pointer(PointerStyle::Move);
}
@@ -2236,7 +2236,7 @@ bool SdrDragRotate::EndSdrDrag(bool bCopy)
Pointer SdrDragRotate::GetSdrDragPointer() const
{
- return Pointer(POINTER_ROTATE);
+ return Pointer(PointerStyle::Rotate);
}
@@ -2516,9 +2516,9 @@ bool SdrDragShear::EndSdrDrag(bool bCopy)
Pointer SdrDragShear::GetSdrDragPointer() const
{
if (bVertical)
- return Pointer(POINTER_VSHEAR);
+ return Pointer(PointerStyle::VShear);
else
- return Pointer(POINTER_HSHEAR);
+ return Pointer(PointerStyle::HShear);
}
@@ -2649,7 +2649,7 @@ bool SdrDragMirror::EndSdrDrag(bool bCopy)
Pointer SdrDragMirror::GetSdrDragPointer() const
{
- return Pointer(POINTER_MIRROR);
+ return Pointer(PointerStyle::Mirror);
}
@@ -2810,7 +2810,7 @@ void SdrDragGradient::CancelSdrDrag()
Pointer SdrDragGradient::GetSdrDragPointer() const
{
- return Pointer(POINTER_REFHAND);
+ return Pointer(PointerStyle::RefHand);
}
@@ -3447,7 +3447,7 @@ bool SdrDragCrook::EndSdrDrag(bool bCopy)
Pointer SdrDragCrook::GetSdrDragPointer() const
{
- return Pointer(POINTER_CROOK);
+ return Pointer(PointerStyle::Crook);
}
@@ -3585,7 +3585,7 @@ bool SdrDragDistort::EndSdrDrag(bool bCopy)
Pointer SdrDragDistort::GetSdrDragPointer() const
{
- return Pointer(POINTER_REFHAND);
+ return Pointer(PointerStyle::RefHand);
}
void SdrDragDistort::applyCurrentTransformationToSdrObject(SdrObject& rTarget)
@@ -4068,7 +4068,7 @@ bool SdrDragCrop::EndSdrDrag(bool /*bCopy*/)
Pointer SdrDragCrop::GetSdrDragPointer() const
{
- return Pointer(POINTER_CROP);
+ return Pointer(PointerStyle::Crop);
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/svdraw/svdhdl.cxx b/svx/source/svdraw/svdhdl.cxx
index f7d3262..c007892 100644
--- a/svx/source/svdraw/svdhdl.cxx
+++ b/svx/source/svdraw/svdhdl.cxx
@@ -856,16 +856,16 @@ bool SdrHdl::IsHdlHit(const Point& rPnt) const
Pointer SdrHdl::GetPointer() const
{
- PointerStyle ePtr=POINTER_MOVE;
+ PointerStyle ePtr=PointerStyle::Move;
const bool bSize=eKind>=HDL_UPLFT && eKind<=HDL_LWRGT;
const bool bRot=pHdlList!=NULL && pHdlList->IsRotateShear();
const bool bDis=pHdlList!=NULL && pHdlList->IsDistortShear();
if (bSize && pHdlList!=NULL && (bRot || bDis)) {
switch (eKind) {
case HDL_UPLFT: case HDL_UPRGT:
- case HDL_LWLFT: case HDL_LWRGT: ePtr=bRot ? POINTER_ROTATE :
POINTER_REFHAND; break;
- case HDL_LEFT : case HDL_RIGHT: ePtr=POINTER_VSHEAR; break;
- case HDL_UPPER: case HDL_LOWER: ePtr=POINTER_HSHEAR; break;
... etc. - the rest is truncated
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
