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 /vcl | |
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 'vcl')
-rw-r--r-- | vcl/source/control/ivctrl.cxx | 2 | ||||
-rw-r--r-- | vcl/source/treelist/treelistbox.cxx | 2 | ||||
-rw-r--r-- | vcl/source/window/dndeventdispatcher.cxx | 2 | ||||
-rw-r--r-- | vcl/source/window/menu.cxx | 2 | ||||
-rw-r--r-- | vcl/unx/generic/dtrans/X11_clipboard.cxx | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/vcl/source/control/ivctrl.cxx b/vcl/source/control/ivctrl.cxx index 5a20afa0ed1a..82e2bbc0c08b 100644 --- a/vcl/source/control/ivctrl.cxx +++ b/vcl/source/control/ivctrl.cxx @@ -425,7 +425,7 @@ css::uno::Reference< XAccessible > SvtIconChoiceCtrl::CreateAccessible() css::uno::Reference< XAccessible > xAccParent = pParent->GetAccessible(); if ( xAccParent.is() ) { - css::uno::Reference< css::awt::XWindowPeer > xTemp(GetComponentInterface()); + css::uno::Reference< css::awt::XWindowPeer > xHoldAlive(GetComponentInterface()); xAccessible = _pImpl->GetAccessibleFactory().createAccessibleIconChoiceCtrl( *this, xAccParent ); } } diff --git a/vcl/source/treelist/treelistbox.cxx b/vcl/source/treelist/treelistbox.cxx index 32e035ffc9d5..901fed2ba4d8 100644 --- a/vcl/source/treelist/treelistbox.cxx +++ b/vcl/source/treelist/treelistbox.cxx @@ -3562,7 +3562,7 @@ css::uno::Reference< XAccessible > SvTreeListBox::CreateAccessible() if ( xAccParent.is() ) { // need to be done here to get the vclxwindow later on in the accessible - css::uno::Reference< css::awt::XWindowPeer > xTemp(GetComponentInterface()); + css::uno::Reference< css::awt::XWindowPeer > xHoldAlive(GetComponentInterface()); xAccessible = pImpl->m_aFactoryAccess.getFactory().createAccessibleTreeListBox( *this, xAccParent ); } } diff --git a/vcl/source/window/dndeventdispatcher.cxx b/vcl/source/window/dndeventdispatcher.cxx index 9af6ab6e76c3..47adfcf87d5a 100644 --- a/vcl/source/window/dndeventdispatcher.cxx +++ b/vcl/source/window/dndeventdispatcher.cxx @@ -365,7 +365,7 @@ sal_Int32 DNDEventDispatcher::fireDropEvent( vcl::Window *pWindow, Reference< XDropTarget > xDropTarget = pWindow->GetDropTarget(); // window may be destroyed in drop event handler - VclPtr<vcl::Window> xWindow = pWindow; + VclPtr<vcl::Window> xPreventDelete = pWindow; if( xDropTarget.is() ) { diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx index 3a54ca66b692..e2a617270af2 100644 --- a/vcl/source/window/menu.cxx +++ b/vcl/source/window/menu.cxx @@ -2946,7 +2946,7 @@ sal_uInt16 PopupMenu::ImplExecute( const VclPtr<vcl::Window>& pW, const tools::R } // tdf#126054 hold this until after function completes - VclPtr<PopupMenu> m_xThis(this); + VclPtr<PopupMenu> xThis(this); pWin->SetFocusId( xFocusId ); pWin->SetOutputSizePixel( aSz ); diff --git a/vcl/unx/generic/dtrans/X11_clipboard.cxx b/vcl/unx/generic/dtrans/X11_clipboard.cxx index ee277808d2e8..8740f2418538 100644 --- a/vcl/unx/generic/dtrans/X11_clipboard.cxx +++ b/vcl/unx/generic/dtrans/X11_clipboard.cxx @@ -109,7 +109,7 @@ void X11Clipboard::clearContents() // copy member references on stack so they can be called // without having the mutex Reference< XClipboardOwner > xOwner( m_aOwner ); - Reference< XTransferable > xTrans( m_aContents ); + Reference< XTransferable > xKeepAlive( m_aContents ); // clear members m_aOwner.clear(); m_aContents.clear(); |