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>

4 files changed, 22 insertions, 22 deletions

diff --git a/sc/source/ui/drawfunc/fuconpol.cxx b/sc/source/ui/drawfunc/fuconpol.cxx
index 3504154d7b99..22b94acfad43 100644
--- a/sc/source/ui/drawfunc/fuconpol.cxx
+++ b/sc/source/ui/drawfunc/fuconpol.cxx
@@ -47,10 +47,10 @@ bool FuConstPolygon::MouseButtonDown(const MouseEvent& rMEvt)
 
     SdrViewEvent aVEvt;
     (void)pView->PickAnything(rMEvt, SdrMouseEventKind::BUTTONDOWN, aVEvt);
-    if (aVEvt.eEvent == SdrEventKind::BeginTextEdit)
+    if (aVEvt.meEvent == SdrEventKind::BeginTextEdit)
     {
         // Text input not allowed here
-        aVEvt.eEvent = SdrEventKind::BeginDragObj;
+        aVEvt.meEvent = SdrEventKind::BeginDragObj;
         pView->EnableExtendedMouseEventDispatcher(false);
     }
     else
@@ -83,7 +83,7 @@ bool FuConstPolygon::MouseButtonUp(const MouseEvent& rMEvt)
 
     pView->MouseButtonUp(rMEvt, pWindow->GetOutDev());
 
