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 /sc | |
parent | 43d7f4e3640c5e370fd1204739c2b0c7eb5f40e4 (diff) |
Replace exisiting TriState, AutoState with more generic TriState
Change-Id: Ida05478aae5a379775c671e0c2f2851d820d78be
Diffstat (limited to 'sc')
-rw-r--r-- | sc/source/ui/attrdlg/tabpages.cxx | 22 | ||||
-rw-r--r-- | sc/source/ui/cctrl/checklistmenu.cxx | 32 | ||||
-rw-r--r-- | sc/source/ui/dbgui/validate.cxx | 12 | ||||
-rw-r--r-- | sc/source/ui/navipi/navipi.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/pagedlg/tptable.cxx | 10 | ||||
-rw-r--r-- | sc/source/ui/sidebar/AlignmentPropertyPanel.cxx | 32 |
6 files changed, 55 insertions, 55 deletions
diff --git a/sc/source/ui/attrdlg/tabpages.cxx b/sc/source/ui/attrdlg/tabpages.cxx index 88090598be77..e87cf53c5a0b 100644 --- a/sc/source/ui/attrdlg/tabpages.cxx +++ b/sc/source/ui/attrdlg/tabpages.cxx @@ -169,12 +169,12 @@ int ScTabPageProtection::DeactivatePage( SfxItemSet* pSetP ) IMPL_LINK( ScTabPageProtection, ButtonClickHdl, TriStateBox*, pBox ) { TriState eState = pBox->GetState(); - if ( eState == STATE_DONTKNOW ) + if ( eState == TRISTATE_INDET ) bDontCare = true; // everything combined at DontCare else { bDontCare = false; // DontCare from everywhere - sal_Bool bOn = ( eState == STATE_CHECK ); // from a selected value + sal_Bool bOn = ( eState == TRISTATE_TRUE ); // from a selected value if ( pBox == m_pBtnProtect ) bProtect = bOn; @@ -201,20 +201,20 @@ void ScTabPageProtection::UpdateButtons() { if ( bDontCare ) { - m_pBtnProtect->SetState( STATE_DONTKNOW ); - m_pBtnHideCell->SetState( STATE_DONTKNOW ); - m_pBtnHideFormula->SetState( STATE_DONTKNOW ); - m_pBtnHidePrint->SetState( STATE_DONTKNOW ); + m_pBtnProtect->SetState( TRISTATE_INDET ); + m_pBtnHideCell->SetState( TRISTATE_INDET ); + m_pBtnHideFormula->SetState( TRISTATE_INDET ); + m_pBtnHidePrint->SetState( TRISTATE_INDET ); } else { - m_pBtnProtect->SetState( bProtect ? STATE_CHECK : STATE_NOCHECK ); - m_pBtnHideCell->SetState( bHideCell ? STATE_CHECK : STATE_NOCHECK ); - m_pBtnHideFormula->SetState( bHideForm ? STATE_CHECK : STATE_NOCHECK ); - m_pBtnHidePrint->SetState( bHidePrint ? STATE_CHECK : STATE_NOCHECK ); + m_pBtnProtect->SetState( bProtect ? TRISTATE_TRUE : TRISTATE_FALSE ); + m_pBtnHideCell->SetState( bHideCell ? TRISTATE_TRUE : TRISTATE_FALSE ); + m_pBtnHideFormula->SetState( bHideForm ? TRISTATE_TRUE : TRISTATE_FALSE ); + m_pBtnHidePrint->SetState( bHidePrint ? TRISTATE_TRUE : TRISTATE_FALSE ); } - sal_Bool bEnable = ( m_pBtnHideCell->GetState() != STATE_CHECK ); + sal_Bool bEnable = ( m_pBtnHideCell->GetState() != TRISTATE_TRUE ); { m_pBtnProtect->Enable( bEnable ); m_pBtnHideFormula->Enable( bEnable ); diff --git a/sc/source/ui/cctrl/checklistmenu.cxx b/sc/source/ui/cctrl/checklistmenu.cxx index 2fd7f1d92521..30c98ec202dd 100644 --- a/sc/source/ui/cctrl/checklistmenu.cxx +++ b/sc/source/ui/cctrl/checklistmenu.cxx @@ -897,7 +897,7 @@ ScCheckListMenuWindow::ScCheckListMenuWindow(Window* pParent, ScDocument* pDoc) mpOKAction(NULL), mpPopupEndAction(NULL), maWndSize(200, 330), - mePrevToggleAllState(STATE_DONTKNOW) + mePrevToggleAllState(TRISTATE_INDET) { maTabStopCtrls.reserve(7); maTabStopCtrls.push_back(this); @@ -1146,17 +1146,17 @@ IMPL_LINK_NOARG(ScCheckListMenuWindow, TriStateHdl) { switch (mePrevToggleAllState) { - case STATE_NOCHECK: - maChkToggleAll.SetState(STATE_CHECK); + case TRISTATE_FALSE: + maChkToggleAll.SetState(TRISTATE_TRUE); setAllMemberState(true); break; - case STATE_CHECK: - maChkToggleAll.SetState(STATE_NOCHECK); + case TRISTATE_TRUE: + maChkToggleAll.SetState(TRISTATE_FALSE); setAllMemberState(false); break; - case STATE_DONTKNOW: + case TRISTATE_INDET: default: - maChkToggleAll.SetState(STATE_CHECK); + maChkToggleAll.SetState(TRISTATE_TRUE); setAllMemberState(true); break; } @@ -1175,12 +1175,12 @@ IMPL_LINK( ScCheckListMenuWindow, CheckHdl, SvTreeListBox*, pChecks ) size_t nNumChecked = maChecks.GetCheckedEntryCount(); if (nNumChecked == maMembers.size()) // all members visible - maChkToggleAll.SetState(STATE_CHECK); + maChkToggleAll.SetState(TRISTATE_TRUE); else if (nNumChecked == 0) // no members visible - maChkToggleAll.SetState(STATE_NOCHECK); + maChkToggleAll.SetState(TRISTATE_FALSE); else - maChkToggleAll.SetState(STATE_DONTKNOW); + maChkToggleAll.SetState(TRISTATE_INDET); if (!maConfig.mbAllowEmptySet) // We need to have at least one member selected. @@ -1530,19 +1530,19 @@ void ScCheckListMenuWindow::initMembers() if (nVisMemCount == n) { // all members visible - maChkToggleAll.SetState(STATE_CHECK); - mePrevToggleAllState = STATE_CHECK; + maChkToggleAll.SetState(TRISTATE_TRUE); + mePrevToggleAllState = TRISTATE_TRUE; } else if (nVisMemCount == 0) { // no members visible - maChkToggleAll.SetState(STATE_NOCHECK); - mePrevToggleAllState = STATE_NOCHECK; + maChkToggleAll.SetState(TRISTATE_FALSE); + mePrevToggleAllState = TRISTATE_FALSE; } else { - maChkToggleAll.SetState(STATE_DONTKNOW); - mePrevToggleAllState = STATE_DONTKNOW; + maChkToggleAll.SetState(TRISTATE_INDET); + mePrevToggleAllState = TRISTATE_INDET; } maChecks.SetUpdateMode(true); } diff --git a/sc/source/ui/dbgui/validate.cxx b/sc/source/ui/dbgui/validate.cxx index b07a1c9a716d..291b0d618e55 100644 --- a/sc/source/ui/dbgui/validate.cxx +++ b/sc/source/ui/dbgui/validate.cxx @@ -728,9 +728,9 @@ void ScTPValidationHelp::Reset( const SfxItemSet& rArgSet ) const SfxPoolItem* pItem; if ( rArgSet.GetItemState( FID_VALID_SHOWHELP, true, &pItem ) == SFX_ITEM_SET ) - pTsbHelp->SetState( ((const SfxBoolItem*)pItem)->GetValue() ? STATE_CHECK : STATE_NOCHECK ); + pTsbHelp->SetState( ((const SfxBoolItem*)pItem)->GetValue() ? TRISTATE_TRUE : TRISTATE_FALSE ); else - pTsbHelp->SetState( STATE_NOCHECK ); + pTsbHelp->SetState( TRISTATE_FALSE ); if ( rArgSet.GetItemState( FID_VALID_HELPTITLE, true, &pItem ) == SFX_ITEM_SET ) pEdtTitle->SetText( ((const SfxStringItem*)pItem)->GetValue() ); @@ -747,7 +747,7 @@ void ScTPValidationHelp::Reset( const SfxItemSet& rArgSet ) sal_Bool ScTPValidationHelp::FillItemSet( SfxItemSet& rArgSet ) { - rArgSet.Put( SfxBoolItem( FID_VALID_SHOWHELP, pTsbHelp->GetState() == STATE_CHECK ) ); + rArgSet.Put( SfxBoolItem( FID_VALID_SHOWHELP, pTsbHelp->GetState() == TRISTATE_TRUE ) ); rArgSet.Put( SfxStringItem( FID_VALID_HELPTITLE, pEdtTitle->GetText() ) ); rArgSet.Put( SfxStringItem( FID_VALID_HELPTEXT, pEdInputHelp->GetText() ) ); @@ -817,9 +817,9 @@ void ScTPValidationError::Reset( const SfxItemSet& rArgSet ) const SfxPoolItem* pItem; if ( rArgSet.GetItemState( FID_VALID_SHOWERR, true, &pItem ) == SFX_ITEM_SET ) - m_pTsbShow->SetState( ((const SfxBoolItem*)pItem)->GetValue() ? STATE_CHECK : STATE_NOCHECK ); + m_pTsbShow->SetState( ((const SfxBoolItem*)pItem)->GetValue() ? TRISTATE_TRUE : TRISTATE_FALSE ); else - m_pTsbShow->SetState( STATE_CHECK ); // check by default + m_pTsbShow->SetState( TRISTATE_TRUE ); // check by default if ( rArgSet.GetItemState( FID_VALID_ERRSTYLE, true, &pItem ) == SFX_ITEM_SET ) m_pLbAction->SelectEntryPos( ((const SfxAllEnumItem*)pItem)->GetValue() ); @@ -843,7 +843,7 @@ void ScTPValidationError::Reset( const SfxItemSet& rArgSet ) sal_Bool ScTPValidationError::FillItemSet( SfxItemSet& rArgSet ) { - rArgSet.Put( SfxBoolItem( FID_VALID_SHOWERR, m_pTsbShow->GetState() == STATE_CHECK ) ); + rArgSet.Put( SfxBoolItem( FID_VALID_SHOWERR, m_pTsbShow->GetState() == TRISTATE_TRUE ) ); rArgSet.Put( SfxAllEnumItem( FID_VALID_ERRSTYLE, m_pLbAction->GetSelectEntryPos() ) ); rArgSet.Put( SfxStringItem( FID_VALID_ERRTITLE, m_pEdtTitle->GetText() ) ); rArgSet.Put( SfxStringItem( FID_VALID_ERRTEXT, m_pEdError->GetText() ) ); diff --git a/sc/source/ui/navipi/navipi.cxx b/sc/source/ui/navipi/navipi.cxx index f0e8c493b77a..4255ee90d796 100644 --- a/sc/source/ui/navipi/navipi.cxx +++ b/sc/source/ui/navipi/navipi.cxx @@ -1408,7 +1408,7 @@ void ScNavigatorDlg::CheckDataArea() || nCurRow < pMarkArea->nRowStart+1 || nCurRow > pMarkArea->nRowEnd+1 ) { - aTbxCmd.SetItemState( IID_DATA, TriState(STATE_CHECK) ); + aTbxCmd.SetItemState( IID_DATA, TriState(TRISTATE_TRUE) ); aTbxCmd.Select( IID_DATA ); } } diff --git a/sc/source/ui/pagedlg/tptable.cxx b/sc/source/ui/pagedlg/tptable.cxx index 239054c5a2b8..034d27bcfe6c 100644 --- a/sc/source/ui/pagedlg/tptable.cxx +++ b/sc/source/ui/pagedlg/tptable.cxx @@ -241,17 +241,17 @@ sal_Bool ScTablePage::FillItemSet( SfxItemSet& rCoreSet ) bDataChanged |= lcl_PutBoolItem( GetWhich(SID_SCATTR_PAGE_NOTES), rCoreSet, rOldSet, m_pBtnNotes->IsChecked(), - m_pBtnNotes->GetSavedValue() != STATE_NOCHECK ); + m_pBtnNotes->GetSavedValue() != TRISTATE_FALSE ); bDataChanged |= lcl_PutBoolItem( GetWhich(SID_SCATTR_PAGE_GRID), rCoreSet, rOldSet, m_pBtnGrid->IsChecked(), - m_pBtnGrid->GetSavedValue() != STATE_NOCHECK ); + m_pBtnGrid->GetSavedValue() != TRISTATE_FALSE ); bDataChanged |= lcl_PutBoolItem( GetWhich(SID_SCATTR_PAGE_HEADERS), rCoreSet, rOldSet, m_pBtnHeaders->IsChecked(), - m_pBtnHeaders->GetSavedValue() != STATE_NOCHECK ); + m_pBtnHeaders->GetSavedValue() != TRISTATE_FALSE ); bDataChanged |= lcl_PutBoolItem( GetWhich(SID_SCATTR_PAGE_TOPDOWN), rCoreSet, rOldSet, @@ -261,12 +261,12 @@ sal_Bool ScTablePage::FillItemSet( SfxItemSet& rCoreSet ) bDataChanged |= lcl_PutBoolItem( GetWhich(SID_SCATTR_PAGE_FORMULAS), rCoreSet, rOldSet, m_pBtnFormulas->IsChecked(), - m_pBtnFormulas->GetSavedValue() != STATE_NOCHECK ); + m_pBtnFormulas->GetSavedValue() != TRISTATE_FALSE ); bDataChanged |= lcl_PutBoolItem( GetWhich(SID_SCATTR_PAGE_NULLVALS), rCoreSet, rOldSet, m_pBtnNullVals->IsChecked(), - m_pBtnNullVals->GetSavedValue() != STATE_NOCHECK ); + m_pBtnNullVals->GetSavedValue() != TRISTATE_FALSE ); // first printed page: sal_Bool bUseValue = m_pBtnPageNo->IsChecked(); diff --git a/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx b/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx index 9c83b3b9775e..a00819222c89 100644 --- a/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx +++ b/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx @@ -442,7 +442,7 @@ void AlignmentPropertyPanel::NotifyItemUpdate( else if(eState == SFX_ITEM_DONTCARE) { mpCBXWrapText->EnableTriState(true); - mpCBXWrapText->SetState(STATE_DONTKNOW); + mpCBXWrapText->SetState(TRISTATE_INDET); } } break; @@ -515,7 +515,7 @@ void AlignmentPropertyPanel::NotifyItemUpdate( mpMtrAngle->Disable(); mpCtrlDial->Disable(); mpCbStacked->EnableTriState(true); - mpCbStacked->SetState(STATE_DONTKNOW); + mpCbStacked->SetState(TRISTATE_INDET); } } } @@ -546,10 +546,10 @@ void AlignmentPropertyPanel::UpdateHorAlign() const sal_uInt16 nIdRight = mpTBHorizontal->GetItemId(UNO_ALIGNRIGHT); const sal_uInt16 nIdBlock = mpTBHorizontal->GetItemId(UNO_ALIGNBLOCK); - mpTBHorizontal->SetItemState(nIdLeft, STATE_NOCHECK); - mpTBHorizontal->SetItemState(nIdCenter, STATE_NOCHECK); - mpTBHorizontal->SetItemState(nIdRight, STATE_NOCHECK); - mpTBHorizontal->SetItemState(nIdBlock, STATE_NOCHECK); + mpTBHorizontal->SetItemState(nIdLeft, TRISTATE_FALSE); + mpTBHorizontal->SetItemState(nIdCenter, TRISTATE_FALSE); + mpTBHorizontal->SetItemState(nIdRight, TRISTATE_FALSE); + mpTBHorizontal->SetItemState(nIdBlock, TRISTATE_FALSE); mpFTLeftIndent->Disable(); mpMFLeftIndent->Disable(); if(meHorAlignState==SVX_HOR_JUSTIFY_REPEAT) @@ -578,13 +578,13 @@ void AlignmentPropertyPanel::UpdateHorAlign() switch(meHorAlignState) { case SVX_HOR_JUSTIFY_LEFT: - mpTBHorizontal->SetItemState(nIdLeft, STATE_CHECK); + mpTBHorizontal->SetItemState(nIdLeft, TRISTATE_TRUE); mpFTLeftIndent->Enable(); mpMFLeftIndent->Enable(); break; - case SVX_HOR_JUSTIFY_CENTER:mpTBHorizontal->SetItemState(nIdCenter, STATE_CHECK);break; - case SVX_HOR_JUSTIFY_RIGHT: mpTBHorizontal->SetItemState(nIdRight, STATE_CHECK);break; - case SVX_HOR_JUSTIFY_BLOCK: mpTBHorizontal->SetItemState(nIdBlock, STATE_CHECK);break; + case SVX_HOR_JUSTIFY_CENTER:mpTBHorizontal->SetItemState(nIdCenter, TRISTATE_TRUE);break; + case SVX_HOR_JUSTIFY_RIGHT: mpTBHorizontal->SetItemState(nIdRight, TRISTATE_TRUE);break; + case SVX_HOR_JUSTIFY_BLOCK: mpTBHorizontal->SetItemState(nIdBlock, TRISTATE_TRUE);break; default:; } } @@ -597,15 +597,15 @@ void AlignmentPropertyPanel::UpdateVerAlign() const sal_uInt16 nIdVCenter = mpTBVertical->GetItemId(UNO_ALIGNVCENTER); const sal_uInt16 nIdBottom = mpTBVertical->GetItemId(UNO_ALIGNBOTTOM); - mpTBVertical->SetItemState(nIdTop, STATE_NOCHECK); - mpTBVertical->SetItemState(nIdVCenter, STATE_NOCHECK); - mpTBVertical->SetItemState(nIdBottom, STATE_NOCHECK); + mpTBVertical->SetItemState(nIdTop, TRISTATE_FALSE); + mpTBVertical->SetItemState(nIdVCenter, TRISTATE_FALSE); + mpTBVertical->SetItemState(nIdBottom, TRISTATE_FALSE); switch(meVerAlignState) { - case SVX_VER_JUSTIFY_TOP: mpTBVertical->SetItemState(nIdTop, STATE_CHECK);break; - case SVX_VER_JUSTIFY_CENTER:mpTBVertical->SetItemState(nIdVCenter, STATE_CHECK);break; - case SVX_VER_JUSTIFY_BOTTOM:mpTBVertical->SetItemState(nIdBottom, STATE_CHECK);break; + case SVX_VER_JUSTIFY_TOP: mpTBVertical->SetItemState(nIdTop, TRISTATE_TRUE);break; + case SVX_VER_JUSTIFY_CENTER:mpTBVertical->SetItemState(nIdVCenter, TRISTATE_TRUE);break; + case SVX_VER_JUSTIFY_BOTTOM:mpTBVertical->SetItemState(nIdBottom, TRISTATE_TRUE);break; default:; } } |