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

[Caolán McNamara]

 include/vcl/menu.hxx       |    2 +-
 vcl/source/window/menu.cxx |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 125c845f406fca336baea89614a5017f909bab40
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Mar 16 10:33:50 2016 +0000

    attempt to address reported loplugin:vclwidgets warning
    
    Change-Id: I6ccefa2d5d1c57cf9f1c4041d14c92d03ded1333

diff --git a/include/vcl/menu.hxx b/include/vcl/menu.hxx
index 6fd25ac..2846fa7 100644
--- a/include/vcl/menu.hxx
+++ b/include/vcl/menu.hxx
@@ -413,7 +413,7 @@ class VCL_DLLPUBLIC MenuBar : public Menu
     bool mbFloatBtnVisible : 1;
     bool mbHideBtnVisible : 1;
     bool mbDisplayable : 1;
-    SystemWindow* mpAssociatedSystemWindow;
+    VclPtr<SystemWindow> mxAssociatedSystemWindow;
 
     friend class Application;
     friend class Menu;
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index 373d946..c31887e 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -2494,9 +2494,9 @@ MenuBar::MenuBar(SystemWindow* pAssociatedSystemWindow)
       mbFloatBtnVisible(false),
       mbHideBtnVisible(false),
       mbDisplayable(true),
-      mpAssociatedSystemWindow(pAssociatedSystemWindow)
+      mxAssociatedSystemWindow(pAssociatedSystemWindow)
 {
-    mpSalMenu = ImplGetSVData()->mpDefInst->CreateMenu(true, this, mpAssociatedSystemWindow);
+    mpSalMenu = ImplGetSVData()->mpDefInst->CreateMenu(true, this, mxAssociatedSystemWindow.get());
 }
 
 MenuBar::MenuBar( const MenuBar& rMenu )
@@ -2506,7 +2506,7 @@ MenuBar::MenuBar( const MenuBar& rMenu )
       mbHideBtnVisible(false),
       mbDisplayable(true)
 {
-    mpSalMenu = ImplGetSVData()->mpDefInst->CreateMenu(true, this, mpAssociatedSystemWindow);
+    mpSalMenu = ImplGetSVData()->mpDefInst->CreateMenu(true, this, mxAssociatedSystemWindow.get());
     *this = rMenu;
 }