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>

4 files changed, 8 insertions, 8 deletions

diff --git a/sd/source/filter/eppt/pptexsoundcollection.cxx b/sd/source/filter/eppt/pptexsoundcollection.cxx
index c6ee37ddee2d..34e26bd354d0 100644
--- a/sd/source/filter/eppt/pptexsoundcollection.cxx
+++ b/sd/source/filter/eppt/pptexsoundcollection.cxx
@@ -93,7 +93,7 @@ void ExSoundEntry::Write( SvStream& rSt, sal_uInt32 nId ) const
 {
     try
     {
-        ::ucbhelper::Content aCnt( aSoundURL,
+        ::ucbhelper::Content aLoadContentIfExists( aSoundURL,
             css::uno::Reference< css::ucb::XCommandEnvironment >(),
             comphelper::getProcessComponentContext() );
 
diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx
index 18b367aece04..74abf278ffc1 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -835,7 +835,7 @@ bool SlideshowImpl::startPreview(
 
 bool SlideshowImpl::startShow( PresentationSettingsEx const * pPresSettings )
 {
-    const rtl::Reference<SlideshowImpl> this_(this);
+    const rtl::Reference<SlideshowImpl> xKeepAlive(this);
 
     DBG_ASSERT( !mxShow.is(), "sd::SlideshowImpl::startShow(), called twice!" );
     if( mxShow.is() )
@@ -1661,7 +1661,7 @@ IMPL_LINK_NOARG(SlideshowImpl, updateHdl, Timer *, void)
 void SlideshowImpl::updateSlideShow()
 {
     // prevent me from deletion when recursing (App::EnableYieldMode does)
-    const rtl::Reference<SlideshowImpl> this_(this);
+    const rtl::Reference<SlideshowImpl> xKeepAlive(this);
 
     Reference< XSlideShow > xShow( mxShow );
     if ( ! xShow.is())
diff --git a/sd/source/ui/slideshow/slideshowviewimpl.cxx b/sd/source/ui/slideshow/slideshowviewimpl.cxx
index 71a9ddf4fc0b..b1c5fb52fa0c 100644
--- a/sd/source/ui/slideshow/slideshowviewimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowviewimpl.cxx
@@ -487,7 +487,7 @@ void SlideShowView::updateimpl( ::osl::ClearableMutexGuard& rGuard, SlideshowImp
     if( !pSlideShow )
         return;
 
-    ::rtl::Reference< SlideshowImpl > aSLGuard( pSlideShow );
+    ::rtl::Reference< SlideshowImpl > xKeepAlive( pSlideShow );
 
     if( mbFirstPaint )
     {
diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx
index 916e30d306bd..3ac055930198 100644
--- a/sd/source/ui/view/viewshel.cxx
+++ b/sd/source/ui/view/viewshel.cxx
@@ -1401,7 +1401,7 @@ void ViewShell::SetCurrentFunction( const rtl::Reference<FuPoor>& xFunction)
 {
     if( mxCurrentFunction.is() && (mxOldFunction != mxCurrentFunction) )
         mxCurrentFunction->Dispose();
-    rtl::Reference<FuPoor> xTemp( mxCurrentFunction );
+    rtl::Reference<FuPoor> xDisposeAfterNewOne( mxCurrentFunction );
     mxCurrentFunction = xFunction;
 }
 
@@ -1410,7 +1410,7 @@ void ViewShell::SetOldFunction(const rtl::Reference<FuPoor>& xFunction)
     if( mxOldFunction.is() && (xFunction != mxOldFunction) && (mxCurrentFunction != mxOldFunction) )
         mxOldFunction->Dispose();
 
-    rtl::Reference<FuPoor> xTemp( mxOldFunction );
+    rtl::Reference<FuPoor> xDisposeAfterNewOne( mxOldFunction );
     mxOldFunction = xFunction;
 }
 
@@ -1445,7 +1445,7 @@ void ViewShell::DeactivateCurrentFunction( bool bPermanent /* == false */ )
         if( mxCurrentFunction != mxOldFunction )
             mxCurrentFunction->Dispose();
 
-        rtl::Reference<FuPoor> xTemp( mxCurrentFunction );
+        rtl::Reference<FuPoor> xDisposeAfterNewOne( mxCurrentFunction );
         mxCurrentFunction.clear();
     }
 }
@@ -1462,7 +1462,7 @@ void ViewShell::DisposeFunctions()
 
     if(mxOldFunction.is())
     {
-        rtl::Reference<FuPoor> xTemp( mxOldFunction );
+        rtl::Reference<FuPoor> xDisposeAfterNewOne( mxOldFunction );
         mxOldFunction->Dispose();
         mxOldFunction.clear();
     }