diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-02-24 12:25:02 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-02-24 12:27:32 +0100 |
| commit | 33740b7d5abb8aca34692fbdaa787b26a60652a9 (patch) | |
| tree | ad2574a7850e2aa8ac18eaff89f4a85567896692 /framework | |
| parent | 43d7f4e3640c5e370fd1204739c2b0c7eb5f40e4 (diff) | |
Replace exisiting TriState, AutoState with more generic TriState
Change-Id: Ida05478aae5a379775c671e0c2f2851d820d78be
Diffstat (limited to 'framework')
4 files changed, 9 insertions, 9 deletions
diff --git a/framework/source/uielement/complextoolbarcontroller.cxx b/framework/source/uielement/complextoolbarcontroller.cxx index 71a4b4947c91..386a20711b96 100644 --- a/framework/source/uielement/complextoolbarcontroller.cxx +++ b/framework/source/uielement/complextoolbarcontroller.cxx @@ -152,7 +152,7 @@ throw ( RuntimeException ) sal_uInt16 nItemBits = m_pToolbar->GetItemBits( m_nID ); nItemBits &= ~TIB_CHECKABLE; - TriState eTri = STATE_NOCHECK; + TriState eTri = TRISTATE_FALSE; sal_Bool bValue = sal_Bool(); OUString aStrValue; @@ -167,7 +167,7 @@ throw ( RuntimeException ) m_pToolbar->ShowItem( m_nID, true ); m_pToolbar->CheckItem( m_nID, bValue ); if ( bValue ) - eTri = STATE_CHECK; + eTri = TRISTATE_TRUE; nItemBits |= TIB_CHECKABLE; } else if ( Event.State >>= aStrValue ) @@ -181,7 +181,7 @@ throw ( RuntimeException ) } else if ( Event.State >>= aItemState ) { - eTri = STATE_DONTKNOW; + eTri = TRISTATE_INDET; nItemBits |= TIB_CHECKABLE; if ( m_bMadeInvisible ) m_pToolbar->ShowItem( m_nID, true ); diff --git a/framework/source/uielement/generictoolbarcontroller.cxx b/framework/source/uielement/generictoolbarcontroller.cxx index 55fcd6fd2cd0..61cfb09a96fd 100644 --- a/framework/source/uielement/generictoolbarcontroller.cxx +++ b/framework/source/uielement/generictoolbarcontroller.cxx @@ -191,7 +191,7 @@ throw ( RuntimeException ) sal_uInt16 nItemBits = m_pToolbar->GetItemBits( m_nID ); nItemBits &= ~TIB_CHECKABLE; - TriState eTri = STATE_NOCHECK; + TriState eTri = TRISTATE_FALSE; sal_Bool bValue = sal_Bool(); OUString aStrValue; @@ -205,7 +205,7 @@ throw ( RuntimeException ) m_pToolbar->ShowItem( m_nID, true ); m_pToolbar->CheckItem( m_nID, bValue ); if ( bValue ) - eTri = STATE_CHECK; + eTri = TRISTATE_TRUE; nItemBits |= TIB_CHECKABLE; } else if ( Event.State >>= aStrValue ) @@ -219,7 +219,7 @@ throw ( RuntimeException ) m_pToolbar->CheckItem( m_nID, bValue ); if ( bValue ) - eTri = STATE_CHECK; + eTri = TRISTATE_TRUE; nItemBits |= TIB_CHECKABLE; } else @@ -254,7 +254,7 @@ throw ( RuntimeException ) } else if (( Event.State >>= aItemState ) && !m_bEnumCommand ) { - eTri = STATE_DONTKNOW; + eTri = TRISTATE_INDET; nItemBits |= TIB_CHECKABLE; if ( m_bMadeInvisible ) m_pToolbar->ShowItem( m_nID, true ); diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx index ce4df551fefd..4fbcf98536ca 100644 --- a/framework/source/uielement/toolbarmanager.cxx +++ b/framework/source/uielement/toolbarmanager.cxx @@ -1316,7 +1316,7 @@ void ToolBarManager::FillToolbar( const Reference< XIndexAccess >& rItemContaine m_pToolBar->SetItemText( nId, aString ); } m_pToolBar->EnableItem( nId, true ); - m_pToolBar->SetItemState( nId, STATE_NOCHECK ); + m_pToolBar->SetItemState( nId, TRISTATE_FALSE ); // Fill command map. It stores all our commands and from what // image manager we got our image. So we can decide if we have to use an diff --git a/framework/source/uielement/toolbarmerger.cxx b/framework/source/uielement/toolbarmerger.cxx index 4d398a153dc0..4b860e39153a 100644 --- a/framework/source/uielement/toolbarmerger.cxx +++ b/framework/source/uielement/toolbarmerger.cxx @@ -668,7 +668,7 @@ void ToolBarMerger::CreateToolbarItem( ToolBox* pToolbar, CommandToInfoMap& rCom pToolbar->SetQuickHelpText( nItemId, rItem.aLabel ); pToolbar->SetItemText( nItemId, rItem.aLabel ); pToolbar->EnableItem( nItemId, true ); - pToolbar->SetItemState( nItemId, STATE_NOCHECK ); + pToolbar->SetItemState( nItemId, TRISTATE_FALSE ); CommandToInfoMap::iterator pIter = rCommandMap.find( rItem.aCommandURL ); if ( pIter != rCommandMap.end() ) |