svx: prefix member variables SdrViewEvent SdrView SdrObjGroup

Change-Id: Ic20c9dc7b8109cb095a883f2dfcec3e4f10b2428
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117352
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>

6 files changed, 53 insertions, 53 deletions

diff --git a/sd/source/ui/func/fuconbez.cxx b/sd/source/ui/func/fuconbez.cxx
index e9eb1b2bacef..6ab9bf17c669 100644
--- a/sd/source/ui/func/fuconbez.cxx
+++ b/sd/source/ui/func/fuconbez.cxx
@@ -154,10 +154,10 @@ bool FuConstructBezierPolygon::MouseButtonDown(const MouseEvent& rMEvt)
         mpView->SetEditMode(SdrViewEditMode::Create);
     }
 
-    if (aVEvt.eEvent == SdrEventKind::BeginTextEdit)
+    if (aVEvt.meEvent == SdrEventKind::BeginTextEdit)
     {
         // here, we do not allow text input
-        aVEvt.eEvent = SdrEventKind::BeginDragObj;
+        aVEvt.meEvent = SdrEventKind::BeginDragObj;
         mpView->EnableExtendedMouseEventDispatcher(false);
     }
     else
@@ -207,7 +207,7 @@ bool FuConstructBezierPolygon::MouseButtonUp(const MouseEvent& rMEvt )
         mpView->MouseButtonUp(rMEvt, mpWindow->GetOutDev());
     }
 