-    if (aVEvt.eEvent == SdrEventKind::EndCreate)
+    if (aVEvt.meEvent == SdrEventKind::EndCreate)
     {
         bReturn = true;
         bSimple = true;         // Do not pass on double-click
diff --git a/sc/source/ui/drawfunc/fudraw.cxx b/sc/source/ui/drawfunc/fudraw.cxx
index 318151b1d558..ab70e9094615 100644
--- a/sc/source/ui/drawfunc/fudraw.cxx
+++ b/sc/source/ui/drawfunc/fudraw.cxx
@@ -652,13 +652,13 @@ static bool lcl_UrlHit( const SdrView* pView, const Point& rPosPixel, const vcl:
     MouseEvent aMEvt( rPosPixel, 1, MouseEventModifiers::NONE, MOUSE_LEFT );
     SdrHitKind eHit = pView->PickAnything( aMEvt, SdrMouseEventKind::BUTTONDOWN, aVEvt );
 
-    if ( eHit != SdrHitKind::NONE && aVEvt.pObj != nullptr )
+    if (eHit != SdrHitKind::NONE && aVEvt.mpObj != nullptr)
     {
-        if ( SvxIMapInfo::GetIMapInfo( aVEvt.pObj ) && SvxIMapInfo::GetHitIMapObject(
-                                aVEvt.pObj, pWindow->PixelToLogic(rPosPixel), pWindow->GetOutDev() ) )
+        if ( SvxIMapInfo::GetIMapInfo(aVEvt.mpObj) && SvxIMapInfo::GetHitIMapObject(
+                                aVEvt.mpObj, pWindow->PixelToLogic(rPosPixel), pWindow->GetOutDev() ) )
             return true;
 
-        if ( aVEvt.eEvent == SdrEventKind::ExecuteUrl )
+        if (aVEvt.meEvent == SdrEventKind::ExecuteUrl)
             return true;
     }
 
diff --git a/sc/source/ui/drawfunc/fusel.cxx b/sc/source/ui/drawfunc/fusel.cxx
index 52a5b9a4be17..6c8f753d4974 100644
--- a/sc/source/ui/drawfunc/fusel.cxx
+++ b/sc/source/ui/drawfunc/fusel.cxx
@@ -203,22 +203,22 @@ bool FuSelection::MouseButtonDown(const MouseEvent& rMEvt)
                 SdrViewEvent aVEvt;
                 if ( !bAlt &&
                     pView->PickAnything( rMEvt, SdrMouseEventKind::BUTTONDOWN, aVEvt ) != SdrHitKind::NONE &&
-                    aVEvt.pObj != nullptr )
+                    aVEvt.mpObj != nullptr )
                 {
-                    if ( SvxIMapInfo::GetIMapInfo( aVEvt.pObj ) )       // ImageMap
+                    if ( SvxIMapInfo::GetIMapInfo( aVEvt.mpObj ) )       // ImageMap
                     {
                         const IMapObject* pIMapObj =
-                                SvxIMapInfo::GetHitIMapObject( aVEvt.pObj, aMDPos, pWindow->GetOutDev() );
+                                SvxIMapInfo::GetHitIMapObject( aVEvt.mpObj, aMDPos, pWindow->GetOutDev() );
                         if ( pIMapObj && !pIMapObj->GetURL().isEmpty() )
                         {
                             sURL = pIMapObj->GetURL();
                             sTarget = pIMapObj->GetTarget();
                         }
                     }
-                    if ( aVEvt.eEvent == SdrEventKind::ExecuteUrl && aVEvt.pURLField )   // URL
+                    if ( aVEvt.meEvent == SdrEventKind::ExecuteUrl && aVEvt.mpURLField )   // URL
                     {
-                        sURL = aVEvt.pURLField->GetURL();
-                        sTarget = aVEvt.pURLField->GetTargetFrame();
+                        sURL = aVEvt.mpURLField->GetURL();
+                        sTarget = aVEvt.mpURLField->GetTargetFrame();
                     }
                 }
 
@@ -456,7 +456,7 @@ bool FuSelection::MouseButtonUp(const MouseEvent& rMEvt)
 
                 SdrViewEvent aVEvt;
                 SdrHitKind eHit = pView->PickAnything( rMEvt, SdrMouseEventKind::BUTTONDOWN, aVEvt );
-                if (eHit != SdrHitKind::NONE && aVEvt.pObj == pObj)
+                if (eHit != SdrHitKind::NONE && aVEvt.mpObj == pObj)
                 {
                     sal_uInt16 nSdrObjKind = pObj->GetObjIdentifier();
 
diff --git a/sc/source/ui/view/gridwin5.cxx b/sc/source/ui/view/gridwin5.cxx
index 01a1db0d5fe6..21ecc7a1e018 100644
--- a/sc/source/ui/view/gridwin5.cxx
+++ b/sc/source/ui/view/gridwin5.cxx
@@ -252,14 +252,14 @@ void ScGridWindow::RequestHelp(const HelpEvent& rHEvt)
             MouseEvent aMEvt( aPosPixel, 1, MouseEventModifiers::NONE, MOUSE_LEFT );
             SdrHitKind eHit = pDrView->PickAnything( aMEvt, SdrMouseEventKind::BUTTONDOWN, aVEvt );
 
-            if ( eHit != SdrHitKind::NONE && aVEvt.pObj != nullptr )
+            if ( eHit != SdrHitKind::NONE && aVEvt.mpObj != nullptr )
             {
                 // URL for IMapObject below Pointer is help text
-                if ( SvxIMapInfo::GetIMapInfo( aVEvt.pObj ) )
+                if (SvxIMapInfo::GetIMapInfo(aVEvt.mpObj))
                 {
                     Point aLogicPos = PixelToLogic( aPosPixel );
                     IMapObject* pIMapObj = SvxIMapInfo::GetHitIMapObject(
-                                                    aVEvt.pObj, aLogicPos, GetOutDev() );
+                                                    aVEvt.mpObj, aLogicPos, GetOutDev() );
 
                     if ( pIMapObj )
                     {
@@ -267,16 +267,16 @@ void ScGridWindow::RequestHelp(const HelpEvent& rHEvt)
                         aHelpText = pIMapObj->GetAltText();
                         if (aHelpText.isEmpty())
                             aHelpText = SfxHelp::GetURLHelpText(pIMapObj->GetURL());
-                        aPixRect = LogicToPixel(aVEvt.pObj->GetLogicRect());
+                        aPixRect = LogicToPixel(aVEvt.mpObj->GetLogicRect());
                     }
                 }
                 // URL in shape text or at shape itself (URL in text overrides object URL)
                 if ( aHelpText.isEmpty() )
                 {
-                    if( aVEvt.eEvent == SdrEventKind::ExecuteUrl )
+                    if( aVEvt.meEvent == SdrEventKind::ExecuteUrl )
                     {
-                        aHelpText = SfxHelp::GetURLHelpText(aVEvt.pURLField->GetURL());
-                        aPixRect = LogicToPixel(aVEvt.pObj->GetLogicRect());
+                        aHelpText = SfxHelp::GetURLHelpText(aVEvt.mpURLField->GetURL());
+                        aPixRect = LogicToPixel(aVEvt.mpObj->GetLogicRect());
                     }
                     else
                     {
@@ -294,7 +294,7 @@ void ScGridWindow::RequestHelp(const HelpEvent& rHEvt)
                             ScMacroInfo* pInfo = ScDrawLayer::GetMacroInfo( pObj );
                             if ( pInfo && (pInfo->GetHlink().getLength() > 0) )
                             {
-                                aPixRect = LogicToPixel(aVEvt.pObj->GetLogicRect());
+                                aPixRect = LogicToPixel(aVEvt.mpObj->GetLogicRect());
                                 aHelpText = SfxHelp::GetURLHelpText(pInfo->GetHlink());
                             }
                         }