summaryrefslogtreecommitdiff
path: root/sw/source
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-09-10 15:17:49 +0200
committerStephan Bergmann <sbergman@redhat.com>2014-09-10 16:37:20 +0200
commitce65d21ddb0f77846ecf3f3800ca0f361a9e5dbd (patch)
treea0ea059db9246cba3a5a1ad226b813ef03f81d39 /sw/source
parenta8d59b7f3e361538ad5409b9faa6c6ebca60ff59 (diff)
Replace uses of old SFX_ITEM_ON alias with SFX_ITEM_SET
Change-Id: I64be7ca711dcd3ea7c4d5840a30f2f701d055e1b
Diffstat (limited to 'sw/source')
-rw-r--r--sw/source/filter/ww8/wrtw8esh.cxx4
-rw-r--r--sw/source/filter/ww8/wrtw8nds.cxx4
-rw-r--r--sw/source/filter/ww8/wrtw8sty.cxx2
-rw-r--r--sw/source/filter/ww8/wrtww8.cxx4
-rw-r--r--sw/source/filter/ww8/wrtww8gr.cxx4
-rw-r--r--sw/source/uibase/shells/annotsh.cxx2
-rw-r--r--sw/source/uibase/shells/drwtxtex.cxx2
7 files changed, 11 insertions, 11 deletions
diff --git a/sw/source/filter/ww8/wrtw8esh.cxx b/sw/source/filter/ww8/wrtw8esh.cxx
index d9f5d6ce17a1..ad8cd7af6c36 100644
--- a/sw/source/filter/ww8/wrtw8esh.cxx
+++ b/sw/source/filter/ww8/wrtw8esh.cxx
@@ -1981,13 +1981,13 @@ sal_Int32 SwBasicEscherEx::WriteFlyFrameAttr(const SwFrmFmt& rFmt,
rPropOpt.AddOpt( ESCHER_Prop_dxTextRight, 0 );
}
const SwAttrSet& rAttrSet = rFmt.GetAttrSet();
- if (SFX_ITEM_ON == rAttrSet.GetItemState(RES_BOX, false, &pItem))
+ if (SFX_ITEM_SET == rAttrSet.GetItemState(RES_BOX, false, &pItem))
{
const SvxBoxItem* pBox = (const SvxBoxItem*)pItem;
if( pBox )
{
const SfxPoolItem* pShadItem;
- if (SFX_ITEM_ON
+ if (SFX_ITEM_SET
== rAttrSet.GetItemState(RES_SHADOW, true, &pShadItem))
{
const SvxShadowItem* pSI = (const SvxShadowItem*)pShadItem;
diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx
index b7da8b6cf1a5..8889d0f04401 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -2740,7 +2740,7 @@ bool MSWordExportBase::NoPageBreakSection( const SfxItemSet* pSet )
if( pSet)
{
bool bNoPageBreak = false;
- if ( SFX_ITEM_ON != pSet->GetItemState(RES_PAGEDESC, true, &pI)
+ if ( SFX_ITEM_SET != pSet->GetItemState(RES_PAGEDESC, true, &pI)
|| 0 == ((SwFmtPageDesc*)pI)->GetPageDesc() )
{
bNoPageBreak = true;
@@ -2748,7 +2748,7 @@ bool MSWordExportBase::NoPageBreakSection( const SfxItemSet* pSet )
if (bNoPageBreak)
{
- if (SFX_ITEM_ON != pSet->GetItemState(RES_BREAK, true, &pI))
+ if (SFX_ITEM_SET != pSet->GetItemState(RES_BREAK, true, &pI))
bNoPageBreak = true;
else
{
diff --git a/sw/source/filter/ww8/wrtw8sty.cxx b/sw/source/filter/ww8/wrtw8sty.cxx
index ff70ccbfb5e5..307463885aea 100644
--- a/sw/source/filter/ww8/wrtw8sty.cxx
+++ b/sw/source/filter/ww8/wrtw8sty.cxx
@@ -1071,7 +1071,7 @@ MSWordSections::MSWordSections( MSWordExportBase& rExport )
// Hole evtl. Pagedesc des 1. Nodes
if ( pSet &&
- SFX_ITEM_ON == pSet->GetItemState( RES_PAGEDESC, true, &pI ) &&
+ SFX_ITEM_SET == pSet->GetItemState( RES_PAGEDESC, true, &pI ) &&
( (SwFmtPageDesc*)pI )->GetPageDesc() )
{
AppendSection( *(SwFmtPageDesc*)pI, *pNd, pFmt, nRstLnNum );
diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index 2f720f4af174..65ba9570e32b 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -2473,7 +2473,7 @@ void WW8AttributeOutput::TableBackgrounds( ww8::WW8TableNodeInfoInner::Pointer_t
const SfxPoolItem * pI = NULL;
Color aColor;
- if ( SFX_ITEM_ON == pFrmFmt->GetAttrSet().GetItemState( RES_BACKGROUND, false, &pI ) )
+ if ( SFX_ITEM_SET == pFrmFmt->GetAttrSet().GetItemState( RES_BACKGROUND, false, &pI ) )
{
aColor = dynamic_cast<const SvxBrushItem *>(pI)->GetColor();
}
@@ -2505,7 +2505,7 @@ void WW8AttributeOutput::TableBackgrounds( ww8::WW8TableNodeInfoInner::Pointer_t
const SfxPoolItem * pI = NULL;
Color aColor;
- if ( SFX_ITEM_ON ==
+ if ( SFX_ITEM_SET ==
pFrmFmt->GetAttrSet().
GetItemState( RES_BACKGROUND, false, &pI ) )
{
diff --git a/sw/source/filter/ww8/wrtww8gr.cxx b/sw/source/filter/ww8/wrtww8gr.cxx
index aad94909c506..1baf2e94bde9 100644
--- a/sw/source/filter/ww8/wrtww8gr.cxx
+++ b/sw/source/filter/ww8/wrtww8gr.cxx
@@ -539,7 +539,7 @@ void SwWW8WrGrf::WritePICFHeader(SvStream& rStrm, const sw::Frame &rFly,
// write Crop-Attribut content in Header ( if available )
const SfxPoolItem* pItem;
- if (pAttrSet && (SFX_ITEM_ON
+ if (pAttrSet && (SFX_ITEM_SET
== pAttrSet->GetItemState(RES_GRFATR_CROPGRF, false, &pItem)))
{
const SwCropGrf& rCr = *(SwCropGrf*)pItem;
@@ -560,7 +560,7 @@ void SwWW8WrGrf::WritePICFHeader(SvStream& rStrm, const sw::Frame &rFly,
sal_uInt8* pArr = aArr + 0x2E; // Do borders first
const SwAttrSet& rAttrSet = rFly.GetFrmFmt().GetAttrSet();
- if (SFX_ITEM_ON == rAttrSet.GetItemState(RES_BOX, false, &pItem))
+ if (SFX_ITEM_SET == rAttrSet.GetItemState(RES_BOX, false, &pItem))
{
const SvxBoxItem* pBox = (const SvxBoxItem*)pItem;
if( pBox )
diff --git a/sw/source/uibase/shells/annotsh.cxx b/sw/source/uibase/shells/annotsh.cxx
index c44c9a8b1fc9..a691a2b246cd 100644
--- a/sw/source/uibase/shells/annotsh.cxx
+++ b/sw/source/uibase/shells/annotsh.cxx
@@ -577,7 +577,7 @@ void SwAnnotationShell::Exec( SfxRequest &rReq )
0 );
sal_uInt16 nAdjust = SVX_ADJUST_LEFT;
- if( SFX_ITEM_ON == aEditAttr.GetItemState(EE_PARA_JUST, true, &pPoolItem ) )
+ if( SFX_ITEM_SET == aEditAttr.GetItemState(EE_PARA_JUST, true, &pPoolItem ) )
nAdjust = ( (SvxAdjustItem*)pPoolItem)->GetEnumValue();
if( bLeftToRight )
diff --git a/sw/source/uibase/shells/drwtxtex.cxx b/sw/source/uibase/shells/drwtxtex.cxx
index 6cf3c146e836..a1084394b5c3 100644
--- a/sw/source/uibase/shells/drwtxtex.cxx
+++ b/sw/source/uibase/shells/drwtxtex.cxx
@@ -536,7 +536,7 @@ void SwDrawTextShell::Execute( SfxRequest &rReq )
0 );
sal_uInt16 nAdjust = SVX_ADJUST_LEFT;
- if( SFX_ITEM_ON == aEditAttr.GetItemState(EE_PARA_JUST, true, &pPoolItem ) )
+ if( SFX_ITEM_SET == aEditAttr.GetItemState(EE_PARA_JUST, true, &pPoolItem ) )
nAdjust = ( (SvxAdjustItem*)pPoolItem)->GetEnumValue();
if( bLeftToRight )