diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-01-25 15:05:53 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-01-26 08:01:13 +0100 |
commit | b9fe4f26eaf1099b8d0907b8d9cbf52c86914466 (patch) | |
tree | fd80c20323ce7c72303c98a11454f607888d6c86 /sfx2 | |
parent | de60c73db31ec34ffb2e008829083bb7ddcb3061 (diff) |
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>
Diffstat (limited to 'sfx2')
-rw-r--r-- | sfx2/source/appl/linksrc.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/control/statcach.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/doc/objxtor.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/doc/sfxbasemodel.cxx | 4 | ||||
-rw-r--r-- | sfx2/source/view/sfxbasecontroller.cxx | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/sfx2/source/appl/linksrc.cxx b/sfx2/source/appl/linksrc.cxx index 9bfab2bfa4d8..0e0708f8da68 100644 --- a/sfx2/source/appl/linksrc.cxx +++ b/sfx2/source/appl/linksrc.cxx @@ -53,7 +53,7 @@ SvLinkSourceTimer::SvLinkSourceTimer( SvLinkSource * pOwn ) void SvLinkSourceTimer::Invoke() { // Secure against being destroyed in Handler - SvLinkSourceRef aAdv( pOwner ); + SvLinkSourceRef xHoldAlive( pOwner ); pOwner->SendDataChanged(); } diff --git a/sfx2/source/control/statcach.cxx b/sfx2/source/control/statcach.cxx index af28bec53a2a..ab0e95c91039 100644 --- a/sfx2/source/control/statcach.cxx +++ b/sfx2/source/control/statcach.cxx @@ -70,7 +70,7 @@ void SAL_CALL BindDispatch_Impl::statusChanged( const css::frame::FeatureStateE if ( !pCache ) return; - css::uno::Reference< css::frame::XStatusListener > xRef( static_cast<cppu::OWeakObject*>(this), css::uno::UNO_QUERY ); + css::uno::Reference< css::frame::XStatusListener > xKeepAlive( static_cast<cppu::OWeakObject*>(this), css::uno::UNO_QUERY ); if ( aStatus.Requery ) pCache->Invalidate( true ); else diff --git a/sfx2/source/doc/objxtor.cxx b/sfx2/source/doc/objxtor.cxx index af6a722d24d9..fd8fc433c3b2 100644 --- a/sfx2/source/doc/objxtor.cxx +++ b/sfx2/source/doc/objxtor.cxx @@ -354,7 +354,7 @@ bool SfxObjectShell::Stamp_GetPrintCancelState() const bool SfxObjectShell::Close() { - SfxObjectShellRef aRef(this); + SfxObjectShellRef xKeepAlive(this); return CloseInternal(); } diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx index 0446ee82ac50..2767c5d0d9d2 100644 --- a/sfx2/source/doc/sfxbasemodel.cxx +++ b/sfx2/source/doc/sfxbasemodel.cxx @@ -3194,10 +3194,10 @@ void SfxBaseModel::postEvent_Impl( const OUString& aName, const Reference< frame return; // keep m_pData alive, if notified target would dispose the document - std::shared_ptr<IMPL_SfxBaseModel_DataContainer> pData(m_pData); + std::shared_ptr<IMPL_SfxBaseModel_DataContainer> xKeepAlive(m_pData); // also make sure this object doesn't self-destruct while notifying - rtl::Reference<SfxBaseModel> self(this); + rtl::Reference<SfxBaseModel> xHoldAlive(this); DBG_ASSERT( !aName.isEmpty(), "Empty event name!" ); if (aName.isEmpty()) diff --git a/sfx2/source/view/sfxbasecontroller.cxx b/sfx2/source/view/sfxbasecontroller.cxx index 32150062aba9..4d7f6001526b 100644 --- a/sfx2/source/view/sfxbasecontroller.cxx +++ b/sfx2/source/view/sfxbasecontroller.cxx @@ -919,7 +919,7 @@ void SfxBaseController::BorderWidthsChanged_Impl() void SAL_CALL SfxBaseController::dispose() { SolarMutexGuard aGuard; - Reference< XController > xTmp( this ); + Reference< XController > xKeepAlive( this ); m_pData->m_bDisposing = true ; lang::EventObject aEventObject; |