-    if (aVEvt.eEvent == SdrEventKind::EndCreate)
+    if (aVEvt.meEvent == SdrEventKind::EndCreate)
     {
         bReturn = true;
 
diff --git a/sd/source/ui/func/fudraw.cxx b/sd/source/ui/func/fudraw.cxx
index 18cd90fb77e6..8d489d81b8e2 100644
--- a/sd/source/ui/func/fudraw.cxx
+++ b/sd/source/ui/func/fudraw.cxx
@@ -531,16 +531,16 @@ void FuDraw::ForcePointer(const MouseEvent* pMEvt)
             }
             else if (eHit == SdrHitKind::UnmarkedObject)
             {
-                pObj = aVEvt.pObj;
+                pObj = aVEvt.mpObj;
             }
             else if (eHit == SdrHitKind::TextEditObj && dynamic_cast< const FuSelection *>( this ) !=  nullptr)
             {
-                sal_uInt16 nSdrObjKind = aVEvt.pObj->GetObjIdentifier();
+                sal_uInt16 nSdrObjKind = aVEvt.mpObj->GetObjIdentifier();
 
                 if ( nSdrObjKind != OBJ_TEXT        &&
                      nSdrObjKind != OBJ_TITLETEXT   &&
                      nSdrObjKind != OBJ_OUTLINETEXT &&
-                     aVEvt.pObj->IsEmptyPresObj() )
+                     aVEvt.mpObj->IsEmptyPresObj() )
                 {
                     pObj = nullptr;
                     bDefPointer = false;
@@ -690,7 +690,7 @@ bool FuDraw::RequestHelp(const HelpEvent& rHEvt)
 
         SdrHitKind eHit = mpView->PickAnything(aMEvt, SdrMouseEventKind::BUTTONDOWN, aVEvt);
 
-        SdrObject* pObj = aVEvt.pObj;
+        SdrObject* pObj = aVEvt.mpObj;
 
         if (eHit != SdrHitKind::NONE && pObj != nullptr)
         {
@@ -729,12 +729,12 @@ bool FuDraw::SetHelpText(const SdrObject* pObj, const Point& rPosPixel, const Sd
     Point aPos(mpWindow->PixelToLogic(mpWindow->ScreenToOutputPixel(rPosPixel)));
     IMapObject* pIMapObj = SvxIMapInfo::GetHitIMapObject(pObj, aPos);
 
-    if (!rVEvt.pURLField && !pIMapObj)
+    if (!rVEvt.mpURLField && !pIMapObj)
         return false;
 
     OUString aURL;
-    if (rVEvt.pURLField)
-        aURL = INetURLObject::decode(rVEvt.pURLField->GetURL(),
+    if (rVEvt.mpURLField)
+        aURL = INetURLObject::decode(rVEvt.mpURLField->GetURL(),
                                      INetURLObject::DecodeMechanism::WithCharset);
     else if (pIMapObj)
     {
diff --git a/sd/source/ui/func/fuediglu.cxx b/sd/source/ui/func/fuediglu.cxx
index 25f4b9cf4b66..6a793db7a60c 100644
--- a/sd/source/ui/func/fuediglu.cxx
+++ b/sd/source/ui/func/fuediglu.cxx
@@ -99,18 +99,18 @@ bool FuEditGluePoints::MouseButtonDown(const MouseEvent& rMEvt)
         if (eHit == SdrHitKind::Handle)
         {
             // drag handle
-            SdrHdl* pHdl = aVEvt.pHdl;
+            SdrHdl* pHdl = aVEvt.mpHdl;
 
-            if (mpView->IsGluePointMarked(aVEvt.pObj, aVEvt.nGlueId) && rMEvt.IsShift())
+            if (mpView->IsGluePointMarked(aVEvt.mpObj, aVEvt.mnGlueId) && rMEvt.IsShift())
             {
-                mpView->UnmarkGluePoint(aVEvt.pObj, aVEvt.nGlueId);
+                mpView->UnmarkGluePoint(aVEvt.mpObj, aVEvt.mnGlueId);
                 pHdl = nullptr;
             }
 
             if (pHdl)
             {
                 // drag handle
-                mpView->BegDragObj(aMDPos, nullptr, aVEvt.pHdl, nDrgLog);
+                mpView->BegDragObj(aMDPos, nullptr, aVEvt.mpHdl, nDrgLog);
             }
         }
         else if (eHit == SdrHitKind::MarkedObject && mpView->IsInsGluePointMode())
@@ -137,8 +137,8 @@ bool FuEditGluePoints::MouseButtonDown(const MouseEvent& rMEvt)
             if (!rMEvt.IsShift())
                 mpView->UnmarkAllGluePoints();
 
-            mpView->MarkGluePoint(aVEvt.pObj, aVEvt.nGlueId, false);
-            SdrHdl* pHdl = mpView->GetGluePointHdl(aVEvt.pObj, aVEvt.nGlueId);
+            mpView->MarkGluePoint(aVEvt.mpObj, aVEvt.mnGlueId, false);
+            SdrHdl* pHdl = mpView->GetGluePointHdl(aVEvt.mpObj, aVEvt.mnGlueId);
 
             if (pHdl)
             {
@@ -171,7 +171,7 @@ bool FuEditGluePoints::MouseButtonDown(const MouseEvent& rMEvt)
                 (!rMEvt.IsShift() || eHit == SdrHitKind::MarkedObject))
             {
                 // move object
-                mpView->BegDragObj(aMDPos, nullptr, aVEvt.pHdl, nDrgLog);
+                mpView->BegDragObj(aMDPos, nullptr, aVEvt.mpHdl, nDrgLog);
             }
             else if (mpView->AreObjectsMarked())
             {
diff --git a/sd/source/ui/func/fuformatpaintbrush.cxx b/sd/source/ui/func/fuformatpaintbrush.cxx
index 437af13d0270..c7a3ca604a6c 100644
--- a/sd/source/ui/func/fuformatpaintbrush.cxx
+++ b/sd/source/ui/func/fuformatpaintbrush.cxx
@@ -91,7 +91,7 @@ bool FuFormatPaintBrush::MouseButtonDown(const MouseEvent& rMEvt)
         SdrViewEvent aVEvt;
         SdrHitKind eHit = mpView->PickAnything(rMEvt, SdrMouseEventKind::BUTTONDOWN, aVEvt);
 
-        if( (eHit == SdrHitKind::TextEdit) || (eHit == SdrHitKind::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.mpObj) != nullptr ) ))
         {
             SdrPageView* pPV=nullptr;
             sal_uInt16 nHitLog = sal_uInt16 ( mpWindow->PixelToLogic(Size(HITPIX,0)).Width() );
@@ -121,13 +121,13 @@ bool FuFormatPaintBrush::MouseButtonDown(const MouseEvent& rMEvt)
                 return FuText::MouseButtonDown(aMEvt);
             }
 
-            if( aVEvt.pObj == nullptr )
-                aVEvt.pObj = pPickObj;
+            if (aVEvt.mpObj == nullptr)
+                aVEvt.mpObj = pPickObj;
         }
 
         unmarkimpl( mpView );
 
-        if( aVEvt.pObj )
+        if (aVEvt.mpObj)
         {
             sal_uInt16 nHitLog = sal_uInt16 ( mpWindow->PixelToLogic(Size(HITPIX,0)).Width() );
             mpView->MarkObj(mpWindow->PixelToLogic( rMEvt.GetPosPixel() ), nHitLog, false/*bToggle*/);
diff --git a/sd/source/ui/func/fusel.cxx b/sd/source/ui/func/fusel.cxx
index 138978339afb..045a61a725bc 100644
--- a/sd/source/ui/func/fusel.cxx
+++ b/sd/source/ui/func/fusel.cxx
@@ -192,7 +192,7 @@ bool FuSelection::MouseButtonDown(const MouseEvent& rMEvt)
         SdrViewEvent aVEvt;
         SdrHitKind eHit = mpView->PickAnything(rMEvt, SdrMouseEventKind::BUTTONDOWN, aVEvt);
 
-        if ( eHit == SdrHitKind::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.mpObj) != nullptr))
         {
             bTextEdit = true;
         }
@@ -248,13 +248,13 @@ bool FuSelection::MouseButtonDown(const MouseEvent& rMEvt)
             }
             else if ( bTextEdit )
             {
-                sal_uInt16 nSdrObjKind = aVEvt.pObj->GetObjIdentifier();
+                sal_uInt16 nSdrObjKind = aVEvt.mpObj->GetObjIdentifier();
 
-                if (aVEvt.pObj->GetObjInventor() == SdrInventor::Default &&
+                if (aVEvt.mpObj->GetObjInventor() == SdrInventor::Default &&
                     (nSdrObjKind == OBJ_TEXT ||
                      nSdrObjKind == OBJ_TITLETEXT ||
                      nSdrObjKind == OBJ_OUTLINETEXT ||
-                     !aVEvt.pObj->IsEmptyPresObj()))
+                     !aVEvt.mpObj->IsEmptyPresObj()))
                 {
                     // Seamless Editing: branch to text input
                     if (!rMEvt.IsShift())
@@ -269,7 +269,7 @@ bool FuSelection::MouseButtonDown(const MouseEvent& rMEvt)
                 }
             }
             else if ( !rMEvt.IsMod2() && rMEvt.GetClicks() == 1 &&
-                      aVEvt.eEvent == SdrEventKind::ExecuteUrl )
+                      aVEvt.meEvent == SdrEventKind::ExecuteUrl )
              {
                 mpWindow->ReleaseMouse();
 
@@ -277,14 +277,14 @@ bool FuSelection::MouseButtonDown(const MouseEvent& rMEvt)
                 if (comphelper::LibreOfficeKit::isActive())
                 {
                     SfxViewShell& rSfxViewShell = mpViewShell->GetViewShellBase();
-                    rSfxViewShell.libreOfficeKitViewCallback(LOK_CALLBACK_HYPERLINK_CLICKED, aVEvt.pURLField->GetURL().toUtf8().getStr());
+                    rSfxViewShell.libreOfficeKitViewCallback(LOK_CALLBACK_HYPERLINK_CLICKED, aVEvt.mpURLField->GetURL().toUtf8().getStr());
                     return true;
                 }
 
                 if (!lcl_followHyperlinkAllowed(rMEvt))
                     return true;
 
-                SfxStringItem aStrItem(SID_FILE_NAME, aVEvt.pURLField->GetURL());
+                SfxStringItem aStrItem(SID_FILE_NAME, aVEvt.mpURLField->GetURL());
                 SfxStringItem aReferer(SID_REFERER, mpDocSh->GetMedium()->GetName());
                 SfxBoolItem aBrowseItem( SID_BROWSE, true );
                 SfxViewFrame* pFrame = mpViewShell->GetViewFrame();
@@ -458,13 +458,13 @@ bool FuSelection::MouseButtonDown(const MouseEvent& rMEvt)
         SdrViewEvent aVEvt;
         SdrHitKind eHit = mpView->PickAnything(rMEvt, SdrMouseEventKind::BUTTONDOWN, aVEvt);
 
-        if (eHit == SdrHitKind::Handle && aVEvt.pHdl->GetKind() == SdrHdlKind::BezierWeight)
+        if (eHit == SdrHitKind::Handle && aVEvt.mpHdl->GetKind() == SdrHdlKind::BezierWeight)
         {
             /******************************************************************
             * Drag Handle
             ******************************************************************/
             if ( ! rMEvt.IsRight())
-                mpView->BegDragObj(aMDPos, nullptr, aVEvt.pHdl, nDrgLog);
+                mpView->BegDragObj(aMDPos, nullptr, aVEvt.mpHdl, nDrgLog);
         }
         else if (eHit == SdrHitKind::MarkedObject && nEditMode == SID_BEZIER_INSERT)
         {
@@ -497,7 +497,7 @@ bool FuSelection::MouseButtonDown(const MouseEvent& rMEvt)
             /******************************************************************
             * Select glue point
             ******************************************************************/
-            if (!mpView->IsPointMarked(*aVEvt.pHdl) || rMEvt.IsShift())
+            if (!mpView->IsPointMarked(*aVEvt.mpHdl) || rMEvt.IsShift())
             {
                 if (!rMEvt.IsShift())
                 {
@@ -506,9 +506,9 @@ bool FuSelection::MouseButtonDown(const MouseEvent& rMEvt)
                 }
                 else
                 {
-                    if (mpView->IsPointMarked(*aVEvt.pHdl))
+                    if (mpView->IsPointMarked(*aVEvt.mpHdl))
                     {
-                        mpView->UnmarkPoint(*aVEvt.pHdl);
+                        mpView->UnmarkPoint(*aVEvt.mpHdl);
                         pHdl = nullptr;
                     }
                     else
@@ -563,7 +563,7 @@ bool FuSelection::MouseButtonDown(const MouseEvent& rMEvt)
             {
                 // Move object
                 if ( ! rMEvt.IsRight())
-                    mpView->BegDragObj(aMDPos, nullptr, aVEvt.pHdl, nDrgLog);
+                    mpView->BegDragObj(aMDPos, nullptr, aVEvt.mpHdl, nDrgLog);
             }
             else if (mpView->AreObjectsMarked())
             {
diff --git a/sd/source/ui/func/futext.cxx b/sd/source/ui/func/futext.cxx
index ec04594d3d95..945965e1b951 100644
--- a/sd/source/ui/func/futext.cxx
+++ b/sd/source/ui/func/futext.cxx
@@ -194,9 +194,9 @@ void FuText::DoExecute( SfxRequest& )
         SdrPageView* pPV = mpView->GetSdrPageView();
         SdrViewEvent aVEvt;
         mpView->PickAnything(aMEvt, SdrMouseEventKind::BUTTONDOWN, aVEvt);
-        mpView->MarkObj(aVEvt.pRootObj, pPV);
+        mpView->MarkObj(aVEvt.mpRootObj, pPV);
 
-        mxTextObj.reset( dynamic_cast< SdrTextObj* >( aVEvt.pObj ) );
+        mxTextObj.reset( dynamic_cast< SdrTextObj* >( aVEvt.mpObj ) );
     }
     else if (mpView->AreObjectsMarked())
     {
@@ -268,8 +268,8 @@ bool FuText::MouseButtonDown(const MouseEvent& rMEvt)
                 if (auto pURLField = dynamic_cast< const SvxURLField *>( pField ))
                 {
                     eHit = SdrHitKind::MarkedObject;
-                    aVEvt.eEvent = SdrEventKind::ExecuteUrl;
-                    aVEvt.pURLField = pURLField;
+                    aVEvt.meEvent = SdrEventKind::ExecuteUrl;
+                    aVEvt.mpURLField = pURLField;
                 }
             }
         }
@@ -322,7 +322,7 @@ bool FuText::MouseButtonDown(const MouseEvent& rMEvt)
                 if (eHit == SdrHitKind::TextEditObj && xSelectionController.is())
                 {
                     const SdrMarkList& rMarkList = mpView->GetMarkedObjectList();
-                    if (rMarkList.GetMarkCount() == 1 && rMarkList.GetMark(0)->GetMarkedSdrObj() == aVEvt.pRootObj)
+                    if (rMarkList.GetMarkCount() == 1 && rMarkList.GetMark(0)->GetMarkedSdrObj() == aVEvt.mpRootObj)
                         bMarkChanges = false;
                 }
 
@@ -339,7 +339,7 @@ bool FuText::MouseButtonDown(const MouseEvent& rMEvt)
                     }
                 }
 
-                if ( aVEvt.eEvent == SdrEventKind::ExecuteUrl                   ||
+                if ( aVEvt.meEvent == SdrEventKind::ExecuteUrl                   ||
                      eHit == SdrHitKind::Handle                                 ||
                      eHit == SdrHitKind::MarkedObject                           ||
                      eHit == SdrHitKind::TextEditObj                            ||
@@ -352,20 +352,20 @@ bool FuText::MouseButtonDown(const MouseEvent& rMEvt)
                         /* hit text of unmarked object:
                            select object and set to EditMode */
                         if (bMarkChanges)
-                            mpView->MarkObj(aVEvt.pRootObj, pPV);
+                            mpView->MarkObj(aVEvt.mpRootObj, pPV);
 
-                        if (auto pSdrTextObj = dynamic_cast<SdrTextObj *>( aVEvt.pObj ))
+                        if (auto pSdrTextObj = dynamic_cast<SdrTextObj*>(aVEvt.mpObj))
                         {
                             mxTextObj.reset( pSdrTextObj );
                         }
 
                         SetInEditMode(rMEvt, true);
                     }
-                    else if (aVEvt.eEvent == SdrEventKind::ExecuteUrl && !rMEvt.IsMod2())
+                    else if (aVEvt.meEvent == SdrEventKind::ExecuteUrl && !rMEvt.IsMod2())
                     {
                         // execute URL
                         mpWindow->ReleaseMouse();
-                        SfxStringItem aStrItem(SID_FILE_NAME, aVEvt.pURLField->GetURL());
+                        SfxStringItem aStrItem(SID_FILE_NAME, aVEvt.mpURLField->GetURL());
                         SfxStringItem aReferer(SID_REFERER, mpDocSh->GetMedium()->GetName());
                         SfxBoolItem aBrowseItem( SID_BROWSE, true );
                         SfxViewFrame* pFrame = mpViewShell->GetViewFrame();
@@ -393,7 +393,7 @@ bool FuText::MouseButtonDown(const MouseEvent& rMEvt)
 
                         // #i78748#
                         // do the EndTextEdit first, it will delete the handles and force a
-                        // recreation. This will make aVEvt.pHdl to point to a deleted handle,
+                        // recreation. This will make aVEvt.mpHdl to point to a deleted handle,
                         // thus it is necessary to reset it and to get it again.
 
                         // #i112855#
@@ -406,23 +406,23 @@ bool FuText::MouseButtonDown(const MouseEvent& rMEvt)
                             mpView->SdrEndTextEdit();
                             bJustEndedEdit = true;
 
-                            if(aVEvt.pHdl)
+                            if(aVEvt.mpHdl)
                             {
                                 // force new handle identification, the pointer will be dead here
                                 // since SdrEndTextEdit has reset (deleted) the handles.
-                                aVEvt.pHdl = nullptr;
+                                aVEvt.mpHdl = nullptr;
                                 mpView->PickAnything(rMEvt, SdrMouseEventKind::BUTTONDOWN, aVEvt);
                             }
                         }
 
-                        if (!aVEvt.pHdl)
+                        if (!aVEvt.mpHdl)
                         {
                             if( eHit == SdrHitKind::UnmarkedObject )
                             {
                                 if ( !rMEvt.IsShift() )
                                     mpView->UnmarkAll();
 
-                                mpView->MarkObj(aVEvt.pRootObj, pPV);
+                                mpView->MarkObj(aVEvt.mpRootObj, pPV);
                             }
 
                             // Drag object
@@ -437,7 +437,7 @@ bool FuText::MouseButtonDown(const MouseEvent& rMEvt)
                             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);
+                                mpView->BegDragObj(aMDPos, nullptr, aVEvt.mpHdl, nDrgLog);
                             }
                         }
                         bReturn = true;
