diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-08-11 16:15:19 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-08-11 16:15:19 +0000 |
| commit | b3cdcd49c1b8d17d0dc66dcfeda7583fface56fd (patch) | |
| tree | 2ea92859cf4db5700a1cccfc838f40736d1ac5ea /framework | |
| parent | 1c7d9f1b95271015ea80fb0182104554a8c5a9c0 (diff) | |
INTEGRATION: CWS fwk44 (1.15.24); FILE MERGED
2006/08/07 09:13:08 cd 1.15.24.1: #i67882# Revert changes of i66983 as sd uses this non-documented behavior
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/source/uielement/generictoolbarcontroller.cxx | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/framework/source/uielement/generictoolbarcontroller.cxx b/framework/source/uielement/generictoolbarcontroller.cxx index fc197efd7a0e..1c72e58abb07 100644 --- a/framework/source/uielement/generictoolbarcontroller.cxx +++ b/framework/source/uielement/generictoolbarcontroller.cxx @@ -4,9 +4,9 @@ * * $RCSfile: generictoolbarcontroller.cxx,v $ * - * $Revision: 1.15 $ + * $Revision: 1.16 $ * - * last change: $Author: obo $ $Date: 2006-07-10 15:53:55 $ + * last change: $Author: hr $ $Date: 2006-08-11 17:15:19 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -243,7 +243,7 @@ throw ( RuntimeException ) USHORT nItemBits = m_pToolbar->GetItemBits( m_nID ); nItemBits &= ~TIB_CHECKABLE; - TriState eTri = m_pToolbar->GetItemState( m_nID ); + TriState eTri = STATE_NOCHECK; sal_Bool bValue; rtl::OUString aStrValue; @@ -256,7 +256,8 @@ throw ( RuntimeException ) if ( m_bMadeInvisible ) m_pToolbar->ShowItem( m_nID, TRUE ); m_pToolbar->CheckItem( m_nID, bValue ); - eTri = bValue ? STATE_CHECK : STATE_NOCHECK; + if ( bValue ) + eTri = STATE_CHECK; nItemBits |= TIB_CHECKABLE; } else if ( Event.State >>= aStrValue ) @@ -269,7 +270,8 @@ throw ( RuntimeException ) bValue = sal_False; m_pToolbar->CheckItem( m_nID, bValue ); - eTri = bValue ? STATE_CHECK : STATE_NOCHECK; + if ( bValue ) + eTri = STATE_CHECK; nItemBits |= TIB_CHECKABLE; } else |