diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-09-10 15:21:44 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-09-10 16:37:20 +0200 |
commit | 39e91c585d55b99a2b73ed2a58312a387763a4bc (patch) | |
tree | 8752da8db5cd2a73d7225a9cd9fccfe72f48627d /sc | |
parent | Replace uses of old SFX_ITEM_ON alias with SFX_ITEM_SET (diff) | |
download | core-39e91c585d55b99a2b73ed2a58312a387763a4bc.tar.gz core-39e91c585d55b99a2b73ed2a58312a387763a4bc.zip |
Replace uses of old SFX_ITEM_AVAILABLE alias with SFX_ITEM_DEFAULT
Change-Id: I88eeac06413fc3935cbbdb357ff8bf9acaa383a8
Diffstat (limited to 'sc')
-rw-r--r-- | sc/source/ui/cctrl/tbinsert.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/cctrl/tbzoomsliderctrl.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/drawfunc/drawsh2.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/drawfunc/drtxtob.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/optdlg/tpview.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/pagedlg/tptable.cxx | 6 | ||||
-rw-r--r-- | sc/source/ui/sidebar/AlignmentPropertyPanel.cxx | 4 | ||||
-rw-r--r-- | sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx | 4 | ||||
-rw-r--r-- | sc/source/ui/view/formatsh.cxx | 2 |
9 files changed, 13 insertions, 13 deletions
diff --git a/sc/source/ui/cctrl/tbinsert.cxx b/sc/source/ui/cctrl/tbinsert.cxx index 4332cc283834..7f017f7e0a2e 100644 --- a/sc/source/ui/cctrl/tbinsert.cxx +++ b/sc/source/ui/cctrl/tbinsert.cxx @@ -53,7 +53,7 @@ void ScTbxInsertCtrl::StateChanged( sal_uInt16 /* nSID */, SfxItemState eState, { GetToolBox().EnableItem( GetId(), (GetItemState(pState) != SFX_ITEM_DISABLED) ); - if( eState == SFX_ITEM_AVAILABLE ) + if( eState == SFX_ITEM_DEFAULT ) { const SfxUInt16Item* pItem = PTR_CAST( SfxUInt16Item, pState ); diff --git a/sc/source/ui/cctrl/tbzoomsliderctrl.cxx b/sc/source/ui/cctrl/tbzoomsliderctrl.cxx index 9cd27838a2fe..817cf4f5ef65 100644 --- a/sc/source/ui/cctrl/tbzoomsliderctrl.cxx +++ b/sc/source/ui/cctrl/tbzoomsliderctrl.cxx @@ -61,7 +61,7 @@ void ScZoomSliderControl::StateChanged( sal_uInt16 /*nSID*/, SfxItemState eState ScZoomSliderWnd* pBox = (ScZoomSliderWnd*)(rTbx.GetItemWindow( nId )); OSL_ENSURE( pBox ,"Control not found!" ); - if ( SFX_ITEM_AVAILABLE != eState || pState->ISA( SfxVoidItem ) ) + if ( SFX_ITEM_DEFAULT != eState || pState->ISA( SfxVoidItem ) ) { SvxZoomSliderItem aZoomSliderItem( 100 ); pBox->Disable(); diff --git a/sc/source/ui/drawfunc/drawsh2.cxx b/sc/source/ui/drawfunc/drawsh2.cxx index 294e630e0d90..eeaa2fbf5664 100644 --- a/sc/source/ui/drawfunc/drawsh2.cxx +++ b/sc/source/ui/drawfunc/drawsh2.cxx @@ -266,7 +266,7 @@ void ScDrawShell::GetDrawFuncState( SfxItemSet& rSet ) // Funktionen disabl { SfxItemSet aAttrs( pView->GetModel()->GetItemPool() ); pView->GetAttributes( aAttrs ); - if( aAttrs.GetItemState( EE_PARA_HYPHENATE ) >= SFX_ITEM_AVAILABLE ) + if( aAttrs.GetItemState( EE_PARA_HYPHENATE ) >= SFX_ITEM_DEFAULT ) { bool bValue = ( (const SfxBoolItem&) aAttrs.Get( EE_PARA_HYPHENATE ) ).GetValue(); rSet.Put( SfxBoolItem( SID_ENABLE_HYPHENATION, bValue ) ); diff --git a/sc/source/ui/drawfunc/drtxtob.cxx b/sc/source/ui/drawfunc/drtxtob.cxx index 9403a4f4a907..e34680efd1d4 100644 --- a/sc/source/ui/drawfunc/drtxtob.cxx +++ b/sc/source/ui/drawfunc/drtxtob.cxx @@ -442,7 +442,7 @@ void ScDrawTextObjectBar::GetState( SfxItemSet& rSet ) SdrView* pView = pViewData->GetScDrawView(); SfxItemSet aAttrs( pView->GetModel()->GetItemPool() ); pView->GetAttributes( aAttrs ); - if( aAttrs.GetItemState( EE_PARA_HYPHENATE ) >= SFX_ITEM_AVAILABLE ) + if( aAttrs.GetItemState( EE_PARA_HYPHENATE ) >= SFX_ITEM_DEFAULT ) { bool bValue = ( (const SfxBoolItem&) aAttrs.Get( EE_PARA_HYPHENATE ) ).GetValue(); rSet.Put( SfxBoolItem( SID_ENABLE_HYPHENATION, bValue ) ); diff --git a/sc/source/ui/optdlg/tpview.cxx b/sc/source/ui/optdlg/tpview.cxx index 3293770cc079..2e42029b6234 100644 --- a/sc/source/ui/optdlg/tpview.cxx +++ b/sc/source/ui/optdlg/tpview.cxx @@ -525,7 +525,7 @@ bool ScTpLayoutOptions::FillItemSet( SfxItemSet* rCoreSet ) void ScTpLayoutOptions::Reset( const SfxItemSet* rCoreSet ) { m_pUnitLB->SetNoSelection(); - if ( rCoreSet->GetItemState( SID_ATTR_METRIC ) >= SFX_ITEM_AVAILABLE ) + if ( rCoreSet->GetItemState( SID_ATTR_METRIC ) >= SFX_ITEM_DEFAULT ) { const SfxUInt16Item& rItem = (SfxUInt16Item&)rCoreSet->Get( SID_ATTR_METRIC ); FieldUnit eFieldUnit = (FieldUnit)rItem.GetValue(); diff --git a/sc/source/ui/pagedlg/tptable.cxx b/sc/source/ui/pagedlg/tptable.cxx index fa74838e152c..71dd44e3182c 100644 --- a/sc/source/ui/pagedlg/tptable.cxx +++ b/sc/source/ui/pagedlg/tptable.cxx @@ -164,7 +164,7 @@ void ScTablePage::Reset( const SfxItemSet* rCoreSet ) // scaling: nWhich = GetWhich(SID_SCATTR_PAGE_SCALE); - if ( rCoreSet->GetItemState( nWhich, true ) >= SFX_ITEM_AVAILABLE ) + if ( rCoreSet->GetItemState( nWhich, true ) >= SFX_ITEM_DEFAULT ) { sal_uInt16 nScale = ((const SfxUInt16Item&)rCoreSet->Get(nWhich)).GetValue(); if( nScale > 0 ) @@ -173,7 +173,7 @@ void ScTablePage::Reset( const SfxItemSet* rCoreSet ) } nWhich = GetWhich(SID_SCATTR_PAGE_SCALETO); - if ( rCoreSet->GetItemState( nWhich, true ) >= SFX_ITEM_AVAILABLE ) + if ( rCoreSet->GetItemState( nWhich, true ) >= SFX_ITEM_DEFAULT ) { const ScPageScaleToItem& rItem = static_cast< const ScPageScaleToItem& >( rCoreSet->Get( nWhich ) ); sal_uInt16 nWidth = rItem.GetWidth(); @@ -189,7 +189,7 @@ void ScTablePage::Reset( const SfxItemSet* rCoreSet ) } nWhich = GetWhich(SID_SCATTR_PAGE_SCALETOPAGES); - if ( rCoreSet->GetItemState( nWhich, true ) >= SFX_ITEM_AVAILABLE ) + if ( rCoreSet->GetItemState( nWhich, true ) >= SFX_ITEM_DEFAULT ) { sal_uInt16 nPages = ((const SfxUInt16Item&)rCoreSet->Get(nWhich)).GetValue(); if( nPages > 0 ) diff --git a/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx b/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx index 649fdf4a5e08..462a69c7ea00 100644 --- a/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx +++ b/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx @@ -311,7 +311,7 @@ void AlignmentPropertyPanel::NotifyItemUpdate( } break; case SID_ATTR_ALIGN_DEGREES: - if (eState >= SFX_ITEM_AVAILABLE) + if (eState >= SFX_ITEM_DEFAULT) { long nTmp = ((const SfxInt32Item*)pState)->GetValue(); mpMtrAngle->SetValue( nTmp / 100); //wj @@ -350,7 +350,7 @@ void AlignmentPropertyPanel::NotifyItemUpdate( } break; case SID_ATTR_ALIGN_STACKED: - if (eState >= SFX_ITEM_AVAILABLE) + if (eState >= SFX_ITEM_DEFAULT) { mpCbStacked->EnableTriState(false); const SfxBoolItem* aStackItem = (const SfxBoolItem*)pState; diff --git a/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx b/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx index 3a162f9434de..51bc433e63ff 100644 --- a/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx +++ b/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx @@ -216,7 +216,7 @@ void NumberFormatPropertyPanel::NotifyItemUpdate( { case SID_NUMBER_TYPE_FORMAT: { - if( eState >= SFX_ITEM_AVAILABLE) + if( eState >= SFX_ITEM_DEFAULT) { const SfxInt16Item* pItem = (const SfxInt16Item*)pState; sal_uInt16 nVal = pItem->GetValue(); @@ -254,7 +254,7 @@ void NumberFormatPropertyPanel::NotifyItemUpdate( bool bNegRed = false; sal_uInt16 nPrecision = 0; sal_uInt16 nLeadZeroes = 0; - if( eState >= SFX_ITEM_AVAILABLE) + if( eState >= SFX_ITEM_DEFAULT) { const SfxStringItem* pItem = (const SfxStringItem*)pState; OUString aCode = pItem->GetValue(); diff --git a/sc/source/ui/view/formatsh.cxx b/sc/source/ui/view/formatsh.cxx index 2bdb132ad6cb..cb376c5c0271 100644 --- a/sc/source/ui/view/formatsh.cxx +++ b/sc/source/ui/view/formatsh.cxx @@ -2456,7 +2456,7 @@ void ScFormatShell::GetNumFormatState( SfxItemSet& rSet ) { sal_Int16 aFormatCode = -1; const SfxItemSet& rAttrSet = pTabViewShell->GetSelectionPattern()->GetItemSet(); - if ( rAttrSet.GetItemState( ATTR_VALUE_FORMAT ) >= SFX_ITEM_AVAILABLE ) //Modify for more robust + if ( rAttrSet.GetItemState( ATTR_VALUE_FORMAT ) >= SFX_ITEM_DEFAULT ) //Modify for more robust { SvNumberFormatter* pFormatter = pDoc->GetFormatTable(); sal_uInt32 nNumberFormat = pTabViewShell->GetSelectionPattern()->GetNumberFormat( pFormatter ); |