core.git: sd/source

[Caolán McNamara (via logerrit)]

 sd/source/ui/view/sdview.cxx |   22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

New commits:
commit ce8e39bc9a2507e40f92275a4357fc4bf314e982
Author:     Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Fri Oct 18 08:47:40 2024 +0100
Commit:     Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Fri Oct 18 11:21:01 2024 +0200

    change misleading var prefix
    
    Change-Id: I0e59d51cbbb7b9d7481d028fb0c682e108b0e7d2
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/175118
    Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
    Tested-by: Jenkins

diff --git a/sd/source/ui/view/sdview.cxx b/sd/source/ui/view/sdview.cxx
index d8938428ca91..4087b209db2e 100644
--- a/sd/source/ui/view/sdview.cxx
+++ b/sd/source/ui/view/sdview.cxx
@@ -783,9 +783,9 @@ SdrEndTextEditKind View::SdrEndTextEdit(bool 
bDontDeleteReally)
 {
     maMasterViewFilter.End();
 
-    SdrTextObj* xObj = GetTextEditObject();
+    SdrTextObj* pObj = GetTextEditObject();
 
-    bool bDefaultTextRestored = RestoreDefaultText( xObj );
+    bool bDefaultTextRestored = RestoreDefaultText( pObj );
     const bool bSaveSetModifiedEnabled = mpDocSh && 
mpDocSh->IsEnableSetModified();
     if (bDefaultTextRestored)
     {
@@ -800,27 +800,27 @@ SdrEndTextEditKind View::SdrEndTextEdit(bool 
bDontDeleteReally)
         if (bSaveSetModifiedEnabled)
             mpDocSh->EnableSetModified();
 
-        if( xObj && !xObj->IsEmptyPresObj() )
+        if( pObj && !pObj->IsEmptyPresObj() )
         {
-            xObj->SetEmptyPresObj( true );
+            pObj->SetEmptyPresObj( true );
         }
         else
         {
             eKind = SdrEndTextEditKind::Unchanged;
         }
     }
-    else if( xObj && xObj->IsEmptyPresObj() && xObj->HasText() )
+    else if( pObj && pObj->IsEmptyPresObj() && pObj->HasText() )
     {
-        SdrPage* pPage = xObj->getSdrPageFromSdrObject();
+        SdrPage* pPage = pObj->getSdrPageFromSdrObject();
         if( !pPage || !pPage->IsMasterPage() )
-            xObj->SetEmptyPresObj( false );
+            pObj->SetEmptyPresObj( false );
     }
 
     GetViewShell()->GetViewShellBase().GetEventMultiplexer()->MultiplexEvent(
         EventMultiplexerEventId::EndTextEdit,
-        static_cast<void*>(xObj) );
+        static_cast<void*>(pObj) );
 
-    if( xObj )
+    if( pObj )
     {
         if ( mpViewSh )
         {
@@ -831,9 +831,9 @@ SdrEndTextEditKind View::SdrEndTextEdit(bool 
bDontDeleteReally)
 
         }
 
-        SdPage* pPage = dynamic_cast< SdPage* >( 
xObj->getSdrPageFromSdrObject() );
+        SdPage* pPage = dynamic_cast< SdPage* >( 
pObj->getSdrPageFromSdrObject() );
         if( pPage )
-            pPage->onEndTextEdit( xObj );
+            pPage->onEndTextEdit( pObj );
     }
 
     return eKind;