diff options
author | Kurt Zenker <kz@openoffice.org> | 2005-03-21 12:27:57 +0000 |
---|---|---|
committer | Kurt Zenker <kz@openoffice.org> | 2005-03-21 12:27:57 +0000 |
commit | f3a41287bb3a43be8fc0b6051f9ecc34a27706df (patch) | |
tree | f54c24b6d98666c9c75e311f9c2df5271b83ac73 /framework/source/uielement/generictoolbarcontroller.cxx | |
parent | 0c917a2263352087b0a19031cc52526371d499d4 (diff) |
INTEGRATION: CWS fwkpostbeta1 (1.7.32); FILE MERGED
2005/03/03 12:47:07 jl 1.7.32.2: RESYNC: (1.7-1.8); FILE MERGED
2005/01/27 16:14:35 cd 1.7.32.1: #i38788# Made CTL toolbar buttons automatically available in CTL mode
Diffstat (limited to 'framework/source/uielement/generictoolbarcontroller.cxx')
-rw-r--r-- | framework/source/uielement/generictoolbarcontroller.cxx | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/framework/source/uielement/generictoolbarcontroller.cxx b/framework/source/uielement/generictoolbarcontroller.cxx index 8b83205372f0..ff658b630620 100644 --- a/framework/source/uielement/generictoolbarcontroller.cxx +++ b/framework/source/uielement/generictoolbarcontroller.cxx @@ -2,9 +2,9 @@ * * $RCSfile: generictoolbarcontroller.cxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: vg $ $Date: 2005-02-24 16:53:40 $ + * last change: $Author: kz $ $Date: 2005-03-21 13:27:57 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -167,6 +167,7 @@ GenericToolbarController::GenericToolbarController( const Reference< XMultiServi , m_pToolbar( pToolbar ) , m_nID( nID ) , m_bEnumCommand( isEnumCommand( aCommand )) + , m_bMadeInvisible( sal_False ) , m_aEnumCommand( getEnumCommand( aCommand )) { } @@ -296,8 +297,11 @@ throw ( RuntimeException ) m_pToolbar->ShowItem( m_nID, TRUE ); } else if ( Event.State >>= aItemVisibility ) + { m_pToolbar->ShowItem( m_nID, aItemVisibility.bVisible ); - else + m_bMadeInvisible = !aItemVisibility.bVisible; + } + else if ( m_bMadeInvisible ) m_pToolbar->ShowItem( m_nID, TRUE ); m_pToolbar->SetItemState( m_nID, eTri ); |