[Libreoffice-commits] core.git: vcl/source

[Stephan Bergmann]

 vcl/source/window/menu.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 884e9296417235e088d4813c4a751f74faf6cae0
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Sat Nov 12 09:54:51 2016 +0100

    loplugin:vclwidgets
    
    Change-Id: Ia828755baa2c244cb23dc92202c1f9ed2448fe31

diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index 473f456..934fdb0 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;