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

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Fri Feb 22 07:24:22 UTC 2019


 include/toolkit/awt/vclxtopwindow.hxx |    3 ---
 toolkit/source/awt/vclxtopwindow.cxx  |    1 -
 toolkit/source/awt/vclxwindow.cxx     |   10 ++--------
 3 files changed, 2 insertions(+), 12 deletions(-)

New commits:
commit 4c349c7b2fa422f17354b1db7231ffe4d15d3b44
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Thu Feb 21 16:05:23 2019 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Fri Feb 22 08:23:47 2019 +0100

    loplugin:unusedfields in toolkit
    
    Change-Id: Ida146892e786aa05cd9b94cd647a1c5849ecc2ce
    Reviewed-on: https://gerrit.libreoffice.org/68162
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/include/toolkit/awt/vclxtopwindow.hxx b/include/toolkit/awt/vclxtopwindow.hxx
index b018b20335f9..08777e280cee 100644
--- a/include/toolkit/awt/vclxtopwindow.hxx
+++ b/include/toolkit/awt/vclxtopwindow.hxx
@@ -39,9 +39,6 @@ class TOOLKIT_DLLPUBLIC VCLXTopWindow_Base  :public VCLXTopWindow_XBase
                                             ,public VCLXTopWindow_SBase
 {
 protected:
-    css::uno::Reference< css::awt::XMenuBar> mxMenuBar;
-
-
     virtual vcl::Window* GetWindowImpl() = 0;
     virtual ::comphelper::OInterfaceContainerHelper2& GetTopWindowListenersImpl() = 0;
 
diff --git a/toolkit/source/awt/vclxtopwindow.cxx b/toolkit/source/awt/vclxtopwindow.cxx
index 69330da50fa6..fd78b543768f 100644
--- a/toolkit/source/awt/vclxtopwindow.cxx
+++ b/toolkit/source/awt/vclxtopwindow.cxx
@@ -159,7 +159,6 @@ void VCLXTopWindow_Base::setMenuBar( const css::uno::Reference< css::awt::XMenuB
                 pSystemWindow->SetMenuBar( static_cast<MenuBar*>( pMenu->GetMenu() ));
         }
     }
-    mxMenuBar = rxMenu;
 }
 
 
diff --git a/toolkit/source/awt/vclxwindow.cxx b/toolkit/source/awt/vclxwindow.cxx
index f956569d0079..55a61ac36307 100644
--- a/toolkit/source/awt/vclxwindow.cxx
+++ b/toolkit/source/awt/vclxwindow.cxx
@@ -132,8 +132,6 @@ public:
     std::unique_ptr<UnoPropertyArrayHelper>
                                         mpPropHelper;
 
-    css::uno::Reference< css::awt::XPointer >
-                                        mxPointer;
     css::uno::Reference< css::accessibility::XAccessibleContext >
                                         mxAccessibleContext;
     css::uno::Reference< css::awt::XGraphics >
@@ -1147,12 +1145,8 @@ void VCLXWindow::setPointer( const css::uno::Reference< css::awt::XPointer >& rx
     SolarMutexGuard aGuard;
 
     VCLXPointer* pPointer = VCLXPointer::GetImplementation( rxPointer );
-    if ( pPointer )
-    {
-        mpImpl->mxPointer = rxPointer;
-        if ( GetWindow() )
-            GetWindow()->SetPointer( pPointer->GetPointer() );
-    }
+    if ( pPointer && GetWindow() )
+        GetWindow()->SetPointer( pPointer->GetPointer() );
 }
 
 void VCLXWindow::setBackground( sal_Int32 nColor )


More information about the Libreoffice-commits mailing list