summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
Diffstat (limited to 'sd')
-rw-r--r--sd/source/ui/func/fuconbez.cxx4
-rw-r--r--sd/source/ui/func/fudraw.cxx12
-rw-r--r--sd/source/ui/func/fuediglu.cxx16
-rw-r--r--sd/source/ui/func/fuformatpaintbrush.cxx2
-rw-r--r--sd/source/ui/func/fusel.cxx18
-rw-r--r--sd/source/ui/func/futext.cxx30
6 files changed, 41 insertions, 41 deletions
diff --git a/sd/source/ui/func/fuconbez.cxx b/sd/source/ui/func/fuconbez.cxx
index 46de4c0482a2..58432e878b94 100644
--- a/sd/source/ui/func/fuconbez.cxx
+++ b/sd/source/ui/func/fuconbez.cxx
@@ -77,7 +77,7 @@ bool FuConstructBezierPolygon::MouseButtonDown(const MouseEvent& rMEvt)
SdrViewEvent aVEvt;
SdrHitKind eHit = mpView->PickAnything(rMEvt, SdrMouseEventKind::BUTTONDOWN, aVEvt);
- if (eHit == SDRHIT_HANDLE || rMEvt.IsMod1())
+ if (eHit == SdrHitKind::Handle || rMEvt.IsMod1())
{
mpView->SetEditMode(SDREDITMODE_EDIT);
}
@@ -97,7 +97,7 @@ bool FuConstructBezierPolygon::MouseButtonDown(const MouseEvent& rMEvt)
mpView->EnableExtendedMouseEventDispatcher(true);
}
- if (eHit == SDRHIT_MARKEDOBJECT && nEditMode == SID_BEZIER_INSERT)
+ if (eHit == SdrHitKind::MarkedObject && nEditMode == SID_BEZIER_INSERT)
{
// insert glue point
mpView->BegInsObjPoint(aMDPos, rMEvt.IsMod1());
diff --git a/sd/source/ui/func/fudraw.cxx b/sd/source/ui/func/fudraw.cxx
index d37203ad40b2..d5f309d0f714 100644
--- a/sd/source/ui/func/fudraw.cxx
+++ b/sd/source/ui/func/fudraw.cxx
@@ -516,7 +516,7 @@ void FuDraw::ForcePointer(const MouseEvent* pMEvt)
SdrObject* pObj = nullptr;
SdrPageView* pPV = nullptr;
SdrViewEvent aVEvt;
- SdrHitKind eHit = SDRHIT_NONE;
+ SdrHitKind eHit = SdrHitKind::NONE;
SdrDragMode eDragMode = mpView->GetDragMode();
if (pMEvt)
@@ -524,7 +524,7 @@ void FuDraw::ForcePointer(const MouseEvent* pMEvt)
eHit = mpView->PickAnything(*pMEvt, SdrMouseEventKind::MOVE, aVEvt);
}
- if ((eDragMode == SdrDragMode::Rotate) && (eHit == SDRHIT_MARKEDOBJECT))
+ if ((eDragMode == SdrDragMode::Rotate) && (eHit == SdrHitKind::MarkedObject))
{
// The goal of this request is show always the rotation-arrow for 3D-objects at rotation-modus
// Independent of the settings at Extras->Optionen->Grafik "Objekte immer verschieben"
@@ -539,16 +539,16 @@ void FuDraw::ForcePointer(const MouseEvent* pMEvt)
}
}
- if (eHit == SDRHIT_NONE)
+ if (eHit == SdrHitKind::NONE)
{
// found nothing -> look after at the masterpage
mpView->PickObj(aPnt, mpView->getHitTolLog(), pObj, pPV, SdrSearchOptions::ALSOONMASTER);
}
- else if (eHit == SDRHIT_UNMARKEDOBJECT)
+ else if (eHit == SdrHitKind::UnmarkedObject)
{
pObj = aVEvt.pObj;
}
- else if (eHit == SDRHIT_TEXTEDITOBJ && dynamic_cast< const FuSelection *>( this ) != nullptr)
+ else if (eHit == SdrHitKind::TextEditObj && dynamic_cast< const FuSelection *>( this ) != nullptr)
{
sal_uInt16 nSdrObjKind = aVEvt.pObj->GetObjIdentifier();
@@ -747,7 +747,7 @@ bool FuDraw::RequestHelp(const HelpEvent& rHEvt)
SdrObject* pObj = aVEvt.pObj;
- if (eHit != SDRHIT_NONE && pObj != nullptr)
+ if (eHit != SdrHitKind::NONE && pObj != nullptr)
{
Point aPosPixel = rHEvt.GetMousePosPixel();
diff --git a/sd/source/ui/func/fuediglu.cxx b/sd/source/ui/func/fuediglu.cxx
index 24a85a7bdd27..472779d06e52 100644
--- a/sd/source/ui/func/fuediglu.cxx
+++ b/sd/source/ui/func/fuediglu.cxx
@@ -100,7 +100,7 @@ bool FuEditGluePoints::MouseButtonDown(const MouseEvent& rMEvt)
SdrViewEvent aVEvt;
SdrHitKind eHit = mpView->PickAnything(rMEvt, SdrMouseEventKind::BUTTONDOWN, aVEvt);
- if (eHit == SDRHIT_HANDLE)
+ if (eHit == SdrHitKind::Handle)
{
// drag handle
SdrHdl* pHdl = aVEvt.pHdl;
@@ -117,12 +117,12 @@ bool FuEditGluePoints::MouseButtonDown(const MouseEvent& rMEvt)
mpView->BegDragObj(aMDPos, nullptr, aVEvt.pHdl, nDrgLog);
}
}
- else if (eHit == SDRHIT_MARKEDOBJECT && mpView->IsInsGluePointMode())
+ else if (eHit == SdrHitKind::MarkedObject && mpView->IsInsGluePointMode())
{
// insert glue points
mpView->BegInsGluePoint(aMDPos);
}
- else if (eHit == SDRHIT_MARKEDOBJECT && rMEvt.IsMod1())
+ else if (eHit == SdrHitKind::MarkedObject && rMEvt.IsMod1())
{
// select glue points
if (!rMEvt.IsShift())
@@ -130,12 +130,12 @@ bool FuEditGluePoints::MouseButtonDown(const MouseEvent& rMEvt)
mpView->BegMarkGluePoints(aMDPos);
}
- else if (eHit == SDRHIT_MARKEDOBJECT && !rMEvt.IsShift() && !rMEvt.IsMod2())
+ else if (eHit == SdrHitKind::MarkedObject && !rMEvt.IsShift() && !rMEvt.IsMod2())
{
// move object
mpView->BegDragObj(aMDPos, nullptr, nullptr, nDrgLog);
}
- else if (eHit == SDRHIT_GLUEPOINT)
+ else if (eHit == SdrHitKind::Gluepoint)
{
// select glue points
if (!rMEvt.IsShift())
@@ -152,7 +152,7 @@ bool FuEditGluePoints::MouseButtonDown(const MouseEvent& rMEvt)
else
{
// select or drag object
- if (!rMEvt.IsShift() && !rMEvt.IsMod2() && eHit == SDRHIT_UNMARKEDOBJECT)
+ if (!rMEvt.IsShift() && !rMEvt.IsMod2() && eHit == SdrHitKind::UnmarkedObject)
{
mpView->UnmarkAllObj();
}
@@ -172,7 +172,7 @@ bool FuEditGluePoints::MouseButtonDown(const MouseEvent& rMEvt)
}
if (bMarked &&
- (!rMEvt.IsShift() || eHit == SDRHIT_MARKEDOBJECT))
+ (!rMEvt.IsShift() || eHit == SdrHitKind::MarkedObject))
{
// move object
mpView->BegDragObj(aMDPos, nullptr, aVEvt.pHdl, nDrgLog);
@@ -241,7 +241,7 @@ bool FuEditGluePoints::MouseButtonUp(const MouseEvent& rMEvt)
SdrViewEvent aVEvt;
SdrHitKind eHit = mpView->PickAnything(rMEvt, SdrMouseEventKind::BUTTONDOWN, aVEvt);
- if (eHit == SDRHIT_NONE)
+ if (eHit == SdrHitKind::NONE)
{
// click on position: deselect
mpView->UnmarkAllObj();
diff --git a/sd/source/ui/func/fuformatpaintbrush.cxx b/sd/source/ui/func/fuformatpaintbrush.cxx
index c9e578de9bf2..dc70c36bbf6a 100644
--- a/sd/source/ui/func/fuformatpaintbrush.cxx
+++ b/sd/source/ui/func/fuformatpaintbrush.cxx
@@ -97,7 +97,7 @@ bool FuFormatPaintBrush::MouseButtonDown(const MouseEvent& rMEvt)
SdrViewEvent aVEvt;
SdrHitKind eHit = mpView->PickAnything(rMEvt, SdrMouseEventKind::BUTTONDOWN, aVEvt);
- if( (eHit == SDRHIT_TEXTEDIT) || (eHit == SDRHIT_TEXTEDITOBJ && ( mpViewShell->GetFrameView()->IsQuickEdit() || dynamic_cast< sdr::table::SdrTableObj* >( aVEvt.pObj ) != nullptr ) ))
+ if( (eHit == SdrHitKind::TextEdit) || (eHit == SdrHitKind::TextEditObj && ( mpViewShell->GetFrameView()->IsQuickEdit() || dynamic_cast< sdr::table::SdrTableObj* >( aVEvt.pObj ) != nullptr ) ))
{
SdrObject* pPickObj=nullptr;
SdrPageView* pPV=nullptr;
diff --git a/sd/source/ui/func/fusel.cxx b/sd/source/ui/func/fusel.cxx
index d0c2df7ed3cc..9e62290c83f1 100644
--- a/sd/source/ui/func/fusel.cxx
+++ b/sd/source/ui/func/fusel.cxx
@@ -197,7 +197,7 @@ bool FuSelection::MouseButtonDown(const MouseEvent& rMEvt)
SdrViewEvent aVEvt;
SdrHitKind eHit = mpView->PickAnything(rMEvt, SdrMouseEventKind::BUTTONDOWN, aVEvt);
- if ( eHit == SDRHIT_TEXTEDITOBJ && ( mpViewShell->GetFrameView()->IsQuickEdit() || dynamic_cast< sdr::table::SdrTableObj* >( aVEvt.pObj ) != nullptr ) )
+ if ( eHit == SdrHitKind::TextEditObj && ( mpViewShell->GetFrameView()->IsQuickEdit() || dynamic_cast< sdr::table::SdrTableObj* >( aVEvt.pObj ) != nullptr ) )
{
bTextEdit = true;
}
@@ -438,7 +438,7 @@ bool FuSelection::MouseButtonDown(const MouseEvent& rMEvt)
SdrViewEvent aVEvt;
SdrHitKind eHit = mpView->PickAnything(rMEvt, SdrMouseEventKind::BUTTONDOWN, aVEvt);
- if (eHit == SDRHIT_HANDLE && aVEvt.pHdl->GetKind() == HDL_BWGT)
+ if (eHit == SdrHitKind::Handle && aVEvt.pHdl->GetKind() == HDL_BWGT)
{
/******************************************************************
* Drag Handle
@@ -446,14 +446,14 @@ bool FuSelection::MouseButtonDown(const MouseEvent& rMEvt)
if ( ! rMEvt.IsRight())
mpView->BegDragObj(aMDPos, nullptr, aVEvt.pHdl, nDrgLog);
}
- else if (eHit == SDRHIT_MARKEDOBJECT && nEditMode == SID_BEZIER_INSERT)
+ else if (eHit == SdrHitKind::MarkedObject && nEditMode == SID_BEZIER_INSERT)
{
/******************************************************************
* Insert glue point
******************************************************************/
mpView->BegInsObjPoint(aMDPos, rMEvt.IsMod1());
}
- else if (eHit == SDRHIT_MARKEDOBJECT && rMEvt.IsMod1())
+ else if (eHit == SdrHitKind::MarkedObject && rMEvt.IsMod1())
{
/******************************************************************
* Select glue point
@@ -464,7 +464,7 @@ bool FuSelection::MouseButtonDown(const MouseEvent& rMEvt)
if ( ! rMEvt.IsRight())
mpView->BegMarkPoints(aMDPos);
}
- else if (eHit == SDRHIT_MARKEDOBJECT && !rMEvt.IsShift() && !rMEvt.IsMod2())
+ else if (eHit == SdrHitKind::MarkedObject && !rMEvt.IsShift() && !rMEvt.IsMod2())
{
/******************************************************************
* Move object
@@ -472,7 +472,7 @@ bool FuSelection::MouseButtonDown(const MouseEvent& rMEvt)
if ( ! rMEvt.IsRight())
mpView->BegDragObj(aMDPos, nullptr, nullptr, nDrgLog);
}
- else if (eHit == SDRHIT_HANDLE)
+ else if (eHit == SdrHitKind::Handle)
{
/******************************************************************
* Select glue point
@@ -520,7 +520,7 @@ bool FuSelection::MouseButtonDown(const MouseEvent& rMEvt)
/******************************************************************
* Select or drag object
******************************************************************/
- if (!rMEvt.IsShift() && !rMEvt.IsMod2() && eHit == SDRHIT_UNMARKEDOBJECT)
+ if (!rMEvt.IsShift() && !rMEvt.IsMod2() && eHit == SdrHitKind::UnmarkedObject)
{
mpView->UnmarkAllObj();
}
@@ -540,7 +540,7 @@ bool FuSelection::MouseButtonDown(const MouseEvent& rMEvt)
}
if (bMarked &&
- (!rMEvt.IsShift() || eHit == SDRHIT_MARKEDOBJECT))
+ (!rMEvt.IsShift() || eHit == SdrHitKind::MarkedObject))
{
// Move object
if ( ! rMEvt.IsRight())
@@ -876,7 +876,7 @@ bool FuSelection::MouseButtonUp(const MouseEvent& rMEvt)
SdrViewEvent aVEvt;
SdrHitKind eHit = mpView->PickAnything(rMEvt, SdrMouseEventKind::BUTTONDOWN, aVEvt);
- if (eHit == SDRHIT_NONE)
+ if (eHit == SdrHitKind::NONE)
{
// Click on the same place - unselect
mpView->UnmarkAllObj();
diff --git a/sd/source/ui/func/futext.cxx b/sd/source/ui/func/futext.cxx
index 775f9543f921..0bd82738094a 100644
--- a/sd/source/ui/func/futext.cxx
+++ b/sd/source/ui/func/futext.cxx
@@ -257,7 +257,7 @@ bool FuText::MouseButtonDown(const MouseEvent& rMEvt)
SdrViewEvent aVEvt;
SdrHitKind eHit = mpView->PickAnything(rMEvt, SdrMouseEventKind::BUTTONDOWN, aVEvt);
- if (eHit == SDRHIT_TEXTEDIT)
+ if (eHit == SdrHitKind::TextEdit)
{
// hit text -> SdrView handles event
if (mpView->MouseButtonDown(rMEvt, mpWindow))
@@ -266,19 +266,19 @@ bool FuText::MouseButtonDown(const MouseEvent& rMEvt)
if (rMEvt.GetClicks() == 1)
{
- if (mpView->IsTextEdit() && eHit != SDRHIT_MARKEDOBJECT && eHit != SDRHIT_HANDLE)
+ if (mpView->IsTextEdit() && eHit != SdrHitKind::MarkedObject && eHit != SdrHitKind::Handle)
{
// finish text input
if(mpView->SdrEndTextEdit() == SDRENDTEXTEDIT_DELETED)
{
/* Bugfix from MBA: during a double click onto the unused? area
in text mode, we get with the second click eHit =
- SDRHIT_TEXTEDITOBJ since it goes to the TextObject which was
+ SdrHitKind::TextEditObj since it goes to the TextObject which was
created with the first click. But this is removed by
SdrEndTextEdit since it is empty. But it is still in the mark
list. The call MarkObj further below accesses then the dead
object. As a simple fix, we determine eHit after
- SdrEndTextEdit again, this returns then SDRHIT_NONE. */
+ SdrEndTextEdit again, this returns then SdrHitKind::NONE. */
mxTextObj.reset( nullptr );
eHit = mpView->PickAnything(rMEvt, SdrMouseEventKind::BUTTONDOWN, aVEvt);
}
@@ -292,16 +292,16 @@ bool FuText::MouseButtonDown(const MouseEvent& rMEvt)
mpWindow->CaptureMouse();
SdrPageView* pPV = mpView->GetSdrPageView();
- if (eHit == SDRHIT_TEXTEDIT)
+ if (eHit == SdrHitKind::TextEdit)
{
SetInEditMode(rMEvt, false);
}
else
{
- if (eHit != SDRHIT_HANDLE)
+ if (eHit != SdrHitKind::Handle)
{
// deselect selection
- if (!rMEvt.IsShift() && eHit == SDRHIT_TEXTEDITOBJ)
+ if (!rMEvt.IsShift() && eHit == SdrHitKind::TextEditObj)
{
mpView->UnmarkAll();
mpView->SetDragMode(SdrDragMode::Move);
@@ -309,14 +309,14 @@ bool FuText::MouseButtonDown(const MouseEvent& rMEvt)
}
if ( aVEvt.eEvent == SdrEventKind::ExecuteUrl ||
- eHit == SDRHIT_HANDLE ||
- eHit == SDRHIT_MARKEDOBJECT ||
- eHit == SDRHIT_TEXTEDITOBJ ||
- ( eHit == SDRHIT_UNMARKEDOBJECT && bFirstObjCreated &&
+ eHit == SdrHitKind::Handle ||
+ eHit == SdrHitKind::MarkedObject ||
+ eHit == SdrHitKind::TextEditObj ||
+ ( eHit == SdrHitKind::UnmarkedObject && bFirstObjCreated &&
!bPermanent ) )
{
// Handle, hit marked or umarked object
- if (eHit == SDRHIT_TEXTEDITOBJ)
+ if (eHit == SdrHitKind::TextEditObj)
{
/* hit text of unmarked object:
select object and set to EditMode */
@@ -385,7 +385,7 @@ bool FuText::MouseButtonDown(const MouseEvent& rMEvt)
if (!aVEvt.pHdl)
{
- if( eHit == SDRHIT_UNMARKEDOBJECT )
+ if( eHit == SdrHitKind::UnmarkedObject )
{
if ( !rMEvt.IsShift() )
mpView->UnmarkAll();
@@ -402,7 +402,7 @@ bool FuText::MouseButtonDown(const MouseEvent& rMEvt)
{
// we need to pick again since SdrEndTextEdit can rebuild the handles list
eHit = mpView->PickAnything(rMEvt, SdrMouseEventKind::BUTTONDOWN, aVEvt);
- if( (eHit == SDRHIT_HANDLE) || (eHit == SDRHIT_MARKEDOBJECT) )
+ if( (eHit == SdrHitKind::Handle) || (eHit == SdrHitKind::MarkedObject) )
{
sal_uInt16 nDrgLog = sal_uInt16 ( mpWindow->PixelToLogic(Size(DRGPIX,0)).Width() );
mpView->BegDragObj(aMDPos, nullptr, aVEvt.pHdl, nDrgLog);
@@ -1074,7 +1074,7 @@ void FuText::SetInEditMode(const MouseEvent& rMEvt, bool bQuickDrag)
SdrViewEvent aVEvt;
SdrHitKind eHit = mpView->PickAnything(rMEvt, SdrMouseEventKind::BUTTONDOWN, aVEvt);
- if (eHit == SDRHIT_TEXTEDIT)
+ if (eHit == SdrHitKind::TextEdit)
{
// hit text
if (nSdrObjKind == OBJ_TEXT ||
generated by cgit (git 2.34.1) at 2025-02-03 21:00:02 +0000