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 /svx/source/dialog | |
parent | ce65d21ddb0f77846ecf3f3800ca0f361a9e5dbd (diff) |
Replace uses of old SFX_ITEM_AVAILABLE alias with SFX_ITEM_DEFAULT
Change-Id: I88eeac06413fc3935cbbdb357ff8bf9acaa383a8
Diffstat (limited to 'svx/source/dialog')
-rw-r--r-- | svx/source/dialog/grfflt.cxx | 24 | ||||
-rw-r--r-- | svx/source/dialog/hdft.cxx | 4 | ||||
-rw-r--r-- | svx/source/dialog/rlrcitem.cxx | 2 | ||||
-rw-r--r-- | svx/source/dialog/rubydialog.cxx | 2 | ||||
-rw-r--r-- | svx/source/dialog/srchctrl.cxx | 2 |
5 files changed, 17 insertions, 17 deletions
diff --git a/svx/source/dialog/grfflt.cxx b/svx/source/dialog/grfflt.cxx index 4890faacd06f..d7f167c6bdb6 100644 --- a/svx/source/dialog/grfflt.cxx +++ b/svx/source/dialog/grfflt.cxx @@ -279,40 +279,40 @@ sal_uIntPtr SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObj void SvxGraphicFilter::DisableGraphicFilterSlots( SfxItemSet& rSet ) { - if( SFX_ITEM_AVAILABLE <= rSet.GetItemState( SID_GRFFILTER ) ) + if( SFX_ITEM_DEFAULT <= rSet.GetItemState( SID_GRFFILTER ) ) rSet.DisableItem( SID_GRFFILTER ); - if( SFX_ITEM_AVAILABLE <= rSet.GetItemState( SID_GRFFILTER_INVERT ) ) + if( SFX_ITEM_DEFAULT <= rSet.GetItemState( SID_GRFFILTER_INVERT ) ) rSet.DisableItem( SID_GRFFILTER_INVERT ); - if( SFX_ITEM_AVAILABLE <= rSet.GetItemState( SID_GRFFILTER_SMOOTH ) ) + if( SFX_ITEM_DEFAULT <= rSet.GetItemState( SID_GRFFILTER_SMOOTH ) ) rSet.DisableItem( SID_GRFFILTER_SMOOTH ); - if( SFX_ITEM_AVAILABLE <= rSet.GetItemState( SID_GRFFILTER_SHARPEN ) ) + if( SFX_ITEM_DEFAULT <= rSet.GetItemState( SID_GRFFILTER_SHARPEN ) ) rSet.DisableItem( SID_GRFFILTER_SHARPEN ); - if( SFX_ITEM_AVAILABLE <= rSet.GetItemState( SID_GRFFILTER_REMOVENOISE ) ) + if( SFX_ITEM_DEFAULT <= rSet.GetItemState( SID_GRFFILTER_REMOVENOISE ) ) rSet.DisableItem( SID_GRFFILTER_REMOVENOISE ); - if( SFX_ITEM_AVAILABLE <= rSet.GetItemState( SID_GRFFILTER_SOBEL ) ) + if( SFX_ITEM_DEFAULT <= rSet.GetItemState( SID_GRFFILTER_SOBEL ) ) rSet.DisableItem( SID_GRFFILTER_SOBEL ); - if( SFX_ITEM_AVAILABLE <= rSet.GetItemState( SID_GRFFILTER_MOSAIC ) ) + if( SFX_ITEM_DEFAULT <= rSet.GetItemState( SID_GRFFILTER_MOSAIC ) ) rSet.DisableItem( SID_GRFFILTER_MOSAIC ); - if( SFX_ITEM_AVAILABLE <= rSet.GetItemState( SID_GRFFILTER_EMBOSS ) ) + if( SFX_ITEM_DEFAULT <= rSet.GetItemState( SID_GRFFILTER_EMBOSS ) ) rSet.DisableItem( SID_GRFFILTER_EMBOSS ); - if( SFX_ITEM_AVAILABLE <= rSet.GetItemState( SID_GRFFILTER_POSTER ) ) + if( SFX_ITEM_DEFAULT <= rSet.GetItemState( SID_GRFFILTER_POSTER ) ) rSet.DisableItem( SID_GRFFILTER_POSTER ); - if( SFX_ITEM_AVAILABLE <= rSet.GetItemState( SID_GRFFILTER_POPART ) ) + if( SFX_ITEM_DEFAULT <= rSet.GetItemState( SID_GRFFILTER_POPART ) ) rSet.DisableItem( SID_GRFFILTER_POPART ); - if( SFX_ITEM_AVAILABLE <= rSet.GetItemState( SID_GRFFILTER_SEPIA ) ) + if( SFX_ITEM_DEFAULT <= rSet.GetItemState( SID_GRFFILTER_SEPIA ) ) rSet.DisableItem( SID_GRFFILTER_SEPIA ); - if( SFX_ITEM_AVAILABLE <= rSet.GetItemState( SID_GRFFILTER_SOLARIZE ) ) + if( SFX_ITEM_DEFAULT <= rSet.GetItemState( SID_GRFFILTER_SOLARIZE ) ) rSet.DisableItem( SID_GRFFILTER_SOLARIZE ); }; diff --git a/svx/source/dialog/hdft.cxx b/svx/source/dialog/hdft.cxx index 616ff403b266..3b9c05d887e2 100644 --- a/svx/source/dialog/hdft.cxx +++ b/svx/source/dialog/hdft.cxx @@ -872,7 +872,7 @@ void SvxHFPage::ResetBackground_Impl( const SfxItemSet& rSet ) { nWhich = GetWhich(SID_ATTR_BRUSH); - if(rSet.GetItemState(nWhich) >= SFX_ITEM_AVAILABLE) + if(rSet.GetItemState(nWhich) >= SFX_ITEM_DEFAULT) { //UUUU create FillAttributes from SvxBrushItem const SvxBrushItem& rItem = static_cast< const SvxBrushItem& >(rSet.Get(nWhich)); @@ -886,7 +886,7 @@ void SvxHFPage::ResetBackground_Impl( const SfxItemSet& rSet ) m_pBspWin->setPageFillAttributes(aPageFillAttributes); nWhich = GetWhich(SID_ATTR_BORDER_OUTER); - if(rSet.GetItemState(nWhich) >= SFX_ITEM_AVAILABLE) + if(rSet.GetItemState(nWhich) >= SFX_ITEM_DEFAULT) { const SvxBoxItem& rItem = static_cast< const SvxBoxItem& >(rSet.Get(nWhich)); m_pBspWin->SetBorder(rItem); diff --git a/svx/source/dialog/rlrcitem.cxx b/svx/source/dialog/rlrcitem.cxx index e02fdb9cac8f..4133eaea288b 100644 --- a/svx/source/dialog/rlrcitem.cxx +++ b/svx/source/dialog/rlrcitem.cxx @@ -47,7 +47,7 @@ void SvxRulerItem::StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState) { // SFX_ITEM_DONTCARE => pState == -1 => PTR_CAST buff - if ( eState != SFX_ITEM_AVAILABLE ) + if ( eState != SFX_ITEM_DEFAULT ) pState = 0; switch(nSID) diff --git a/svx/source/dialog/rubydialog.cxx b/svx/source/dialog/rubydialog.cxx index 5e71d5015d90..804b11ee74fa 100644 --- a/svx/source/dialog/rubydialog.cxx +++ b/svx/source/dialog/rubydialog.cxx @@ -291,7 +291,7 @@ void SvxRubyDialog::Activate() SfxModelessDialog::Activate(); SfxPoolItem* pState = 0; SfxItemState eState = pBindings->QueryState( SID_STYLE_DESIGNER, pState ); - bool bEnable = (eState < SFX_ITEM_AVAILABLE) || !pState || !((SfxBoolItem*)pState)->GetValue(); + bool bEnable = (eState < SFX_ITEM_DEFAULT) || !pState || !((SfxBoolItem*)pState)->GetValue(); delete pState; m_pStylistPB->Enable(bEnable); //get selection from current view frame diff --git a/svx/source/dialog/srchctrl.cxx b/svx/source/dialog/srchctrl.cxx index 46c6a9baa37c..8b11d6d5ed82 100644 --- a/svx/source/dialog/srchctrl.cxx +++ b/svx/source/dialog/srchctrl.cxx @@ -43,7 +43,7 @@ SvxSearchController::SvxSearchController void SvxSearchController::StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) { - if ( SFX_ITEM_AVAILABLE == eState ) + if ( SFX_ITEM_DEFAULT == eState ) { if ( SID_STYLE_FAMILY1 <= nSID && nSID <= SID_STYLE_FAMILY4 ) { |