diff options
Diffstat (limited to 'sc/source/ui')
| -rw-r--r-- | sc/source/ui/cctrl/checklistmenu.cxx | 23 | ||||
| -rw-r--r-- | sc/source/ui/miscdlgs/solveroptions.cxx | 2 |
2 files changed, 11 insertions, 14 deletions
diff --git a/sc/source/ui/cctrl/checklistmenu.cxx b/sc/source/ui/cctrl/checklistmenu.cxx index e8a1ad3acd6c..88d466932696 100644 --- a/sc/source/ui/cctrl/checklistmenu.cxx +++ b/sc/source/ui/cctrl/checklistmenu.cxx @@ -1261,7 +1261,7 @@ IMPL_LINK_TYPED( ScCheckListMenuWindow, CheckHdl, SvTreeListBox*, pChecks, void return; SvTreeListEntry* pEntry = pChecks->GetHdlEntry(); if ( pEntry ) - maChecks->CheckEntry( pEntry, ( pChecks->GetCheckButtonState( pEntry ) == SV_BUTTON_CHECKED ) ); + maChecks->CheckEntry( pEntry, ( pChecks->GetCheckButtonState( pEntry ) == SvButtonState::Checked ) ); size_t nNumChecked = maChecks->GetCheckedEntryCount(); if (nNumChecked == maMembers.size()) // all members visible @@ -1573,7 +1573,7 @@ void ScCheckListBox::Init() bool ScCheckListBox::IsChecked( const OUString& sName, SvTreeListEntry* pParent ) { SvTreeListEntry* pEntry = FindEntry( pParent, sName ); - if ( pEntry && GetCheckButtonState( pEntry ) == SV_BUTTON_CHECKED) + if ( pEntry && GetCheckButtonState( pEntry ) == SvButtonState::Checked) return true; return false; } @@ -1591,8 +1591,7 @@ void ScCheckListBox::CheckAllChildren( SvTreeListEntry* pParent, bool bCheck ) if ( pParent ) { SetCheckButtonState( - pParent, bCheck ? SvButtonState( SV_BUTTON_CHECKED ) : - SvButtonState( SV_BUTTON_UNCHECKED ) ); + pParent, bCheck ? SvButtonState::Checked : SvButtonState::Unchecked ); } SvTreeListEntry* pEntry = pParent ? FirstChild( pParent ) : First(); while ( pEntry ) @@ -1621,16 +1620,14 @@ void ScCheckListBox::CheckEntry( SvTreeListEntry* pParent, bool bCheck ) while ( pChild ) { - if ( GetCheckButtonState( pChild ) == SV_BUTTON_CHECKED ) + if ( GetCheckButtonState( pChild ) == SvButtonState::Checked ) { bChildChecked = true; break; } pChild = NextSibling( pChild ); } - SetCheckButtonState( - pAncestor, bChildChecked ? SvButtonState( SV_BUTTON_CHECKED ) : - SvButtonState( SV_BUTTON_UNCHECKED ) ); + SetCheckButtonState( pAncestor, bChildChecked ? SvButtonState::Checked : SvButtonState::Unchecked ); pAncestor = GetParent(pAncestor); } } @@ -1647,7 +1644,7 @@ void ScCheckListBox::ShowCheckEntry( const OUString& sName, SvTreeListEntry* pPa sName); SetCheckButtonState( - pEntry, bCheck ? SV_BUTTON_CHECKED : SV_BUTTON_UNCHECKED); + pEntry, bCheck ? SvButtonState::Checked : SvButtonState::Unchecked); } else CheckEntry( pEntry, bCheck ); @@ -1658,7 +1655,7 @@ void ScCheckListBox::ShowCheckEntry( const OUString& sName, SvTreeListEntry* pPa void ScCheckListBox::CountCheckedEntries( SvTreeListEntry* pParent, sal_uLong& nCount ) const { - if ( pParent && GetCheckButtonState( pParent ) == SV_BUTTON_CHECKED ) + if ( pParent && GetCheckButtonState( pParent ) == SvButtonState::Checked ) nCount++; // Iterate over the children SvTreeListEntry* pEntry = pParent ? FirstChild( pParent ) : First(); @@ -1698,9 +1695,9 @@ void ScCheckListBox::KeyInput( const KeyEvent& rKEvt ) SvTreeListEntry* pEntry = GetCurEntry(); if ( pEntry ) { - bool bCheck = ( GetCheckButtonState( pEntry ) == SV_BUTTON_CHECKED ); + bool bCheck = ( GetCheckButtonState( pEntry ) == SvButtonState::Checked ); CheckEntry( pEntry, !bCheck ); - if ( bCheck != ( GetCheckButtonState( pEntry ) == SV_BUTTON_CHECKED ) ) + if ( bCheck != ( GetCheckButtonState( pEntry ) == SvButtonState::Checked ) ) CheckButtonHdl(); } } @@ -1762,7 +1759,7 @@ void ScCheckListMenuWindow::initMembers() aLabel); maChecks->SetCheckButtonState( - pEntry, maMembers[i].mbVisible ? SV_BUTTON_CHECKED : SV_BUTTON_UNCHECKED); + pEntry, maMembers[i].mbVisible ? SvButtonState::Checked : SvButtonState::Unchecked); } if (maMembers[i].mbVisible) diff --git a/sc/source/ui/miscdlgs/solveroptions.cxx b/sc/source/ui/miscdlgs/solveroptions.cxx index 571e146aa2da..b222be3ff0b8 100644 --- a/sc/source/ui/miscdlgs/solveroptions.cxx +++ b/sc/source/ui/miscdlgs/solveroptions.cxx @@ -204,7 +204,7 @@ const uno::Sequence<beans::PropertyValue>& ScSolverOptionsDialog::GetProperties( } if ( !bHasData ) ScUnoHelpFunctions::SetBoolInAny( rValue, - m_pLbSettings->GetCheckButtonState( pEntry ) == SV_BUTTON_CHECKED ); + m_pLbSettings->GetCheckButtonState( pEntry ) == SvButtonState::Checked ); } } else |