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 /framework | |
| 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 'framework')
| -rw-r--r-- | framework/source/uielement/menubarmanager.cxx | 2 | ||||
| -rw-r--r-- | framework/source/uielement/toolbarmanager.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx index 5711fc1d36bc..b1cc795ad112 100644 --- a/framework/source/uielement/menubarmanager.cxx +++ b/framework/source/uielement/menubarmanager.cxx @@ -875,7 +875,7 @@ IMPL_LINK( MenuBarManager, Select, Menu *, pMenu, bool ) } // tdf#126054 don't let dispatch destroy this until after function completes - rtl::Reference<MenuBarManager> xRef(this); + rtl::Reference<MenuBarManager> xKeepAlive(this); if (xDispatch.is()) { SolarMutexReleaser aReleaser; diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx index 9e17204f3b7e..78a5c1198584 100644 --- a/framework/source/uielement/toolbarmanager.cxx +++ b/framework/source/uielement/toolbarmanager.cxx @@ -1610,7 +1610,7 @@ IMPL_LINK( ToolBarManager, MenuSelect, Menu*, pMenu, bool ) { // We have to hold a reference to ourself as it is possible that we will be disposed and // our refcount could be zero (destruction) otherwise. - Reference< XInterface > xInterface( static_cast< OWeakObject* >( this ), UNO_QUERY ); + Reference< XInterface > xKeepAlive( static_cast< OWeakObject* >( this ), UNO_QUERY ); { // The guard must be in its own context as the we can get destroyed when our |