summaryrefslogtreecommitdiff
path: root/sw/source/ui
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-09-10 15:21:44 +0200
committerStephan Bergmann <sbergman@redhat.com>2014-09-10 16:37:20 +0200
commit39e91c585d55b99a2b73ed2a58312a387763a4bc (patch)
tree8752da8db5cd2a73d7225a9cd9fccfe72f48627d /sw/source/ui
parentce65d21ddb0f77846ecf3f3800ca0f361a9e5dbd (diff)
Replace uses of old SFX_ITEM_AVAILABLE alias with SFX_ITEM_DEFAULT
Change-Id: I88eeac06413fc3935cbbdb357ff8bf9acaa383a8
Diffstat (limited to 'sw/source/ui')
-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
9 files changed, 15 insertions, 15 deletions
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;