Replace uses of old SFX_ITEM_ON alias with SFX_ITEM_SET

Change-Id: I64be7ca711dcd3ea7c4d5840a30f2f701d055e1b

11 files changed, 26 insertions, 26 deletions

diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx
index d4df5db2c469..0dc8bd793350 100644
--- a/sd/source/filter/html/htmlex.cxx
+++ b/sd/source/filter/html/htmlex.cxx
@@ -833,7 +833,7 @@ void HtmlExport::SetDocColors( SdPage* pPage )
     if(pSheet)
     {
         SfxItemSet& rSet = pSheet->GetItemSet();
-        if(rSet.GetItemState(EE_CHAR_COLOR,true) == SFX_ITEM_ON)
+        if(rSet.GetItemState(EE_CHAR_COLOR,true) == SFX_ITEM_SET)
             maTextColor = ((SvxColorItem*)rSet.GetItem(EE_CHAR_COLOR,true))->GetValue();
     }
 
@@ -1462,7 +1462,7 @@ OUString HtmlExport::TextAttribToHTMLString( SfxItemSet* pSet, HtmlState* pState
         return OUString();
 
     OUString aLink, aTarget;
-    if ( pSet->GetItemState( EE_FEATURE_FIELD ) == SFX_ITEM_ON )
+    if ( pSet->GetItemState( EE_FEATURE_FIELD ) == SFX_ITEM_SET )
     {
         SvxFieldItem* pItem = (SvxFieldItem*)pSet->GetItem( EE_FEATURE_FIELD );
         if(pItem)
@@ -1479,7 +1479,7 @@ OUString HtmlExport::TextAttribToHTMLString( SfxItemSet* pSet, HtmlState* pState
     bool bTemp;
     OUString aTemp;
 
-    if ( pSet->GetItemState( EE_CHAR_WEIGHT ) == SFX_ITEM_ON )
+    if ( pSet->GetItemState( EE_CHAR_WEIGHT ) == SFX_ITEM_SET )
     {
         bTemp = ((const SvxWeightItem&)pSet->Get( EE_CHAR_WEIGHT )).GetWeight() == WEIGHT_BOLD;
         aTemp = pState->SetWeight( bTemp );
@@ -1489,7 +1489,7 @@ OUString HtmlExport::TextAttribToHTMLString( SfxItemSet* pSet, HtmlState* pState
             aStr.append(aTemp);
     }
 
-    if ( pSet->GetItemState( EE_CHAR_UNDERLINE ) == SFX_ITEM_ON )
+    if ( pSet->GetItemState( EE_CHAR_UNDERLINE ) == SFX_ITEM_SET )
     {
         bTemp = ((const SvxUnderlineItem&)pSet->Get( EE_CHAR_UNDERLINE )).GetLineStyle() != UNDERLINE_NONE;
         aTemp = pState->SetUnderline( bTemp );
@@ -1499,7 +1499,7 @@ OUString HtmlExport::TextAttribToHTMLString( SfxItemSet* pSet, HtmlState* pState
             aStr.append(aTemp);
     }
 
-    if ( pSet->GetItemState( EE_CHAR_STRIKEOUT ) == SFX_ITEM_ON )
+    if ( pSet->GetItemState( EE_CHAR_STRIKEOUT ) == SFX_ITEM_SET )
     {
         bTemp = ((const SvxCrossedOutItem&)pSet->Get( EE_CHAR_STRIKEOUT )).GetStrikeout() != STRIKEOUT_NONE;
         aTemp = pState->SetStrikeout( bTemp );
@@ -1509,7 +1509,7 @@ OUString HtmlExport::TextAttribToHTMLString( SfxItemSet* pSet, HtmlState* pState
             aStr.append(aTemp);
     }
 
-    if ( pSet->GetItemState( EE_CHAR_ITALIC ) == SFX_ITEM_ON )
+    if ( pSet->GetItemState( EE_CHAR_ITALIC ) == SFX_ITEM_SET )
     {
         bTemp = ((const SvxPostureItem&)pSet->Get( EE_CHAR_ITALIC )).GetPosture() != ITALIC_NONE;
         aTemp = pState->SetItalic( bTemp );
@@ -1521,7 +1521,7 @@ OUString HtmlExport::TextAttribToHTMLString( SfxItemSet* pSet, HtmlState* pState
 
     if(mbDocColors)
     {
-        if ( pSet->GetItemState( EE_CHAR_COLOR ) == SFX_ITEM_ON )
+        if ( pSet->GetItemState( EE_CHAR_COLOR ) == SFX_ITEM_SET )
         {
             Color aTextColor = ((const SvxColorItem&) pSet->Get( EE_CHAR_COLOR )).GetValue();
             if( aTextColor == COL_AUTO )
diff --git a/sd/source/ui/annotations/annotationmanager.cxx b/sd/source/ui/annotations/annotationmanager.cxx
index 613c2da963fa..71e99321b3af 100644
--- a/sd/source/ui/annotations/annotationmanager.cxx
+++ b/sd/source/ui/annotations/annotationmanager.cxx
@@ -947,25 +947,25 @@ void AnnotationManagerImpl::ExecuteAnnotationContextMenu( Reference< XAnnotation
         {
             SfxItemSet aSet(pAnnotationWindow->getView()->GetAttribs());
 
-            if ( aSet.GetItemState( EE_CHAR_WEIGHT ) == SFX_ITEM_ON )
+            if ( aSet.GetItemState( EE_CHAR_WEIGHT ) == SFX_ITEM_SET )
             {
                 if( ((const SvxWeightItem&)aSet.Get( EE_CHAR_WEIGHT )).GetWeight() == WEIGHT_BOLD )
                     pMenu->CheckItem( SID_ATTR_CHAR_WEIGHT );
             }
 
-            if ( aSet.GetItemState( EE_CHAR_ITALIC ) == SFX_ITEM_ON )
+            if ( aSet.GetItemState( EE_CHAR_ITALIC ) == SFX_ITEM_SET )
             {
                 if( ((const SvxPostureItem&)aSet.Get( EE_CHAR_ITALIC )).GetPosture() != ITALIC_NONE )
                     pMenu->CheckItem( SID_ATTR_CHAR_POSTURE );
 
             }
-            if ( aSet.GetItemState( EE_CHAR_UNDERLINE ) == SFX_ITEM_ON )
+            if ( aSet.GetItemState( EE_CHAR_UNDERLINE ) == SFX_ITEM_SET )
             {
                 if( ((const SvxUnderlineItem&)aSet.Get( EE_CHAR_UNDERLINE )).GetLineStyle() != UNDERLINE_NONE )
                     pMenu->CheckItem( SID_ATTR_CHAR_UNDERLINE );
             }
 
-            if ( aSet.GetItemState( EE_CHAR_STRIKEOUT ) == SFX_ITEM_ON )
+            if ( aSet.GetItemState( EE_CHAR_STRIKEOUT ) == SFX_ITEM_SET )
             {
                 if( ((const SvxCrossedOutItem&)aSet.Get( EE_CHAR_STRIKEOUT )).GetStrikeout() != STRIKEOUT_NONE )
                     pMenu->CheckItem( SID_ATTR_CHAR_STRIKEOUT );
diff --git a/sd/source/ui/dlg/dlgolbul.cxx b/sd/source/ui/dlg/dlgolbul.cxx
index 2c7fe94e93f9..0bbcc57a574c 100644
--- a/sd/source/ui/dlg/dlgolbul.cxx
+++ b/sd/source/ui/dlg/dlgolbul.cxx
@@ -109,7 +109,7 @@ OutlineBulletDlg::OutlineBulletDlg(
         aInputSet.Put(*pItem, EE_PARA_NUMBULLET);
     }
 
-    if(bTitle && aInputSet.GetItemState(EE_PARA_NUMBULLET,true) == SFX_ITEM_ON )
+    if(bTitle && aInputSet.GetItemState(EE_PARA_NUMBULLET,true) == SFX_ITEM_SET )
     {
         SvxNumBulletItem* pItem = (SvxNumBulletItem*)aInputSet.GetItem(EE_PARA_NUMBULLET,true);
         SvxNumRule* pRule = pItem->GetNumRule();
@@ -178,7 +178,7 @@ const SfxItemSet* OutlineBulletDlg::GetOutputItemSet() const
 // #i35937 - removed EE_PARA_BULLETSTATE setting
     }
 
-    if(bTitle && pOutputSet->GetItemState(EE_PARA_NUMBULLET,true) == SFX_ITEM_ON )
+    if(bTitle && pOutputSet->GetItemState(EE_PARA_NUMBULLET,true) == SFX_ITEM_SET )
     {
         SvxNumBulletItem* pBulletItem = (SvxNumBulletItem*)pOutputSet->GetItem(EE_PARA_NUMBULLET,true);
         SvxNumRule* pRule = pBulletItem->GetNumRule();
diff --git a/sd/source/ui/func/fuolbull.cxx b/sd/source/ui/func/fuolbull.cxx
index 790ac72413a5..2bc9809f53ae 100644
--- a/sd/source/ui/func/fuolbull.cxx
+++ b/sd/source/ui/func/fuolbull.cxx
@@ -356,7 +356,7 @@ const SfxPoolItem* FuOutlineBullet::GetNumBulletItem(SfxItemSet& aNewAttr, sal_u
 
             aNewAttr.Put(*pItem, EE_PARA_NUMBULLET);
 
-            if(bTitle && aNewAttr.GetItemState(EE_PARA_NUMBULLET,true) == SFX_ITEM_ON )
+            if(bTitle && aNewAttr.GetItemState(EE_PARA_NUMBULLET,true) == SFX_ITEM_SET )
             {
                 SvxNumBulletItem* pBulletItem = (SvxNumBulletItem*)aNewAttr.GetItem(EE_PARA_NUMBULLET,true);
                 SvxNumRule* pLclRule = pBulletItem->GetNumRule();
diff --git a/sd/source/ui/func/futempl.cxx b/sd/source/ui/func/futempl.cxx
index e352bd29978f..4c730bfd7671 100644
--- a/sd/source/ui/func/futempl.cxx
+++ b/sd/source/ui/func/futempl.cxx
@@ -171,7 +171,7 @@ void FuTemplate::DoExecute( SfxRequest& rReq )
             }
             pStyleSheet = &pSSPool->Make( aStyleName, (SfxStyleFamily) nFamily, SFXSTYLEBIT_USERDEF );
 
-            if (pArgs && pArgs->GetItemState(SID_STYLE_REFERENCE) == SFX_ITEM_ON)
+            if (pArgs && pArgs->GetItemState(SID_STYLE_REFERENCE) == SFX_ITEM_SET)
             {
                 OUString aParentName(((const SfxStringItem&) pArgs->Get(SID_STYLE_REFERENCE)).GetValue());
                 pStyleSheet->SetParent(aParentName);
diff --git a/sd/source/ui/view/drawview.cxx b/sd/source/ui/view/drawview.cxx
index 780f6eb701d1..3c4ea2923d19 100644
--- a/sd/source/ui/view/drawview.cxx
+++ b/sd/source/ui/view/drawview.cxx
@@ -207,7 +207,7 @@ bool DrawView::SetAttributes(const SfxItemSet& rSet,
                             aTempSet.Put( rSet );
                             aTempSet.ClearInvalidItems();
 
-                            if( nDepth > 0 && aTempSet.GetItemState( EE_PARA_NUMBULLET ) == SFX_ITEM_ON )
+                            if( nDepth > 0 && aTempSet.GetItemState( EE_PARA_NUMBULLET ) == SFX_ITEM_SET )
                             {
                                 // no SvxNumBulletItem in outline level 1 to 8!
                                 aTempSet.ClearItem( EE_PARA_NUMBULLET );
@@ -237,7 +237,7 @@ bool DrawView::SetAttributes(const SfxItemSet& rSet,
                         pPara = iter != aSelList.rend() ? *iter : NULL;
 
                         bool bJumpToLevel1 = false;
-                        if( !pPara && nDepth > 0 && rSet.GetItemState( EE_PARA_NUMBULLET ) == SFX_ITEM_ON )
+                        if( !pPara && nDepth > 0 && rSet.GetItemState( EE_PARA_NUMBULLET ) == SFX_ITEM_SET )
                             bJumpToLevel1 = true;
 
                         if (bJumpToLevel1)
@@ -318,7 +318,7 @@ bool DrawView::SetAttributes(const SfxItemSet& rSet,
                                 sal_uInt16 nWhich(aWhichIter.FirstWhich());
                                 while( nWhich )
                                 {
-                                    if( SFX_ITEM_ON == rSet.GetItemState( nWhich ) )
+                                    if( SFX_ITEM_SET == rSet.GetItemState( nWhich ) )
                                         aTempSet.ClearItem( nWhich );
                                     nWhich = aWhichIter.NextWhich();
                                 }
@@ -345,7 +345,7 @@ bool DrawView::SetAttributes(const SfxItemSet& rSet,
                         sal_uInt16 nWhich(aWhichIter.FirstWhich());
                         while( nWhich )
                         {
-                            if( SFX_ITEM_ON == rSet.GetItemState( nWhich ) )
+                            if( SFX_ITEM_SET == rSet.GetItemState( nWhich ) )
                                 pObject->ClearMergedItem( nWhich );
                             nWhich = aWhichIter.NextWhich();
                         }
diff --git a/sd/source/ui/view/drtxtob1.cxx b/sd/source/ui/view/drtxtob1.cxx
index 51cb6e5ddaed..8b5b396ee1d1 100644
--- a/sd/source/ui/view/drtxtob1.cxx
+++ b/sd/source/ui/view/drtxtob1.cxx
@@ -592,7 +592,7 @@ void TextObjectBar::Execute( SfxRequest &rReq )
                 bool bLeftToRight = nSlot == SID_ATTR_PARA_LEFT_TO_RIGHT;
 
                 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/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx
index ce6138603387..e93b366ccecc 100644
--- a/sd/source/ui/view/drviews2.cxx
+++ b/sd/source/ui/view/drviews2.cxx
@@ -905,12 +905,12 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
                         boost::scoped_ptr<SfxItemSet> pNewSet(rAttr.first);
                         SdrObjUserCall* pUserCall = rAttr.second;
 
-                        if ( pNewSet && pNewSet->GetItemState( SDRATTR_TEXT_MINFRAMEHEIGHT ) == SFX_ITEM_ON )
+                        if ( pNewSet && pNewSet->GetItemState( SDRATTR_TEXT_MINFRAMEHEIGHT ) == SFX_ITEM_SET )
                         {
                             pObj->SetMergedItem(pNewSet->Get(SDRATTR_TEXT_MINFRAMEHEIGHT));
                         }
 
-                        if ( pNewSet && pNewSet->GetItemState( SDRATTR_TEXT_AUTOGROWHEIGHT ) == SFX_ITEM_ON )
+                        if ( pNewSet && pNewSet->GetItemState( SDRATTR_TEXT_AUTOGROWHEIGHT ) == SFX_ITEM_SET )
                         {
                             pObj->SetMergedItem(pNewSet->Get(SDRATTR_TEXT_AUTOGROWHEIGHT));
                         }
diff --git a/sd/source/ui/view/drviews3.cxx b/sd/source/ui/view/drviews3.cxx
index eb8a0e838eeb..67df3b2e3ce1 100644
--- a/sd/source/ui/view/drviews3.cxx
+++ b/sd/source/ui/view/drviews3.cxx
@@ -932,7 +932,7 @@ void  DrawViewShell::GetRulerState(SfxItemSet& rSet)
 
                     Point aPos( aPagePos + maMarkRect.TopLeft() );
 
-                    if ( aEditAttr.GetItemState( SDRATTR_TEXT_LEFTDIST ) == SFX_ITEM_ON )
+                    if ( aEditAttr.GetItemState( SDRATTR_TEXT_LEFTDIST ) == SFX_ITEM_SET )
                     {
                         const SdrMetricItem& rTLDItem = (const SdrMetricItem&)
                                                               aEditAttr.Get( SDRATTR_TEXT_LEFTDIST );
@@ -944,7 +944,7 @@ void  DrawViewShell::GetRulerState(SfxItemSet& rSet)
 
                     aLRSpace.SetLeft( aPagePos.X() + maMarkRect.Left() );
 
-                    if ( aEditAttr.GetItemState( SDRATTR_TEXT_LEFTDIST ) == SFX_ITEM_ON )
+                    if ( aEditAttr.GetItemState( SDRATTR_TEXT_LEFTDIST ) == SFX_ITEM_SET )
                     {
                         const SdrMetricItem& rTLDItem = (const SdrMetricItem&)
                                                               aEditAttr.Get( SDRATTR_TEXT_LEFTDIST );
diff --git a/sd/source/ui/view/outlview.cxx b/sd/source/ui/view/outlview.cxx
index f873ad4e5a8b..47cdee4557b4 100644
--- a/sd/source/ui/view/outlview.cxx
+++ b/sd/source/ui/view/outlview.cxx
@@ -771,7 +771,7 @@ IMPL_LINK( OutlineView, DepthChangedHdl, ::Outliner *, pOutliner )
 
             // restore the old bullet item but not if the style changed
             if ( pOutliner->GetPrevDepth() != -1 && nDepth != -1 &&
-                 aOldAttrs.GetItemState( EE_PARA_NUMBULLET ) == SFX_ITEM_ON )
+                 aOldAttrs.GetItemState( EE_PARA_NUMBULLET ) == SFX_ITEM_SET )
             {
                 SfxItemSet aAttrs( pOutliner->GetParaAttribs( nPara ) );
                 aAttrs.Put( *aOldAttrs.GetItem( EE_PARA_NUMBULLET ) );
diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx
index 23de40151bbf..95eb3e90a81e 100644
--- a/sd/source/ui/view/viewshel.cxx
+++ b/sd/source/ui/view/viewshel.cxx
@@ -775,7 +775,7 @@ const SfxPoolItem* ViewShell::GetNumBulletItem(SfxItemSet& aNewAttr, sal_uInt16&
 
             aNewAttr.Put(*pItem, EE_PARA_NUMBULLET);
 
-            if(bTitle && aNewAttr.GetItemState(EE_PARA_NUMBULLET,true) == SFX_ITEM_ON )
+            if(bTitle && aNewAttr.GetItemState(EE_PARA_NUMBULLET,true) == SFX_ITEM_SET )
             {
                 SvxNumBulletItem* pBulletItem = (SvxNumBulletItem*)aNewAttr.GetItem(EE_PARA_NUMBULLET,true);
                 SvxNumRule* pRule = pBulletItem->GetNumRule();