Turn SfxItemState into a C++11 scoped enumeration

...to gain further confidence in the claim "that none of the existing
code tries to uses combinations of these enum values"
(d92602c5b13d0a60439d86c5a033d124178726ca "more fixes for SfxItemState")

Change-Id: I987922d945e8738e38adfde83b869adf3ff35b13
Reviewed-on: https://gerrit.libreoffice.org/11384
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Tested-by: Stephan Bergmann <sbergman@redhat.com>

54 files changed, 332 insertions, 332 deletions

diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index 0ee88c5cb07b..940f856f0c31 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -1886,7 +1886,7 @@ bool ScInputHandler::StartTable( sal_Unicode cTyped, bool bFromCommand, bool bIn
                 const SfxItemSet& rAttrSet = pPattern->GetItemSet();
                 const SfxPoolItem* pItem;
 
-                if ( SFX_ITEM_SET == rAttrSet.GetItemState( ATTR_VALUE_FORMAT, true, &pItem ) )
+                if ( SfxItemState::SET == rAttrSet.GetItemState( ATTR_VALUE_FORMAT, true, &pItem ) )
                 {
                     sal_uLong nFormat = ((const SfxUInt32Item*)pItem)->GetValue();
                     bCellHasPercentFormat = ( NUMBERFORMAT_PERCENT ==
@@ -1896,7 +1896,7 @@ bool ScInputHandler::StartTable( sal_Unicode cTyped, bool bFromCommand, bool bIn
                     bCellHasPercentFormat = false; // Default: no percent
 
                 // Validity specified?
-                if ( SFX_ITEM_SET == rAttrSet.GetItemState( ATTR_VALIDDATA, true, &pItem ) )
+                if ( SfxItemState::SET == rAttrSet.GetItemState( ATTR_VALIDDATA, true, &pItem ) )
                     nValidation = ((const SfxUInt32Item*)pItem)->GetValue();
                 else
                     nValidation = 0;
@@ -2521,7 +2521,7 @@ void ScInputHandler::EnterHandler( sal_uInt8 nBlockMode )
             for (sal_uInt16 nId = EE_CHAR_START; nId <= EE_CHAR_END; nId++)
             {
                 SfxItemState eState = aOldAttribs.GetItemState( nId, false, &pItem );
-                if ( eState == SFX_ITEM_SET &&
+                if ( eState == SfxItemState::SET &&
                         nId != EE_CHAR_ESCAPEMENT && nId != EE_CHAR_PAIRKERNING &&
                         nId != EE_CHAR_KERNING && nId != EE_CHAR_XMLATTRIBS &&
                             *pItem != pEditDefaults->Get(nId) )
@@ -2554,9 +2554,9 @@ void ScInputHandler::EnterHandler( sal_uInt8 nBlockMode )
             for (sal_uInt16 nId = EE_CHAR_START; nId <= EE_CHAR_END && !bAttrib; nId++)
             {
                 SfxItemState eState = aOldAttribs.GetItemState( nId, false, &pItem );
-                if (eState == SFX_ITEM_DONTCARE)
+                if (eState == SfxItemState::DONTCARE)
                     bAttrib = true;
-                else if (eState == SFX_ITEM_SET)
+                else if (eState == SfxItemState::SET)
                 {
                     // Keep same items in EditEngine as in ScEditAttrTester
                     if ( nId == EE_CHAR_ESCAPEMENT || nId == EE_CHAR_PAIRKERNING ||
@@ -2570,12 +2570,12 @@ void ScInputHandler::EnterHandler( sal_uInt8 nBlockMode )
 
             // Contains fields?
             SfxItemState eFieldState = aOldAttribs.GetItemState( EE_FEATURE_FIELD, false );
-            if ( eFieldState == SFX_ITEM_DONTCARE || eFieldState == SFX_ITEM_SET )
+            if ( eFieldState == SfxItemState::DONTCARE || eFieldState == SfxItemState::SET )
                 bAttrib = true;
 
             // Not converted characters?
             SfxItemState eConvState = aOldAttribs.GetItemState( EE_FEATURE_NOTCONV, false );
-            if ( eConvState == SFX_ITEM_DONTCARE || eConvState == SFX_ITEM_SET )
+            if ( eConvState == SfxItemState::DONTCARE || eConvState == SfxItemState::SET )
                 bAttrib = true;
 
             // Always recognize formulas as formulas
@@ -3666,7 +3666,7 @@ bool ScInputHandler::GetTextAndFields( ScEditEngineDefaulter& rDestEngine )
         sal_Int32 nParCnt = pEngine->GetParagraphCount();
         SfxItemSet aSet = pEngine->GetAttribs( ESelection(0,0,nParCnt,0) );
         SfxItemState eFieldState = aSet.GetItemState( EE_FEATURE_FIELD, false );
-        if ( eFieldState == SFX_ITEM_DONTCARE || eFieldState == SFX_ITEM_SET )
+        if ( eFieldState == SfxItemState::DONTCARE || eFieldState == SfxItemState::SET )
         {
             // Copy content
             EditTextObject* pObj = pEngine->CreateTextObject();
diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx
index 213782e88d56..fde742995a1e 100644
--- a/sc/source/ui/app/scmod.cxx
+++ b/sc/source/ui/app/scmod.cxx
@@ -394,7 +394,7 @@ void ScModule::Execute( SfxRequest& rReq )
             {
                 bool bSet;
                 const SfxPoolItem* pItem;
-                if ( pReqArgs && SFX_ITEM_SET == pReqArgs->GetItemState( nSlot, true, &pItem ) )
+                if ( pReqArgs && SfxItemState::SET == pReqArgs->GetItemState( nSlot, true, &pItem ) )
                     bSet = ((const SfxBoolItem*)pItem)->GetValue();
                 else
                 {   // Toggle
@@ -415,7 +415,7 @@ void ScModule::Execute( SfxRequest& rReq )
         case SID_ATTR_METRIC:
             {
                 const SfxPoolItem* pItem;
-                if ( pReqArgs && SFX_ITEM_SET == pReqArgs->GetItemState( nSlot, true, &pItem ) )
+                if ( pReqArgs && SfxItemState::SET == pReqArgs->GetItemState( nSlot, true, &pItem ) )
                 {
                     FieldUnit eUnit = (FieldUnit)((const SfxUInt16Item*)pItem)->GetValue();
                     switch( eUnit )
@@ -499,7 +499,7 @@ void ScModule::Execute( SfxRequest& rReq )
         case SID_ATTR_CHAR_CTL_LANGUAGE:
             {
                 const SfxPoolItem* pItem;
-                if ( pReqArgs && SFX_ITEM_SET == pReqArgs->GetItemState( GetPool().GetWhich(nSlot), true, &pItem ) )
+                if ( pReqArgs && SfxItemState::SET == pReqArgs->GetItemState( GetPool().GetWhich(nSlot), true, &pItem ) )
                 {
                     ScDocShell* pDocSh = PTR_CAST(ScDocShell, SfxObjectShell::Current());
                     if ( pDocSh )
diff --git a/sc/source/ui/attrdlg/tabpages.cxx b/sc/source/ui/attrdlg/tabpages.cxx
index 88814f3fdfb1..2884663d4df0 100644
--- a/sc/source/ui/attrdlg/tabpages.cxx
+++ b/sc/source/ui/attrdlg/tabpages.cxx
@@ -79,9 +79,9 @@ void ScTabPageProtection::Reset( const SfxItemSet* rCoreAttrs )
                                           (const SfxPoolItem**)&pProtAttr );
 
     // Is this a Default-Item?
-    if ( eItemState == SFX_ITEM_DEFAULT )
+    if ( eItemState == SfxItemState::DEFAULT )
         pProtAttr = (const ScProtectionAttr*)&(rCoreAttrs->Get(nWhich));
-    // At SFX_ITEM_DONTCARE let to 0
+    // At SfxItemState::DONTCARE let to 0
 
     bTriEnabled = ( pProtAttr == NULL );                // TriState, when DontCare
     bDontCare = bTriEnabled;
@@ -136,7 +136,7 @@ bool ScTabPageProtection::FillItemSet( SfxItemSet* rCoreAttrs )
 
     if ( bAttrsChanged )
         rCoreAttrs->Put( aProtAttr );
-    else if ( eItemState == SFX_ITEM_DEFAULT )
+    else if ( eItemState == SfxItemState::DEFAULT )
         rCoreAttrs->ClearItem( nWhich );
 
     return bAttrsChanged;
diff --git a/sc/source/ui/cctrl/tbinsert.cxx b/sc/source/ui/cctrl/tbinsert.cxx
index 7f017f7e0a2e..5de5395ed8e0 100644
--- a/sc/source/ui/cctrl/tbinsert.cxx
+++ b/sc/source/ui/cctrl/tbinsert.cxx
@@ -51,9 +51,9 @@ ScTbxInsertCtrl::~ScTbxInsertCtrl()
 void ScTbxInsertCtrl::StateChanged( sal_uInt16 /* nSID */, SfxItemState eState,
                                               const SfxPoolItem* pState )
 {
-    GetToolBox().EnableItem( GetId(), (GetItemState(pState) != SFX_ITEM_DISABLED) );
+    GetToolBox().EnableItem( GetId(), (GetItemState(pState) != SfxItemState::DISABLED) );
 
-    if( eState == SFX_ITEM_DEFAULT )
+    if( eState == SfxItemState::DEFAULT )
     {
 
         const SfxUInt16Item* pItem = PTR_CAST( SfxUInt16Item, pState );
diff --git a/sc/source/ui/cctrl/tbzoomsliderctrl.cxx b/sc/source/ui/cctrl/tbzoomsliderctrl.cxx
index 817cf4f5ef65..bf00d6d6d462 100644
--- a/sc/source/ui/cctrl/tbzoomsliderctrl.cxx
+++ b/sc/source/ui/cctrl/tbzoomsliderctrl.cxx
@@ -61,7 +61,7 @@ void ScZoomSliderControl::StateChanged( sal_uInt16 /*nSID*/, SfxItemState eState
     ScZoomSliderWnd*        pBox = (ScZoomSliderWnd*)(rTbx.GetItemWindow( nId ));
     OSL_ENSURE( pBox ,"Control not found!" );
 
-    if ( SFX_ITEM_DEFAULT != eState || pState->ISA( SfxVoidItem ) )
+    if ( SfxItemState::DEFAULT != eState || pState->ISA( SfxVoidItem ) )
     {
         SvxZoomSliderItem aZoomSliderItem( 100 );
         pBox->Disable();
diff --git a/sc/source/ui/dbgui/tpsort.cxx b/sc/source/ui/dbgui/tpsort.cxx
index 271af19386b3..d0ad201f6228 100644
--- a/sc/source/ui/dbgui/tpsort.cxx
+++ b/sc/source/ui/dbgui/tpsort.cxx
@@ -230,7 +230,7 @@ bool ScTabPageSortFields::FillItemSet( SfxItemSet* rArgSet )
     {
         const SfxItemSet* pExample = pDlg->GetExampleSet();
         const SfxPoolItem* pItem;
-        if ( pExample && pExample->GetItemState( nWhichSort, true, &pItem ) == SFX_ITEM_SET )
+        if ( pExample && pExample->GetItemState( nWhichSort, true, &pItem ) == SfxItemState::SET )
         {
             ScSortParam aTempData = static_cast<const ScSortItem*>(pItem)->GetSortData();
             aTempData.maKeyState = aNewSortData.maKeyState;
@@ -690,7 +690,7 @@ bool ScTabPageSortOptions::FillItemSet( SfxItemSet* rArgSet )
     {
         const SfxItemSet* pExample = pDlg->GetExampleSet();
         const SfxPoolItem* pItem;
-        if ( pExample && pExample->GetItemState( nWhichSort, true, &pItem ) == SFX_ITEM_SET )
+        if ( pExample && pExample->GetItemState( nWhichSort, true, &pItem ) == SfxItemState::SET )
             aNewSortData = static_cast<const ScSortItem*>(pItem)->GetSortData();
     }
     aNewSortData.bByRow          = m_pBtnTopDown->IsChecked();
diff --git a/sc/source/ui/dbgui/tpsubt.cxx b/sc/source/ui/dbgui/tpsubt.cxx
index 264c61fe86ed..c8fd47da5408 100644
--- a/sc/source/ui/dbgui/tpsubt.cxx
+++ b/sc/source/ui/dbgui/tpsubt.cxx
@@ -186,7 +186,7 @@ bool ScTpSubTotalGroup::DoFillItemSet( sal_uInt16       nGroupNo,
     {
         const SfxItemSet* pExample = pDlg->GetExampleSet();
         const SfxPoolItem* pItem;
-        if ( pExample && pExample->GetItemState( nWhichSubTotals, true, &pItem ) == SFX_ITEM_SET )
+        if ( pExample && pExample->GetItemState( nWhichSubTotals, true, &pItem ) == SfxItemState::SET )
             theSubTotalData = ((const ScSubTotalItem*)pItem)->GetSubTotalData();
     }
 
@@ -501,7 +501,7 @@ bool ScTpSubTotalOptions::FillItemSet( SfxItemSet* rArgSet )
     {
         const SfxItemSet* pExample = pDlg->GetExampleSet();
         const SfxPoolItem* pItem;
-        if ( pExample && pExample->GetItemState( nWhichSubTotals, true, &pItem ) == SFX_ITEM_SET )
+        if ( pExample && pExample->GetItemState( nWhichSubTotals, true, &pItem ) == SfxItemState::SET )
             theSubTotalData = ((const ScSubTotalItem*)pItem)->GetSubTotalData();
     }
 
diff --git a/sc/source/ui/dbgui/validate.cxx b/sc/source/ui/dbgui/validate.cxx
index ef4351ece0ea..703556626491 100644
--- a/sc/source/ui/dbgui/validate.cxx
+++ b/sc/source/ui/dbgui/validate.cxx
@@ -371,37 +371,37 @@ void ScTPValidationValue::Reset( const SfxItemSet* rArgSet )
     const SfxPoolItem* pItem;
 
     sal_uInt16 nLbPos = SC_VALIDDLG_ALLOW_ANY;
-    if( rArgSet->GetItemState( FID_VALID_MODE, true, &pItem ) == SFX_ITEM_SET )
+    if( rArgSet->GetItemState( FID_VALID_MODE, true, &pItem ) == SfxItemState::SET )
         nLbPos = lclGetPosFromValMode( static_cast< ScValidationMode >(
             static_cast< const SfxAllEnumItem* >( pItem )->GetValue() ) );
     m_pLbAllow->SelectEntryPos( nLbPos );
 
     nLbPos = SC_VALIDDLG_DATA_EQUAL;
-    if( rArgSet->GetItemState( FID_VALID_CONDMODE, true, &pItem ) == SFX_ITEM_SET )
+    if( rArgSet->GetItemState( FID_VALID_CONDMODE, true, &pItem ) == SfxItemState::SET )
         nLbPos = lclGetPosFromCondMode( static_cast< ScConditionMode >(
             static_cast< const SfxAllEnumItem* >( pItem )->GetValue() ) );
     m_pLbValue->SelectEntryPos( nLbPos );
 
     // *** check boxes ***
     bool bCheck = true;
-    if( rArgSet->GetItemState( FID_VALID_BLANK, true, &pItem ) == SFX_ITEM_SET )
+    if( rArgSet->GetItemState( FID_VALID_BLANK, true, &pItem ) == SfxItemState::SET )
         bCheck = static_cast< const SfxBoolItem* >( pItem )->GetValue();
     m_pCbAllow->Check( bCheck );
 
     sal_Int32 nListType = ValidListType::UNSORTED;
-    if( rArgSet->GetItemState( FID_VALID_LISTTYPE, true, &pItem ) == SFX_ITEM_SET )
+    if( rArgSet->GetItemState( FID_VALID_LISTTYPE, true, &pItem ) == SfxItemState::SET )
         nListType = static_cast< const SfxInt16Item* >( pItem )->GetValue();
     m_pCbShow->Check( nListType != ValidListType::INVISIBLE );
     m_pCbSort->Check( nListType == ValidListType::SORTEDASCENDING );
 
     // *** formulas ***
     OUString aFmlaStr;
-    if ( rArgSet->GetItemState( FID_VALID_VALUE1, true, &pItem ) == SFX_ITEM_SET )
+    if ( rArgSet->GetItemState( FID_VALID_VALUE1, true, &pItem ) == SfxItemState::SET )
         aFmlaStr = static_cast< const SfxStringItem* >( pItem )->GetValue();
     SetFirstFormula( aFmlaStr );
 
     aFmlaStr= "";
-    if ( rArgSet->GetItemState( FID_VALID_VALUE2, true, &pItem ) == SFX_ITEM_SET )
+    if ( rArgSet->GetItemState( FID_VALID_VALUE2, true, &pItem ) == SfxItemState::SET )
         aFmlaStr = static_cast< const SfxStringItem* >( pItem )->GetValue();
     SetSecondFormula( aFmlaStr );
 
@@ -661,17 +661,17 @@ void ScTPValidationHelp::Reset( const SfxItemSet* rArgSet )
 {
     const SfxPoolItem* pItem;
 
-    if ( rArgSet->GetItemState( FID_VALID_SHOWHELP, true, &pItem ) == SFX_ITEM_SET )
+    if ( rArgSet->GetItemState( FID_VALID_SHOWHELP, true, &pItem ) == SfxItemState::SET )
         pTsbHelp->SetState( ((const SfxBoolItem*)pItem)->GetValue() ? TRISTATE_TRUE : TRISTATE_FALSE );
     else
         pTsbHelp->SetState( TRISTATE_FALSE );
 
-    if ( rArgSet->GetItemState( FID_VALID_HELPTITLE, true, &pItem ) == SFX_ITEM_SET )
+    if ( rArgSet->GetItemState( FID_VALID_HELPTITLE, true, &pItem ) == SfxItemState::SET )
         pEdtTitle->SetText( ((const SfxStringItem*)pItem)->GetValue() );
     else
         pEdtTitle->SetText( EMPTY_OUSTRING );
 
-    if ( rArgSet->GetItemState( FID_VALID_HELPTEXT, true, &pItem ) == SFX_ITEM_SET )
+    if ( rArgSet->GetItemState( FID_VALID_HELPTEXT, true, &pItem ) == SfxItemState::SET )
         pEdInputHelp->SetText( ((const SfxStringItem*)pItem)->GetValue() );
     else
         pEdInputHelp->SetText( EMPTY_OUSTRING );
@@ -731,22 +731,22 @@ void ScTPValidationError::Reset( const SfxItemSet* rArgSet )
 {
     const SfxPoolItem* pItem;
 
-    if ( rArgSet->GetItemState( FID_VALID_SHOWERR, true, &pItem ) == SFX_ITEM_SET )
+    if ( rArgSet->GetItemState( FID_VALID_SHOWERR, true, &pItem ) == SfxItemState::SET )
         m_pTsbShow->SetState( ((const SfxBoolItem*)pItem)->GetValue() ? TRISTATE_TRUE : TRISTATE_FALSE );
     else
         m_pTsbShow->SetState( TRISTATE_TRUE );   // check by default
 
-    if ( rArgSet->GetItemState( FID_VALID_ERRSTYLE, true, &pItem ) == SFX_ITEM_SET )
+    if ( rArgSet->GetItemState( FID_VALID_ERRSTYLE, true, &pItem ) == SfxItemState::SET )
         m_pLbAction->SelectEntryPos( ((const SfxAllEnumItem*)pItem)->GetValue() );
     else
         m_pLbAction->SelectEntryPos( 0 );
 
-    if ( rArgSet->GetItemState( FID_VALID_ERRTITLE, true, &pItem ) == SFX_ITEM_SET )
+    if ( rArgSet->GetItemState( FID_VALID_ERRTITLE, true, &pItem ) == SfxItemState::SET )
         m_pEdtTitle->SetText( ((const SfxStringItem*)pItem)->GetValue() );
     else
         m_pEdtTitle->SetText( EMPTY_OUSTRING );
 
-    if ( rArgSet->GetItemState( FID_VALID_ERRTEXT, true, &pItem ) == SFX_ITEM_SET )
+    if ( rArgSet->GetItemState( FID_VALID_ERRTEXT, true, &pItem ) == SfxItemState::SET )
         m_pEdError->SetText( ((const SfxStringItem*)pItem)->GetValue() );
     else
         m_pEdError->SetText( EMPTY_OUSTRING );
diff --git a/sc/source/ui/docshell/docfunc.cxx b/sc/source/ui/docshell/docfunc.cxx
index 90cc95d23584..a235b332e40a 100644
--- a/sc/source/ui/docshell/docfunc.cxx
+++ b/sc/source/ui/docshell/docfunc.cxx
@@ -774,7 +774,7 @@ bool ScDocFunc::SetNormalString( bool& o_rbNumFmtSet, const ScAddress& rPos, con
 
         const SfxPoolItem* pItem;
         const ScPatternAttr* pPattern = rDoc.GetPattern( rPos.Col(),rPos.Row(),rPos.Tab() );
-        if ( SFX_ITEM_SET == pPattern->GetItemSet().GetItemState(
+        if ( SfxItemState::SET == pPattern->GetItemSet().GetItemState(
                                 ATTR_VALUE_FORMAT,false,&pItem) )
         {
             aOldValue.mbHasFormat = true;
diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx
index 0d06c524622c..1287c8a8c07f 100644
--- a/sc/source/ui/docshell/docsh.cxx
+++ b/sc/source/ui/docshell/docsh.cxx
@@ -1086,7 +1086,7 @@ bool ScDocShell::ConvertFrom( SfxMedium& rMedium )
             OUString sItStr;
             SfxItemSet*  pSet = rMedium.GetItemSet();
             const SfxPoolItem* pItem;
-            if ( pSet && SFX_ITEM_SET ==
+            if ( pSet && SfxItemState::SET ==
                  pSet->GetItemState( SID_FILE_FILTEROPTIONS, true, &pItem ) )
             {
                 sItStr = ((const SfxStringItem*)pItem)->GetValue();
@@ -1159,7 +1159,7 @@ bool ScDocShell::ConvertFrom( SfxMedium& rMedium )
             ScAsciiOptions aOptions;
             bool bOptInit = false;
 
-            if ( pSet && SFX_ITEM_SET ==
+            if ( pSet && SfxItemState::SET ==
                  pSet->GetItemState( SID_FILE_FILTEROPTIONS, true, &pItem ) )
             {
                 aOptions.ReadFromString( ((const SfxStringItem*)pItem)->GetValue() );
@@ -1228,7 +1228,7 @@ bool ScDocShell::ConvertFrom( SfxMedium& rMedium )
             OUString sItStr;
             SfxItemSet*  pSet = rMedium.GetItemSet();
             const SfxPoolItem* pItem;
-            if ( pSet && SFX_ITEM_SET ==
+            if ( pSet && SfxItemState::SET ==
                  pSet->GetItemState( SID_FILE_FILTEROPTIONS, true, &pItem ) )
             {
                 sItStr = ((const SfxStringItem*)pItem)->GetValue();
@@ -1269,7 +1269,7 @@ bool ScDocShell::ConvertFrom( SfxMedium& rMedium )
                 OUString sItStr;
                 SfxItemSet*  pSet = rMedium.GetItemSet();
                 const SfxPoolItem* pItem;
-                if ( pSet && SFX_ITEM_SET ==
+                if ( pSet && SfxItemState::SET ==
                      pSet->GetItemState( SID_FILE_FILTEROPTIONS, true, &pItem ) )
                 {
                     sItStr = ((const SfxStringItem*)pItem)->GetValue();
@@ -1396,7 +1396,7 @@ bool ScDocShell::ConvertFrom( SfxMedium& rMedium )
                     bool bDateConvert = false;
                     SfxItemSet*  pSet = rMedium.GetItemSet();
                     const SfxPoolItem* pItem;
-                    if ( pSet && SFX_ITEM_SET ==
+                    if ( pSet && SfxItemState::SET ==
                          pSet->GetItemState( SID_FILE_FILTEROPTIONS, true, &pItem ) )
                     {
                         OUString aFilterOption = (static_cast<const SfxStringItem*>(pItem))->GetValue();
@@ -2225,7 +2225,7 @@ bool ScDocShell::ConvertTo( SfxMedium &rMed )
             {
                 SfxItemSet* pItemSet = rMed.GetItemSet();
                 const SfxPoolItem* pItem = 0;
-                if( pItemSet && pItemSet->GetItemState( SID_PASSWORD, true, &pItem ) == SFX_ITEM_SET )
+                if( pItemSet && pItemSet->GetItemState( SID_PASSWORD, true, &pItem ) == SfxItemState::SET )
                 {
                     bDoSave = ScWarnPassword::WarningOnPassword( rMed );
                     // #i42858# remove password from medium (warn only one time)
@@ -2268,7 +2268,7 @@ bool ScDocShell::ConvertTo( SfxMedium &rMed )
             OUString sItStr;
             SfxItemSet*  pSet = rMed.GetItemSet();
             const SfxPoolItem* pItem;
-            if ( pSet && SFX_ITEM_SET ==
+            if ( pSet && SfxItemState::SET ==
                  pSet->GetItemState( SID_FILE_FILTEROPTIONS, true, &pItem ) )
             {
                 sItStr = ((const SfxStringItem*)pItem)->GetValue();
@@ -2298,7 +2298,7 @@ bool ScDocShell::ConvertTo( SfxMedium &rMed )
         OUString sCharSet;
         SfxItemSet* pSet = rMed.GetItemSet();
         const SfxPoolItem* pItem;
-        if ( pSet && SFX_ITEM_SET ==
+        if ( pSet && SfxItemState::SET ==
              pSet->GetItemState( SID_FILE_FILTEROPTIONS, true, &pItem ) )
         {
             sCharSet = ((const SfxStringItem*)pItem)->GetValue();
@@ -2365,7 +2365,7 @@ bool ScDocShell::ConvertTo( SfxMedium &rMed )
             OUString sItStr;
             SfxItemSet*  pSet = rMed.GetItemSet();
             const SfxPoolItem* pItem;
-            if ( pSet && SFX_ITEM_SET ==
+            if ( pSet && SfxItemState::SET ==
                  pSet->GetItemState( SID_FILE_FILTEROPTIONS, true, &pItem ) )
             {
                 sItStr = ((const SfxStringItem*)pItem)->GetValue();
@@ -2415,7 +2415,7 @@ bool ScDocShell::ConvertTo( SfxMedium &rMed )
             const SfxPoolItem* pItem;
             OUString sFilterOptions;
 
-            if (pSet->GetItemState(SID_FILE_FILTEROPTIONS, true, &pItem) == SFX_ITEM_SET)
+            if (pSet->GetItemState(SID_FILE_FILTEROPTIONS, true, &pItem) == SfxItemState::SET)
                 sFilterOptions = ((SfxStringItem*)pItem)->GetValue();
 
             WaitObject aWait(GetActiveDialogParent());
diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx
index 13aa479e23a0..631f61b136b6 100644
--- a/sc/source/ui/docshell/docsh4.cxx
+++ b/sc/source/ui/docshell/docsh4.cxx
@@ -176,7 +176,7 @@ void ScDocShell::Execute( SfxRequest& rReq )
             {
                 const SfxPoolItem* pItem;
                 svx::ODataAccessDescriptor aDesc;
-                if ( pReqArgs->GetItemState( nSlot, true, &pItem ) == SFX_ITEM_SET )
+                if ( pReqArgs->GetItemState( nSlot, true, &pItem ) == SfxItemState::SET )
                 {
                     uno::Any aAny = static_cast<const SfxUsrAnyItem*>(pItem)->GetValue();
                     uno::Sequence<beans::PropertyValue> aProperties;
@@ -185,11 +185,11 @@ void ScDocShell::Execute( SfxRequest& rReq )
                 }
 
                 OUString sTarget;
-                if ( pReqArgs->GetItemState( FN_PARAM_1, true, &pItem ) == SFX_ITEM_SET )
+                if ( pReqArgs->GetItemState( FN_PARAM_1, true, &pItem ) == SfxItemState::SET )
                     sTarget = ((const SfxStringItem*)pItem)->GetValue();
 
                 bool bIsNewArea = true;         // Default sal_True (keine Nachfrage)
-                if ( pReqArgs->GetItemState( FN_PARAM_2, true, &pItem ) == SFX_ITEM_SET )
+                if ( pReqArgs->GetItemState( FN_PARAM_2, true, &pItem ) == SfxItemState::SET )
                     bIsNewArea = ((const SfxBoolItem*)pItem)->GetValue();
 
                 // bei Bedarf neuen Datenbankbereich anlegen
@@ -385,7 +385,7 @@ void ScDocShell::Execute( SfxRequest& rReq )
             {
                 bool bNewVal;
                 const SfxPoolItem* pItem;
-                if ( pReqArgs && SFX_ITEM_SET == pReqArgs->GetItemState( nSlot, true, &pItem ) )
+                if ( pReqArgs && SfxItemState::SET == pReqArgs->GetItemState( nSlot, true, &pItem ) )
                     bNewVal = ((const SfxBoolItem*)pItem)->GetValue();
                 else
                     bNewVal = !aDocument.GetAutoCalc();     // Toggle fuer Menue
@@ -564,7 +564,7 @@ void ScDocShell::Execute( SfxRequest& rReq )
                 // getting real parent window when called from Security-Options TP
                 Window* pParent = NULL;
                 const SfxPoolItem* pParentItem;
-                if( pReqArgs && SFX_ITEM_SET == pReqArgs->GetItemState( SID_ATTR_XWINDOW, false, &pParentItem ) )
+                if( pReqArgs && SfxItemState::SET == pReqArgs->GetItemState( SID_ATTR_XWINDOW, false, &pParentItem ) )
                     pParent = ( ( const XWindowItem* ) pParentItem )->GetWindowPtr();
 
                 // desired state
@@ -623,7 +623,7 @@ void ScDocShell::Execute( SfxRequest& rReq )
             {
                 Window* pParent = NULL;
                 const SfxPoolItem* pParentItem;
-                if( pReqArgs && SFX_ITEM_SET == pReqArgs->GetItemState( SID_ATTR_XWINDOW, false, &pParentItem ) )
+                if( pReqArgs && SfxItemState::SET == pReqArgs->GetItemState( SID_ATTR_XWINDOW, false, &pParentItem ) )
                     pParent = ( ( const XWindowItem* ) pParentItem )->GetWindowPtr();
                 if ( ExecuteChangeProtectionDialog( pParent ) )
                 {
@@ -664,26 +664,26 @@ void ScDocShell::Execute( SfxRequest& rReq )
                 const SfxPoolItem* pItem;
                 SfxMedium* pMed = NULL;
                 if ( pReqArgs &&
-                     pReqArgs->GetItemState( SID_FILE_NAME, true, &pItem ) == SFX_ITEM_SET &&
+                     pReqArgs->GetItemState( SID_FILE_NAME, true, &pItem ) == SfxItemState::SET &&
                      pItem->ISA(SfxStringItem) )
                 {
                     OUString aFileName =
                         static_cast<const SfxStringItem*>(pItem)->GetValue();
 
                     OUString aFilterName;
-                    if ( pReqArgs->GetItemState( SID_FILTER_NAME, true, &pItem ) == SFX_ITEM_SET &&
+                    if ( pReqArgs->GetItemState( SID_FILTER_NAME, true, &pItem ) == SfxItemState::SET &&
                          pItem->ISA(SfxStringItem) )
                     {
                         aFilterName = static_cast<const SfxStringItem*>(pItem)->GetValue();
                     }
                     OUString aOptions;
-                    if ( pReqArgs->GetItemState( SID_FILE_FILTEROPTIONS, true, &pItem ) == SFX_ITEM_SET &&
+                    if ( pReqArgs->GetItemState( SID_FILE_FILTEROPTIONS, true, &pItem ) == SfxItemState::SET &&
                          pItem->ISA(SfxStringItem) )
                     {
                         aOptions = static_cast<const SfxStringItem*>(pItem)->GetValue();
                     }
                     short nVersion = 0;
-                    if ( pReqArgs->GetItemState( SID_VERSION, true, &pItem ) == SFX_ITEM_SET &&
+                    if ( pReqArgs->GetItemState( SID_VERSION, true, &pItem ) == SfxItemState::SET &&
                          pItem->ISA(SfxInt16Item) )
                     {
                         nVersion = static_cast<const SfxInt16Item*>(pItem)->GetValue();
@@ -803,7 +803,7 @@ void ScDocShell::Execute( SfxRequest& rReq )
             if (pReqArgs)
             {
                 const SfxPoolItem* pItem;
-                if ( pReqArgs->GetItemState( nSlot, true, &pItem ) == SFX_ITEM_SET )
+                if ( pReqArgs->GetItemState( nSlot, true, &pItem ) == SfxItemState::SET )
                 {
                     if ( pItem->ISA(SfxStringItem) )
                     {
@@ -831,7 +831,7 @@ void ScDocShell::Execute( SfxRequest& rReq )
         case SID_EDIT_SCENARIO:
             {
                 const SfxPoolItem* pItem;
-                if ( pReqArgs->GetItemState( nSlot, true, &pItem ) == SFX_ITEM_SET )
+                if ( pReqArgs->GetItemState( nSlot, true, &pItem ) == SfxItemState::SET )
                 {
                     if ( pItem->ISA(SfxStringItem) )
                     {
@@ -879,7 +879,7 @@ void ScDocShell::Execute( SfxRequest& rReq )
         case SID_ATTR_YEAR2000 :
         {
             const SfxPoolItem* pItem;
-            if ( pReqArgs->GetItemState( nSlot, true, &pItem ) == SFX_ITEM_SET )
+            if ( pReqArgs->GetItemState( nSlot, true, &pItem ) == SfxItemState::SET )
             {
                 if ( pItem->ISA(SfxUInt16Item) )
                 {
@@ -2264,7 +2264,7 @@ IMPL_LINK( ScDocShell, DialogClosedHdl, sfx2::FileDialogHelper*, _pFileDlg )
             const SfxPoolItem* pItem = NULL;
             SfxItemSet* pSet = pMed->GetItemSet();
             if ( pSet &&
-                    pSet->GetItemState( SID_VERSION, true, &pItem ) == SFX_ITEM_SET &&
+                    pSet->GetItemState( SID_VERSION, true, &pItem ) == SfxItemState::SET &&
                     pItem->ISA( SfxInt16Item ) )
             {
                 pImpl->pRequest->AppendItem( *pItem );
diff --git a/sc/source/ui/docshell/docsh6.cxx b/sc/source/ui/docshell/docsh6.cxx
index c4b25acce685..8468f47c5c04 100644
--- a/sc/source/ui/docshell/docsh6.cxx
+++ b/sc/source/ui/docshell/docsh6.cxx
@@ -232,14 +232,14 @@ static void lcl_AdjustPool( SfxStyleSheetBasePool* pStylePool )
         SfxItemSet& rStyleSet = pStyle->GetItemSet();
 
         const SfxPoolItem* pItem;
-        if (rStyleSet.GetItemState(ATTR_PAGE_HEADERSET,false,&pItem) == SFX_ITEM_SET)
+        if (rStyleSet.GetItemState(ATTR_PAGE_HEADERSET,false,&pItem) == SfxItemState::SET)
         {
             SfxItemSet& rSrcSet = ((SvxSetItem*)pItem)->GetItemSet();
             SfxItemSet* pDestSet = new SfxItemSet(*rStyleSet.GetPool(),rSrcSet.GetRanges());
             pDestSet->Put(rSrcSet);
             rStyleSet.Put(SvxSetItem(ATTR_PAGE_HEADERSET,pDestSet));
         }
-        if (rStyleSet.GetItemState(ATTR_PAGE_FOOTERSET,false,&pItem) == SFX_ITEM_SET)
+        if (rStyleSet.GetItemState(ATTR_PAGE_FOOTERSET,false,&pItem) == SfxItemState::SET)
         {
             SfxItemSet& rSrcSet = ((SvxSetItem*)pItem)->GetItemSet();
             SfxItemSet* pDestSet = new SfxItemSet(*rStyleSet.GetPool(),rSrcSet.GetRanges());
@@ -320,7 +320,7 @@ void ScDocShell::LoadStylesArgs( ScDocShell& rSource, bool bReplace, bool bCellS
     for ( sal_uInt16 i = 0; i < nFound; ++i )
     {
         pStyles[i].pDest->GetItemSet().PutExtended(
-            pStyles[i].pSource->GetItemSet(), SFX_ITEM_DONTCARE, SFX_ITEM_DEFAULT);
+            pStyles[i].pSource->GetItemSet(), SfxItemState::DONTCARE, SfxItemState::DEFAULT);
         if(pStyles[i].pSource->HasParentSupport())
             pStyles[i].pDest->SetParent(pStyles[i].pSource->GetParent());
         // follow is never used
diff --git a/sc/source/ui/docshell/tablink.cxx b/sc/source/ui/docshell/tablink.cxx
index 8ece986b7a10..446530cfd96c 100644
--- a/sc/source/ui/docshell/tablink.cxx
+++ b/sc/source/ui/docshell/tablink.cxx
@@ -434,7 +434,7 @@ OUString ScDocumentLoader::GetOptions( SfxMedium& rMedium )
 {
     SfxItemSet* pSet = rMedium.GetItemSet();
     const SfxPoolItem* pItem;
-    if ( pSet && SFX_ITEM_SET == pSet->GetItemState( SID_FILE_FILTEROPTIONS, true, &pItem ) )
+    if ( pSet && SfxItemState::SET == pSet->GetItemState( SID_FILE_FILTEROPTIONS, true, &pItem ) )
         return ((const SfxStringItem*)pItem)->GetValue();
 
     return EMPTY_OUSTRING;
diff --git a/sc/source/ui/drawfunc/drawsh.cxx b/sc/source/ui/drawfunc/drawsh.cxx
index 758cf0fa0fae..4cf5ca959641 100644
--- a/sc/source/ui/drawfunc/drawsh.cxx
+++ b/sc/source/ui/drawfunc/drawsh.cxx
@@ -344,7 +344,7 @@ void ScDrawShell::ExecuteMacroAssign( SdrObject* pObj, Window* pWin )
     {
         const SfxItemSet* pOutSet = pMacroDlg->GetOutputItemSet();
         const SfxPoolItem* pItem;
-        if( SFX_ITEM_SET == pOutSet->GetItemState( SID_ATTR_MACROITEM, false, &pItem ))
+        if( SfxItemState::SET == pOutSet->GetItemState( SID_ATTR_MACROITEM, false, &pItem ))
         {
             OUString sMacro;
             const SvxMacro* pMacro = ((SvxMacroItem*)pItem)->GetMacroTable().Get( SFX_EVENT_MOUSECLICK_OBJECT );
diff --git a/sc/source/ui/drawfunc/drawsh2.cxx b/sc/source/ui/drawfunc/drawsh2.cxx
index eeaa2fbf5664..9c7a9bbc0437 100644
--- a/sc/source/ui/drawfunc/drawsh2.cxx
+++ b/sc/source/ui/drawfunc/drawsh2.cxx
@@ -262,11 +262,11 @@ void ScDrawShell::GetDrawFuncState( SfxItemSet& rSet )      // Funktionen disabl
         rSet.DisableItem( SID_ATTR_TRANSFORM );
     }
 
-    if ( rSet.GetItemState( SID_ENABLE_HYPHENATION ) != SFX_ITEM_UNKNOWN )
+    if ( rSet.GetItemState( SID_ENABLE_HYPHENATION ) != SfxItemState::UNKNOWN )
     {
         SfxItemSet aAttrs( pView->GetModel()->GetItemPool() );
         pView->GetAttributes( aAttrs );
-        if( aAttrs.GetItemState( EE_PARA_HYPHENATE ) >= SFX_ITEM_DEFAULT )
+        if( aAttrs.GetItemState( EE_PARA_HYPHENATE ) >= SfxItemState::DEFAULT )
         {
             bool bValue = ( (const SfxBoolItem&) aAttrs.Get( EE_PARA_HYPHENATE ) ).GetValue();
             rSet.Put( SfxBoolItem( SID_ENABLE_HYPHENATION, bValue ) );
@@ -349,13 +349,13 @@ void ScDrawShell::GetAttrFuncState(SfxItemSet &rSet)
     ScDrawView* pDrView = pViewData->GetScDrawView();
     SfxItemSet aViewSet = pDrView->GetAttrFromMarked(false);
 
-    if ( aViewSet.GetItemState( XATTR_LINESTYLE ) == SFX_ITEM_DEFAULT )
+    if ( aViewSet.GetItemState( XATTR_LINESTYLE ) == SfxItemState::DEFAULT )
     {
         rSet.DisableItem( SID_ATTRIBUTES_LINE );
         rSet.DisableItem( SID_ATTR_LINEEND_STYLE );     // Tbx-Controller
     }
 
-    if ( aViewSet.GetItemState( XATTR_FILLSTYLE ) == SFX_ITEM_DEFAULT )
+    if ( aViewSet.GetItemState( XATTR_FILLSTYLE ) == SfxItemState::DEFAULT )
         rSet.DisableItem( SID_ATTRIBUTES_AREA );
 }
 
diff --git a/sc/source/ui/drawfunc/drawsh5.cxx b/sc/source/ui/drawfunc/drawsh5.cxx
index 614d49ff3cb4..206ee0c49eed 100644
--- a/sc/source/ui/drawfunc/drawsh5.cxx
+++ b/sc/source/ui/drawfunc/drawsh5.cxx
@@ -150,7 +150,7 @@ void ScDrawShell::ExecuteHLink( SfxRequest& rReq )
             if( pReqArgs )
             {
                 const SfxPoolItem* pItem;
-                if ( pReqArgs->GetItemState( SID_HYPERLINK_SETLINK, true, &pItem ) == SFX_ITEM_SET )
+                if ( pReqArgs->GetItemState( SID_HYPERLINK_SETLINK, true, &pItem ) == SfxItemState::SET )
                 {
                     const SvxHyperlinkItem* pHyper = (const SvxHyperlinkItem*) pItem;
                     const OUString& rName     = pHyper->GetName();
diff --git a/sc/source/ui/drawfunc/drtxtob.cxx b/sc/source/ui/drawfunc/drtxtob.cxx
index e34680efd1d4..85f1d069dceb 100644
--- a/sc/source/ui/drawfunc/drtxtob.cxx
+++ b/sc/source/ui/drawfunc/drtxtob.cxx
@@ -179,7 +179,7 @@ void ScDrawTextObjectBar::Execute( SfxRequest &rReq )
                 sal_uLong nFormat = 0;
                 const SfxPoolItem* pItem;
                 if ( pReqArgs &&
-                     pReqArgs->GetItemState(nSlot, true, &pItem) == SFX_ITEM_SET &&
+                     pReqArgs->GetItemState(nSlot, true, &pItem) == SfxItemState::SET &&
                      pItem->ISA(SfxUInt32Item) )
                 {
                     nFormat = ((const SfxUInt32Item*)pItem)->GetValue();
@@ -257,7 +257,7 @@ void ScDrawTextObjectBar::Execute( SfxRequest &rReq )
             if( pReqArgs )
             {
                 const SfxPoolItem* pItem;
-                if ( pReqArgs->GetItemState( SID_HYPERLINK_SETLINK, true, &pItem ) == SFX_ITEM_SET )
+                if ( pReqArgs->GetItemState( SID_HYPERLINK_SETLINK, true, &pItem ) == SfxItemState::SET )
                 {
                     const SvxHyperlinkItem* pHyper = (const SvxHyperlinkItem*) pItem;
                     const OUString& rName     = pHyper->GetName();
@@ -377,7 +377,7 @@ void ScDrawTextObjectBar::GetState( SfxItemSet& rSet )
     else
         rSet.Put(SfxBoolItem(SID_FONTWORK, bHasFontWork));
 
-    if ( rSet.GetItemState( SID_HYPERLINK_GETLINK ) != SFX_ITEM_UNKNOWN )
+    if ( rSet.GetItemState( SID_HYPERLINK_GETLINK ) != SfxItemState::UNKNOWN )
     {
         SvxHyperlinkItem aHLinkItem;
         SdrView* pView = pViewData->GetScDrawView();
@@ -410,7 +410,7 @@ void ScDrawTextObjectBar::GetState( SfxItemSet& rSet )
         rSet.Put(aHLinkItem);
     }
 
-    if ( rSet.GetItemState( SID_OPEN_HYPERLINK ) != SFX_ITEM_UNKNOWN )
+    if ( rSet.GetItemState( SID_OPEN_HYPERLINK ) != SfxItemState::UNKNOWN )
     {
         SdrView* pView = pViewData->GetScDrawView();
         OutlinerView* pOutView = pView->GetTextEditOutlinerView();
@@ -428,29 +428,29 @@ void ScDrawTextObjectBar::GetState( SfxItemSet& rSet )
             rSet.DisableItem( SID_OPEN_HYPERLINK );
     }
 
-    if( rSet.GetItemState( SID_TRANSLITERATE_HALFWIDTH ) != SFX_ITEM_UNKNOWN )
+    if( rSet.GetItemState( SID_TRANSLITERATE_HALFWIDTH ) != SfxItemState::UNKNOWN )
         ScViewUtil::HideDisabledSlot( rSet, pViewFrm->GetBindings(), SID_TRANSLITERATE_HALFWIDTH );
-    if( rSet.GetItemState( SID_TRANSLITERATE_FULLWIDTH ) != SFX_ITEM_UNKNOWN )
+    if( rSet.GetItemState( SID_TRANSLITERATE_FULLWIDTH ) != SfxItemState::UNKNOWN )
         ScViewUtil::HideDisabledSlot( rSet, pViewFrm->GetBindings(), SID_TRANSLITERATE_FULLWIDTH );
-    if( rSet.GetItemState( SID_TRANSLITERATE_HIRAGANA ) != SFX_ITEM_UNKNOWN )
+    if( rSet.GetItemState( SID_TRANSLITERATE_HIRAGANA ) != SfxItemState::UNKNOWN )
         ScViewUtil::HideDisabledSlot( rSet, pViewFrm->GetBindings(), SID_TRANSLITERATE_HIRAGANA );
-    if( rSet.GetItemState( SID_TRANSLITERATE_KATAGANA ) != SFX_ITEM_UNKNOWN )
+    if( rSet.GetItemState( SID_TRANSLITERATE_KATAGANA ) != SfxItemState::UNKNOWN )
         ScViewUtil::HideDisabledSlot( rSet, pViewFrm->GetBindings(), SID_TRANSLITERATE_KATAGANA );
 
-    if ( rSet.GetItemState( SID_ENABLE_HYPHENATION ) != SFX_ITEM_UNKNOWN )
+    if ( rSet.GetItemState( SID_ENABLE_HYPHENATION ) != SfxItemState::UNKNOWN )
     {
         SdrView* pView = pViewData->GetScDrawView();
         SfxItemSet aAttrs( pView->GetModel()->GetItemPool() );
         pView->GetAttributes( aAttrs );
-        if( aAttrs.GetItemState( EE_PARA_HYPHENATE ) >= SFX_ITEM_DEFAULT )
+        if( aAttrs.GetItemState( EE_PARA_HYPHENATE ) >= SfxItemState::DEFAULT )
         {
             bool bValue = ( (const SfxBoolItem&) aAttrs.Get( EE_PARA_HYPHENATE ) ).GetValue();
             rSet.Put( SfxBoolItem( SID_ENABLE_HYPHENATION, bValue ) );
         }
     }
 
-    if ( rSet.GetItemState( SID_THES ) != SFX_ITEM_UNKNOWN  ||
-         rSet.GetItemState( SID_THESAURUS ) != SFX_ITEM_UNKNOWN )
+    if ( rSet.GetItemState( SID_THES ) != SfxItemState::UNKNOWN  ||
+         rSet.GetItemState( SID_THESAURUS ) != SfxItemState::UNKNOWN )
     {
         SdrView * pView = pViewData->GetScDrawView();
         OutlinerView* pOutView = pView->GetTextEditOutlinerView();
@@ -623,7 +623,7 @@ static void lcl_RemoveFields( OutlinerView& rOutView )
                 {
                     ESelection aFieldSel( nPar, nStart, nPar, nEnd );
                     SfxItemSet aSet = rEditEng.GetAttribs( aFieldSel );
-                    if ( aSet.GetItemState( EE_FEATURE_FIELD ) == SFX_ITEM_SET )
+                    if ( aSet.GetItemState( EE_FEATURE_FIELD ) == SfxItemState::SET )
                     {
                         if (!bChanged)
                         {
@@ -953,13 +953,13 @@ void ScDrawTextObjectBar::GetAttrState( SfxItemSet& rDestSet )
     }
 
     // #i55929# according to spec, nInputScript is used for font and font height only
-    if ( rDestSet.GetItemState( EE_CHAR_FONTINFO ) != SFX_ITEM_UNKNOWN )
+    if ( rDestSet.GetItemState( EE_CHAR_FONTINFO ) != SfxItemState::UNKNOWN )
         ScViewUtil::PutItemScript( rDestSet, aAttrSet, EE_CHAR_FONTINFO, nInputScript );
-    if ( rDestSet.GetItemState( EE_CHAR_FONTHEIGHT ) != SFX_ITEM_UNKNOWN )
+    if ( rDestSet.GetItemState( EE_CHAR_FONTHEIGHT ) != SfxItemState::UNKNOWN )
         ScViewUtil::PutItemScript( rDestSet, aAttrSet, EE_CHAR_FONTHEIGHT, nInputScript );
-    if ( rDestSet.GetItemState( EE_CHAR_WEIGHT ) != SFX_ITEM_UNKNOWN )
+    if ( rDestSet.GetItemState( EE_CHAR_WEIGHT ) != SfxItemState::UNKNOWN )
         ScViewUtil::PutItemScript( rDestSet, aAttrSet, EE_CHAR_WEIGHT, nScript );
-    if ( rDestSet.GetItemState( EE_CHAR_ITALIC ) != SFX_ITEM_UNKNOWN )
+    if ( rDestSet.GetItemState( EE_CHAR_ITALIC ) != SfxItemState::UNKNOWN )
         ScViewUtil::PutItemScript( rDestSet, aAttrSet, EE_CHAR_ITALIC, nScript );
     //  Ausrichtung
 
@@ -1006,7 +1006,7 @@ void ScDrawTextObjectBar::GetAttrState( SfxItemSet& rDestSet )
     rDestSet.Put(aLR);
     Invalidate( SID_ATTR_PARA_LRSPACE );
     SfxItemState eState = aAttrSet.GetItemState( EE_PARA_LRSPACE );
-    if ( eState == SFX_ITEM_DONTCARE )
+    if ( eState == SfxItemState::DONTCARE )
         rDestSet.InvalidateItem(SID_ATTR_PARA_LRSPACE);
     //xuxu for Line Space
     SvxLineSpacingItem aLineSP = ((const SvxLineSpacingItem&)aAttrSet.
@@ -1015,7 +1015,7 @@ void ScDrawTextObjectBar::GetAttrState( SfxItemSet& rDestSet )
     rDestSet.Put(aLineSP);
     Invalidate(SID_ATTR_PARA_LINESPACE);
     eState = aAttrSet.GetItemState( EE_PARA_SBL );
-    if ( eState == SFX_ITEM_DONTCARE )
+    if ( eState == SfxItemState::DONTCARE )
         rDestSet.InvalidateItem(SID_ATTR_PARA_LINESPACE);
     //xuxu for UL Space
     SvxULSpaceItem aULSP = ((const SvxULSpaceItem&)aAttrSet.
@@ -1024,7 +1024,7 @@ void ScDrawTextObjectBar::GetAttrState( SfxItemSet& rDestSet )
     rDestSet.Put(aULSP);
     Invalidate(SID_ATTR_PARA_ULSPACE);
     eState = aAttrSet.GetItemState( EE_PARA_ULSPACE );
-    if ( eState == SFX_ITEM_DONTCARE )
+    if ( eState == SfxItemState::DONTCARE )
         rDestSet.InvalidateItem(SID_ATTR_PARA_ULSPACE);
 
     //  Zeilenabstand
@@ -1057,7 +1057,7 @@ void ScDrawTextObjectBar::GetAttrState( SfxItemSet& rDestSet )
     //  Unterstreichung
 
     eState = aAttrSet.GetItemState( EE_CHAR_UNDERLINE, true );
-    if ( eState == SFX_ITEM_DONTCARE )
+    if ( eState == SfxItemState::DONTCARE )
     {
         rDestSet.InvalidateItem( SID_ULINE_VAL_NONE );
         rDestSet.InvalidateItem( SID_ULINE_VAL_SINGLE );
@@ -1112,7 +1112,7 @@ void ScDrawTextObjectBar::GetAttrState( SfxItemSet& rDestSet )
         rDestSet.DisableItem( SID_ATTR_PARA_LEFT_TO_RIGHT );
         rDestSet.DisableItem( SID_ATTR_PARA_RIGHT_TO_LEFT );
     }
-    else if ( aAttrSet.GetItemState( EE_PARA_WRITINGDIR ) == SFX_ITEM_DONTCARE )
+    else if ( aAttrSet.GetItemState( EE_PARA_WRITINGDIR ) == SfxItemState::DONTCARE )
     {
         rDestSet.InvalidateItem( SID_ATTR_PARA_LEFT_TO_RIGHT );
         rDestSet.InvalidateItem( SID_ATTR_PARA_RIGHT_TO_LEFT );
@@ -1176,7 +1176,7 @@ void ScDrawTextObjectBar::GetStatePropPanelAttr(SfxItemSet &rSet)
             case SID_TABLE_VERT_BOTTOM:
                 bool bContour = false;
                 SfxItemState eConState = aEditAttr.GetItemState( SDRATTR_TEXT_CONTOURFRAME );
-                if( eConState != SFX_ITEM_DONTCARE )
+                if( eConState != SfxItemState::DONTCARE )
                 {
                     bContour = ( ( const SdrOnOffItem& )aEditAttr.Get( SDRATTR_TEXT_CONTOURFRAME ) ).GetValue();
                 }
@@ -1185,8 +1185,8 @@ void ScDrawTextObjectBar::GetStatePropPanelAttr(SfxItemSet &rSet)
                 SfxItemState eVState = aEditAttr.GetItemState( SDRATTR_TEXT_VERTADJUST );
                 //SfxItemState eHState = aAttrs.GetItemState( SDRATTR_TEXT_HORZADJUST );
 
-                //if(SFX_ITEM_DONTCARE != eVState && SFX_ITEM_DONTCARE != eHState)
-                if(SFX_ITEM_DONTCARE != eVState)
+                //if(SfxItemState::DONTCARE != eVState && SfxItemState::DONTCARE != eHState)
+                if(SfxItemState::DONTCARE != eVState)
                 {
                     SdrTextVertAdjust eTVA = (SdrTextVertAdjust)((const SdrTextVertAdjustItem&)aEditAttr.Get(SDRATTR_TEXT_VERTADJUST)).GetValue();
                     bool bSet = (nSlotId == SID_TABLE_VERT_NONE && eTVA == SDRTEXTVERTADJUST_TOP) ||
diff --git a/sc/source/ui/drawfunc/fuins1.cxx b/sc/source/ui/drawfunc/fuins1.cxx
index df225de294d3..3b96207d14ca 100644
--- a/sc/source/ui/drawfunc/fuins1.cxx
+++ b/sc/source/ui/drawfunc/fuins1.cxx
@@ -235,16 +235,16 @@ FuInsertGraphic::FuInsertGraphic( ScTabViewShell*   pViewSh,
     const SfxItemSet* pReqArgs = rReq.GetArgs();
     const SfxPoolItem* pItem;
     if ( pReqArgs &&
-         pReqArgs->GetItemState( SID_INSERT_GRAPHIC, true, &pItem ) == SFX_ITEM_SET )
+         pReqArgs->GetItemState( SID_INSERT_GRAPHIC, true, &pItem ) == SfxItemState::SET )
     {
         OUString aFileName = ((const SfxStringItem*)pItem)->GetValue();
 
         OUString aFilterName;
-        if ( pReqArgs->GetItemState( FN_PARAM_FILTER, true, &pItem ) == SFX_ITEM_SET )
+        if ( pReqArgs->GetItemState( FN_PARAM_FILTER, true, &pItem ) == SfxItemState::SET )
             aFilterName = ((const SfxStringItem*)pItem)->GetValue();
 
         bool bAsLink = false;
-        if ( pReqArgs->GetItemState( FN_PARAM_1, true, &pItem ) == SFX_ITEM_SET )
+        if ( pReqArgs->GetItemState( FN_PARAM_1, true, &pItem ) == SfxItemState::SET )
             bAsLink = ((const SfxBoolItem*)pItem)->GetValue();
 
         Graphic aGraphic;
diff --git a/sc/source/ui/drawfunc/mediash.cxx b/sc/source/ui/drawfunc/mediash.cxx
index a7c4e22546ab..ce1135188c82 100644
--- a/sc/source/ui/drawfunc/mediash.cxx
+++ b/sc/source/ui/drawfunc/mediash.cxx
@@ -106,7 +106,7 @@ void ScMediaShell::ExecuteMedia( SfxRequest& rReq )
         const SfxItemSet*   pArgs = rReq.GetArgs();
         const SfxPoolItem*  pItem;
 
-        if( !pArgs || ( SFX_ITEM_SET != pArgs->GetItemState( SID_AVMEDIA_TOOLBOX, false, &pItem ) ) )
+        if( !pArgs || ( SfxItemState::SET != pArgs->GetItemState( SID_AVMEDIA_TOOLBOX, false, &pItem ) ) )
             pItem = NULL;
 
         if( pItem )
diff --git a/sc/source/ui/optdlg/tpdefaults.cxx b/sc/source/ui/optdlg/tpdefaults.cxx
index 5e7c302965bd..8dd1f4219baa 100644
--- a/sc/source/ui/optdlg/tpdefaults.cxx
+++ b/sc/source/ui/optdlg/tpdefaults.cxx
@@ -62,7 +62,7 @@ void ScTpDefaultsOptions::Reset(const SfxItemSet* rCoreSet)
     ScDefaultsOptions aOpt;
     const SfxPoolItem* pItem = NULL;
 
-    if(SFX_ITEM_SET == rCoreSet->GetItemState(SID_SCDEFAULTSOPTIONS, false , &pItem))
+    if(SfxItemState::SET == rCoreSet->GetItemState(SID_SCDEFAULTSOPTIONS, false , &pItem))
         aOpt = ((const ScTpDefaultsItem*)pItem)->GetDefaultsOptions();
 
     m_pEdNSheets->SetValue( static_cast<sal_uInt16>( aOpt.GetInitTabCount()) );
diff --git a/sc/source/ui/optdlg/tpformula.cxx b/sc/source/ui/optdlg/tpformula.cxx
index 87aa63918b35..0cedac43dcc2 100644
--- a/sc/source/ui/optdlg/tpformula.cxx
+++ b/sc/source/ui/optdlg/tpformula.cxx
@@ -290,7 +290,7 @@ void ScTpFormulaOptions::Reset(const SfxItemSet* rCoreSet)
     ScFormulaOptions aOpt;
     const SfxPoolItem* pItem = NULL;
 
-    if(SFX_ITEM_SET == rCoreSet->GetItemState(SID_SCFORMULAOPTIONS, false , &pItem))
+    if(SfxItemState::SET == rCoreSet->GetItemState(SID_SCFORMULAOPTIONS, false , &pItem))
         aOpt = ((const ScTpFormulaItem*)pItem)->GetFormulaOptions();
 
     // formula grammar.
diff --git a/sc/source/ui/optdlg/tpprint.cxx b/sc/source/ui/optdlg/tpprint.cxx
index e7b7a8c5e4e3..9b65283d7cd1 100644
--- a/sc/source/ui/optdlg/tpprint.cxx
+++ b/sc/source/ui/optdlg/tpprint.cxx
@@ -61,7 +61,7 @@ void ScTpPrintOptions::Reset( const SfxItemSet* rCoreSet )
     ScPrintOptions aOptions;
 
     const SfxPoolItem* pItem;
-    if(SFX_ITEM_SET == rCoreSet->GetItemState(SID_SCPRINTOPTIONS, false , &pItem))
+    if(SfxItemState::SET == rCoreSet->GetItemState(SID_SCPRINTOPTIONS, false , &pItem))
         aOptions = ((const ScTpPrintItem*)pItem)->GetPrintOptions();
     else
     {
@@ -69,7 +69,7 @@ void ScTpPrintOptions::Reset( const SfxItemSet* rCoreSet )
         aOptions = SC_MOD()->GetPrintOptions();
     }
 
-    if ( SFX_ITEM_SET == rCoreSet->GetItemState( SID_PRINT_SELECTEDSHEET, false , &pItem ) )
+    if ( SfxItemState::SET == rCoreSet->GetItemState( SID_PRINT_SELECTEDSHEET, false , &pItem ) )
     {
         bool bChecked = ( (const SfxBoolItem*)pItem )->GetValue();
         m_pSelectedSheetsCB->Check( bChecked );
diff --git a/sc/source/ui/optdlg/tpview.cxx b/sc/source/ui/optdlg/tpview.cxx
index 2e42029b6234..0beeeb909b20 100644
--- a/sc/source/ui/optdlg/tpview.cxx
+++ b/sc/source/ui/optdlg/tpview.cxx
@@ -148,7 +148,7 @@ bool    ScTpContentOptions::FillItemSet( SfxItemSet* rCoreSet )
 void    ScTpContentOptions::Reset( const SfxItemSet* rCoreSet )
 {
     const SfxPoolItem* pItem;
-    if(SFX_ITEM_SET == rCoreSet->GetItemState(SID_SCVIEWOPTIONS, false , &pItem))
+    if(SfxItemState::SET == rCoreSet->GetItemState(SID_SCVIEWOPTIONS, false , &pItem))
         pLocalOptions  = new ScViewOptions(
                             ((const ScTpViewItem*)pItem)->GetViewOptions() );
     else
@@ -175,9 +175,9 @@ void    ScTpContentOptions::Reset( const SfxItemSet* rCoreSet )
     pBreakCB->Check( pLocalOptions->GetOption(VOPT_PAGEBREAKS) );
     pGuideLineCB->Check( pLocalOptions->GetOption(VOPT_HELPLINES) );
 
-    if(SFX_ITEM_SET == rCoreSet->GetItemState(SID_SC_INPUT_RANGEFINDER, false, &pItem))
+    if(SfxItemState::SET == rCoreSet->GetItemState(SID_SC_INPUT_RANGEFINDER, false, &pItem))
         pRangeFindCB->Check(((const SfxBoolItem*)pItem)->GetValue());
-    if(SFX_ITEM_SET == rCoreSet->GetItemState(SID_SC_OPT_SYNCZOOM, false, &pItem))
+    if(SfxItemState::SET == rCoreSet->GetItemState(SID_SC_OPT_SYNCZOOM, false, &pItem))
         pSyncZoomCB->Check(((const SfxBoolItem*)pItem)->GetValue());
 
     pRangeFindCB->SaveValue();
@@ -206,7 +206,7 @@ void    ScTpContentOptions::Reset( const SfxItemSet* rCoreSet )
 void ScTpContentOptions::ActivatePage( const SfxItemSet& rSet)
 {
     const SfxPoolItem* pItem;
-    if(SFX_ITEM_SET == rSet.GetItemState(SID_SCVIEWOPTIONS, false , &pItem))
+    if(SfxItemState::SET == rSet.GetItemState(SID_SCVIEWOPTIONS, false , &pItem))
         *pLocalOptions = ((const ScTpViewItem*)pItem)->GetViewOptions();
 }
 
@@ -525,7 +525,7 @@ bool    ScTpLayoutOptions::FillItemSet( SfxItemSet* rCoreSet )
 void    ScTpLayoutOptions::Reset( const SfxItemSet* rCoreSet )
 {
     m_pUnitLB->SetNoSelection();
-    if ( rCoreSet->GetItemState( SID_ATTR_METRIC ) >= SFX_ITEM_DEFAULT )
+    if ( rCoreSet->GetItemState( SID_ATTR_METRIC ) >= SfxItemState::DEFAULT )
     {
         const SfxUInt16Item& rItem = (SfxUInt16Item&)rCoreSet->Get( SID_ATTR_METRIC );
         FieldUnit eFieldUnit = (FieldUnit)rItem.GetValue();
@@ -543,7 +543,7 @@ void    ScTpLayoutOptions::Reset( const SfxItemSet* rCoreSet )
     m_pUnitLB->SaveValue();
 
     const SfxPoolItem* pItem;
-    if(SFX_ITEM_SET == rCoreSet->GetItemState(SID_ATTR_DEFTABSTOP, false, &pItem))
+    if(SfxItemState::SET == rCoreSet->GetItemState(SID_ATTR_DEFTABSTOP, false, &pItem))
         m_pTabMF->SetValue(m_pTabMF->Normalize(((SfxUInt16Item*)pItem)->GetValue()), FUNIT_TWIP);
     m_pTabMF->SaveValue();
 
@@ -573,34 +573,34 @@ void    ScTpLayoutOptions::Reset( const SfxItemSet* rCoreSet )
             // added to avoid warnings
         }
     }
-    if(SFX_ITEM_SET == rCoreSet->GetItemState(SID_SC_INPUT_SELECTION, false, &pItem))
+    if(SfxItemState::SET == rCoreSet->GetItemState(SID_SC_INPUT_SELECTION, false, &pItem))
         m_pAlignCB->Check(((const SfxBoolItem*)pItem)->GetValue());
 
-    if(SFX_ITEM_SET == rCoreSet->GetItemState(SID_SC_INPUT_SELECTIONPOS, false, &pItem))
+    if(SfxItemState::SET == rCoreSet->GetItemState(SID_SC_INPUT_SELECTIONPOS, false, &pItem))
         m_pAlignLB->SelectEntryPos(((const SfxUInt16Item*)pItem)->GetValue());
 
-    if(SFX_ITEM_SET == rCoreSet->GetItemState(SID_SC_INPUT_EDITMODE, false, &pItem))
+    if(SfxItemState::SET == rCoreSet->GetItemState(SID_SC_INPUT_EDITMODE, false, &pItem))
         m_pEditModeCB->Check(((const SfxBoolItem*)pItem)->GetValue());
 
-    if(SFX_ITEM_SET == rCoreSet->GetItemState(SID_SC_INPUT_FMT_EXPAND, false, &pItem))
+    if(SfxItemState::SET == rCoreSet->GetItemState(SID_SC_INPUT_FMT_EXPAND, false, &pItem))
         m_pFormatCB->Check(((const SfxBoolItem*)pItem)->GetValue());
 
-    if(SFX_ITEM_SET == rCoreSet->GetItemState(SID_SC_INPUT_REF_EXPAND, false, &pItem))
+    if(SfxItemState::SET == rCoreSet->GetItemState(SID_SC_INPUT_REF_EXPAND, false, &pItem))
         m_pExpRefCB->Check(((const SfxBoolItem*)pItem)->GetValue());
 
     if (rCoreSet->HasItem(SID_SC_OPT_SORT_REF_UPDATE, &pItem))
         m_pSortRefUpdateCB->Check(static_cast<const SfxBoolItem*>(pItem)->GetValue());
 
-    if(SFX_ITEM_SET == rCoreSet->GetItemState(SID_SC_INPUT_MARK_HEADER, false, &pItem))
+    if(SfxItemState::SET == rCoreSet->GetItemState(SID_SC_INPUT_MARK_HEADER, false, &pItem))
         m_pMarkHdrCB->Check(((const SfxBoolItem*)pItem)->GetValue());
 
-    if(SFX_ITEM_SET == rCoreSet->GetItemState(SID_SC_INPUT_TEXTWYSIWYG, false, &pItem))
+    if(SfxItemState::SET == rCoreSet->GetItemState(SID_SC_INPUT_TEXTWYSIWYG, false, &pItem))
         m_pTextFmtCB->Check(((const SfxBoolItem*)pItem)->GetValue());
 
-    if( SFX_ITEM_SET == rCoreSet->GetItemState( SID_SC_INPUT_REPLCELLSWARN, false, &pItem ) )
+    if( SfxItemState::SET == rCoreSet->GetItemState( SID_SC_INPUT_REPLCELLSWARN, false, &pItem ) )
         m_pReplWarnCB->Check( ( (const SfxBoolItem*)pItem)->GetValue() );
 
-    if( SFX_ITEM_SET == rCoreSet->GetItemState( SID_SC_INPUT_LEGACY_CELL_SELECTION, false, &pItem ) )
+    if( SfxItemState::SET == rCoreSet->GetItemState( SID_SC_INPUT_LEGACY_CELL_SELECTION, false, &pItem ) )
         m_pLegacyCellSelectionCB->Check( ( (const SfxBoolItem*)pItem)->GetValue() );
 
     m_pAlignCB    ->SaveValue();
diff --git a/sc/source/ui/pagedlg/tptable.cxx b/sc/source/ui/pagedlg/tptable.cxx
index 71dd44e3182c..aa58550fd7f7 100644
--- a/sc/source/ui/pagedlg/tptable.cxx
+++ b/sc/source/ui/pagedlg/tptable.cxx
@@ -69,7 +69,7 @@ static bool lcl_PutBoolItem( sal_uInt16            nWhich,
 #define PAGEDIR_HDL         LINK(this,ScTablePage,PageDirHdl)
 #define SCALE_HDL           LINK(this,ScTablePage,ScaleHdl)
 
-#define WAS_DEFAULT(w,s)    (SFX_ITEM_DEFAULT==(s).GetItemState((w),true))
+#define WAS_DEFAULT(w,s)    (SfxItemState::DEFAULT==(s).GetItemState((w),true))
 #define GET_BOOL(sid,set)   ((const SfxBoolItem&)((set).Get(GetWhich((sid))))).GetValue()
 #define GET_USHORT(sid,set) (sal_uInt16)((const SfxUInt16Item&)((set).Get(GetWhich((sid))))).GetValue()
 #define GET_SHOW(sid,set)   ( ScVObjMode( ((const ScViewObjectModeItem&)((set).Get(GetWhich((sid))))).GetValue() ) \
@@ -164,7 +164,7 @@ void ScTablePage::Reset( const SfxItemSet* rCoreSet )
 
     // scaling:
     nWhich = GetWhich(SID_SCATTR_PAGE_SCALE);
-    if ( rCoreSet->GetItemState( nWhich, true ) >= SFX_ITEM_DEFAULT )
+    if ( rCoreSet->GetItemState( nWhich, true ) >= SfxItemState::DEFAULT )
     {
         sal_uInt16 nScale = ((const SfxUInt16Item&)rCoreSet->Get(nWhich)).GetValue();
         if( nScale > 0 )
@@ -173,7 +173,7 @@ void ScTablePage::Reset( const SfxItemSet* rCoreSet )
     }
 
     nWhich = GetWhich(SID_SCATTR_PAGE_SCALETO);
-    if ( rCoreSet->GetItemState( nWhich, true ) >= SFX_ITEM_DEFAULT )
+    if ( rCoreSet->GetItemState( nWhich, true ) >= SfxItemState::DEFAULT )
     {
         const ScPageScaleToItem& rItem = static_cast< const ScPageScaleToItem& >( rCoreSet->Get( nWhich ) );
         sal_uInt16 nWidth = rItem.GetWidth();
@@ -189,7 +189,7 @@ void ScTablePage::Reset( const SfxItemSet* rCoreSet )
     }
 
     nWhich = GetWhich(SID_SCATTR_PAGE_SCALETOPAGES);
-    if ( rCoreSet->GetItemState( nWhich, true ) >= SFX_ITEM_DEFAULT )
+    if ( rCoreSet->GetItemState( nWhich, true ) >= SfxItemState::DEFAULT )
     {
         sal_uInt16 nPages = ((const SfxUInt16Item&)rCoreSet->Get(nWhich)).GetValue();
         if( nPages > 0 )
diff --git a/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx b/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx
index 462a69c7ea00..03432bec2530 100644
--- a/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx
+++ b/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx
@@ -236,7 +236,7 @@ void AlignmentPropertyPanel::NotifyItemUpdate(
     case SID_H_ALIGNCELL:
         {
             SvxCellHorJustify meHorAlignState = SVX_HOR_JUSTIFY_STANDARD;
-            if(eState >= SFX_ITEM_DEFAULT && pState && pState->ISA(SvxHorJustifyItem) )
+            if(eState >= SfxItemState::DEFAULT && pState && pState->ISA(SvxHorJustifyItem) )
             {
                 const SvxHorJustifyItem* pItem = (const SvxHorJustifyItem*)pState;
                 meHorAlignState = (SvxCellHorJustify)pItem->GetValue();
@@ -261,7 +261,7 @@ void AlignmentPropertyPanel::NotifyItemUpdate(
         }
         break;
     case SID_ATTR_ALIGN_INDENT:
-        if(eState >= SFX_ITEM_DEFAULT && pState && pState->ISA(SfxUInt16Item) )
+        if(eState >= SfxItemState::DEFAULT && pState && pState->ISA(SfxUInt16Item) )
         {
                 const SfxUInt16Item* pItem = (const SfxUInt16Item*)pState;
                 sal_uInt16 nVal = pItem->GetValue();
@@ -274,7 +274,7 @@ void AlignmentPropertyPanel::NotifyItemUpdate(
         }
         break;
     case FID_MERGE_TOGGLE:
-        if(eState >= SFX_ITEM_DEFAULT && pState && pState->ISA(SfxBoolItem) )
+        if(eState >= SfxItemState::DEFAULT && pState && pState->ISA(SfxBoolItem) )
         {
             mpCBXMergeCell->Enable();
             const SfxBoolItem* pItem = (const SfxBoolItem*)pState;
@@ -288,7 +288,7 @@ void AlignmentPropertyPanel::NotifyItemUpdate(
         break;
 
     case SID_ATTR_ALIGN_LINEBREAK:
-        if(eState == SFX_ITEM_DISABLED)
+        if(eState == SfxItemState::DISABLED)
         {
             mpCBXWrapText->EnableTriState(false);
             mpCBXWrapText->Check(false);
@@ -297,13 +297,13 @@ void AlignmentPropertyPanel::NotifyItemUpdate(
         else
         {
             mpCBXWrapText->Enable();
-            if(eState >= SFX_ITEM_DEFAULT && pState && pState->ISA(SfxBoolItem) )
+            if(eState >= SfxItemState::DEFAULT && pState && pState->ISA(SfxBoolItem) )
             {
                 mpCBXWrapText->EnableTriState(false);
                 const SfxBoolItem* pItem = (const SfxBoolItem*)pState;
                 mpCBXWrapText->Check(pItem->GetValue());
             }
-            else if(eState == SFX_ITEM_DONTCARE)
+            else if(eState == SfxItemState::DONTCARE)
             {
                 mpCBXWrapText->EnableTriState(true);
                 mpCBXWrapText->SetState(TRISTATE_INDET);
@@ -311,7 +311,7 @@ void AlignmentPropertyPanel::NotifyItemUpdate(
         }
         break;
     case SID_ATTR_ALIGN_DEGREES:
-        if (eState >= SFX_ITEM_DEFAULT)
+        if (eState >= SfxItemState::DEFAULT)
         {
             long nTmp = ((const SfxInt32Item*)pState)->GetValue();
             mpMtrAngle->SetValue( nTmp / 100);  //wj
@@ -350,7 +350,7 @@ void AlignmentPropertyPanel::NotifyItemUpdate(
         }
         break;
     case SID_ATTR_ALIGN_STACKED:
-        if (eState >= SFX_ITEM_DEFAULT)
+        if (eState >= SfxItemState::DEFAULT)
         {
             mpCbStacked->EnableTriState(false);
             const SfxBoolItem* aStackItem = (const SfxBoolItem*)pState;
diff --git a/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx b/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx
index a16668c3ca40..49bfa73a0570 100644
--- a/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx
+++ b/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx
@@ -387,7 +387,7 @@ void CellAppearancePropertyPanel::NotifyItemUpdate(
     switch(nSID)
     {
     case SID_BACKGROUND_COLOR:
-        if(eState >= SFX_ITEM_DEFAULT)
+        if(eState >= SfxItemState::DEFAULT)
         {
             const SvxColorItem* pSvxColorItem = dynamic_cast< const SvxColorItem* >(pState);
 
@@ -405,7 +405,7 @@ void CellAppearancePropertyPanel::NotifyItemUpdate(
         mpFillColorUpdater->Update(COL_TRANSPARENT);
         break;
     case SID_FRAME_LINECOLOR:
-        if( eState == SFX_ITEM_DONTCARE)
+        if( eState == SfxItemState::DONTCARE)
         {
             mbLineColorAvailable = true;
             maLineColor.SetColor( COL_TRANSPARENT );
@@ -413,7 +413,7 @@ void CellAppearancePropertyPanel::NotifyItemUpdate(
             break;
         }
 
-        if(eState >= SFX_ITEM_DEFAULT && pState && pState->ISA(SvxColorItem) )
+        if(eState >= SfxItemState::DEFAULT && pState && pState->ISA(SvxColorItem) )
         {
             const SvxColorItem* pSvxColorItem = dynamic_cast< const SvxColorItem* >(pState);
 
@@ -439,7 +439,7 @@ void CellAppearancePropertyPanel::NotifyItemUpdate(
         UpdateControlState();
         break;
     case SID_FRAME_LINESTYLE:
-        if( eState == SFX_ITEM_DONTCARE )
+        if( eState == SfxItemState::DONTCARE )
         {
             mbBorderStyleAvailable = true;
             mnIn = 0;
@@ -449,7 +449,7 @@ void CellAppearancePropertyPanel::NotifyItemUpdate(
             break;
         }
 
-        if(eState >= SFX_ITEM_DEFAULT)
+        if(eState >= SfxItemState::DEFAULT)
         {
             const SvxLineItem* pSvxLineItem = dynamic_cast< const SvxLineItem* >(pState);
 
@@ -474,7 +474,7 @@ void CellAppearancePropertyPanel::NotifyItemUpdate(
         SetStyleIcon();
         break;
     case SID_ATTR_BORDER_OUTER:
-        if(eState >= SFX_ITEM_DEFAULT)
+        if(eState >= SfxItemState::DEFAULT)
         {
             const SvxBoxItem* pBoxItem = dynamic_cast< const SvxBoxItem* >(pState);
 
@@ -509,7 +509,7 @@ void CellAppearancePropertyPanel::NotifyItemUpdate(
         }
         break;
     case SID_ATTR_BORDER_INNER:
-        if(eState >= SFX_ITEM_DEFAULT)
+        if(eState >= SfxItemState::DEFAULT)
         {
             const SvxBoxInfoItem* pBoxInfoItem = dynamic_cast< const SvxBoxInfoItem* >(pState);
 
@@ -552,7 +552,7 @@ void CellAppearancePropertyPanel::NotifyItemUpdate(
         }
         break;
     case SID_ATTR_BORDER_DIAG_TLBR:
-        if( eState == SFX_ITEM_DONTCARE )
+        if( eState == SfxItemState::DONTCARE )
         {
             mbTLBR = true;
             maTLBRColor.SetColor(COL_TRANSPARENT);
@@ -561,7 +561,7 @@ void CellAppearancePropertyPanel::NotifyItemUpdate(
             break;
         }
 
-        if(eState >= SFX_ITEM_DEFAULT)
+        if(eState >= SfxItemState::DEFAULT)
         {
             const SvxLineItem* pItem = dynamic_cast< const SvxLineItem* >(pState);
 
@@ -594,7 +594,7 @@ void CellAppearancePropertyPanel::NotifyItemUpdate(
         UpdateControlState();
         break;
     case SID_ATTR_BORDER_DIAG_BLTR:
-        if( eState == SFX_ITEM_DONTCARE )
+        if( eState == SfxItemState::DONTCARE )
         {
             mbBLTR = true;
             maBLTRColor.SetColor( COL_TRANSPARENT );
@@ -603,7 +603,7 @@ void CellAppearancePropertyPanel::NotifyItemUpdate(
             break;
         }
 
-        if(eState >= SFX_ITEM_DEFAULT)
+        if(eState >= SfxItemState::DEFAULT)
         {
             const SvxLineItem* pItem = dynamic_cast< const SvxLineItem* >(pState);
 
@@ -636,7 +636,7 @@ void CellAppearancePropertyPanel::NotifyItemUpdate(
         UpdateControlState();
         break;
     case FID_TAB_TOGGLE_GRID:
-        if(eState >= SFX_ITEM_DEFAULT)
+        if(eState >= SfxItemState::DEFAULT)
         {
             const SfxBoolItem* pItem = dynamic_cast< const SfxBoolItem* >(pState);
 
diff --git a/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx b/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx
index 51bc433e63ff..a63f065182e7 100644
--- a/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx
+++ b/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx
@@ -216,7 +216,7 @@ void NumberFormatPropertyPanel::NotifyItemUpdate(
     {
     case SID_NUMBER_TYPE_FORMAT:
         {
-            if( eState >= SFX_ITEM_DEFAULT)
+            if( eState >= SfxItemState::DEFAULT)
             {
                 const SfxInt16Item* pItem = (const SfxInt16Item*)pState;
                 sal_uInt16 nVal = pItem->GetValue();
@@ -254,7 +254,7 @@ void NumberFormatPropertyPanel::NotifyItemUpdate(
             bool          bNegRed       =    false;
             sal_uInt16        nPrecision    =    0;
             sal_uInt16        nLeadZeroes   =    0;
-            if( eState >= SFX_ITEM_DEFAULT)
+            if( eState >= SfxItemState::DEFAULT)
             {
                 const SfxStringItem* pItem = (const SfxStringItem*)pState;
                 OUString aCode = pItem->GetValue();
diff --git a/sc/source/ui/undo/undocell.cxx b/sc/source/ui/undo/undocell.cxx
index bc37706095e5..485e89015388 100644
--- a/sc/source/ui/undo/undocell.cxx
+++ b/sc/source/ui/undo/undocell.cxx
@@ -136,9 +136,9 @@ void ScUndoCursorAttr::DoChange( const ScPatternAttr* pWhichPattern, const share
     }
 
     const SfxItemSet& rApplySet = pApplyPattern->GetItemSet();
-    bool bPaintExt = ( rApplySet.GetItemState( ATTR_SHADOW, true ) != SFX_ITEM_DEFAULT ||
-                       rApplySet.GetItemState( ATTR_CONDITIONAL, true ) != SFX_ITEM_DEFAULT );
-    bool bPaintRows = ( rApplySet.GetItemState( ATTR_HOR_JUSTIFY, true ) != SFX_ITEM_DEFAULT );
+    bool bPaintExt = ( rApplySet.GetItemState( ATTR_SHADOW, true ) != SfxItemState::DEFAULT ||
+                       rApplySet.GetItemState( ATTR_CONDITIONAL, true ) != SfxItemState::DEFAULT );
+    bool bPaintRows = ( rApplySet.GetItemState( ATTR_HOR_JUSTIFY, true ) != SfxItemState::DEFAULT );
 
     sal_uInt16 nFlags = SC_PF_TESTMERGE;
     if (bPaintExt)
diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx
index 1089af3ee3d5..0d19e29a72e1 100644
--- a/sc/source/ui/unoobj/cellsuno.cxx
+++ b/sc/source/ui/unoobj/cellsuno.cxx
@@ -1876,14 +1876,14 @@ beans::PropertyState ScCellRangesBase::GetOnePropertyState( sal_uInt16 nItemWhic
         {
             SfxItemState eState = pPattern->GetItemSet().GetItemState( nItemWhich, false );
 
-            if ( nItemWhich == ATTR_VALUE_FORMAT && eState == SFX_ITEM_DEFAULT )
+            if ( nItemWhich == ATTR_VALUE_FORMAT && eState == SfxItemState::DEFAULT )
                 eState = pPattern->GetItemSet().GetItemState( ATTR_LANGUAGE_FORMAT, false );
 
-            if ( eState == SFX_ITEM_SET )
+            if ( eState == SfxItemState::SET )
                 eRet = beans::PropertyState_DIRECT_VALUE;
-            else if ( eState == SFX_ITEM_DEFAULT )
+            else if ( eState == SfxItemState::DEFAULT )
                 eRet = beans::PropertyState_DEFAULT_VALUE;
-            else if ( eState == SFX_ITEM_DONTCARE )
+            else if ( eState == SfxItemState::DONTCARE )
                 eRet = beans::PropertyState_AMBIGUOUS_VALUE;
             else
             {
diff --git a/sc/source/ui/unoobj/styleuno.cxx b/sc/source/ui/unoobj/styleuno.cxx
index a79af3dbeb67..b32e23f5b32b 100644
--- a/sc/source/ui/unoobj/styleuno.cxx
+++ b/sc/source/ui/unoobj/styleuno.cxx
@@ -1224,14 +1224,14 @@ beans::PropertyState SAL_CALL ScStyleObj::getPropertyState( const OUString& aPro
 
 //           //  if no rotate value is set, look at orientation
 //           //! also for a fixed value of 0 (in case orientation is ambiguous)?
-//           if ( nWhich == ATTR_ROTATE_VALUE && eState == SFX_ITEM_DEFAULT )
+//           if ( nWhich == ATTR_ROTATE_VALUE && eState == SfxItemState::DEFAULT )
 //               eState = pItemSet->GetItemState( ATTR_ORIENTATION, sal_False );
 
-            if ( eState == SFX_ITEM_SET )
+            if ( eState == SfxItemState::SET )
                 eRet = beans::PropertyState_DIRECT_VALUE;
-            else if ( eState == SFX_ITEM_DEFAULT )
+            else if ( eState == SfxItemState::DEFAULT )
                 eRet = beans::PropertyState_DEFAULT_VALUE;
-            else if ( eState == SFX_ITEM_DONTCARE )
+            else if ( eState == SfxItemState::DONTCARE )
                 eRet = beans::PropertyState_AMBIGUOUS_VALUE;    // kann eigentlich nicht sein...
             else
             {
@@ -1294,7 +1294,7 @@ uno::Any SAL_CALL ScStyleObj::getPropertyDefault( const OUString& aPropertyName
             //  Default-Items mit falscher Slot-ID funktionieren im SfxItemPropertySet3 nicht
             //! Slot-IDs aendern...
             if ( aEmptySet.GetPool()->GetSlotId(nWhich) == nWhich &&
-                 aEmptySet.GetItemState(nWhich, false) == SFX_ITEM_DEFAULT )
+                 aEmptySet.GetItemState(nWhich, false) == SfxItemState::DEFAULT )
             {
                 aEmptySet.Put( aEmptySet.Get( nWhich ) );
             }
@@ -1761,7 +1761,7 @@ void ScStyleObj::SetOnePropertyValue( const OUString& rPropertyName, const SfxIt
                                 //  funktionieren im SfxItemPropertySet3 nicht
                                 //! Slot-IDs aendern...
                                 if ( rSet.GetPool()->GetSlotId(pEntry->nWID) == pEntry->nWID &&
-                                     rSet.GetItemState(pEntry->nWID, false) == SFX_ITEM_DEFAULT )
+                                     rSet.GetItemState(pEntry->nWID, false) == SfxItemState::DEFAULT )
                                 {
                                     rSet.Put( rSet.Get(pEntry->nWID) );
                                 }
@@ -1953,7 +1953,7 @@ uno::Any SAL_CALL ScStyleObj::getPropertyValue( const OUString& aPropertyName )
                         //  funktionieren im SfxItemPropertySet3 nicht
                         //! Slot-IDs aendern...
                         if ( pItemSet->GetPool()->GetSlotId(nWhich) == nWhich &&
-                             pItemSet->GetItemState(nWhich, false) == SFX_ITEM_DEFAULT )
+                             pItemSet->GetItemState(nWhich, false) == SfxItemState::DEFAULT )
                         {
                             SfxItemSet aNoEmptySet( *pItemSet );
                             aNoEmptySet.Put( aNoEmptySet.Get( nWhich ) );
diff --git a/sc/source/ui/vba/vbaapplication.cxx b/sc/source/ui/vba/vbaapplication.cxx
index db47c7f2db43..0b632d787aac 100644
--- a/sc/source/ui/vba/vbaapplication.cxx
+++ b/sc/source/ui/vba/vbaapplication.cxx
@@ -1244,7 +1244,7 @@ ScVbaApplication::getDisplayFormulaBar()
 
         pViewShell->GetState( reqList );
         const SfxPoolItem *pItem=0;
-        if ( reqList.GetItemState( FID_TOGGLEINPUTLINE, false, &pItem ) == SFX_ITEM_SET )
+        if ( reqList.GetItemState( FID_TOGGLEINPUTLINE, false, &pItem ) == SfxItemState::SET )
             bRes =   ((SfxBoolItem*)pItem)->GetValue();
     }
     return bRes;
diff --git a/sc/source/ui/vba/vbafont.cxx b/sc/source/ui/vba/vbafont.cxx
index 873650bd3642..5d92e7025939 100644
--- a/sc/source/ui/vba/vbafont.cxx
+++ b/sc/source/ui/vba/vbafont.cxx
@@ -220,7 +220,7 @@ uno::Any SAL_CALL
 ScVbaFont::getSize() throw ( uno::RuntimeException, std::exception )
 {
     if ( GetDataSet() )
-        if (  GetDataSet()->GetItemState( ATTR_FONT_HEIGHT, true, NULL) == SFX_ITEM_DONTCARE )
+        if (  GetDataSet()->GetItemState( ATTR_FONT_HEIGHT, true, NULL) == SfxItemState::DONTCARE )
             return aNULL();
     return ScVbaFont_BASE::getSize();
 }
@@ -246,7 +246,7 @@ uno::Any SAL_CALL
 ScVbaFont::getColorIndex() throw ( uno::RuntimeException, std::exception )
 {
     if ( GetDataSet() )
-        if (  GetDataSet()->GetItemState( ATTR_FONT_COLOR, true, NULL) == SFX_ITEM_DONTCARE )
+        if (  GetDataSet()->GetItemState( ATTR_FONT_COLOR, true, NULL) == SfxItemState::DONTCARE )
             return aNULL();
     return ScVbaFont_BASE::getColorIndex();
 }
@@ -337,7 +337,7 @@ uno::Any SAL_CALL
 ScVbaFont::getBold() throw ( uno::RuntimeException, std::exception )
 {
     if ( GetDataSet() )
-        if (  GetDataSet()->GetItemState( ATTR_FONT_WEIGHT, true, NULL) == SFX_ITEM_DONTCARE )
+        if (  GetDataSet()->GetItemState( ATTR_FONT_WEIGHT, true, NULL) == SfxItemState::DONTCARE )
             return aNULL();
     return ScVbaFont_BASE::getBold();
 }
@@ -380,7 +380,7 @@ uno::Any SAL_CALL
 ScVbaFont::getUnderline() throw ( uno::RuntimeException, std::exception )
 {
     if ( GetDataSet() )
-        if (  GetDataSet()->GetItemState( ATTR_FONT_UNDERLINE, true, NULL) == SFX_ITEM_DONTCARE )
+        if (  GetDataSet()->GetItemState( ATTR_FONT_UNDERLINE, true, NULL) == SfxItemState::DONTCARE )
             return aNULL();
 
     sal_Int32 nValue = awt::FontUnderline::NONE;
@@ -407,7 +407,7 @@ uno::Any SAL_CALL
 ScVbaFont::getStrikethrough() throw ( uno::RuntimeException, std::exception )
 {
     if ( GetDataSet() )
-        if (  GetDataSet()->GetItemState( ATTR_FONT_CROSSEDOUT, true, NULL) == SFX_ITEM_DONTCARE )
+        if (  GetDataSet()->GetItemState( ATTR_FONT_CROSSEDOUT, true, NULL) == SfxItemState::DONTCARE )
             return aNULL();
     return ScVbaFont_BASE::getStrikethrough();
 }
@@ -416,7 +416,7 @@ uno::Any SAL_CALL
 ScVbaFont::getShadow() throw (uno::RuntimeException, std::exception)
 {
     if ( GetDataSet() )
-        if (  GetDataSet()->GetItemState( ATTR_FONT_SHADOWED, true, NULL) == SFX_ITEM_DONTCARE )
+        if (  GetDataSet()->GetItemState( ATTR_FONT_SHADOWED, true, NULL) == SfxItemState::DONTCARE )
             return aNULL();
     return ScVbaFont_BASE::getShadow();
 }
@@ -425,7 +425,7 @@ uno::Any SAL_CALL
 ScVbaFont::getItalic() throw ( uno::RuntimeException, std::exception )
 {
     if ( GetDataSet() )
-        if (  GetDataSet()->GetItemState( ATTR_FONT_POSTURE, true, NULL) == SFX_ITEM_DONTCARE )
+        if (  GetDataSet()->GetItemState( ATTR_FONT_POSTURE, true, NULL) == SfxItemState::DONTCARE )
             return aNULL();
 
     return ScVbaFont_BASE::getItalic();
@@ -435,7 +435,7 @@ uno::Any SAL_CALL
 ScVbaFont::getName() throw ( uno::RuntimeException, std::exception )
 {
     if ( GetDataSet() )
-        if (  GetDataSet()->GetItemState( ATTR_FONT, true, NULL) == SFX_ITEM_DONTCARE )
+        if (  GetDataSet()->GetItemState( ATTR_FONT, true, NULL) == SfxItemState::DONTCARE )
             return aNULL();
     return ScVbaFont_BASE::getName();
 }
@@ -458,7 +458,7 @@ uno::Any SAL_CALL
 ScVbaFont::getOutlineFont() throw (uno::RuntimeException, std::exception)
 {
     if ( GetDataSet() )
-        if (  GetDataSet()->GetItemState( ATTR_FONT_CONTOUR, true, NULL) == SFX_ITEM_DONTCARE )
+        if (  GetDataSet()->GetItemState( ATTR_FONT_CONTOUR, true, NULL) == SfxItemState::DONTCARE )
             return aNULL();
     return mxFont->getPropertyValue("CharContoured");
 }
diff --git a/sc/source/ui/vba/vbaformat.cxx b/sc/source/ui/vba/vbaformat.cxx
index 3cab632f1c00..7edec3fd0e52 100644
--- a/sc/source/ui/vba/vbaformat.cxx
+++ b/sc/source/ui/vba/vbaformat.cxx
@@ -556,7 +556,7 @@ ScVbaFormat<Ifc1>::getLocked(  ) throw (script::BasicErrorException, uno::Runtim
             {
                 const ScProtectionAttr& rProtAttr = (const ScProtectionAttr &) pDataSet->Get(ATTR_PROTECTION, true);
                 SfxItemState eState = pDataSet->GetItemState(ATTR_PROTECTION, true, NULL);
-                if(eState != SFX_ITEM_DONTCARE)
+                if(eState != SfxItemState::DONTCARE)
                     aCellProtection =  uno::makeAny(rProtAttr.GetProtection());
             }
             else // fallback to propertyset
@@ -589,7 +589,7 @@ ScVbaFormat<Ifc1>::getFormulaHidden(  ) throw (script::BasicErrorException, uno:
             {
                 const ScProtectionAttr& rProtAttr = (const ScProtectionAttr &) pDataSet->Get(ATTR_PROTECTION, true);
                 SfxItemState eState = pDataSet->GetItemState(ATTR_PROTECTION, true, NULL);
-                if(eState != SFX_ITEM_DONTCARE)
+                if(eState != SfxItemState::DONTCARE)
                     aBoolRet = uno::makeAny(rProtAttr.GetHideFormula());
             }
             else
diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx
index 523db877a903..a314da25041d 100644
--- a/sc/source/ui/vba/vbarange.cxx
+++ b/sc/source/ui/vba/vbarange.cxx
@@ -543,7 +543,7 @@ public:
             SfxItemState eState = pDataSet->GetItemState( ATTR_VALUE_FORMAT, true, NULL);
             // one of the cells in the range is not like the other ;-)
             // so return a zero length format to indicate that
-            if ( eState == SFX_ITEM_DONTCARE )
+            if ( eState == SfxItemState::DONTCARE )
                 return OUString();
         }
 
@@ -2660,7 +2660,7 @@ ScVbaRange::getWrapText() throw (script::BasicErrorException, uno::RuntimeExcept
     SfxItemSet* pDataSet = getCurrentDataSet();
 
     SfxItemState eState = pDataSet->GetItemState( ATTR_LINEBREAK, true, NULL);
-    if ( eState == SFX_ITEM_DONTCARE )
+    if ( eState == SfxItemState::DONTCARE )
         return aNULL();
 
     uno::Reference< beans::XPropertySet > xProps(mxRange, ::uno::UNO_QUERY_THROW );
@@ -3947,7 +3947,7 @@ ScVbaRange::getRowHeight()
     sal_Int32 nEndRow = thisAddress.EndRow;
         sal_uInt16 nRowTwips = 0;
     // #TODO probably possible to use the SfxItemSet ( and see if
-    //  SFX_ITEM_DONTCARE is set ) to improve performance
+    //  SfxItemState::DONTCARE is set ) to improve performance
 // #CHECKME looks like this is general behaviour not just row Range specific
 //  if ( mbIsRows )
     ScDocShell* pShell = getScDocShell();
diff --git a/sc/source/ui/view/auditsh.cxx b/sc/source/ui/view/auditsh.cxx
index f8723e688ccf..ac5b37f777c5 100644
--- a/sc/source/ui/view/auditsh.cxx
+++ b/sc/source/ui/view/auditsh.cxx
@@ -92,8 +92,8 @@ void ScAuditingShell::Execute( SfxRequest& rReq )
                 {
                     const SfxPoolItem* pXItem;
                     const SfxPoolItem* pYItem;
-                    if ( pReqArgs->GetItemState( SID_RANGE_COL, true, &pXItem ) == SFX_ITEM_SET
-                      && pReqArgs->GetItemState( SID_RANGE_ROW, true, &pYItem ) == SFX_ITEM_SET )
+                    if ( pReqArgs->GetItemState( SID_RANGE_COL, true, &pXItem ) == SfxItemState::SET
+                      && pReqArgs->GetItemState( SID_RANGE_ROW, true, &pYItem ) == SfxItemState::SET )
                     {
                         OSL_ENSURE( pXItem->ISA(SfxInt16Item) && pYItem->ISA(SfxInt32Item),
                                         "wrong items" );
diff --git a/sc/source/ui/view/cellsh.cxx b/sc/source/ui/view/cellsh.cxx
index 3a9f22d07c51..4af143c894f5 100644
--- a/sc/source/ui/view/cellsh.cxx
+++ b/sc/source/ui/view/cellsh.cxx
@@ -539,7 +539,7 @@ void ScCellShell::GetClipState( SfxItemSet& rSet )
         rSet.DisableItem( SID_PASTE_ONLY_FORMULA );
         rSet.DisableItem( SID_CLIPBOARD_FORMAT_ITEMS );
     }
-    else if ( rSet.GetItemState( SID_CLIPBOARD_FORMAT_ITEMS ) != SFX_ITEM_UNKNOWN )
+    else if ( rSet.GetItemState( SID_CLIPBOARD_FORMAT_ITEMS ) != SfxItemState::UNKNOWN )
     {
         SvxClipboardFmtItem aFormats( SID_CLIPBOARD_FORMAT_ITEMS );
         GetPossibleClipboardFormats( aFormats );
diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx
index c5f509ba449f..04e5401b36ff 100644
--- a/sc/source/ui/view/cellsh1.cxx
+++ b/sc/source/ui/view/cellsh1.cxx
@@ -1250,7 +1250,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
                 sal_uLong nFormat = 0;
                 const SfxPoolItem* pItem;
                 if ( pReqArgs &&
-                     pReqArgs->GetItemState(nSlot, true, &pItem) == SFX_ITEM_SET &&
+                     pReqArgs->GetItemState(nSlot, true, &pItem) == SfxItemState::SET &&
                      pItem->ISA(SfxUInt32Item) )
                 {
                     nFormat = ((const SfxUInt32Item*)pItem)->GetValue();
@@ -1504,7 +1504,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
                 //  Clipboard-ID given as parameter? Basic "PasteSpecial(Format)"
                 const SfxPoolItem* pItem=NULL;
                 if ( pReqArgs &&
-                     pReqArgs->GetItemState(nSlot, true, &pItem) == SFX_ITEM_SET &&
+                     pReqArgs->GetItemState(nSlot, true, &pItem) == SfxItemState::SET &&
                      pItem->ISA(SfxUInt32Item) )
                 {
                     sal_uLong nFormat = ((const SfxUInt32Item*)pItem)->GetValue();
@@ -1791,7 +1791,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
         case SID_CONSOLIDATE:
             {
                 const SfxPoolItem* pItem;
-                if ( pReqArgs && SFX_ITEM_SET ==
+                if ( pReqArgs && SfxItemState::SET ==
                         pReqArgs->GetItemState( SCITEM_CONSOLIDATEDATA, true, &pItem ) )
                 {
                     const ScConsolidateParam& rParam =
@@ -2150,7 +2150,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
                 {
                     bool bShow;
                     const SfxPoolItem* pItem;
-                    if ( pReqArgs && (pReqArgs->GetItemState( FID_NOTE_VISIBLE, true, &pItem ) == SFX_ITEM_SET) )
+                    if ( pReqArgs && (pReqArgs->GetItemState( FID_NOTE_VISIBLE, true, &pItem ) == SfxItemState::SET) )
                         bShow = ((const SfxBoolItem*) pItem)->GetValue();
                     else
                         bShow = !pNote->IsCaptionShown();
diff --git a/sc/source/ui/view/cellsh2.cxx b/sc/source/ui/view/cellsh2.cxx
index e921a1aabcd8..df91eebb1040 100644
--- a/sc/source/ui/view/cellsh2.cxx
+++ b/sc/source/ui/view/cellsh2.cxx
@@ -413,17 +413,17 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
                         aSortParam.bInplace = true;             // from Basic always
 
                         const SfxPoolItem* pItem;
-                        if ( pArgs->GetItemState( SID_SORT_BYROW, true, &pItem ) == SFX_ITEM_SET )
+                        if ( pArgs->GetItemState( SID_SORT_BYROW, true, &pItem ) == SfxItemState::SET )
                             aSortParam.bByRow = static_cast<const SfxBoolItem*>(pItem)->GetValue();
-                        if ( pArgs->GetItemState( SID_SORT_HASHEADER, true, &pItem ) == SFX_ITEM_SET )
+                        if ( pArgs->GetItemState( SID_SORT_HASHEADER, true, &pItem ) == SfxItemState::SET )
                             aSortParam.bHasHeader = static_cast<const SfxBoolItem*>(pItem)->GetValue();
-                        if ( pArgs->GetItemState( SID_SORT_CASESENS, true, &pItem ) == SFX_ITEM_SET )
+                        if ( pArgs->GetItemState( SID_SORT_CASESENS, true, &pItem ) == SfxItemState::SET )
                             aSortParam.bCaseSens = static_cast<const SfxBoolItem*>(pItem)->GetValue();
-                        if ( pArgs->GetItemState( SID_SORT_NATURALSORT, true, &pItem ) == SFX_ITEM_SET )
+                        if ( pArgs->GetItemState( SID_SORT_NATURALSORT, true, &pItem ) == SfxItemState::SET )
                             aSortParam.bNaturalSort = static_cast<const SfxBoolItem*>(pItem)->GetValue();
-                        if ( pArgs->GetItemState( SID_SORT_ATTRIBS, true, &pItem ) == SFX_ITEM_SET )
+                        if ( pArgs->GetItemState( SID_SORT_ATTRIBS, true, &pItem ) == SfxItemState::SET )
                             aSortParam.bIncludePattern = static_cast<const SfxBoolItem*>(pItem)->GetValue();
-                        if ( pArgs->GetItemState( SID_SORT_USERDEF, true, &pItem ) == SFX_ITEM_SET )
+                        if ( pArgs->GetItemState( SID_SORT_USERDEF, true, &pItem ) == SfxItemState::SET )
                         {
                             sal_uInt16 nUserIndex = static_cast<const SfxUInt16Item*>(pItem)->GetValue();
                             aSortParam.bUserDef = ( nUserIndex != 0 );
@@ -432,25 +432,25 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
                         }
 
                         SCCOLROW nField0 = 0;
-                        if ( pArgs->GetItemState( FN_PARAM_1, true, &pItem ) == SFX_ITEM_SET )
+                        if ( pArgs->GetItemState( FN_PARAM_1, true, &pItem ) == SfxItemState::SET )
                             nField0 = static_cast<const SfxInt32Item*>(pItem)->GetValue();
                         aSortParam.maKeyState[0].bDoSort = ( nField0 != 0 );
                         aSortParam.maKeyState[0].nField = nField0 > 0 ? (nField0-1) : 0;
-                        if ( pArgs->GetItemState( FN_PARAM_2, true, &pItem ) == SFX_ITEM_SET )
+                        if ( pArgs->GetItemState( FN_PARAM_2, true, &pItem ) == SfxItemState::SET )
                             aSortParam.maKeyState[0].bAscending = static_cast<const SfxBoolItem*>(pItem)->GetValue();
                         SCCOLROW nField1 = 0;
-                        if ( pArgs->GetItemState( FN_PARAM_3, true, &pItem ) == SFX_ITEM_SET )
+                        if ( pArgs->GetItemState( FN_PARAM_3, true, &pItem ) == SfxItemState::SET )
                             nField1 = static_cast<const SfxInt32Item*>(pItem)->GetValue();
                         aSortParam.maKeyState[1].bDoSort = ( nField1 != 0 );
                         aSortParam.maKeyState[1].nField = nField1 > 0 ? (nField1-1) : 0;
-                        if ( pArgs->GetItemState( FN_PARAM_4, true, &pItem ) == SFX_ITEM_SET )
+                        if ( pArgs->GetItemState( FN_PARAM_4, true, &pItem ) == SfxItemState::SET )
                             aSortParam.maKeyState[1].bAscending = static_cast<const SfxBoolItem*>(pItem)->GetValue();
                         SCCOLROW nField2 = 0;
-                        if ( pArgs->GetItemState( FN_PARAM_5, true, &pItem ) == SFX_ITEM_SET )
+                        if ( pArgs->GetItemState( FN_PARAM_5, true, &pItem ) == SfxItemState::SET )
                             nField2 = static_cast<const SfxInt32Item*>(pItem)->GetValue();
                         aSortParam.maKeyState[2].bDoSort = ( nField2 != 0 );
                         aSortParam.maKeyState[2].nField = nField2 > 0 ? (nField2-1) : 0;
-                        if ( pArgs->GetItemState( FN_PARAM_6, true, &pItem ) == SFX_ITEM_SET )
+                        if ( pArgs->GetItemState( FN_PARAM_6, true, &pItem ) == SfxItemState::SET )
                             aSortParam.maKeyState[2].bAscending = static_cast<const SfxBoolItem*>(pItem)->GetValue();
 
                         // subtotal when needed new
@@ -586,7 +586,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
         case FID_FILTER_OK:
             {
                 const SfxPoolItem* pItem;
-                if ( pReqArgs && SFX_ITEM_SET ==
+                if ( pReqArgs && SfxItemState::SET ==
                         pReqArgs->GetItemState( SCITEM_QUERYDATA, true, &pItem ) )
                 {
                     const ScQueryItem& rQueryItem = static_cast<const ScQueryItem&>(*pItem);
@@ -641,7 +641,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
         case SID_PIVOT_TABLE:
             {
                 const SfxPoolItem* pItem;
-                if ( pReqArgs && SFX_ITEM_SET ==
+                if ( pReqArgs && SfxItemState::SET ==
                         pReqArgs->GetItemState( SCITEM_PIVOTDATA, true, &pItem ) )
                 {
                     SCTAB nCurTab = GetViewData()->GetTabNo();
@@ -853,11 +853,11 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
                     {
                         const SfxItemSet* pOutSet = pDlg->GetOutputItemSet();
 
-                        if ( pOutSet->GetItemState( FID_VALID_MODE, true, &pItem ) == SFX_ITEM_SET )
+                        if ( pOutSet->GetItemState( FID_VALID_MODE, true, &pItem ) == SfxItemState::SET )
                             eMode = (ScValidationMode) ((const SfxAllEnumItem*)pItem)->GetValue();
-                        if ( pOutSet->GetItemState( FID_VALID_CONDMODE, true, &pItem ) == SFX_ITEM_SET )
+                        if ( pOutSet->GetItemState( FID_VALID_CONDMODE, true, &pItem ) == SfxItemState::SET )
                             eOper = (ScConditionMode) ((const SfxAllEnumItem*)pItem)->GetValue();
-                        if ( pOutSet->GetItemState( FID_VALID_VALUE1, true, &pItem ) == SFX_ITEM_SET )
+                        if ( pOutSet->GetItemState( FID_VALID_VALUE1, true, &pItem ) == SfxItemState::SET )
                         {
                             OUString aTemp1 = ((const SfxStringItem*)pItem)->GetValue();
                             if (eMode == SC_VALID_DATE || eMode == SC_VALID_TIME)
@@ -874,7 +874,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
                             else
                                 aExpr1 = aTemp1;
                         }
-                        if ( pOutSet->GetItemState( FID_VALID_VALUE2, true, &pItem ) == SFX_ITEM_SET )
+                        if ( pOutSet->GetItemState( FID_VALID_VALUE2, true, &pItem ) == SfxItemState::SET )
                         {
                             OUString aTemp2 = ((const SfxStringItem*)pItem)->GetValue();
                             if (eMode == SC_VALID_DATE || eMode == SC_VALID_TIME)
@@ -892,25 +892,25 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
                                 aExpr2 = aTemp2;
                         }
 
-                        if ( pOutSet->GetItemState( FID_VALID_BLANK, true, &pItem ) == SFX_ITEM_SET )
+                        if ( pOutSet->GetItemState( FID_VALID_BLANK, true, &pItem ) == SfxItemState::SET )
                             bBlank = ((const SfxBoolItem*)pItem)->GetValue();
-                        if ( pOutSet->GetItemState( FID_VALID_LISTTYPE, true, &pItem ) == SFX_ITEM_SET )
+                        if ( pOutSet->GetItemState( FID_VALID_LISTTYPE, true, &pItem ) == SfxItemState::SET )
                             nListType = ((const SfxInt16Item*)pItem)->GetValue();
 
-                        if ( pOutSet->GetItemState( FID_VALID_SHOWHELP, true, &pItem ) == SFX_ITEM_SET )
+                        if ( pOutSet->GetItemState( FID_VALID_SHOWHELP, true, &pItem ) == SfxItemState::SET )
                             bShowHelp = ((const SfxBoolItem*)pItem)->GetValue();
-                        if ( pOutSet->GetItemState( FID_VALID_HELPTITLE, true, &pItem ) == SFX_ITEM_SET )
+                        if ( pOutSet->GetItemState( FID_VALID_HELPTITLE, true, &pItem ) == SfxItemState::SET )
                             aHelpTitle = ((const SfxStringItem*)pItem)->GetValue();
-                        if ( pOutSet->GetItemState( FID_VALID_HELPTEXT, true, &pItem ) == SFX_ITEM_SET )
+                        if ( pOutSet->GetItemState( FID_VALID_HELPTEXT, true, &pItem ) == SfxItemState::SET )
                             aHelpText = ((const SfxStringItem*)pItem)->GetValue();
 
-                        if ( pOutSet->GetItemState( FID_VALID_SHOWERR, true, &pItem ) == SFX_ITEM_SET )
+                        if ( pOutSet->GetItemState( FID_VALID_SHOWERR, true, &pItem ) == SfxItemState::SET )
                             bShowError = ((const SfxBoolItem*)pItem)->GetValue();
-                        if ( pOutSet->GetItemState( FID_VALID_ERRSTYLE, true, &pItem ) == SFX_ITEM_SET )
+                        if ( pOutSet->GetItemState( FID_VALID_ERRSTYLE, true, &pItem ) == SfxItemState::SET )
                             eErrStyle = (ScValidErrorStyle) ((const SfxAllEnumItem*)pItem)->GetValue();
-                        if ( pOutSet->GetItemState( FID_VALID_ERRTITLE, true, &pItem ) == SFX_ITEM_SET )
+                        if ( pOutSet->GetItemState( FID_VALID_ERRTITLE, true, &pItem ) == SfxItemState::SET )
                             aErrTitle = ((const SfxStringItem*)pItem)->GetValue();
-                        if ( pOutSet->GetItemState( FID_VALID_ERRTEXT, true, &pItem ) == SFX_ITEM_SET )
+                        if ( pOutSet->GetItemState( FID_VALID_ERRTEXT, true, &pItem ) == SfxItemState::SET )
                             aErrText = ((const SfxStringItem*)pItem)->GetValue();
 
                         ScValidationData aData( eMode, eOper, aExpr1, aExpr2, pDoc, aCursorPos );
diff --git a/sc/source/ui/view/cellsh3.cxx b/sc/source/ui/view/cellsh3.cxx
index d1b7759a89b2..273296b95ed8 100644
--- a/sc/source/ui/view/cellsh3.cxx
+++ b/sc/source/ui/view/cellsh3.cxx
@@ -339,7 +339,7 @@ void ScCellShell::Execute( SfxRequest& rReq )
                     sal_uInt16              nWhich = 0;
 
                     for ( nWhich=ATTR_PATTERN_START; nWhich<=ATTR_PATTERN_END; nWhich++ )
-                        if ( pReqArgs->GetItemState( nWhich, true, &pAttr ) == SFX_ITEM_SET )
+                        if ( pReqArgs->GetItemState( nWhich, true, &pAttr ) == SfxItemState::SET )
                             pNewSet->Put( *pAttr );
 
                     pTabViewShell->ApplyAttributes( pNewSet.get(), pEmptySet.get() );
@@ -475,9 +475,9 @@ void ScCellShell::Execute( SfxRequest& rReq )
                             OUString aArgName;
                             OUString aArgComment;
                             const SfxPoolItem* pItem;
-                            if ( pReqArgs->GetItemState( SID_SCENARIOS, true, &pItem ) == SFX_ITEM_SET )
+                            if ( pReqArgs->GetItemState( SID_SCENARIOS, true, &pItem ) == SfxItemState::SET )
                                 aArgName = ((const SfxStringItem*)pItem)->GetValue();
-                            if ( pReqArgs->GetItemState( SID_NEW_TABLENAME, true, &pItem ) == SFX_ITEM_SET )
+                            if ( pReqArgs->GetItemState( SID_NEW_TABLENAME, true, &pItem ) == SfxItemState::SET )
                                 aArgComment = ((const SfxStringItem*)pItem)->GetValue();
 
                             aColor = Color( COL_LIGHTGRAY );        // Default
@@ -734,7 +734,7 @@ void ScCellShell::Execute( SfxRequest& rReq )
                     {
                         bCenter = true;
                         SfxPoolItem* pItem = 0;
-                        if( rBindings.QueryState( nSlot, pItem ) >= SFX_ITEM_DEFAULT )
+                        if( rBindings.QueryState( nSlot, pItem ) >= SfxItemState::DEFAULT )
                             bMerge = !static_cast< SfxBoolItem* >( pItem )->GetValue();
 
                         delete pItem;
@@ -749,7 +749,7 @@ void ScCellShell::Execute( SfxRequest& rReq )
                     bool bApi = rReq.IsAPI();
                     const SfxPoolItem* pItem;
                     if ( pReqArgs &&
-                        pReqArgs->GetItemState(nSlot, true, &pItem) == SFX_ITEM_SET )
+                        pReqArgs->GetItemState(nSlot, true, &pItem) == SfxItemState::SET )
                     {
                         OSL_ENSURE(pItem && pItem->ISA(SfxBoolItem), "falsches Item");
                         bMoveContents = ((const SfxBoolItem*)pItem)->GetValue();
diff --git a/sc/source/ui/view/editsh.cxx b/sc/source/ui/view/editsh.cxx
index 5ab8b2bcea81..1c2d6dddb12e 100644
--- a/sc/source/ui/view/editsh.cxx
+++ b/sc/source/ui/view/editsh.cxx
@@ -250,7 +250,7 @@ void ScEditShell::Execute( SfxRequest& rReq )
                 sal_uLong nFormat = 0;
                 const SfxPoolItem* pItem;
                 if ( pReqArgs &&
-                     pReqArgs->GetItemState(nSlot, true, &pItem) == SFX_ITEM_SET &&
+                     pReqArgs->GetItemState(nSlot, true, &pItem) == SfxItemState::SET &&
                      pItem->ISA(SfxUInt32Item) )
                 {
                     nFormat = ((const SfxUInt32Item*)pItem)->GetValue();
@@ -510,7 +510,7 @@ void ScEditShell::Execute( SfxRequest& rReq )
             if( pReqArgs )
             {
                 const SfxPoolItem* pItem;
-                if ( pReqArgs->GetItemState( SID_HYPERLINK_SETLINK, true, &pItem ) == SFX_ITEM_SET )
+                if ( pReqArgs->GetItemState( SID_HYPERLINK_SETLINK, true, &pItem ) == SfxItemState::SET )
                 {
                     const SvxHyperlinkItem* pHyper = (const SvxHyperlinkItem*) pItem;
                     const OUString& rName     = pHyper->GetName();
@@ -1072,19 +1072,19 @@ void ScEditShell::GetAttrState(SfxItemSet &rSet)
     }
 
     // #i55929# according to spec, nInputScript is used for font and font height only
-    if ( rSet.GetItemState( EE_CHAR_FONTINFO ) != SFX_ITEM_UNKNOWN )
+    if ( rSet.GetItemState( EE_CHAR_FONTINFO ) != SfxItemState::UNKNOWN )
         ScViewUtil::PutItemScript( rSet, aAttribs, EE_CHAR_FONTINFO, nInputScript );
-    if ( rSet.GetItemState( EE_CHAR_FONTHEIGHT ) != SFX_ITEM_UNKNOWN )
+    if ( rSet.GetItemState( EE_CHAR_FONTHEIGHT ) != SfxItemState::UNKNOWN )
         ScViewUtil::PutItemScript( rSet, aAttribs, EE_CHAR_FONTHEIGHT, nInputScript );
-    if ( rSet.GetItemState( EE_CHAR_WEIGHT ) != SFX_ITEM_UNKNOWN )
+    if ( rSet.GetItemState( EE_CHAR_WEIGHT ) != SfxItemState::UNKNOWN )
         ScViewUtil::PutItemScript( rSet, aAttribs, EE_CHAR_WEIGHT, nScript );
-    if ( rSet.GetItemState( EE_CHAR_ITALIC ) != SFX_ITEM_UNKNOWN )
+    if ( rSet.GetItemState( EE_CHAR_ITALIC ) != SfxItemState::UNKNOWN )
         ScViewUtil::PutItemScript( rSet, aAttribs, EE_CHAR_ITALIC, nScript );
 
     //  Unterstreichung
 
     SfxItemState eState = aAttribs.GetItemState( EE_CHAR_UNDERLINE, true );
-    if ( eState == SFX_ITEM_DONTCARE )
+    if ( eState == SfxItemState::DONTCARE )
     {
         rSet.InvalidateItem( SID_ULINE_VAL_NONE );
         rSet.InvalidateItem( SID_ULINE_VAL_SINGLE );
@@ -1127,7 +1127,7 @@ void ScEditShell::GetAttrState(SfxItemSet &rSet)
 
     eState = aAttribs.GetItemState( EE_CHAR_KERNING, true );
     pViewData->GetBindings().Invalidate( SID_ATTR_CHAR_KERNING );
-    if ( eState == SFX_ITEM_DONTCARE )
+    if ( eState == SfxItemState::DONTCARE )
     {
     //  rSet.InvalidateItem( SID_ATTR_CHAR_KERNING );
         rSet.InvalidateItem(EE_CHAR_KERNING);
@@ -1182,7 +1182,7 @@ void ScEditShell::ExecuteUndo(SfxRequest& rReq)
 
                 sal_uInt16 nCount = 1;
                 const SfxPoolItem* pItem;
-                if ( pReqArgs && pReqArgs->GetItemState( nSlot, true, &pItem ) == SFX_ITEM_SET )
+                if ( pReqArgs && pReqArgs->GetItemState( nSlot, true, &pItem ) == SfxItemState::SET )
                     nCount = ((const SfxUInt16Item*)pItem)->GetValue();
 
                 for (sal_uInt16 i=0; i<nCount; i++)
diff --git a/sc/source/ui/view/formatsh.cxx b/sc/source/ui/view/formatsh.cxx
index cb376c5c0271..48ec587da9b1 100644
--- a/sc/source/ui/view/formatsh.cxx
+++ b/sc/source/ui/view/formatsh.cxx
@@ -276,11 +276,11 @@ void ScFormatShell::ExecuteStyle( SfxRequest& rReq )
         {
             SfxStyleFamily eFamily = SFX_STYLE_FAMILY_PARA;
             const SfxPoolItem* pFamItem;
-            if ( pArgs && SFX_ITEM_SET == pArgs->GetItemState( SID_STYLE_FAMILY, true, &pFamItem ) )
+            if ( pArgs && SfxItemState::SET == pArgs->GetItemState( SID_STYLE_FAMILY, true, &pFamItem ) )
                 eFamily = (SfxStyleFamily)((const SfxUInt16Item*)pFamItem)->GetValue();
             const SfxPoolItem* pNameItem;
             OUString aStyleName;
-            if (pArgs && SFX_ITEM_SET == pArgs->GetItemState( nSlotId, true, &pNameItem ))
+            if (pArgs && SfxItemState::SET == pArgs->GetItemState( nSlotId, true, &pNameItem ))
                 aStyleName  = ((const SfxStringItem*)pNameItem)->GetValue();
             if ( eFamily == SFX_STYLE_FAMILY_PARA ) // CellStyles
             {
@@ -356,9 +356,9 @@ void ScFormatShell::ExecuteStyle( SfxRequest& rReq )
 
         SfxStyleFamily eFamily = SFX_STYLE_FAMILY_PARA;
         const SfxPoolItem* pFamItem;
-        if ( pArgs && SFX_ITEM_SET == pArgs->GetItemState( SID_STYLE_FAMILY, true, &pFamItem ) )
+        if ( pArgs && SfxItemState::SET == pArgs->GetItemState( SID_STYLE_FAMILY, true, &pFamItem ) )
             eFamily = (SfxStyleFamily)((const SfxUInt16Item*)pFamItem)->GetValue();
-        else if ( pArgs && SFX_ITEM_SET == pArgs->GetItemState( SID_STYLE_FAMILYNAME, true, &pFamItem ) )
+        else if ( pArgs && SfxItemState::SET == pArgs->GetItemState( SID_STYLE_FAMILYNAME, true, &pFamItem ) )
         {
             OUString sFamily = ((const SfxStringItem*)pFamItem)->GetValue();
             if (sFamily.equalsAscii("CellStyles"))
@@ -377,11 +377,11 @@ void ScFormatShell::ExecuteStyle( SfxRequest& rReq )
             case SID_STYLE_NEW:
                 {
                     const SfxPoolItem* pNameItem;
-                    if (pArgs && SFX_ITEM_SET == pArgs->GetItemState( nSlotId, true, &pNameItem ))
+                    if (pArgs && SfxItemState::SET == pArgs->GetItemState( nSlotId, true, &pNameItem ))
                         aStyleName  = ((const SfxStringItem*)pNameItem)->GetValue();
 
                     const SfxPoolItem* pRefItem=NULL;
-                    if (pArgs && SFX_ITEM_SET == pArgs->GetItemState( SID_STYLE_REFERENCE, true, &pRefItem ))
+                    if (pArgs && SfxItemState::SET == pArgs->GetItemState( SID_STYLE_REFERENCE, true, &pRefItem ))
                     {
                         if(pRefItem!=NULL)
                             aRefName  = ((const SfxStringItem*)pRefItem)->GetValue();
@@ -427,7 +427,7 @@ void ScFormatShell::ExecuteStyle( SfxRequest& rReq )
             case SID_STYLE_NEW_BY_EXAMPLE:
                 {
                     const SfxPoolItem* pNameItem;
-                    if (pArgs && SFX_ITEM_SET == pArgs->GetItemState( nSlotId, true, &pNameItem ))
+                    if (pArgs && SfxItemState::SET == pArgs->GetItemState( nSlotId, true, &pNameItem ))
                         aStyleName  = ((const SfxStringItem*)pNameItem)->GetValue();
                     pStyleSheet = pStylePool->Find( aStyleName, eFamily );
 
@@ -443,7 +443,7 @@ void ScFormatShell::ExecuteStyle( SfxRequest& rReq )
                 {
                     const SfxPoolItem* pItem;
 
-                    if ( SFX_ITEM_SET ==
+                    if ( SfxItemState::SET ==
                          pArgs->GetItemState( nSlotId, true, &pItem ) )
                     {
                         const SfxStringItem* pStrItem = PTR_CAST(SfxStringItem,pItem);
@@ -796,7 +796,7 @@ void ScFormatShell::ExecuteStyle( SfxRequest& rReq )
 
                             const SfxPoolItem* pItem;
                             if ( rSet.GetItemState( ATTR_VALUE_FORMAT,
-                                    false, &pItem ) == SFX_ITEM_SET )
+                                    false, &pItem ) == SfxItemState::SET )
                             {
                                 // NumberFormat Value aus Value und Language
                                 // erzeugen und eintueten
@@ -827,7 +827,7 @@ void ScFormatShell::ExecuteStyle( SfxRequest& rReq )
                             //  (wenn gar kein Item da ist, loescht der Dialog auch das
                             //   BORDER_OUTER SvxBoxItem aus dem Vorlagen-Set)
 
-                            if ( rSet.GetItemState( ATTR_BORDER_INNER, false ) != SFX_ITEM_SET )
+                            if ( rSet.GetItemState( ATTR_BORDER_INNER, false ) != SfxItemState::SET )
                             {
                                 SvxBoxInfoItem aBoxInfoItem( ATTR_BORDER_INNER );
                                 aBoxInfoItem.SetTable(false);       // keine inneren Linien
@@ -1086,7 +1086,7 @@ void ScFormatShell::ExecuteNumFormat( SfxRequest& rReq )
             //if ( pReqArgs )
             //{
             //  const SfxPoolItem* pItem;
-            //  if(pReqArgs->GetItemState(nSlot, sal_True, &pItem) == SFX_ITEM_SET)
+            //  if(pReqArgs->GetItemState(nSlot, sal_True, &pItem) == SfxItemState::SET)
             //  {
             //      String aCode = ((const SfxStringItem*)pItem)->GetValue();
             //      pTabViewShell->SetNumFmtByStr( aCode );
@@ -1129,7 +1129,7 @@ void ScFormatShell::ExecuteNumFormat( SfxRequest& rReq )
                     eType =-1;
                 }
 
-                if(SFX_ITEM_SET == pReqArgs->GetItemState(nSlot, true, &pItem) && eType != -1)
+                if(SfxItemState::SET == pReqArgs->GetItemState(nSlot, true, &pItem) && eType != -1)
                 {
                     OUString aCode = ((const SfxStringItem*)pItem)->GetValue();
                     sal_uInt16 aLen = aCode.getLength();
@@ -1181,7 +1181,7 @@ void ScFormatShell::ExecuteNumFormat( SfxRequest& rReq )
             if ( pReqArgs )
             {
                 const SfxPoolItem* pItem;
-                if ( pReqArgs->GetItemState( ATTR_VALUE_FORMAT, true, &pItem ) == SFX_ITEM_SET )
+                if ( pReqArgs->GetItemState( ATTR_VALUE_FORMAT, true, &pItem ) == SfxItemState::SET )
                 {
                     // We have to accomplish this using ApplyAttributes()
                     // because we also need the language information to be
@@ -1200,7 +1200,7 @@ void ScFormatShell::ExecuteNumFormat( SfxRequest& rReq )
             if ( pReqArgs )
             {
                 const SfxPoolItem* pItem;
-                if ( pReqArgs->GetItemState( nSlot, true, &pItem ) == SFX_ITEM_SET )
+                if ( pReqArgs->GetItemState( nSlot, true, &pItem ) == SfxItemState::SET )
                 {
                     sal_uInt16 nFormat = ((SfxInt16Item *)pItem)->GetValue();
                     switch(nFormat)
@@ -1279,7 +1279,7 @@ void ScFormatShell::ExecuteAlignment( SfxRequest& rReq )
             if( pSet )
             {
                 const SfxPoolItem* pItem = NULL;
-                if( pSet->GetItemState(GetPool().GetWhich(nSlot), true, &pItem  ) == SFX_ITEM_SET )
+                if( pSet->GetItemState(GetPool().GetWhich(nSlot), true, &pItem  ) == SfxItemState::SET )
                 {
 
                     switch ( nSlot )
@@ -1503,12 +1503,12 @@ void ScFormatShell::ExecuteTextAttr( SfxRequest& rReq )
         SvxCellHorJustify        eHorJustify = SVX_HOR_JUSTIFY_STANDARD;
         SvxCellVerJustify        eVerJustify = SVX_VER_JUSTIFY_STANDARD;
 
-        if (rAttrSet.GetItemState(ATTR_HOR_JUSTIFY, true,&pItem ) == SFX_ITEM_SET)
+        if (rAttrSet.GetItemState(ATTR_HOR_JUSTIFY, true,&pItem ) == SfxItemState::SET)
         {
             pHorJustify = (const SvxHorJustifyItem*)pItem;
             eHorJustify = SvxCellHorJustify( pHorJustify->GetValue() );
         }
-        if (rAttrSet.GetItemState(ATTR_VER_JUSTIFY, true,&pItem ) == SFX_ITEM_SET)
+        if (rAttrSet.GetItemState(ATTR_VER_JUSTIFY, true,&pItem ) == SfxItemState::SET)
         {
             pVerJustify = (const SvxVerJustifyItem*)pItem;
             eVerJustify = SvxCellVerJustify( pVerJustify->GetValue() );
@@ -1795,7 +1795,7 @@ void ScFormatShell::ExecuteAttr( SfxRequest& rReq )
                     const SfxPoolItem* pItem = 0;
 
                     if ( pNewAttrs->GetItemState( ATTR_BORDER, true, &pItem )
-                         == SFX_ITEM_SET )
+                         == SfxItemState::SET )
                     {
                         //  The SvxFrameToolBoxControl toolbox controller uses a default
                         //  SvxBorderLine (all widths 0) to mark the lines that should be set.
@@ -1816,7 +1816,7 @@ void ScFormatShell::ExecuteAttr( SfxRequest& rReq )
                     }
 
                     if ( pNewAttrs->GetItemState( ATTR_BORDER_INNER, true, &pItem )
-                         == SFX_ITEM_SET )
+                         == SfxItemState::SET )
                     {
                         SvxBoxInfoItem aBoxInfoItem( *(const SvxBoxInfoItem*)pItem );
                         if ( aBoxInfoItem.GetHori() && aBoxInfoItem.GetHori()->GetOutWidth() == 0 )
@@ -1849,7 +1849,7 @@ void ScFormatShell::ExecuteAttr( SfxRequest& rReq )
 
                     if(SID_ATTR_BORDER_DIAG_TLBR == nSlot)
                     {
-                        if(SFX_ITEM_SET == pNewAttrs->GetItemState(ATTR_BORDER_TLBR, true, &pItem))
+                        if(SfxItemState::SET == pNewAttrs->GetItemState(ATTR_BORDER_TLBR, true, &pItem))
                         {
                             SvxLineItem aItem(ATTR_BORDER_TLBR);
                             aItem.SetLine(((const SvxLineItem&)pNewAttrs->Get(ATTR_BORDER_TLBR)).GetLine());
@@ -1860,7 +1860,7 @@ void ScFormatShell::ExecuteAttr( SfxRequest& rReq )
                     }
                     else // if( nSlot == SID_ATTR_BORDER_DIAG_BLTR )
                     {
-                        if(SFX_ITEM_SET == pNewAttrs->GetItemState(ATTR_BORDER_BLTR, true, &pItem ))
+                        if(SfxItemState::SET == pNewAttrs->GetItemState(ATTR_BORDER_BLTR, true, &pItem ))
                         {
                             SvxLineItem aItem(ATTR_BORDER_BLTR);
                             aItem.SetLine(((const SvxLineItem&)pNewAttrs->Get(ATTR_BORDER_BLTR)).GetLine());
@@ -1934,12 +1934,12 @@ void ScFormatShell::GetAttrState( SfxItemSet& rSet )
 
     //  choose font info according to selection script type
     sal_uInt8 nScript = 0;      // GetSelectionScriptType never returns 0
-    if ( rSet.GetItemState( ATTR_FONT ) != SFX_ITEM_UNKNOWN )
+    if ( rSet.GetItemState( ATTR_FONT ) != SfxItemState::UNKNOWN )
     {
         if (!nScript) nScript = pTabViewShell->GetSelectionScriptType();
         ScViewUtil::PutItemScript( rSet, rAttrSet, ATTR_FONT, nScript );
     }
-    if ( rSet.GetItemState( ATTR_FONT_HEIGHT ) != SFX_ITEM_UNKNOWN )
+    if ( rSet.GetItemState( ATTR_FONT_HEIGHT ) != SfxItemState::UNKNOWN )
     {
         if (!nScript) nScript = pTabViewShell->GetSelectionScriptType();
         ScViewUtil::PutItemScript( rSet, rAttrSet, ATTR_FONT_HEIGHT, nScript );
@@ -1953,7 +1953,7 @@ void ScFormatShell::GetAttrState( SfxItemSet& rSet )
             {
                 rSet.Put( SvxColorItem( rBrushItem.GetColor(), SID_BACKGROUND_COLOR ) );
 
-                if(SFX_ITEM_DONTCARE == rAttrSet.GetItemState(ATTR_BACKGROUND))
+                if(SfxItemState::DONTCARE == rAttrSet.GetItemState(ATTR_BACKGROUND))
                 {
                     rSet.InvalidateItem(SID_BACKGROUND_COLOR);
                 }
@@ -2145,12 +2145,12 @@ void ScFormatShell::GetTextAttrState( SfxItemSet& rSet )
 
     //  choose font info according to selection script type
     sal_uInt8 nScript = 0;      // GetSelectionScriptType never returns 0
-    if ( rSet.GetItemState( ATTR_FONT_WEIGHT ) != SFX_ITEM_UNKNOWN )
+    if ( rSet.GetItemState( ATTR_FONT_WEIGHT ) != SfxItemState::UNKNOWN )
     {
         if (!nScript) nScript = pTabViewShell->GetSelectionScriptType();
         ScViewUtil::PutItemScript( rSet, rAttrSet, ATTR_FONT_WEIGHT, nScript );
     }
-    if ( rSet.GetItemState( ATTR_FONT_POSTURE ) != SFX_ITEM_UNKNOWN )
+    if ( rSet.GetItemState( ATTR_FONT_POSTURE ) != SfxItemState::UNKNOWN )
     {
         if (!nScript) nScript = pTabViewShell->GetSelectionScriptType();
         ScViewUtil::PutItemScript( rSet, rAttrSet, ATTR_FONT_POSTURE, nScript );
@@ -2164,7 +2164,7 @@ void ScFormatShell::GetTextAttrState( SfxItemSet& rSet )
     // Unterstreichung
 
     eState = rAttrSet.GetItemState( ATTR_FONT_UNDERLINE, true );
-    if ( eState == SFX_ITEM_DONTCARE )
+    if ( eState == SfxItemState::DONTCARE )
     {
         rSet.InvalidateItem( SID_ULINE_VAL_NONE );
         rSet.InvalidateItem( SID_ULINE_VAL_SINGLE );
@@ -2200,7 +2200,7 @@ void ScFormatShell::GetTextAttrState( SfxItemSet& rSet )
                                         (const SfxPoolItem**)&pHorJustify );
     switch ( eState )
     {
-        case SFX_ITEM_SET:
+        case SfxItemState::SET:
             {
                 switch ( SvxCellHorJustify( pHorJustify->GetValue() ) )
                 {
@@ -2231,7 +2231,7 @@ void ScFormatShell::GetTextAttrState( SfxItemSet& rSet )
             }
             break;
 
-        case SFX_ITEM_DONTCARE:
+        case SfxItemState::DONTCARE:
             rSet.InvalidateItem( SID_ALIGNLEFT );
             rSet.InvalidateItem( SID_ALIGNRIGHT );
             rSet.InvalidateItem( SID_ALIGNCENTERHOR );
@@ -2268,7 +2268,7 @@ void ScFormatShell::GetTextAttrState( SfxItemSet& rSet )
 
     switch ( eState )
     {
-        case SFX_ITEM_SET:
+        case SfxItemState::SET:
             {
                 eVerJustify = SvxCellVerJustify( pVerJustify->GetValue() );
 
@@ -2294,7 +2294,7 @@ void ScFormatShell::GetTextAttrState( SfxItemSet& rSet )
             }
             break;
 
-        case SFX_ITEM_DONTCARE:
+        case SfxItemState::DONTCARE:
             rSet.InvalidateItem( SID_ALIGNTOP );
             rSet.InvalidateItem( SID_ALIGNBOTTOM );
             rSet.InvalidateItem( SID_ALIGNCENTERVER );
@@ -2327,9 +2327,9 @@ void ScFormatShell::GetBorderState( SfxItemSet& rSet )
 
     pTabViewShell->GetSelectionFrame( aBoxItem, aInfoItem );
 
-    if ( rSet.GetItemState( ATTR_BORDER ) != SFX_ITEM_UNKNOWN )
+    if ( rSet.GetItemState( ATTR_BORDER ) != SfxItemState::UNKNOWN )
         rSet.Put( aBoxItem );
-    if ( rSet.GetItemState( ATTR_BORDER_INNER ) != SFX_ITEM_UNKNOWN )
+    if ( rSet.GetItemState( ATTR_BORDER_INNER ) != SfxItemState::UNKNOWN )
         rSet.Put( aInfoItem );
 }
 
@@ -2341,12 +2341,12 @@ void ScFormatShell::GetAlignState( SfxItemSet& rSet )
     sal_uInt16          nWhich = aIter.FirstWhich();
 
     SvxCellHorJustify eHAlign = SVX_HOR_JUSTIFY_STANDARD;
-    bool bHasHAlign = rAttrSet.GetItemState( ATTR_HOR_JUSTIFY ) != SFX_ITEM_DONTCARE;
+    bool bHasHAlign = rAttrSet.GetItemState( ATTR_HOR_JUSTIFY ) != SfxItemState::DONTCARE;
     if( bHasHAlign )
         eHAlign = (SvxCellHorJustify)((const SvxHorJustifyItem&) rAttrSet.Get( ATTR_HOR_JUSTIFY )).GetValue();
 
     SvxCellVerJustify eVAlign = SVX_VER_JUSTIFY_STANDARD;
-    bool bHasVAlign = rAttrSet.GetItemState( ATTR_VER_JUSTIFY ) != SFX_ITEM_DONTCARE;
+    bool bHasVAlign = rAttrSet.GetItemState( ATTR_VER_JUSTIFY ) != SfxItemState::DONTCARE;
     if( bHasVAlign )
         eVAlign = (SvxCellVerJustify)((const SvxVerJustifyItem&) rAttrSet.Get( ATTR_VER_JUSTIFY )).GetValue();
 
@@ -2399,7 +2399,7 @@ void ScFormatShell::GetNumFormatState( SfxItemSet& rSet )
                 //  String aFormatCode;         // bleibt leer, wenn dont-care
                 //
                 //  const SfxItemSet& rAttrSet  = pTabViewShell->GetSelectionPattern()->GetItemSet();
-                //  if ( rAttrSet.GetItemState( ATTR_VALUE_FORMAT ) != SFX_ITEM_DONTCARE )
+                //  if ( rAttrSet.GetItemState( ATTR_VALUE_FORMAT ) != SfxItemState::DONTCARE )
                 //  {
                 //      sal_uLong nNumberFormat = ((const SfxUInt32Item&)rAttrSet.Get(
                 //                                  ATTR_VALUE_FORMAT )).GetValue();
@@ -2417,7 +2417,7 @@ void ScFormatShell::GetNumFormatState( SfxItemSet& rSet )
                 {
                     const SfxItemSet& rAttrSet = pTabViewShell->GetSelectionPattern()->GetItemSet();
 
-                    if(SFX_ITEM_DONTCARE != rAttrSet.GetItemState(ATTR_VALUE_FORMAT))
+                    if(SfxItemState::DONTCARE != rAttrSet.GetItemState(ATTR_VALUE_FORMAT))
                     {
                         SvNumberFormatter* pFormatter = pDoc->GetFormatTable();
                         sal_uInt32 nNumberFormat = ((const SfxUInt32Item&)rAttrSet.Get(ATTR_VALUE_FORMAT)).GetValue();
@@ -2456,7 +2456,7 @@ void ScFormatShell::GetNumFormatState( SfxItemSet& rSet )
                 {
                     sal_Int16 aFormatCode = -1;
                     const SfxItemSet& rAttrSet  = pTabViewShell->GetSelectionPattern()->GetItemSet();
-                    if ( rAttrSet.GetItemState( ATTR_VALUE_FORMAT ) >= SFX_ITEM_DEFAULT ) //Modify for more robust
+                    if ( rAttrSet.GetItemState( ATTR_VALUE_FORMAT ) >= SfxItemState::DEFAULT ) //Modify for more robust
                     {
                         SvNumberFormatter* pFormatter = pDoc->GetFormatTable();
                         sal_uInt32 nNumberFormat = pTabViewShell->GetSelectionPattern()->GetNumberFormat( pFormatter );
@@ -2596,14 +2596,14 @@ void ScFormatShell::GetTextDirectionState( SfxItemSet& rSet )
     const SfxItemSet& rAttrSet = pTabViewShell->GetSelectionPattern()->GetItemSet();
 
     bool bVertDontCare =
-        (rAttrSet.GetItemState( ATTR_VERTICAL_ASIAN ) == SFX_ITEM_DONTCARE) ||
-        (rAttrSet.GetItemState( ATTR_STACKED ) == SFX_ITEM_DONTCARE);
+        (rAttrSet.GetItemState( ATTR_VERTICAL_ASIAN ) == SfxItemState::DONTCARE) ||
+        (rAttrSet.GetItemState( ATTR_STACKED ) == SfxItemState::DONTCARE);
     bool bLeftRight = !bVertDontCare &&
         !((const SfxBoolItem&) rAttrSet.Get( ATTR_STACKED )).GetValue();
     bool bTopBottom = !bVertDontCare && !bLeftRight &&
         ((const SfxBoolItem&) rAttrSet.Get( ATTR_VERTICAL_ASIAN )).GetValue();
 
-    bool bBidiDontCare = (rAttrSet.GetItemState( ATTR_WRITINGDIR ) == SFX_ITEM_DONTCARE);
+    bool bBidiDontCare = (rAttrSet.GetItemState( ATTR_WRITINGDIR ) == SfxItemState::DONTCARE);
     EEHorizontalTextDirection eBidiDir = EE_HTEXTDIR_DEFAULT;
     if ( !bBidiDontCare )
     {
diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx
index 23300387d009..a52e4f738eec 100644
--- a/sc/source/ui/view/output2.cxx
+++ b/sc/source/ui/view/output2.cxx
@@ -169,7 +169,7 @@ public:
 
     void    SetShrinkScale( long nScale, sal_uInt8 nScript );
 
-    bool    HasCondHeight() const   { return pCondSet && SFX_ITEM_SET ==
+    bool    HasCondHeight() const   { return pCondSet && SfxItemState::SET ==
                                         pCondSet->GetItemState( ATTR_FONT_HEIGHT, true ); }
 
     bool    HasEditCharacters() const;
@@ -450,10 +450,10 @@ void ScDrawStringsVars::SetPatternSimple( const ScPatternAttr* pNew, const SfxIt
 
     sal_uLong nOld = nValueFormat;
     const SfxPoolItem* pFormItem;
-    if ( !pCondSet || pCondSet->GetItemState(ATTR_VALUE_FORMAT,true,&pFormItem) != SFX_ITEM_SET )
+    if ( !pCondSet || pCondSet->GetItemState(ATTR_VALUE_FORMAT,true,&pFormItem) != SfxItemState::SET )
         pFormItem = &pPattern->GetItem(ATTR_VALUE_FORMAT);
     const SfxPoolItem* pLangItem;
-    if ( !pCondSet || pCondSet->GetItemState(ATTR_LANGUAGE_FORMAT,true,&pLangItem) != SFX_ITEM_SET )
+    if ( !pCondSet || pCondSet->GetItemState(ATTR_LANGUAGE_FORMAT,true,&pLangItem) != SfxItemState::SET )
         pLangItem = &pPattern->GetItem(ATTR_LANGUAGE_FORMAT);
     nValueFormat = pOutput->mpDoc->GetFormatTable()->GetFormatForLanguageIfBuiltIn(
                     ((SfxUInt32Item*)pFormItem)->GetValue(),
@@ -1617,11 +1617,11 @@ void ScOutputData::DrawStrings( bool bPixelToLogic )
                         else if ( SfxItemSet* pFontSet = mpDoc->GetPreviewFont( nCellX, nCellY, nTab ) )
                         {
                             const SfxPoolItem* pItem;
-                            if ( pFontSet->GetItemState( ATTR_FONT, true, &pItem ) == SFX_ITEM_SET )
+                            if ( pFontSet->GetItemState( ATTR_FONT, true, &pItem ) == SfxItemState::SET )
                                 pAltPattern->GetItemSet().Put( (const SvxFontItem&)*pItem );
-                            if ( pFontSet->GetItemState( ATTR_CJK_FONT, true, &pItem ) == SFX_ITEM_SET )
+                            if ( pFontSet->GetItemState( ATTR_CJK_FONT, true, &pItem ) == SfxItemState::SET )
                                 pAltPattern->GetItemSet().Put( (const SvxFontItem&)*pItem );
-                            if ( pFontSet->GetItemState( ATTR_CTL_FONT, true, &pItem ) == SFX_ITEM_SET )
+                            if ( pFontSet->GetItemState( ATTR_CTL_FONT, true, &pItem ) == SfxItemState::SET )
                                 pAltPattern->GetItemSet().Put( (const SvxFontItem&)*pItem );
                         }
                         pPattern = pAltPattern;
@@ -2379,19 +2379,19 @@ void ScOutputData::DrawEditParam::setPatternToEngine(bool bUseStyleColor)
     if ( mpPreviewFontSet )
     {
         const SfxPoolItem* pItem;
-        if ( mpPreviewFontSet->GetItemState( ATTR_FONT, true, &pItem ) == SFX_ITEM_SET )
+        if ( mpPreviewFontSet->GetItemState( ATTR_FONT, true, &pItem ) == SfxItemState::SET )
         {
             SvxFontItem aFontItem(EE_CHAR_FONTINFO);
             aFontItem = (const SvxFontItem&)*pItem;
             pSet->Put( aFontItem );
         }
-        if ( mpPreviewFontSet->GetItemState( ATTR_CJK_FONT, true, &pItem ) == SFX_ITEM_SET )
+        if ( mpPreviewFontSet->GetItemState( ATTR_CJK_FONT, true, &pItem ) == SfxItemState::SET )
         {
             SvxFontItem aCjkFontItem(EE_CHAR_FONTINFO_CJK);
             aCjkFontItem = (const SvxFontItem&)*pItem;
             pSet->Put( aCjkFontItem );
         }
-        if ( mpPreviewFontSet->GetItemState( ATTR_CTL_FONT, true, &pItem ) == SFX_ITEM_SET )
+        if ( mpPreviewFontSet->GetItemState( ATTR_CTL_FONT, true, &pItem ) == SfxItemState::SET )
         {
             SvxFontItem aCtlFontItem(EE_CHAR_FONTINFO_CTL);
             aCtlFontItem = (const SvxFontItem&)*pItem;
@@ -2986,7 +2986,7 @@ void ScOutputData::DrawEditStandard(DrawEditParam& rParam)
         //! Allow clipping when vertically merged?
         if ( eType != OUTTYPE_PRINTER ||
             ( mpDoc->GetRowFlags( rParam.mnCellY, nTab ) & CR_MANUALSIZE ) ||
-            ( rParam.mpCondSet && SFX_ITEM_SET ==
+            ( rParam.mpCondSet && SfxItemState::SET ==
                 rParam.mpCondSet->GetItemState(ATTR_FONT_HEIGHT, true) ) )
             bClip = true;
         else
@@ -3200,7 +3200,7 @@ bool ScOutputData::Clip( DrawEditParam& rParam, const Size& aCellSize,
         //! Allow clipping when vertically merged?
         if ( eType != OUTTYPE_PRINTER ||
             ( mpDoc->GetRowFlags( rParam.mnCellY, nTab ) & CR_MANUALSIZE ) ||
-            ( rParam.mpCondSet && SFX_ITEM_SET ==
+            ( rParam.mpCondSet && SfxItemState::SET ==
                 rParam.mpCondSet->GetItemState(ATTR_FONT_HEIGHT, true) ) )
             bClip = true;
         else
@@ -3962,7 +3962,7 @@ void ScOutputData::DrawEditStacked(DrawEditParam& rParam)
         //! Allow clipping when vertically merged?
         if ( eType != OUTTYPE_PRINTER ||
             ( mpDoc->GetRowFlags( rParam.mnCellY, nTab ) & CR_MANUALSIZE ) ||
-            ( rParam.mpCondSet && SFX_ITEM_SET ==
+            ( rParam.mpCondSet && SfxItemState::SET ==
                 rParam.mpCondSet->GetItemState(ATTR_FONT_HEIGHT, true) ) )
             bClip = true;
         else
@@ -4310,7 +4310,7 @@ void ScOutputData::DrawEditAsianVertical(DrawEditParam& rParam)
         //! Allow clipping when vertically merged?
         if ( eType != OUTTYPE_PRINTER ||
             ( mpDoc->GetRowFlags( rParam.mnCellY, nTab ) & CR_MANUALSIZE ) ||
-            ( rParam.mpCondSet && SFX_ITEM_SET ==
+            ( rParam.mpCondSet && SfxItemState::SET ==
                 rParam.mpCondSet->GetItemState(ATTR_FONT_HEIGHT, true) ) )
             bClip = true;
         else
diff --git a/sc/source/ui/view/preview.cxx b/sc/source/ui/view/preview.cxx
index bd7d984e8d81..f6b3f31c8248 100644
--- a/sc/source/ui/view/preview.cxx
+++ b/sc/source/ui/view/preview.cxx
@@ -1184,7 +1184,7 @@ void ScPreview::MouseButtonUp( const MouseEvent& rMEvt )
                     else if( bHeaderRulerMove && bHeaderRulerChange )
                     {
                         const SfxPoolItem* pItem = NULL;
-                        if ( rStyleSet.GetItemState( ATTR_PAGE_HEADERSET, false, &pItem ) == SFX_ITEM_SET )
+                        if ( rStyleSet.GetItemState( ATTR_PAGE_HEADERSET, false, &pItem ) == SfxItemState::SET )
                         {
                             SfxItemSet& pHeaderSet = ((SvxSetItem*)pItem)->GetItemSet();
                             Size  aHeaderSize = ((const SvxSizeItem&)pHeaderSet.Get(ATTR_PAGE_SIZE)).GetSize();
@@ -1199,7 +1199,7 @@ void ScPreview::MouseButtonUp( const MouseEvent& rMEvt )
                     else if( bFooterRulerMove && bFooterRulerChange )
                     {
                         const SfxPoolItem* pItem = NULL;
-                        if( rStyleSet.GetItemState( ATTR_PAGE_FOOTERSET, false, &pItem ) == SFX_ITEM_SET )
+                        if( rStyleSet.GetItemState( ATTR_PAGE_FOOTERSET, false, &pItem ) == SfxItemState::SET )
                         {
                             SfxItemSet& pFooterSet = ((SvxSetItem*)pItem)->GetItemSet();
                             Size aFooterSize = ((const SvxSizeItem&)pFooterSet.Get(ATTR_PAGE_SIZE)).GetSize();
diff --git a/sc/source/ui/view/prevwsh.cxx b/sc/source/ui/view/prevwsh.cxx
index 25fbbb2958ce..e1c9a71cf206 100644
--- a/sc/source/ui/view/prevwsh.cxx
+++ b/sc/source/ui/view/prevwsh.cxx
@@ -722,7 +722,7 @@ void ScPreviewShell::Execute( SfxRequest& rReq )
             {
                 const SfxPoolItem* pItem;
                 eZoom = SVX_ZOOM_PERCENT;
-                if( pReqArgs && SFX_ITEM_SET == pReqArgs->GetItemState( SID_ATTR_ZOOMSLIDER, true, &pItem ) )
+                if( pReqArgs && SfxItemState::SET == pReqArgs->GetItemState( SID_ATTR_ZOOMSLIDER, true, &pItem ) )
                 {
                     const sal_uInt16 nCurrentZoom = ((const SvxZoomSliderItem*)pItem)->GetValue();
                     if( nCurrentZoom )
@@ -742,7 +742,7 @@ void ScPreviewShell::Execute( SfxRequest& rReq )
                 SfxStyleSheetBase* pStyleSheet  = pStylePool->Find( aOldName, SFX_STYLE_FAMILY_PAGE );
                 OSL_ENSURE( pStyleSheet, "PageStyle not found! :-/" );
 
-                if ( pReqArgs && pStyleSheet && SFX_ITEM_SET == pReqArgs->GetItemState( SID_PREVIEW_SCALINGFACTOR, true, &pItem ) )
+                if ( pReqArgs && pStyleSheet && SfxItemState::SET == pReqArgs->GetItemState( SID_PREVIEW_SCALINGFACTOR, true, &pItem ) )
                 {
                     const sal_uInt16 nCurrentZoom   = ((const SvxZoomSliderItem *)pItem)->GetValue();
                     SfxItemSet& rSet            = pStyleSheet->GetItemSet();
diff --git a/sc/source/ui/view/printfun.cxx b/sc/source/ui/view/printfun.cxx
index 129486f07c0b..7160b05019cd 100644
--- a/sc/source/ui/view/printfun.cxx
+++ b/sc/source/ui/view/printfun.cxx
@@ -826,7 +826,7 @@ void ScPrintFunc::InitParam( const ScPrintOptions* pOptions )
     const SvxSetItem* pHeaderSetItem;
     const SfxItemSet* pHeaderSet = NULL;
     if ( pParamSet->GetItemState( ATTR_PAGE_HEADERSET, false,
-                            (const SfxPoolItem**)&pHeaderSetItem ) == SFX_ITEM_SET )
+                            (const SfxPoolItem**)&pHeaderSetItem ) == SfxItemState::SET )
     {
         pHeaderSet = &pHeaderSetItem->GetItemSet();
                                                         // Headline has space below
@@ -842,7 +842,7 @@ void ScPrintFunc::InitParam( const ScPrintOptions* pOptions )
     const SvxSetItem* pFooterSetItem;
     const SfxItemSet* pFooterSet = NULL;
     if ( pParamSet->GetItemState( ATTR_PAGE_FOOTERSET, false,
-                            (const SfxPoolItem**)&pFooterSetItem ) == SFX_ITEM_SET )
+                            (const SfxPoolItem**)&pFooterSetItem ) == SfxItemState::SET )
     {
         pFooterSet = &pFooterSetItem->GetItemSet();
                                                         // Footline has space above
@@ -861,19 +861,19 @@ void ScPrintFunc::InitParam( const ScPrintOptions* pOptions )
 
     eState = pParamSet->GetItemState( ATTR_PAGE_SCALE, false,
                                       (const SfxPoolItem**)&pScaleItem );
-    if ( SFX_ITEM_DEFAULT == eState )
+    if ( SfxItemState::DEFAULT == eState )
         pScaleItem = (const SfxUInt16Item*)
                     &pParamSet->GetPool()->GetDefaultItem( ATTR_PAGE_SCALE );
 
     eState = pParamSet->GetItemState( ATTR_PAGE_SCALETO, false,
                                       (const SfxPoolItem**)&pScaleToItem );
-    if ( SFX_ITEM_DEFAULT == eState )
+    if ( SfxItemState::DEFAULT == eState )
         pScaleToItem = (const ScPageScaleToItem*)
                     &pParamSet->GetPool()->GetDefaultItem( ATTR_PAGE_SCALETO );
 
     eState = pParamSet->GetItemState( ATTR_PAGE_SCALETOPAGES, false,
                                       (const SfxPoolItem**)&pScaleToPagesItem );
-    if ( SFX_ITEM_DEFAULT == eState )
+    if ( SfxItemState::DEFAULT == eState )
         pScaleToPagesItem = (const SfxUInt16Item*)
                     &pParamSet->GetPool()->GetDefaultItem( ATTR_PAGE_SCALETOPAGES );
 
diff --git a/sc/source/ui/view/tabvwsh2.cxx b/sc/source/ui/view/tabvwsh2.cxx
index c29ac7daf37f..ce22a5f73415 100644
--- a/sc/source/ui/view/tabvwsh2.cxx
+++ b/sc/source/ui/view/tabvwsh2.cxx
@@ -101,7 +101,7 @@ void ScTabViewShell::ExecDraw(SfxRequest& rReq)
     if (nNewId == SID_INSERT_DRAW && pArgs)
     {
         const SfxPoolItem* pItem;
-        if ( pArgs->GetItemState( SID_INSERT_DRAW, true, &pItem ) == SFX_ITEM_SET &&
+        if ( pArgs->GetItemState( SID_INSERT_DRAW, true, &pItem ) == SfxItemState::SET &&
              pItem->ISA( SvxDrawToolItem ) )
         {
             SvxDrawToolEnum eSel = (SvxDrawToolEnum)((const SvxDrawToolItem*)pItem)->GetValue();
@@ -138,7 +138,7 @@ void ScTabViewShell::ExecDraw(SfxRequest& rReq)
     if ( nNewId == SID_FM_CREATE_CONTROL && pArgs )
     {
         const SfxPoolItem* pItem;
-        if ( pArgs->GetItemState( SID_FM_CONTROL_IDENTIFIER, true, &pItem ) == SFX_ITEM_SET &&
+        if ( pArgs->GetItemState( SID_FM_CONTROL_IDENTIFIER, true, &pItem ) == SfxItemState::SET &&
              pItem->ISA( SfxUInt16Item ) )
             nNewFormId = ((const SfxUInt16Item*)pItem)->GetValue();
     }
@@ -147,7 +147,7 @@ void ScTabViewShell::ExecDraw(SfxRequest& rReq)
     if ( pArgs )
     {
         const SfxPoolItem* pItem;
-        if ( pArgs->GetItemState( nNewId, true, &pItem ) == SFX_ITEM_SET && pItem->ISA( SfxStringItem ) )
+        if ( pArgs->GetItemState( nNewId, true, &pItem ) == SfxItemState::SET && pItem->ISA( SfxStringItem ) )
             sStringItemValue = static_cast<const SfxStringItem*>(pItem)->GetValue();
     }
     bool bSwitchCustom = ( !sStringItemValue.isEmpty() && !sDrawCustom.isEmpty() && sStringItemValue != sDrawCustom );
diff --git a/sc/source/ui/view/tabvwsh3.cxx b/sc/source/ui/view/tabvwsh3.cxx
index 0676d4355cad..d32a366b4880 100644
--- a/sc/source/ui/view/tabvwsh3.cxx
+++ b/sc/source/ui/view/tabvwsh3.cxx
@@ -107,14 +107,14 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
             {
                 const SfxPoolItem* pItem;
                 if ( pReqArgs &&
-                     pReqArgs->GetItemState(FID_INSERT_FILE,true,&pItem) == SFX_ITEM_SET )
+                     pReqArgs->GetItemState(FID_INSERT_FILE,true,&pItem) == SfxItemState::SET )
                 {
                     OUString aFileName = ((const SfxStringItem*)pItem)->GetValue();
 
                         // Einfuege-Position
 
                     Point aInsertPos;
-                    if ( pReqArgs->GetItemState(FN_PARAM_1,true,&pItem) == SFX_ITEM_SET )
+                    if ( pReqArgs->GetItemState(FN_PARAM_1,true,&pItem) == SfxItemState::SET )
                         aInsertPos = ((const SfxPointItem*)pItem)->GetValue();
                     else
                         aInsertPos = GetInsertPos();
@@ -122,7 +122,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
                         //  als Link?
 
                     bool bAsLink = false;
-                    if ( pReqArgs->GetItemState(FN_PARAM_2,true,&pItem) == SFX_ITEM_SET )
+                    if ( pReqArgs->GetItemState(FN_PARAM_2,true,&pItem) == SfxItemState::SET )
                         bAsLink = ((const SfxBoolItem*)pItem)->GetValue();
 
                         // ausfuehren
@@ -150,13 +150,13 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
                     OUString aColStr;
                     bool bEntire = false;
                     const SfxPoolItem* pItem;
-                    if ( pReqArgs->GetItemState( SID_CHANGE_PRINTAREA, true, &pItem ) == SFX_ITEM_SET )
+                    if ( pReqArgs->GetItemState( SID_CHANGE_PRINTAREA, true, &pItem ) == SfxItemState::SET )
                         aPrintStr = static_cast<const SfxStringItem*>(pItem)->GetValue();
-                    if ( pReqArgs->GetItemState( FN_PARAM_2, true, &pItem ) == SFX_ITEM_SET )
+                    if ( pReqArgs->GetItemState( FN_PARAM_2, true, &pItem ) == SfxItemState::SET )
                         aRowStr = static_cast<const SfxStringItem*>(pItem)->GetValue();
-                    if ( pReqArgs->GetItemState( FN_PARAM_3, true, &pItem ) == SFX_ITEM_SET )
+                    if ( pReqArgs->GetItemState( FN_PARAM_3, true, &pItem ) == SfxItemState::SET )
                         aColStr = static_cast<const SfxStringItem*>(pItem)->GetValue();
-                    if ( pReqArgs->GetItemState( FN_PARAM_4, true, &pItem ) == SFX_ITEM_SET )
+                    if ( pReqArgs->GetItemState( FN_PARAM_4, true, &pItem ) == SfxItemState::SET )
                         bEntire = static_cast<const SfxBoolItem*>(pItem)->GetValue();
 
                     SetPrintRanges( bEntire, &aPrintStr, &aColStr, &aRowStr, false );
@@ -174,7 +174,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
                 {
                     OUString aPrintStr;
                     const SfxPoolItem* pItem;
-                    if ( pReqArgs->GetItemState( SID_DEFINE_PRINTAREA, true, &pItem ) == SFX_ITEM_SET )
+                    if ( pReqArgs->GetItemState( SID_DEFINE_PRINTAREA, true, &pItem ) == SfxItemState::SET )
                         aPrintStr = static_cast<const SfxStringItem*>(pItem)->GetValue();
                     SetPrintRanges( false, &aPrintStr, NULL, NULL, bAdd );
                 }
@@ -224,10 +224,10 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
             {
                 OUString aAddress;
                 const SfxPoolItem* pItem;
-                if ( pReqArgs->GetItemState( nSlot, true, &pItem ) == SFX_ITEM_SET )
+                if ( pReqArgs->GetItemState( nSlot, true, &pItem ) == SfxItemState::SET )
                     aAddress = ((const SfxStringItem*)pItem)->GetValue();
                 else if ( nSlot == SID_JUMPTOMARK && pReqArgs->GetItemState(
-                                            SID_JUMPTOMARK, true, &pItem ) == SFX_ITEM_SET )
+                                            SID_JUMPTOMARK, true, &pItem ) == SfxItemState::SET )
                     aAddress = ((const SfxStringItem*)pItem)->GetValue();
 
                 //  #i14927# SID_CURRENTCELL with a single cell must unmark if FN_PARAM_1
@@ -235,11 +235,11 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
                 //  ScGridWindow::MouseButtonUp no longer executes the slot for a single
                 //  cell if there is a multi selection.
                 bool bUnmark = ( nSlot == SID_CURRENTCELL );
-                if ( pReqArgs->GetItemState( FN_PARAM_1, true, &pItem ) == SFX_ITEM_SET )
+                if ( pReqArgs->GetItemState( FN_PARAM_1, true, &pItem ) == SfxItemState::SET )
                     bUnmark = ((const SfxBoolItem*)pItem)->GetValue();
 
                 bool bAlignToCursor = true;
-                if (pReqArgs->GetItemState(FN_PARAM_2, true, &pItem) == SFX_ITEM_SET)
+                if (pReqArgs->GetItemState(FN_PARAM_2, true, &pItem) == SfxItemState::SET)
                     bAlignToCursor = static_cast<const SfxBoolItem*>(pItem)->GetValue();
 
                 if ( nSlot == SID_JUMPTOMARK )
@@ -520,7 +520,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
 
                 // check whether there is an explicit argument, use it
                 const SfxPoolItem* pItem;
-                if ( pReqArgs && pReqArgs->GetItemState(nSlot, true, &pItem) == SFX_ITEM_SET )
+                if ( pReqArgs && pReqArgs->GetItemState(nSlot, true, &pItem) == SfxItemState::SET )
                 {
                     bool bItemValue = ((const SfxBoolItem*)pItem)->GetValue();
                     bWantPageBreak = (nSlot == FID_PAGEBREAKMODE) == bItemValue;
@@ -561,7 +561,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
             {
                 bool bSet = !GetViewData().IsSyntaxMode();
                 const SfxPoolItem* pItem;
-                if ( pReqArgs && pReqArgs->GetItemState(nSlot, true, &pItem) == SFX_ITEM_SET )
+                if ( pReqArgs && pReqArgs->GetItemState(nSlot, true, &pItem) == SfxItemState::SET )
                     bSet = ((const SfxBoolItem*)pItem)->GetValue();
                 GetViewData().SetSyntaxMode( bSet );
                 PaintGrid();
@@ -574,7 +574,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
             {
                 bool bSet = !GetViewData().IsHeaderMode();
                 const SfxPoolItem* pItem;
-                if ( pReqArgs && pReqArgs->GetItemState(nSlot, true, &pItem) == SFX_ITEM_SET )
+                if ( pReqArgs && pReqArgs->GetItemState(nSlot, true, &pItem) == SfxItemState::SET )
                     bSet = ((const SfxBoolItem*)pItem)->GetValue();
                 GetViewData().SetHeaderMode( bSet );
                 RepeatResize();
@@ -590,7 +590,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
                 const ScViewOptions& rOpts = rViewData.GetOptions();
                 bool bFormulaMode = !rOpts.GetOption( VOPT_FORMULAS );
                 const SfxPoolItem *pItem;
-                if( pReqArgs && pReqArgs->GetItemState(nSlot, true, &pItem) == SFX_ITEM_SET )
+                if( pReqArgs && pReqArgs->GetItemState(nSlot, true, &pItem) == SfxItemState::SET )
                     bFormulaMode = ((const SfxBoolItem *)pItem)->GetValue();
 
                 ScViewOptions rSetOpts = ScViewOptions( rOpts );
@@ -611,7 +611,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
                 SfxChildWindow* pWnd = pThisFrame->GetChildWindow( nId );
                 bool bSet = ( pWnd == NULL );
                 const SfxPoolItem* pItem;
-                if ( pReqArgs && pReqArgs->GetItemState(nSlot, true, &pItem) == SFX_ITEM_SET )
+                if ( pReqArgs && pReqArgs->GetItemState(nSlot, true, &pItem) == SfxItemState::SET )
                     bSet = ((const SfxBoolItem*)pItem)->GetValue();
 
                 pThisFrame->SetChildWindow( nId, bSet );
@@ -736,7 +736,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
             {
                 const SfxPoolItem* pItem = NULL;
                 bool bSyncZoom = SC_MOD()->GetAppOptions().GetSynchronizeZoom();
-                if ( pReqArgs && pReqArgs->GetItemState(SID_ATTR_ZOOMSLIDER, true, &pItem) == SFX_ITEM_SET )
+                if ( pReqArgs && pReqArgs->GetItemState(SID_ATTR_ZOOMSLIDER, true, &pItem) == SfxItemState::SET )
                 {
                     const sal_uInt16 nCurrentZoom = ((const SvxZoomSliderItem *)pItem)->GetValue();
                     if( nCurrentZoom )
@@ -931,7 +931,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
                 {
                     const SfxPoolItem* pItem;
                     if ( pReqArgs &&
-                         pReqArgs->GetItemState( nSlot, true, &pItem ) == SFX_ITEM_SET &&
+                         pReqArgs->GetItemState( nSlot, true, &pItem ) == SfxItemState::SET &&
                          pItem->ISA( SfxStringItem ) )
                     {
                         OUString aComment = ((const SfxStringItem*)pItem)->GetValue();
diff --git a/sc/source/ui/view/tabvwsha.cxx b/sc/source/ui/view/tabvwsha.cxx
index 0d90705a650f..adde73054bbb 100644
--- a/sc/source/ui/view/tabvwsha.cxx
+++ b/sc/source/ui/view/tabvwsha.cxx
@@ -535,7 +535,7 @@ void ScTabViewShell::ExecuteCellFormatDlg(SfxRequest& rReq, const OString &rName
         const SfxItemSet* pOutSet = pDlg->GetOutputItemSet();
 
         const SfxPoolItem* pItem=NULL;
-        if(pOutSet->GetItemState(SID_ATTR_NUMBERFORMAT_INFO,true,&pItem)==SFX_ITEM_SET)
+        if(pOutSet->GetItemState(SID_ATTR_NUMBERFORMAT_INFO,true,&pItem)==SfxItemState::SET)
         {
 
             UpdateNumberFormatter((const SvxNumberInfoItem&)*pItem);
@@ -744,7 +744,7 @@ void ScTabViewShell::ExecDrawOpt( SfxRequest& rReq )
     switch (nSlotId)
     {
         case SID_GRID_VISIBLE:
-            if ( pArgs && pArgs->GetItemState(nSlotId,true,&pItem) == SFX_ITEM_SET )
+            if ( pArgs && pArgs->GetItemState(nSlotId,true,&pItem) == SfxItemState::SET )
             {
                 aGridOptions.SetGridVisible( ((const SfxBoolItem*)pItem)->GetValue() );
                 aViewOptions.SetGridOptions(aGridOptions);
@@ -753,7 +753,7 @@ void ScTabViewShell::ExecDrawOpt( SfxRequest& rReq )
             break;
 
         case SID_GRID_USE:
-            if ( pArgs && pArgs->GetItemState(nSlotId,true,&pItem) == SFX_ITEM_SET )
+            if ( pArgs && pArgs->GetItemState(nSlotId,true,&pItem) == SfxItemState::SET )
             {
                 aGridOptions.SetUseGridSnap( ((const SfxBoolItem*)pItem)->GetValue() );
                 aViewOptions.SetGridOptions(aGridOptions);
@@ -762,7 +762,7 @@ void ScTabViewShell::ExecDrawOpt( SfxRequest& rReq )
             break;
 
         case SID_HELPLINES_MOVE:
-            if ( pArgs && pArgs->GetItemState(nSlotId,true,&pItem) == SFX_ITEM_SET )
+            if ( pArgs && pArgs->GetItemState(nSlotId,true,&pItem) == SfxItemState::SET )
             {
                 aViewOptions.SetOption( VOPT_HELPLINES, ((const SfxBoolItem*)pItem)->GetValue() );
                 rBindings.Invalidate(SID_HELPLINES_MOVE);
diff --git a/sc/source/ui/view/tabvwshb.cxx b/sc/source/ui/view/tabvwshb.cxx
index e42950bdc9e0..3e4ddf8ddb67 100644
--- a/sc/source/ui/view/tabvwshb.cxx
+++ b/sc/source/ui/view/tabvwshb.cxx
@@ -506,7 +506,7 @@ void ScTabViewShell::ExecuteUndo(SfxRequest& rReq)
 
                 sal_uInt16 nCount = 1;
                 const SfxPoolItem* pItem;
-                if ( pReqArgs && pReqArgs->GetItemState( nSlot, true, &pItem ) == SFX_ITEM_SET )
+                if ( pReqArgs && pReqArgs->GetItemState( nSlot, true, &pItem ) == SfxItemState::SET )
                     nCount = ((const SfxUInt16Item*)pItem)->GetValue();
 
                 // lock paint for more than one cell undo action (not for editing within a cell)
diff --git a/sc/source/ui/view/tabvwshe.cxx b/sc/source/ui/view/tabvwshe.cxx
index 5a58806d589f..72e10f842bc6 100644
--- a/sc/source/ui/view/tabvwshe.cxx
+++ b/sc/source/ui/view/tabvwshe.cxx
@@ -225,7 +225,7 @@ void ScTabViewShell::ExecSearch( SfxRequest& rReq )
         case FID_SEARCH_NOW:
             {
                 if ( pReqArgs &&
-                     SFX_ITEM_SET == pReqArgs->GetItemState(SID_SEARCH_ITEM, false, &pItem) )
+                     SfxItemState::SET == pReqArgs->GetItemState(SID_SEARCH_ITEM, false, &pItem) )
                 {
                     OSL_ENSURE( pItem->ISA(SvxSearchItem), "falsches Item" );
                     const SvxSearchItem* pSearchItem = (const SvxSearchItem*) pItem;
@@ -257,7 +257,7 @@ void ScTabViewShell::ExecSearch( SfxRequest& rReq )
             break;
 
         case SID_SEARCH_ITEM:
-            if (pReqArgs && SFX_ITEM_SET ==
+            if (pReqArgs && SfxItemState::SET ==
                             pReqArgs->GetItemState(SID_SEARCH_ITEM, false, &pItem))
             {
                 //  Search-Item merken
@@ -274,7 +274,7 @@ void ScTabViewShell::ExecSearch( SfxRequest& rReq )
         case FID_REPLACE_ALL:
         case FID_SEARCH_ALL:
             {
-                if (pReqArgs && SFX_ITEM_SET == pReqArgs->GetItemState(nSlot, false, &pItem))
+                if (pReqArgs && SfxItemState::SET == pReqArgs->GetItemState(nSlot, false, &pItem))
                 {
                     //  SearchItem holen
 
@@ -283,7 +283,7 @@ void ScTabViewShell::ExecSearch( SfxRequest& rReq )
                     //  SearchItem fuellen
 
                     aSearchItem.SetSearchString(((SfxStringItem*)pItem)->GetValue());
-                    if(SFX_ITEM_SET == pReqArgs->GetItemState(FN_PARAM_1, false, &pItem))
+                    if(SfxItemState::SET == pReqArgs->GetItemState(FN_PARAM_1, false, &pItem))
                         aSearchItem.SetReplaceString(((SfxStringItem*)pItem)->GetValue());
 
                     if (nSlot == FID_SEARCH)
diff --git a/sc/source/ui/view/tabvwshh.cxx b/sc/source/ui/view/tabvwshh.cxx
index 4ece0051951a..05ba436ebf8e 100644
--- a/sc/source/ui/view/tabvwshh.cxx
+++ b/sc/source/ui/view/tabvwshh.cxx
@@ -98,7 +98,7 @@ void ScTabViewShell::ExecuteObject( SfxRequest& rReq )
             {
                 bool bDone = false;
                 const SfxPoolItem* pItem;
-                if ( pReqArgs && pReqArgs->GetItemState( nSlotId, true, &pItem ) == SFX_ITEM_SET )
+                if ( pReqArgs && pReqArgs->GetItemState( nSlotId, true, &pItem ) == SfxItemState::SET )
                 {
                     long nNewVal = ((const SfxInt32Item*)pItem)->GetValue();
                     if ( nNewVal < 0 )
diff --git a/sc/source/ui/view/viewfun2.cxx b/sc/source/ui/view/viewfun2.cxx
index 410eae91c080..50c517debd04 100644
--- a/sc/source/ui/view/viewfun2.cxx
+++ b/sc/source/ui/view/viewfun2.cxx
@@ -2852,10 +2852,10 @@ void ScViewFunc::SetSelectionFrameLines( const SvxBorderLine* pLine,
     SfxItemState            eBLTRState = rSelItemSet.GetItemState( ATTR_BORDER_BLTR, true, &pBLTRItem );
 
     // any of the lines visible?
-    if( (eItemState != SFX_ITEM_DEFAULT) || (eTLBRState != SFX_ITEM_DEFAULT) || (eBLTRState != SFX_ITEM_DEFAULT) )
+    if( (eItemState != SfxItemState::DEFAULT) || (eTLBRState != SfxItemState::DEFAULT) || (eBLTRState != SfxItemState::DEFAULT) )
     {
         // none of the lines don't care?
-        if( (eItemState != SFX_ITEM_DONTCARE) && (eTLBRState != SFX_ITEM_DONTCARE) && (eBLTRState != SFX_ITEM_DONTCARE) )
+        if( (eItemState != SfxItemState::DONTCARE) && (eTLBRState != SfxItemState::DONTCARE) && (eBLTRState != SfxItemState::DONTCARE) )
         {
             boost::scoped_ptr<SfxItemSet> pOldSet(new SfxItemSet(
                                             *(pDoc->GetPool()),
@@ -2910,7 +2910,7 @@ void ScViewFunc::SetSelectionFrameLines( const SvxBorderLine* pLine,
 
             ApplyAttributes( pNewSet.get(), pOldSet.get() );
         }
-        else // if ( eItemState == SFX_ITEM_DONTCARE )
+        else // if ( eItemState == SfxItemState::DONTCARE )
         {
             aFuncMark.MarkToMulti();
             pDoc->ApplySelectionLineStyle( aFuncMark, pLine, bColorOnly );
diff --git a/sc/source/ui/view/viewfunc.cxx b/sc/source/ui/view/viewfunc.cxx
index 1993cca5d2a7..a7ed961f7943 100644
--- a/sc/source/ui/view/viewfunc.cxx
+++ b/sc/source/ui/view/viewfunc.cxx
@@ -885,7 +885,7 @@ void ScViewFunc::ApplyAttributes( const SfxItemSet* pDialogSet,
     ScPatternAttr aNewAttrs( new SfxItemSet(*pDialogSet) );
     aNewAttrs.DeleteUnchanged( &aOldAttrs );
 
-    if ( pDialogSet->GetItemState( ATTR_VALUE_FORMAT ) == SFX_ITEM_SET )
+    if ( pDialogSet->GetItemState( ATTR_VALUE_FORMAT ) == SfxItemState::SET )
     {   // don't reset to default SYSTEM GENERAL if not intended
         sal_uInt32 nOldFormat =
             ((const SfxUInt32Item&)pOldSet->Get( ATTR_VALUE_FORMAT )).GetValue();
@@ -934,8 +934,8 @@ void ScViewFunc::ApplyAttributes( const SfxItemSet* pDialogSet,
      *
      */
 
-    bool bFrame =    (pDialogSet->GetItemState( ATTR_BORDER ) != SFX_ITEM_DEFAULT)
-                  || (pDialogSet->GetItemState( ATTR_BORDER_INNER ) != SFX_ITEM_DEFAULT);
+    bool bFrame =    (pDialogSet->GetItemState( ATTR_BORDER ) != SfxItemState::DEFAULT)
+                  || (pDialogSet->GetItemState( ATTR_BORDER_INNER ) != SfxItemState::DEFAULT);
 
     if ( pNewOuter==pOldOuter && pNewInner==pOldInner )
         bFrame = false;
@@ -1096,13 +1096,13 @@ void ScViewFunc::ApplySelectionPattern( const ScPatternAttr& rAttr,
         bRecord = false;
 
     //  State from old ItemSet doesn't matter for paint flags, as any change will be
-    //  from SFX_ITEM_SET in the new ItemSet (default is ignored in ApplyPattern).
+    //  from SfxItemState::SET in the new ItemSet (default is ignored in ApplyPattern).
     //  New alignment is checked (check in PostPaint isn't enough) in case a right
     //  alignment is changed to left.
     const SfxItemSet& rNewSet = rAttr.GetItemSet();
-    bool bSetLines = rNewSet.GetItemState( ATTR_BORDER, true ) == SFX_ITEM_SET ||
-                     rNewSet.GetItemState( ATTR_SHADOW, true ) == SFX_ITEM_SET;
-    bool bSetAlign = rNewSet.GetItemState( ATTR_HOR_JUSTIFY, true ) == SFX_ITEM_SET;
+    bool bSetLines = rNewSet.GetItemState( ATTR_BORDER, true ) == SfxItemState::SET ||
+                     rNewSet.GetItemState( ATTR_SHADOW, true ) == SfxItemState::SET;
+    bool bSetAlign = rNewSet.GetItemState( ATTR_HOR_JUSTIFY, true ) == SfxItemState::SET;
 
     sal_uInt16 nExtFlags = 0;
     if ( bSetLines )
@@ -1231,7 +1231,7 @@ void ScViewFunc::ApplySelectionPattern( const ScPatternAttr& rAttr,
         for ( sal_uInt16 nWhich = ATTR_PATTERN_START; nWhich <= ATTR_PATTERN_END; ++nWhich )
         {
             const SfxPoolItem* pItem = 0;
-            if ( rNewSet.GetItemState( nWhich, true, &pItem ) == SFX_ITEM_SET && pItem )
+            if ( rNewSet.GetItemState( nWhich, true, &pItem ) == SfxItemState::SET && pItem )
             {
                 PropertyEntryVector_t::const_iterator aIt = aPropVector.begin();
                 while ( aIt != aPropVector.end())
@@ -2888,9 +2888,9 @@ void ScViewFunc::UpdateSelectionArea( const ScMarkData& rSel, ScPatternAttr* pAt
     if ( pAttr )
     {
         const SfxItemSet& rNewSet = pAttr->GetItemSet();
-        bSetLines = rNewSet.GetItemState( ATTR_BORDER, true ) == SFX_ITEM_SET ||
-        rNewSet.GetItemState( ATTR_SHADOW, true ) == SFX_ITEM_SET;
-        bSetAlign = rNewSet.GetItemState( ATTR_HOR_JUSTIFY, true ) == SFX_ITEM_SET;
+        bSetLines = rNewSet.GetItemState( ATTR_BORDER, true ) == SfxItemState::SET ||
+        rNewSet.GetItemState( ATTR_SHADOW, true ) == SfxItemState::SET;
+        bSetAlign = rNewSet.GetItemState( ATTR_HOR_JUSTIFY, true ) == SfxItemState::SET;
     }
 
     sal_uInt16 nExtFlags = 0;
diff --git a/sc/source/ui/view/viewutil.cxx b/sc/source/ui/view/viewutil.cxx
index 17f6008421f2..628c735faebd 100644
--- a/sc/source/ui/view/viewutil.cxx
+++ b/sc/source/ui/view/viewutil.cxx
@@ -59,9 +59,9 @@ void ScViewUtil::PutItemScript( SfxItemSet& rShellSet, const SfxItemSet& rCoreSe
 
     SfxItemPool& rPool = *rShellSet.GetPool();
     SvxScriptSetItem aSetItem( rPool.GetSlotId(nWhichId), rPool );
-    //  use PutExtended with eDefaultAs = SFX_ITEM_SET, so defaults from rCoreSet
+    //  use PutExtended with eDefaultAs = SfxItemState::SET, so defaults from rCoreSet
     //  (document pool) are read and put into rShellSet (MessagePool)
-    aSetItem.GetItemSet().PutExtended( rCoreSet, SFX_ITEM_DONTCARE, SFX_ITEM_SET );
+    aSetItem.GetItemSet().PutExtended( rCoreSet, SfxItemState::DONTCARE, SfxItemState::SET );
     const SfxPoolItem* pI = aSetItem.GetItemOfScript( nScript );
     if (pI)
         rShellSet.Put( *pI, nWhichId );
@@ -371,7 +371,7 @@ bool ScViewUtil::IsFullScreen( SfxViewShell& rViewShell )
     SfxPoolItem*    pItem           = 0;
     bool            bIsFullScreen   = false;
 
-    if (rBindings.QueryState( SID_WIN_FULLSCREEN, pItem ) >= SFX_ITEM_DEFAULT)
+    if (rBindings.QueryState( SID_WIN_FULLSCREEN, pItem ) >= SfxItemState::DEFAULT)
         bIsFullScreen = static_cast< SfxBoolItem* >( pItem )->GetValue();
     delete pItem;