diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2016-11-12 09:54:51 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2016-11-16 19:18:15 +0100 |
| commit | 884e9296417235e088d4813c4a751f74faf6cae0 (patch) | |
| tree | c60b6bfcb173c0c4c6820d1002b417b9ae4c5e0a | |
| parent | 83cbbc6d664d949f6405409713c5bda1a5be559f (diff) | |
loplugin:vclwidgets
Change-Id: Ia828755baa2c244cb23dc92202c1f9ed2448fe31
| -rw-r--r-- | vcl/source/window/menu.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx index 473f456c6c27..934fdb095684 100644 --- a/vcl/source/window/menu.cxx +++ b/vcl/source/window/menu.cxx @@ -319,9 +319,9 @@ void Menu::Select() #if defined(MACOSX) void Menu::ImplSelectWithStart( Menu* pSMenu ) { - Menu* pOldStartedFrom = pStartedFrom; + auto pOldStartedFrom = pStartedFrom; pStartedFrom = pSMenu; - Menu* pOldStartedStarted = pOldStartedFrom ? pOldStartedFrom->pStartedFrom : nullptr; + auto pOldStartedStarted = pOldStartedFrom ? pOldStartedFrom->pStartedFrom : VclPtr<Menu>(); Select(); if( pOldStartedFrom ) pOldStartedFrom->pStartedFrom = pOldStartedStarted; |