diff options
| author | Noel Grandin <noel@peralex.com> | 2016-02-25 10:00:38 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2016-02-25 13:50:25 +0200 |
| commit | ccb8b8307079fe3f57d4d745ed331fba0466998e (patch) | |
| tree | 22d839806d1e2211c954f321c8742be2b0853258 /forms | |
| parent | bf7690bc1b444278bef1e355c7463d27381a8700 (diff) | |
convert FilterComponent to scoped enum
and simplify the overly-general logic in FilterManager
Change-Id: I2cbd9db6a53894cd13713a5cc0d1807cec456848
Diffstat (limited to 'forms')
| -rw-r--r-- | forms/source/component/DatabaseForm.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/forms/source/component/DatabaseForm.cxx b/forms/source/component/DatabaseForm.cxx index 3f122a9fd5db..8d9eb1771185 100644 --- a/forms/source/component/DatabaseForm.cxx +++ b/forms/source/component/DatabaseForm.cxx @@ -1500,7 +1500,7 @@ void ODatabaseForm::getFastPropertyValue( Any& rValue, sal_Int32 nHandle ) const break; case PROPERTY_ID_FILTER: - rValue <<= m_aFilterManager.getFilterComponent( FilterManager::fcPublicFilter ); + rValue <<= m_aFilterManager.getFilterComponent( FilterManager::FilterComponent::PublicFilter ); break; case PROPERTY_ID_APPLYFILTER: @@ -1583,7 +1583,7 @@ sal_Bool ODatabaseForm::convertFastPropertyValue( Any& rConvertedValue, Any& rOl break; case PROPERTY_ID_FILTER: - bModified = tryPropertyValue( rConvertedValue, rOldValue, rValue, m_aFilterManager.getFilterComponent( FilterManager::fcPublicFilter ) ); + bModified = tryPropertyValue( rConvertedValue, rOldValue, rValue, m_aFilterManager.getFilterComponent( FilterManager::FilterComponent::PublicFilter ) ); break; case PROPERTY_ID_APPLYFILTER: @@ -1672,7 +1672,7 @@ void ODatabaseForm::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const A { OUString sNewFilter; rValue >>= sNewFilter; - m_aFilterManager.setFilterComponent( FilterManager::fcPublicFilter, sNewFilter ); + m_aFilterManager.setFilterComponent( FilterManager::FilterComponent::PublicFilter, sNewFilter ); } break; @@ -1815,7 +1815,7 @@ PropertyState ODatabaseForm::getPropertyStateByHandle(sal_Int32 nHandle) break; case PROPERTY_ID_FILTER: - if ( m_aFilterManager.getFilterComponent( FilterManager::fcPublicFilter ).isEmpty() ) + if ( m_aFilterManager.getFilterComponent( FilterManager::FilterComponent::PublicFilter ).isEmpty() ) eState = PropertyState_DEFAULT_VALUE; else eState = PropertyState_DIRECT_VALUE; |