[Libreoffice-commits] core.git: vcl/inc vcl/unx

[Stephan Bergmann]

 vcl/inc/unx/gtk/gtksalmenu.hxx    |    1 -
 vcl/unx/gtk/window/gtksalmenu.cxx |    2 --
 2 files changed, 3 deletions(-)

New commits:
commit 05caf43ff5e78bbc0e672be1547fd1ef098d02bd
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Feb 27 10:26:59 2015 +0100

    Remove unused mpOldSalMenu
    
    ...added in 34504e4af678b52b6d6cfe7519ee1934f89c95dd "Chart menu works now" but
    never read?
    
    Change-Id: Ie756f831eda6bbb9ac0edb14758e097e30a9be6a

diff --git a/vcl/inc/unx/gtk/gtksalmenu.hxx b/vcl/inc/unx/gtk/gtksalmenu.hxx
index 3a3d79e..e74de22 100644
--- a/vcl/inc/unx/gtk/gtksalmenu.hxx
+++ b/vcl/inc/unx/gtk/gtksalmenu.hxx
@@ -42,7 +42,6 @@ private:
 
     bool                        mbMenuBar;
     Menu*                           mpVCLMenu;
-    GtkSalMenu*                     mpOldSalMenu;
     GtkSalMenu*                     mpParentSalMenu;
     const GtkSalFrame*              mpFrame;
 
diff --git a/vcl/unx/gtk/window/gtksalmenu.cxx b/vcl/unx/gtk/window/gtksalmenu.cxx
index 6a3a7b00..8448a91 100644
--- a/vcl/unx/gtk/window/gtksalmenu.cxx
+++ b/vcl/unx/gtk/window/gtksalmenu.cxx
@@ -393,7 +393,6 @@ void GtkSalMenu::UpdateFull()
 GtkSalMenu::GtkSalMenu( bool bMenuBar ) :
     mbMenuBar( bMenuBar ),
     mpVCLMenu( NULL ),
-    mpOldSalMenu( NULL ),
     mpParentSalMenu( NULL ),
     mpFrame( NULL ),
     mpMenuModel( NULL ),
@@ -509,7 +508,6 @@ void GtkSalMenu::SetFrame( const SalFrame* pFrame )
     // if we had a menu on the GtkSalMenu we have to free it as we generate a
     // full menu anyway and we might need to reuse an existing model and
     // actiongroup
-    mpOldSalMenu = static_cast< GtkSalMenu* >( pFrameNonConst->GetMenu() );
     pFrameNonConst->SetMenu( this );
     pFrameNonConst->EnsureAppMenuWatch();