summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
Diffstat (limited to 'sw')
-rw-r--r--sw/source/core/unocore/unoobj2.cxx2
-rw-r--r--sw/source/ui/chrdlg/numpara.cxx10
-rw-r--r--sw/source/ui/chrdlg/pardlg.cxx2
-rw-r--r--sw/source/ui/config/optload.cxx2
-rw-r--r--sw/source/ui/config/optpage.cxx4
-rw-r--r--sw/source/ui/dialog/uiregionsw.cxx2
-rw-r--r--sw/source/ui/frmdlg/column.cxx2
-rw-r--r--sw/source/ui/frmdlg/frmpage.cxx2
-rw-r--r--sw/source/ui/misc/pggrid.cxx2
-rw-r--r--sw/source/ui/table/tabledlg.cxx4
-rw-r--r--sw/source/uibase/docvw/romenu.cxx4
-rw-r--r--sw/source/uibase/frmdlg/colex.cxx4
-rw-r--r--sw/source/uibase/misc/glshell.cxx2
-rw-r--r--sw/source/uibase/ribbar/tbxanchr.cxx2
-rw-r--r--sw/source/uibase/ribbar/workctrl.cxx4
-rw-r--r--sw/source/uibase/sidebar/PagePropertyPanel.cxx10
-rw-r--r--sw/source/uibase/sidebar/WrapPropertyPanel.cxx2
-rw-r--r--sw/source/uibase/uiview/view2.cxx2
-rw-r--r--sw/source/uibase/uiview/viewdraw.cxx2
-rw-r--r--sw/source/uibase/uiview/viewtab.cxx4
-rw-r--r--sw/source/uibase/utlui/bookctrl.cxx2
-rw-r--r--sw/source/uibase/utlui/tmplctrl.cxx2
-rw-r--r--sw/source/uibase/utlui/uitool.cxx2
-rw-r--r--sw/source/uibase/utlui/viewlayoutctrl.cxx2
-rw-r--r--sw/source/uibase/utlui/zoomctrl.cxx2
25 files changed, 39 insertions, 39 deletions
diff --git a/sw/source/core/unocore/unoobj2.cxx b/sw/source/core/unocore/unoobj2.cxx
index 765c6cdff09b..e2bad0b9a95b 100644
--- a/sw/source/core/unocore/unoobj2.cxx
+++ b/sw/source/core/unocore/unoobj2.cxx
@@ -330,7 +330,7 @@ void SwUnoCursorHelper::SetCrsrAttr(SwPaM & rPam,
pDoc->getIDocumentContentOperations().InsertItemSet( rPam, rSet, nFlags );
}
- if( rSet.GetItemState( RES_PARATR_OUTLINELEVEL, false ) >= SFX_ITEM_AVAILABLE )
+ if( rSet.GetItemState( RES_PARATR_OUTLINELEVEL, false ) >= SFX_ITEM_DEFAULT )
{
SwTxtNode * pTmpNode = rPam.GetNode().GetTxtNode();
if ( pTmpNode )
diff --git a/sw/source/ui/chrdlg/numpara.cxx b/sw/source/ui/chrdlg/numpara.cxx
index 68b042dfca19..4585686cc3e3 100644
--- a/sw/source/ui/chrdlg/numpara.cxx
+++ b/sw/source/ui/chrdlg/numpara.cxx
@@ -165,7 +165,7 @@ void SwParagraphNumTabPage::Reset( const SfxItemSet* rSet )
SfxItemState eItemState = rSet->GetItemState( GetWhich(SID_ATTR_PARA_OUTLINE_LEVEL) );
sal_Int16 nOutlineLv;
- if( eItemState >= SFX_ITEM_AVAILABLE )
+ if( eItemState >= SFX_ITEM_DEFAULT )
{
nOutlineLv = ((const SfxUInt16Item &)rSet->Get( GetWhich(SID_ATTR_PARA_OUTLINE_LEVEL) )).GetValue();
m_pOutlineLvLB->SelectEntryPos( nOutlineLv ) ;
@@ -178,7 +178,7 @@ void SwParagraphNumTabPage::Reset( const SfxItemSet* rSet )
eItemState = rSet->GetItemState( GetWhich(SID_ATTR_PARA_NUMRULE) );
- if( eItemState >= SFX_ITEM_AVAILABLE )
+ if( eItemState >= SFX_ITEM_DEFAULT )
{
OUString aStyle = ((const SfxStringItem &)rSet->Get( GetWhich(SID_ATTR_PARA_NUMRULE) )).GetValue();
if(aStyle.isEmpty())
@@ -204,7 +204,7 @@ void SwParagraphNumTabPage::Reset( const SfxItemSet* rSet )
m_pNumberStyleLB->SaveValue();
eItemState = rSet->GetItemState( FN_NUMBER_NEWSTART );
- if(eItemState > SFX_ITEM_AVAILABLE )
+ if(eItemState > SFX_ITEM_DEFAULT )
{
bCurNumrule = true;
const SfxBoolItem& rStart = (const SfxBoolItem&)rSet->Get(FN_NUMBER_NEWSTART);
@@ -219,7 +219,7 @@ void SwParagraphNumTabPage::Reset( const SfxItemSet* rSet )
m_pNewStartCB->SaveValue();
eItemState = rSet->GetItemState( FN_NUMBER_NEWSTART_AT);
- if( eItemState > SFX_ITEM_AVAILABLE )
+ if( eItemState > SFX_ITEM_DEFAULT )
{
const sal_uInt16 nNewStart = ((const SfxUInt16Item&)rSet->Get(FN_NUMBER_NEWSTART_AT)).GetValue();
const bool bNotMax = USHRT_MAX != nNewStart;
@@ -233,7 +233,7 @@ void SwParagraphNumTabPage::Reset( const SfxItemSet* rSet )
m_pNewStartNF->SaveValue();
m_pNewStartNumberCB->SaveValue();
StyleHdl_Impl(m_pNumberStyleLB);
- if( SFX_ITEM_AVAILABLE <= rSet->GetItemState(RES_LINENUMBER))
+ if( SFX_ITEM_DEFAULT <= rSet->GetItemState(RES_LINENUMBER))
{
SwFmtLineNumber& rNum = (SwFmtLineNumber&)rSet->Get(RES_LINENUMBER);
sal_uLong nStartValue = rNum.GetStartValue();
diff --git a/sw/source/ui/chrdlg/pardlg.cxx b/sw/source/ui/chrdlg/pardlg.cxx
index 9be12488b524..96f0d295e589 100644
--- a/sw/source/ui/chrdlg/pardlg.cxx
+++ b/sw/source/ui/chrdlg/pardlg.cxx
@@ -112,7 +112,7 @@ SwParaDlg::SwParaDlg(Window *pParent,
RemoveTabPage("labelTP_PARA_ASIAN");
const sal_uInt16 nWhich(rCoreSet.GetPool()->GetWhich(SID_ATTR_LRSPACE));
- bool bLRValid = SFX_ITEM_AVAILABLE <= rCoreSet.GetItemState(nWhich);
+ bool bLRValid = SFX_ITEM_DEFAULT <= rCoreSet.GetItemState(nWhich);
if(bHtmlMode || !bLRValid)
RemoveTabPage("labelTP_TABULATOR");
else
diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx
index fd598f4bf8dd..bb9803872653 100644
--- a/sw/source/ui/config/optload.cxx
+++ b/sw/source/ui/config/optload.cxx
@@ -279,7 +279,7 @@ void SwLoadOptPage::Reset( const SfxItemSet* rSet)
m_pAutoUpdateFields->SaveValue();
m_pAutoUpdateCharts->SaveValue();
m_pMetricLB->SetNoSelection();
- if ( rSet->GetItemState( SID_ATTR_METRIC ) >= SFX_ITEM_AVAILABLE )
+ if ( rSet->GetItemState( SID_ATTR_METRIC ) >= SFX_ITEM_DEFAULT )
{
const SfxUInt16Item& rItem = (SfxUInt16Item&)rSet->Get( SID_ATTR_METRIC );
FieldUnit eFieldUnit = (FieldUnit)rItem.GetValue();
diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx
index 7352a06ea6a7..8e53f3904943 100644
--- a/sw/source/ui/config/optpage.cxx
+++ b/sw/source/ui/config/optpage.cxx
@@ -167,7 +167,7 @@ SfxTabPage* SwContentOptPage::Create( Window* pParent,
static void lcl_SelectMetricLB(ListBox* rMetric, sal_uInt16 nSID, const SfxItemSet& rSet)
{
const SfxPoolItem* pItem;
- if( rSet.GetItemState( nSID, false, &pItem ) >= SFX_ITEM_AVAILABLE )
+ if( rSet.GetItemState( nSID, false, &pItem ) >= SFX_ITEM_DEFAULT )
{
FieldUnit eFieldUnit = (FieldUnit)((SfxUInt16Item*)pItem)->GetValue();
for ( sal_Int32 i = 0; i < rMetric->GetEntryCount(); ++i )
@@ -1187,7 +1187,7 @@ bool SwTableOptionsTabPage::FillItemSet( SfxItemSet* )
void SwTableOptionsTabPage::Reset( const SfxItemSet* rSet)
{
const SwModuleOptions* pModOpt = SW_MOD()->GetModuleConfig();
- if ( rSet->GetItemState( SID_ATTR_METRIC ) >= SFX_ITEM_AVAILABLE )
+ if ( rSet->GetItemState( SID_ATTR_METRIC ) >= SFX_ITEM_DEFAULT )
{
const SfxUInt16Item& rItem = (SfxUInt16Item&)rSet->Get( SID_ATTR_METRIC );
FieldUnit eFieldUnit = (FieldUnit)rItem.GetValue();
diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx
index 14e078f78bfe..9ddfdfe1b572 100644
--- a/sw/source/ui/dialog/uiregionsw.cxx
+++ b/sw/source/ui/dialog/uiregionsw.cxx
@@ -2120,7 +2120,7 @@ void SwSectionIndentTabPage::Reset( const SfxItemSet* rSet)
SetMetric(*m_pAfterMF , aMetric);
SfxItemState eItemState = rSet->GetItemState( RES_LR_SPACE );
- if ( eItemState >= SFX_ITEM_AVAILABLE )
+ if ( eItemState >= SFX_ITEM_DEFAULT )
{
const SvxLRSpaceItem& rSpace =
(const SvxLRSpaceItem&)rSet->Get( RES_LR_SPACE );
diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx
index ce66d33cc966..a05f16b4a88d 100644
--- a/sw/source/ui/frmdlg/column.cxx
+++ b/sw/source/ui/frmdlg/column.cxx
@@ -608,7 +608,7 @@ void SwColumnPage::Reset(const SfxItemSet *rSet)
}
//text direction
- if( SFX_ITEM_AVAILABLE <= rSet->GetItemState( RES_FRAMEDIR ) )
+ if( SFX_ITEM_DEFAULT <= rSet->GetItemState( RES_FRAMEDIR ) )
{
const SvxFrameDirectionItem& rItem = (const SvxFrameDirectionItem&)rSet->Get(RES_FRAMEDIR);
sal_uIntPtr nVal = rItem.GetValue();
diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx
index c866f5218c07..b1c6c5705891 100644
--- a/sw/source/ui/frmdlg/frmpage.cxx
+++ b/sw/source/ui/frmdlg/frmpage.cxx
@@ -3031,7 +3031,7 @@ void SwFrmAddPage::Reset(const SfxItemSet *rSet )
}
// Content alignment
- if ( rSet->GetItemState(RES_TEXT_VERT_ADJUST) > SFX_ITEM_AVAILABLE )
+ if ( rSet->GetItemState(RES_TEXT_VERT_ADJUST) > SFX_ITEM_DEFAULT )
{
SdrTextVertAdjust nAdjust = ((const SdrTextVertAdjustItem&)rSet->Get(RES_TEXT_VERT_ADJUST)).GetValue();
sal_Int32 nPos = 0;
diff --git a/sw/source/ui/misc/pggrid.cxx b/sw/source/ui/misc/pggrid.cxx
index 130a23df89b3..dd656f2da1c7 100644
--- a/sw/source/ui/misc/pggrid.cxx
+++ b/sw/source/ui/misc/pggrid.cxx
@@ -189,7 +189,7 @@ bool SwTextGridPage::FillItemSet(SfxItemSet *rSet)
void SwTextGridPage::Reset(const SfxItemSet *rSet)
{
- if(SFX_ITEM_AVAILABLE <= rSet->GetItemState(RES_TEXTGRID, true))
+ if(SFX_ITEM_DEFAULT <= rSet->GetItemState(RES_TEXTGRID, true))
{
const SwTextGridItem& rGridItem = (const SwTextGridItem&)rSet->Get(RES_TEXTGRID);
RadioButton* pButton = 0;
diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx
index 4a3567105867..68c2b34a54e3 100644
--- a/sw/source/ui/table/tabledlg.cxx
+++ b/sw/source/ui/table/tabledlg.cxx
@@ -1594,13 +1594,13 @@ void SwTextFlowPage::Reset( const SfxItemSet* rSet )
m_pRepeatHeaderNF->SetMin( 1 );
m_pRepeatHeaderNF->SaveValue();
}
- if ( rSet->GetItemState(FN_TABLE_BOX_TEXTORIENTATION) > SFX_ITEM_AVAILABLE )
+ if ( rSet->GetItemState(FN_TABLE_BOX_TEXTORIENTATION) > SFX_ITEM_DEFAULT )
{
sal_uLong nDirection = ((const SvxFrameDirectionItem&)rSet->Get(FN_TABLE_BOX_TEXTORIENTATION)).GetValue();
m_pTextDirectionLB->SelectEntryPos(m_pTextDirectionLB->GetEntryPos( (const void*)nDirection ));
}
- if ( rSet->GetItemState(FN_TABLE_SET_VERT_ALIGN) > SFX_ITEM_AVAILABLE )
+ if ( rSet->GetItemState(FN_TABLE_SET_VERT_ALIGN) > SFX_ITEM_DEFAULT )
{
sal_uInt16 nVert = ((const SfxUInt16Item&)rSet->Get(FN_TABLE_SET_VERT_ALIGN)).GetValue();
sal_uInt16 nPos = 0;
diff --git a/sw/source/uibase/docvw/romenu.cxx b/sw/source/uibase/docvw/romenu.cxx
index 33f1e175a43c..fa3c14755b4b 100644
--- a/sw/source/uibase/docvw/romenu.cxx
+++ b/sw/source/uibase/docvw/romenu.cxx
@@ -61,7 +61,7 @@ void SwReadOnlyPopup::Check( sal_uInt16 nMID, sal_uInt16 nSID, SfxDispatcher &rD
{
SfxPoolItem *_pItem = 0;
SfxItemState eState = rDis.GetBindings()->QueryState( nSID, _pItem );
- if (eState >= SFX_ITEM_AVAILABLE)
+ if (eState >= SFX_ITEM_DEFAULT)
{
EnableItem( nMID, true );
if (_pItem)
@@ -202,7 +202,7 @@ SwReadOnlyPopup::SwReadOnlyPopup( const Point &rDPos, SwView &rV ) :
SfxItemState eState = pVFrame->GetBindings().QueryState( SID_COPY, pState );
Check( MN_READONLY_COPY, SID_COPY, rDis );
- if(eState < SFX_ITEM_AVAILABLE)
+ if(eState < SFX_ITEM_DEFAULT)
EnableItem( MN_READONLY_COPY, false );
delete pState;
pState = NULL;
diff --git a/sw/source/uibase/frmdlg/colex.cxx b/sw/source/uibase/frmdlg/colex.cxx
index b1f04173bf80..c8f0d2004a58 100644
--- a/sw/source/uibase/frmdlg/colex.cxx
+++ b/sw/source/uibase/frmdlg/colex.cxx
@@ -595,9 +595,9 @@ void SwPageGridExample::UpdateExample( const SfxItemSet& rSet )
{
DELETEZ(pGridItem);
//get the grid information
- if(SFX_ITEM_AVAILABLE <= rSet.GetItemState(RES_TEXTGRID, true))
+ if(SFX_ITEM_DEFAULT <= rSet.GetItemState(RES_TEXTGRID, true))
pGridItem = (SwTextGridItem*)((const SwTextGridItem&)rSet.Get(RES_TEXTGRID)).Clone();
- if( SFX_ITEM_AVAILABLE <= rSet.GetItemState( RES_FRAMEDIR, true ))
+ if( SFX_ITEM_DEFAULT <= rSet.GetItemState( RES_FRAMEDIR, true ))
{
const SvxFrameDirectionItem& rDirItem =
(const SvxFrameDirectionItem&)rSet.Get(RES_FRAMEDIR);
diff --git a/sw/source/uibase/misc/glshell.cxx b/sw/source/uibase/misc/glshell.cxx
index adc97e02d0fc..6fa877697c3d 100644
--- a/sw/source/uibase/misc/glshell.cxx
+++ b/sw/source/uibase/misc/glshell.cxx
@@ -92,7 +92,7 @@ static void lcl_Execute( SwDocShell& rSh, SfxRequest& rReq )
static void lcl_GetState( SwDocShell& rSh, SfxItemSet& rSet )
{
- if( SFX_ITEM_AVAILABLE >= rSet.GetItemState( SID_SAVEDOC, false ))
+ if( SFX_ITEM_DEFAULT >= rSet.GetItemState( SID_SAVEDOC, false ))
{
if( !rSh.GetDoc()->getIDocumentState().IsModified() )
rSet.DisableItem( SID_SAVEDOC );
diff --git a/sw/source/uibase/ribbar/tbxanchr.cxx b/sw/source/uibase/ribbar/tbxanchr.cxx
index e90b3ab9905e..d111348b1d97 100644
--- a/sw/source/uibase/ribbar/tbxanchr.cxx
+++ b/sw/source/uibase/ribbar/tbxanchr.cxx
@@ -53,7 +53,7 @@ void SwTbxAnchor::StateChanged( sal_uInt16 /*nSID*/, SfxItemState eState, const
{
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 );
if(pItem)
diff --git a/sw/source/uibase/ribbar/workctrl.cxx b/sw/source/uibase/ribbar/workctrl.cxx
index 48a4a789b352..9fd4c0cb4375 100644
--- a/sw/source/uibase/ribbar/workctrl.cxx
+++ b/sw/source/uibase/ribbar/workctrl.cxx
@@ -95,7 +95,7 @@ void SwTbxInsertCtrl::StateChanged( sal_uInt16 /*nSID*/,
sal_uInt16 nId = GetId();
GetToolBox().EnableItem( nId, (GetItemState(pState) != SFX_ITEM_DISABLED) );
- if( eState == SFX_ITEM_AVAILABLE )
+ if( eState == SFX_ITEM_DEFAULT )
{
const SfxImageItem* pItem = PTR_CAST( SfxImageItem, pState );
if(pItem)
@@ -741,7 +741,7 @@ void SwPreviewZoomControl::StateChanged( sal_uInt16 /*nSID*/,
sal_uInt16 nId = GetId();
GetToolBox().EnableItem( nId, (GetItemState(pState) != SFX_ITEM_DISABLED) );
SwZoomBox_Impl* pBox = (SwZoomBox_Impl*)GetToolBox().GetItemWindow( GetId() );
- if(SFX_ITEM_AVAILABLE <= eState)
+ if(SFX_ITEM_DEFAULT <= eState)
{
OUString sZoom(unicode::formatPercent(((const SfxUInt16Item*)pState)->GetValue(),
Application::GetSettings().GetUILanguageTag()));
diff --git a/sw/source/uibase/sidebar/PagePropertyPanel.cxx b/sw/source/uibase/sidebar/PagePropertyPanel.cxx
index f065af29f433..2db942542b5c 100644
--- a/sw/source/uibase/sidebar/PagePropertyPanel.cxx
+++ b/sw/source/uibase/sidebar/PagePropertyPanel.cxx
@@ -464,7 +464,7 @@ void PagePropertyPanel::NotifyItemUpdate(
{
case SID_ATTR_PAGE_COLUMN:
{
- if ( eState >= SFX_ITEM_AVAILABLE &&
+ if ( eState >= SFX_ITEM_DEFAULT &&
pState && pState->ISA(SfxInt16Item) )
{
mpPageColumnTypeItem.reset( static_cast<SfxInt16Item*>(pState->Clone()) );
@@ -473,7 +473,7 @@ void PagePropertyPanel::NotifyItemUpdate(
}
break;
case SID_ATTR_PAGE_LRSPACE:
- if ( eState >= SFX_ITEM_AVAILABLE &&
+ if ( eState >= SFX_ITEM_DEFAULT &&
pState && pState->ISA(SvxLongLRSpaceItem) )
{
mpPageLRMarginItem.reset( static_cast<SvxLongLRSpaceItem*>(pState->Clone()) );
@@ -482,7 +482,7 @@ void PagePropertyPanel::NotifyItemUpdate(
break;
case SID_ATTR_PAGE_ULSPACE:
- if ( eState >= SFX_ITEM_AVAILABLE &&
+ if ( eState >= SFX_ITEM_DEFAULT &&
pState && pState->ISA(SvxLongULSpaceItem) )
{
mpPageULMarginItem.reset( static_cast<SvxLongULSpaceItem*>(pState->Clone()) );
@@ -491,7 +491,7 @@ void PagePropertyPanel::NotifyItemUpdate(
break;
case SID_ATTR_PAGE:
- if ( eState >= SFX_ITEM_AVAILABLE &&
+ if ( eState >= SFX_ITEM_DEFAULT &&
pState && pState->ISA(SvxPageItem) )
{
const sal_uInt16 nIdOrientation = mpToolBoxOrientation->GetItemId(UNO_ORIENTATION);
@@ -515,7 +515,7 @@ void PagePropertyPanel::NotifyItemUpdate(
{
mpBindings->Invalidate( SID_ATTR_PAGE, true, false );
}
- if ( eState >= SFX_ITEM_AVAILABLE &&
+ if ( eState >= SFX_ITEM_DEFAULT &&
pState && pState->ISA(SvxSizeItem) )
{
mpPageSizeItem.reset( static_cast<SvxSizeItem*>(pState->Clone()) );
diff --git a/sw/source/uibase/sidebar/WrapPropertyPanel.cxx b/sw/source/uibase/sidebar/WrapPropertyPanel.cxx
index 96d8d344b6f0..540042aa9d02 100644
--- a/sw/source/uibase/sidebar/WrapPropertyPanel.cxx
+++ b/sw/source/uibase/sidebar/WrapPropertyPanel.cxx
@@ -185,7 +185,7 @@ void WrapPropertyPanel::NotifyItemUpdate(
{
(void)bIsEnabled;
- if ( eState == SFX_ITEM_AVAILABLE &&
+ if ( eState == SFX_ITEM_DEFAULT &&
pState->ISA(SfxBoolItem) )
{
//Set Radio Button enable
diff --git a/sw/source/uibase/uiview/view2.cxx b/sw/source/uibase/uiview/view2.cxx
index eb908f179b79..6c875c933c31 100644
--- a/sw/source/uibase/uiview/view2.cxx
+++ b/sw/source/uibase/uiview/view2.cxx
@@ -1556,7 +1556,7 @@ void SwView::StateStatusLine(SfxItemSet &rSet)
SfxItemSet aSet(GetPool(),
RES_PARATR_NUMRULE, RES_PARATR_NUMRULE);
rShell.GetCurAttr(aSet);
- if(SFX_ITEM_AVAILABLE <=
+ if(SFX_ITEM_DEFAULT <=
aSet.GetItemState(RES_PARATR_NUMRULE, true))
{
const OUString& rNumStyle =
diff --git a/sw/source/uibase/uiview/viewdraw.cxx b/sw/source/uibase/uiview/viewdraw.cxx
index 81a1c1bc910c..0ec9e5c40c41 100644
--- a/sw/source/uibase/uiview/viewdraw.cxx
+++ b/sw/source/uibase/uiview/viewdraw.cxx
@@ -751,7 +751,7 @@ bool SwView::IsDrawTextHyphenate()
SfxItemSet aNewAttr( pSdrView->GetModel()->GetItemPool(),
EE_PARA_HYPHENATE, EE_PARA_HYPHENATE );
if( pSdrView->GetAttributes( aNewAttr ) &&
- aNewAttr.GetItemState( EE_PARA_HYPHENATE ) >= SFX_ITEM_AVAILABLE )
+ aNewAttr.GetItemState( EE_PARA_HYPHENATE ) >= SFX_ITEM_DEFAULT )
bHyphenate = ((const SfxBoolItem&)aNewAttr.Get( EE_PARA_HYPHENATE )).
GetValue();
diff --git a/sw/source/uibase/uiview/viewtab.cxx b/sw/source/uibase/uiview/viewtab.cxx
index f3da0ba3bd21..88b7238c2a32 100644
--- a/sw/source/uibase/uiview/viewtab.cxx
+++ b/sw/source/uibase/uiview/viewtab.cxx
@@ -1189,7 +1189,7 @@ void SwView::StateTabWin(SfxItemSet& rSet)
( nSelType & nsSelectionType::SEL_GRF ) ||
( nSelType & nsSelectionType::SEL_FRM ) ||
( nSelType & nsSelectionType::SEL_OLE ) ||
- ( SFX_ITEM_AVAILABLE > aCoreSet.GetItemState(RES_LR_SPACE) ) ||
+ ( SFX_ITEM_DEFAULT > aCoreSet.GetItemState(RES_LR_SPACE) ) ||
(!bVerticalWriting && (SID_ATTR_TABSTOP_VERTICAL == nWhich) ) ||
( bVerticalWriting && (RES_PARATR_TABSTOP == nWhich))
)
@@ -1258,7 +1258,7 @@ void SwView::StateTabWin(SfxItemSet& rSet)
aUL.SetWhich(nWhich);
SfxItemState e = aCoreSet.GetItemState(RES_UL_SPACE);
- if( e >= SFX_ITEM_AVAILABLE )
+ if( e >= SFX_ITEM_DEFAULT )
rSet.Put( aUL );
else
rSet.InvalidateItem(nWhich);
diff --git a/sw/source/uibase/utlui/bookctrl.cxx b/sw/source/uibase/utlui/bookctrl.cxx
index 65d8d090bd8a..15db91a8a88d 100644
--- a/sw/source/uibase/utlui/bookctrl.cxx
+++ b/sw/source/uibase/utlui/bookctrl.cxx
@@ -72,7 +72,7 @@ SwBookmarkControl::~SwBookmarkControl()
void SwBookmarkControl::StateChanged(
sal_uInt16 /*nSID*/, SfxItemState eState, const SfxPoolItem* pState )
{
- if( eState != SFX_ITEM_AVAILABLE || pState->ISA( SfxVoidItem ) )
+ if( eState != SFX_ITEM_DEFAULT || pState->ISA( SfxVoidItem ) )
GetStatusBar().SetItemText( GetId(), OUString() );
else if ( pState->ISA( SfxStringItem ) )
{
diff --git a/sw/source/uibase/utlui/tmplctrl.cxx b/sw/source/uibase/utlui/tmplctrl.cxx
index d86eadba4464..1a6574ff4334 100644
--- a/sw/source/uibase/utlui/tmplctrl.cxx
+++ b/sw/source/uibase/utlui/tmplctrl.cxx
@@ -72,7 +72,7 @@ SwTemplateControl::~SwTemplateControl()
void SwTemplateControl::StateChanged(
sal_uInt16 /*nSID*/, SfxItemState eState, const SfxPoolItem* pState )
{
- if( eState != SFX_ITEM_AVAILABLE || pState->ISA( SfxVoidItem ) )
+ if( eState != SFX_ITEM_DEFAULT || pState->ISA( SfxVoidItem ) )
GetStatusBar().SetItemText( GetId(), OUString() );
else if ( pState->ISA( SfxStringItem ) )
{
diff --git a/sw/source/uibase/utlui/uitool.cxx b/sw/source/uibase/utlui/uitool.cxx
index cb44f35e1c08..8299564d46b9 100644
--- a/sw/source/uibase/utlui/uitool.cxx
+++ b/sw/source/uibase/utlui/uitool.cxx
@@ -643,7 +643,7 @@ void SwToSfxPageDescAttr( SfxItemSet& rCoreSet )
}
break;
- case SFX_ITEM_AVAILABLE:
+ case SFX_ITEM_DEFAULT:
break;
default:
diff --git a/sw/source/uibase/utlui/viewlayoutctrl.cxx b/sw/source/uibase/utlui/viewlayoutctrl.cxx
index 633af0550e22..b81fa35dfdf7 100644
--- a/sw/source/uibase/utlui/viewlayoutctrl.cxx
+++ b/sw/source/uibase/utlui/viewlayoutctrl.cxx
@@ -85,7 +85,7 @@ SwViewLayoutControl::~SwViewLayoutControl()
void SwViewLayoutControl::StateChanged( sal_uInt16 /*nSID*/, SfxItemState eState, const SfxPoolItem* pState )
{
- if ( SFX_ITEM_AVAILABLE != eState || pState->ISA( SfxVoidItem ) )
+ if ( SFX_ITEM_DEFAULT != eState || pState->ISA( SfxVoidItem ) )
GetStatusBar().SetItemText( GetId(), OUString() );
else
{
diff --git a/sw/source/uibase/utlui/zoomctrl.cxx b/sw/source/uibase/utlui/zoomctrl.cxx
index ac592474eb80..3c7fbc81cb10 100644
--- a/sw/source/uibase/utlui/zoomctrl.cxx
+++ b/sw/source/uibase/utlui/zoomctrl.cxx
@@ -43,7 +43,7 @@ SwZoomControl::~SwZoomControl()
void SwZoomControl::StateChanged( sal_uInt16 nSID, SfxItemState eState,
const SfxPoolItem* pState )
{
- if(SFX_ITEM_AVAILABLE == eState && pState->ISA( SfxStringItem ))
+ if(SFX_ITEM_DEFAULT == eState && pState->ISA( SfxStringItem ))
{
sPreviewZoom = ((const SfxStringItem*)pState)->GetValue();
GetStatusBar().SetItemText( GetId(), sPreviewZoom );