@@ -779,7 +779,7 @@ bool FuText::MouseButtonUp(const MouseEvent& rMEvt)
         SdrPageView* pPV2 = mpView->GetSdrPageView();
         SdrViewEvent aVEvt;
         mpView->PickAnything(rMEvt, SdrMouseEventKind::BUTTONDOWN, aVEvt);
-        mpView->MarkObj(aVEvt.pRootObj, pPV2);
+        mpView->MarkObj(aVEvt.mpRootObj, pPV2);
     }
 
     if ( !mxTextObj.is() && mpView )
@@ -1273,9 +1273,9 @@ void FuText::ReceiveRequest(SfxRequest& rReq)
             SdrPageView* pPV = mpView->GetSdrPageView();
             SdrViewEvent aVEvt;
             mpView->PickAnything(aMEvt, SdrMouseEventKind::BUTTONDOWN, aVEvt);
-            mpView->MarkObj(aVEvt.pRootObj, pPV);
+            mpView->MarkObj(aVEvt.mpRootObj, pPV);
 
-            if (auto pSdrTextObj = dynamic_cast< SdrTextObj *>( aVEvt.pObj ))
+            if (auto pSdrTextObj = dynamic_cast<SdrTextObj*>(aVEvt.mpObj))
             {
                 mxTextObj.reset( pSdrTextObj );
             }