From b9fe4f26eaf1099b8d0907b8d9cbf52c86914466 Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel.grandin@collabora.co.uk>
Date: Sat, 25 Jan 2020 15:05:53 +0200
Subject: rename some local variables

mostly to make the job of my very aggressive unused local vars plugin
easier

Change-Id: Ifc21a920841f8589f8b7e10de39dba6622a5d501
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87399
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
---
 basic/source/classes/sb.cxx      | 2 +-
 basic/source/classes/sbxmod.cxx  | 2 +-
 basic/source/runtime/runtime.cxx | 4 ++--
 basic/source/sbx/sbxbase.cxx     | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'basic')

diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx
index 310bc293dfdb..12f2e2bea8c2 100644
--- a/basic/source/classes/sb.cxx
+++ b/basic/source/classes/sb.cxx
@@ -1835,7 +1835,7 @@ bool StarBASIC::LoadData( SvStream& r, sal_uInt16 nVer )
         else if( dynamic_cast<const SbJScriptModule*>( pMod) != nullptr )
         {
             // assign Ref, so that pMod will be deleted
-            SbModuleRef xRef = pMod;
+            SbModuleRef xDeleteRef = pMod;
         }
         else
         {
diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx
index e0b85995b406..45a83f4ec18b 100644
--- a/basic/source/classes/sbxmod.cxx
+++ b/basic/source/classes/sbxmod.cxx
@@ -2055,7 +2055,7 @@ ErrCode SbMethod::Call( SbxValue* pRet, SbxVariable* pCaller )
     // Increment the RefCount of the module
     tools::SvRef<SbModule> pMod_ = static_cast<SbModule*>(GetParent());
 
-    tools::SvRef<StarBASIC> pBasic = static_cast<StarBASIC*>(pMod_->GetParent());
+    tools::SvRef<StarBASIC> xHolder = static_cast<StarBASIC*>(pMod_->GetParent());
 
     // Establish the values to get the return value
     SbxValues aVals;
diff --git a/basic/source/runtime/runtime.cxx b/basic/source/runtime/runtime.cxx
index 0f9f3dfc4fc1..a663dbed961f 100644
--- a/basic/source/runtime/runtime.cxx
+++ b/basic/source/runtime/runtime.cxx
@@ -3523,7 +3523,7 @@ SbxVariable* SbiRuntime::FindElement( SbxObject* pObj, sal_uInt32 nOp1, sal_uInt
                 }
             }
             // assign pElem to a Ref, to delete a temp-var if applicable
-            SbxVariableRef refTemp = pElem;
+            SbxVariableRef xDeleteRef = pElem;
 
             // remove potential rests of the last call of the SbxMethod
             // free Write before, so that there's no error
@@ -3554,7 +3554,7 @@ SbxVariable* SbiRuntime::FindElement( SbxObject* pObj, sal_uInt32 nOp1, sal_uInt
         // this if we actually have params following
         else if( bVBAEnabled && dynamic_cast<const SbUnoProperty*>( pElem) != nullptr && pElem->GetParameters() )
         {
-            SbxVariableRef refTemp = pElem;
+            SbxVariableRef xDeleteRef = pElem;
 
             // dissolve the notify while copying variable
             SbxVariable* pNew = new SbxVariable( *pElem );
diff --git a/basic/source/sbx/sbxbase.cxx b/basic/source/sbx/sbxbase.cxx
index 431a5ae5e612..68fc41547714 100644
--- a/basic/source/sbx/sbxbase.cxx
+++ b/basic/source/sbx/sbxbase.cxx
@@ -210,7 +210,7 @@ SbxBase* SbxBase::Load( SvStream& rStrm )
             if( !p->LoadCompleted() )
             {
                 // Deleting of the object
-                SbxBaseRef aRef( p );
+                SbxBaseRef xDeleteRef( p );
                 p = nullptr;
             }
         }
@@ -218,7 +218,7 @@ SbxBase* SbxBase::Load( SvStream& rStrm )
         {
             rStrm.SetError( SVSTREAM_FILEFORMAT_ERROR );
             // Deleting of the object
-            SbxBaseRef aRef( p );
+            SbxBaseRef xDeleteRef( p );
             p = nullptr;
         }
     }
-- 
cgit