ITEM: Remove InvalidateAllItems()

I checked if this is used, but it can be replaced
using Clear() -> all. This prevents that the whole
array of Items in an ItemSet gets set to
INVALID_POOL_ITEM.

I also checked if INVALID_POOL_ITEM/IsInvalidItem
is needed at all representing SfxItemState::DONTCARE
but it is and still will need to be set for individual
Items.

At last checked if SfxItemState::UNKNOWN and
::DISABLED really need to be separate states, but
indeed there are some rare cases that need that.

To make things more consistent I also renamed
SfxItemState::DONTCARE to SfxItemState::INVALID
to better match Set/IsInvalid calls at ItemSet.

The build showed a missing UT and led to a problem
due to the hand-made ItemSet-like SearchAttrItemList.
The state 'invalid' seems to be used as 'unused'
marker. It should be changed to use SfxPoolItemHolder
and not need that. For now, set by using an own loop
to set to that state.

Change-Id: Ifc51aad60570569a1e37d3084a5e307eed47d06c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165035
Tested-by: Jenkins
Reviewed-by: Armin Le Grand <Armin.Le.Grand@me.com>

12 files changed, 102 insertions, 102 deletions

diff --git a/cui/source/tabpages/align.cxx b/cui/source/tabpages/align.cxx
index 33b41164238f..d5816158d70b 100644
--- a/cui/source/tabpages/align.cxx
+++ b/cui/source/tabpages/align.cxx
@@ -402,7 +402,7 @@ namespace
                 rBtn.set_sensitive(false);
                 rTriState.bTriStateEnabled = false;
                 break;
-            case SfxItemState::DONTCARE:
+            case SfxItemState::INVALID:
                 rBtn.set_state(TRISTATE_INDET);
                 rTriState.bTriStateEnabled = true;
                 break;
@@ -439,7 +439,7 @@ void AlignmentTabPage::Reset(const SfxItemSet* pCoreAttrs)
         case SfxItemState::DISABLED:
             m_xLbHorAlign->set_sensitive(false);
             break;
-        case SfxItemState::DONTCARE:
+        case SfxItemState::INVALID:
             m_xLbHorAlign->set_active(-1);
             break;
         case SfxItemState::DEFAULT:
@@ -482,7 +482,7 @@ void AlignmentTabPage::Reset(const SfxItemSet* pCoreAttrs)
         case SfxItemState::DISABLED:
             m_xEdIndent->set_sensitive(false);
             break;
-        case SfxItemState::DONTCARE:
+        case SfxItemState::INVALID:
             m_xEdIndent->set_text("");
             break;
         case SfxItemState::DEFAULT:
@@ -505,7 +505,7 @@ void AlignmentTabPage::Reset(const SfxItemSet* pCoreAttrs)
         case SfxItemState::DISABLED:
             m_xLbVerAlign->set_sensitive(false);
             break;
-        case SfxItemState::DONTCARE:
+        case SfxItemState::INVALID:
             m_xLbVerAlign->set_active(-1);
             break;
         case SfxItemState::DEFAULT:
@@ -546,7 +546,7 @@ void AlignmentTabPage::Reset(const SfxItemSet* pCoreAttrs)
             m_xNfRotate->set_sensitive(false);
             m_xCtrlDialWin->set_sensitive(false);
             break;
-        case SfxItemState::DONTCARE:
+        case SfxItemState::INVALID:
             m_xCtrlDial->SetNoRotation();
             break;
         case SfxItemState::DEFAULT:
@@ -568,7 +568,7 @@ void AlignmentTabPage::Reset(const SfxItemSet* pCoreAttrs)
         case SfxItemState::DISABLED:
             m_xVsRefEdge->set_sensitive(false);
             break;
-        case SfxItemState::DONTCARE:
+        case SfxItemState::INVALID:
             m_aVsRefEdge.SetNoSelection();
             break;
         case SfxItemState::DEFAULT:
@@ -606,7 +606,7 @@ void AlignmentTabPage::Reset(const SfxItemSet* pCoreAttrs)
         case SfxItemState::DISABLED:
             m_xLbFrameDir->set_sensitive(false);
             break;
-        case SfxItemState::DONTCARE:
+        case SfxItemState::INVALID:
             m_xLbFrameDir->set_active(-1);
             break;
         case SfxItemState::DEFAULT:
diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx
index 1b34af9def2d..cd6965375003 100644
--- a/cui/source/tabpages/chardlg.cxx
+++ b/cui/source/tabpages/chardlg.cxx
@@ -679,7 +679,7 @@ void SvxCharNamePage::Reset_Impl( const SfxItemSet& rSet, LanguageGroup eLangGrp
         eItalic = rItem.GetValue();
         bStyle = true;
     }
-    bStyleAvailable = bStyleAvailable && (eState >= SfxItemState::DONTCARE);
+    bStyleAvailable = bStyleAvailable && (eState >= SfxItemState::INVALID);
 
     switch ( eLangGrp )
     {
@@ -696,7 +696,7 @@ void SvxCharNamePage::Reset_Impl( const SfxItemSet& rSet, LanguageGroup eLangGrp
     }
     else
         bStyle = false;
-    bStyleAvailable = bStyleAvailable && (eState >= SfxItemState::DONTCARE);
+    bStyleAvailable = bStyleAvailable && (eState >= SfxItemState::INVALID);
 
     // currently chosen font
     if ( bStyle && pFontItem )
@@ -792,7 +792,7 @@ void SvxCharNamePage::Reset_Impl( const SfxItemSet& rSet, LanguageGroup eLangGrp
                 pLangBox->set_active_id(eLangType);
             break;
         }
-        case SfxItemState::DONTCARE:
+        case SfxItemState::INVALID:
             break;
     }
 
@@ -1522,7 +1522,7 @@ void SvxCharEffectsPage::ResetColor_Impl( const SfxItemSet& rSet )
             m_xFontColorLB->set_sensitive(false);
             break;
 
-        case SfxItemState::DONTCARE:
+        case SfxItemState::INVALID:
             //Related: tdf#106080 if there is no font color, then allow "none"
             //as a color so the listbox can display that state.
             EnableNoneFontColor();
@@ -1689,9 +1689,9 @@ void SvxCharEffectsPage::Reset( const SfxItemSet* rSet )
     m_xUnderlineLB->set_active( 0 );
     SfxItemState eState = rSet->GetItemState( nWhich );
 
-    if ( eState >= SfxItemState::DONTCARE )
+    if ( eState >= SfxItemState::INVALID )
     {
-        if ( eState == SfxItemState::DONTCARE )
+        if ( eState == SfxItemState::INVALID )
             m_xUnderlineLB->set_active(-1);
         else
         {
@@ -1729,9 +1729,9 @@ void SvxCharEffectsPage::Reset( const SfxItemSet* rSet )
     m_xOverlineLB->set_active( 0 );
     eState = rSet->GetItemState( nWhich );
 
-    if ( eState >= SfxItemState::DONTCARE )
+    if ( eState >= SfxItemState::INVALID )
     {
-        if ( eState == SfxItemState::DONTCARE )
+        if ( eState == SfxItemState::INVALID )
             m_xOverlineLB->set_active(-1);
         else
         {
@@ -1769,9 +1769,9 @@ void SvxCharEffectsPage::Reset( const SfxItemSet* rSet )
     m_xStrikeoutLB->set_active( 0 );
     eState = rSet->GetItemState( nWhich );
 
-    if ( eState >= SfxItemState::DONTCARE )
+    if ( eState >= SfxItemState::INVALID )
     {
-        if ( eState == SfxItemState::DONTCARE )
+        if ( eState == SfxItemState::INVALID )
             m_xStrikeoutLB->set_active(-1);
         else
         {
@@ -1809,7 +1809,7 @@ void SvxCharEffectsPage::Reset( const SfxItemSet* rSet )
             m_xIndividualWordsBtn->set_sensitive(false);
             break;
 
-        case SfxItemState::DONTCARE:
+        case SfxItemState::INVALID:
             m_aIndividualWordsState.bTriStateEnabled = true;
             m_xIndividualWordsBtn->set_state( TRISTATE_INDET );
             break;
@@ -1851,7 +1851,7 @@ void SvxCharEffectsPage::Reset( const SfxItemSet* rSet )
         if (nPos != -1)
             m_xPositionLB->set_active(nPos);
     }
-    else if ( eState == SfxItemState::DONTCARE )
+    else if ( eState == SfxItemState::INVALID )
         m_xEmphasisLB->set_active(-1);
     else if ( eState == SfxItemState::UNKNOWN )
     {
@@ -1886,7 +1886,7 @@ void SvxCharEffectsPage::Reset( const SfxItemSet* rSet )
             m_xEffectsLB->set_sensitive(false);
             break;
 
-        case SfxItemState::DONTCARE:
+        case SfxItemState::INVALID:
             m_xEffectsLB->set_active(-1);
             break;
 
@@ -1915,7 +1915,7 @@ void SvxCharEffectsPage::Reset( const SfxItemSet* rSet )
             m_xReliefLB->set_sensitive(false);
             break;
 
-        case SfxItemState::DONTCARE:
+        case SfxItemState::INVALID:
             m_xReliefLB->set_active(-1);
             break;
 
@@ -1944,7 +1944,7 @@ void SvxCharEffectsPage::Reset( const SfxItemSet* rSet )
             m_xOutlineBtn->set_sensitive(false);
             break;
 
-        case SfxItemState::DONTCARE:
+        case SfxItemState::INVALID:
             m_aOutlineState.bTriStateEnabled = true;
             m_xOutlineBtn->set_state(TRISTATE_INDET);
             break;
@@ -1975,7 +1975,7 @@ void SvxCharEffectsPage::Reset( const SfxItemSet* rSet )
             m_xShadowBtn->set_sensitive(false);
             break;
 
-        case SfxItemState::DONTCARE:
+        case SfxItemState::INVALID:
             m_aShadowState.bTriStateEnabled = true;
             m_xShadowBtn->set_state( TRISTATE_INDET );
             break;
@@ -2006,7 +2006,7 @@ void SvxCharEffectsPage::Reset( const SfxItemSet* rSet )
             m_xHiddenBtn->set_sensitive(false);
             break;
 
-        case SfxItemState::DONTCARE:
+        case SfxItemState::INVALID:
             m_aHiddenState.bTriStateEnabled = true;
             m_xHiddenBtn->set_state(TRISTATE_INDET);
             break;
@@ -2223,7 +2223,7 @@ bool SvxCharEffectsPage::FillItemSet( SfxItemSet* rSet )
 
     if ( pOld )
     {
-        if( rOldSet.GetItemState( nWhich ) != SfxItemState::DONTCARE )
+        if( rOldSet.GetItemState( nWhich ) != SfxItemState::INVALID )
         {
             const SvxEmphasisMarkItem& rItem = *static_cast<const SvxEmphasisMarkItem*>(pOld);
             if ( rItem.GetEmphasisMark() == eMark )
@@ -2231,7 +2231,7 @@ bool SvxCharEffectsPage::FillItemSet( SfxItemSet* rSet )
         }
     }
 
-    if (rOldSet.GetItemState( nWhich ) == SfxItemState::DONTCARE &&
+    if (rOldSet.GetItemState( nWhich ) == SfxItemState::INVALID &&
          m_xEmphasisLB->get_saved_value() == sMarkPos && m_xPositionLB->get_saved_value() == sPosPos)
     {
         bChanged = false;
@@ -2852,7 +2852,7 @@ void SvxCharPositionPage::Reset( const SfxItemSet* rSet )
         }
         else
         {
-            if( eState == SfxItemState::DONTCARE )
+            if( eState == SfxItemState::INVALID )
             {
                 m_x0degRB->set_active(false);
                 m_x90degRB->set_active(false);
@@ -3190,7 +3190,7 @@ void SvxCharTwoLinesPage::Reset( const SfxItemSet* rSet )
     sal_uInt16 nWhich = GetWhich( SID_ATTR_CHAR_TWO_LINES );
     SfxItemState eState = rSet->GetItemState( nWhich );
 
-    if ( eState >= SfxItemState::DONTCARE )
+    if ( eState >= SfxItemState::INVALID )
     {
         const SvxTwoLinesItem& rItem = static_cast<const SvxTwoLinesItem&>(rSet->Get( nWhich ));
         m_xTwoLinesBtn->set_active(rItem.GetValue());
diff --git a/cui/source/tabpages/measure.cxx b/cui/source/tabpages/measure.cxx
index 3e53891e21e2..8c7b4dcd8351 100644
--- a/cui/source/tabpages/measure.cxx
+++ b/cui/source/tabpages/measure.cxx
@@ -186,7 +186,7 @@ void SvxMeasurePage::Reset( const SfxItemSet* rAttrs )
     m_xMtrFldHelpline2Len->save_value();
 
     // SdrMeasureBelowRefEdgeItem
-    if( rAttrs->GetItemState( SDRATTR_MEASUREBELOWREFEDGE ) != SfxItemState::DONTCARE )
+    if( rAttrs->GetItemState( SDRATTR_MEASUREBELOWREFEDGE ) != SfxItemState::INVALID )
     {
         m_xTsbBelowRefEdge->set_state( rAttrs->Get( SDRATTR_MEASUREBELOWREFEDGE ).
                         GetValue() ? TRISTATE_TRUE : TRISTATE_FALSE );
@@ -207,7 +207,7 @@ void SvxMeasurePage::Reset( const SfxItemSet* rAttrs )
 
     // SdrMeasureTextRota90Item
     // Attention: negate !
-    if( rAttrs->GetItemState( SDRATTR_MEASURETEXTROTA90 ) != SfxItemState::DONTCARE )
+    if( rAttrs->GetItemState( SDRATTR_MEASURETEXTROTA90 ) != SfxItemState::INVALID )
     {
         m_xTsbParallel->set_state( rAttrs->Get( SDRATTR_MEASURETEXTROTA90 ).
                         GetValue() ? TRISTATE_FALSE : TRISTATE_TRUE );
@@ -219,7 +219,7 @@ void SvxMeasurePage::Reset( const SfxItemSet* rAttrs )
     m_xTsbParallel->save_state();
 
     // SdrMeasureShowUnitItem
-    if( rAttrs->GetItemState( SDRATTR_MEASURESHOWUNIT ) != SfxItemState::DONTCARE )
+    if( rAttrs->GetItemState( SDRATTR_MEASURESHOWUNIT ) != SfxItemState::INVALID )
     {
         m_xTsbShowUnit->set_state( rAttrs->Get( SDRATTR_MEASURESHOWUNIT ).
                         GetValue() ? TRISTATE_TRUE : TRISTATE_FALSE );
@@ -231,7 +231,7 @@ void SvxMeasurePage::Reset( const SfxItemSet* rAttrs )
     m_xTsbShowUnit->save_state();
 
     // SdrMeasureUnitItem
-    if( rAttrs->GetItemState( SDRATTR_MEASUREUNIT ) != SfxItemState::DONTCARE )
+    if( rAttrs->GetItemState( SDRATTR_MEASUREUNIT ) != SfxItemState::INVALID )
     {
         tools::Long nFieldUnit = static_cast<tools::Long>(rAttrs->Get( SDRATTR_MEASUREUNIT ).GetValue());
 
@@ -251,12 +251,12 @@ void SvxMeasurePage::Reset( const SfxItemSet* rAttrs )
     m_xLbUnit->save_value();
 
     // Position
-    if ( rAttrs->GetItemState( SDRATTR_MEASURETEXTVPOS ) != SfxItemState::DONTCARE )
+    if ( rAttrs->GetItemState( SDRATTR_MEASURETEXTVPOS ) != SfxItemState::INVALID )
     {
         css::drawing::MeasureTextVertPos eVPos =
                     rAttrs->Get( SDRATTR_MEASURETEXTVPOS ).GetValue();
         {
-            if ( rAttrs->GetItemState( SDRATTR_MEASURETEXTHPOS ) != SfxItemState::DONTCARE )
+            if ( rAttrs->GetItemState( SDRATTR_MEASURETEXTHPOS ) != SfxItemState::INVALID )
             {
                 css::drawing::MeasureTextHorzPos eHPos =
                             rAttrs->Get( SDRATTR_MEASURETEXTHPOS ).GetValue();
@@ -465,7 +465,7 @@ bool SvxMeasurePage::FillItemSet( SfxItemSet* rAttrs)
         if (m_xTsbAutoPosV->get_state() == TRISTATE_TRUE)
             eVPos = css::drawing::MeasureTextVertPos_AUTO;
 
-        if ( rAttrs->GetItemState( SDRATTR_MEASURETEXTVPOS ) != SfxItemState::DONTCARE )
+        if ( rAttrs->GetItemState( SDRATTR_MEASURETEXTVPOS ) != SfxItemState::INVALID )
         {
             css::drawing::MeasureTextVertPos eOldVPos = rOutAttrs.Get(SDRATTR_MEASURETEXTVPOS).GetValue();
             if( eOldVPos != eVPos )
@@ -480,7 +480,7 @@ bool SvxMeasurePage::FillItemSet( SfxItemSet* rAttrs)
             bModified = true;
         }
 
-        if ( rAttrs->GetItemState( SDRATTR_MEASURETEXTHPOS ) != SfxItemState::DONTCARE )
+        if ( rAttrs->GetItemState( SDRATTR_MEASURETEXTHPOS ) != SfxItemState::INVALID )
         {
             css::drawing::MeasureTextHorzPos eOldHPos = rOutAttrs.Get( SDRATTR_MEASURETEXTHPOS ).GetValue();
             if( eOldHPos != eHPos )
diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx
index 21972673cc56..afaa43f0dc1c 100644
--- a/cui/source/tabpages/numfmt.cxx
+++ b/cui/source/tabpages/numfmt.cxx
@@ -446,7 +446,7 @@ void SvxNumberFormatTabPage::Reset( const SfxItemSet* rSet )
 
     eState = rSet->GetItemState( GetWhich( SID_ATTR_NUMBERFORMAT_VALUE ) );
 
-    if ( SfxItemState::DONTCARE != eState )
+    if ( SfxItemState::INVALID != eState )
         pValFmtAttr = GetItem( *rSet, SID_ATTR_NUMBERFORMAT_VALUE );
 
     eValType = pNumItem->GetValueType();
diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx
index abe2a1adc315..d0c38140653a 100644
--- a/cui/source/tabpages/paragrph.cxx
+++ b/cui/source/tabpages/paragrph.cxx
@@ -270,7 +270,7 @@ bool SvxStdParagraphTabPage::FillItemSet( SfxItemSet* rOutSet )
 
         if ( m_bLineDistToggled ||
              !pOld || !( *static_cast<const SvxLineSpacingItem*>(pOld) == aSpacing ) ||
-             SfxItemState::DONTCARE == GetItemSet().GetItemState( nWhich ) )
+             SfxItemState::INVALID == GetItemSet().GetItemState( nWhich ) )
         {
             rOutSet->Put( aSpacing );
             bModified = true;
@@ -313,7 +313,7 @@ bool SvxStdParagraphTabPage::FillItemSet( SfxItemSet* rOutSet )
         aMargin.SetContextValue(m_xContextualCB->get_active());
 
         if ( !pOld || *static_cast<const SvxULSpaceItem*>(pOld) != aMargin ||
-             SfxItemState::DONTCARE == GetItemSet().GetItemState( nWhich ) )
+             SfxItemState::INVALID == GetItemSet().GetItemState( nWhich ) )
         {
             rOutSet->Put( aMargin );
             bModified = true;
@@ -350,7 +350,7 @@ bool SvxStdParagraphTabPage::FillItemSet( SfxItemSet* rOutSet )
             item.SetTextLeft(m_aLeftIndent.GetCoreValue(eUnit));
         }
         if (!pOld || *static_cast<const SvxTextLeftMarginItem*>(pOld) != item
-            || SfxItemState::DONTCARE == GetItemSet().GetItemState(nWhich))
+            || SfxItemState::INVALID == GetItemSet().GetItemState(nWhich))
         {
             rOutSet->Put(item);
             bModified = true;
@@ -386,7 +386,7 @@ bool SvxStdParagraphTabPage::FillItemSet( SfxItemSet* rOutSet )
             item.SetRight(m_aRightIndent.GetCoreValue(eUnit));
         }
         if (!pOld || *static_cast<const SvxRightMarginItem*>(pOld) != item
-            || SfxItemState::DONTCARE == GetItemSet().GetItemState(nWhich))
+            || SfxItemState::INVALID == GetItemSet().GetItemState(nWhich))
         {
             rOutSet->Put(item);
             bModified = true;
@@ -429,7 +429,7 @@ bool SvxStdParagraphTabPage::FillItemSet( SfxItemSet* rOutSet )
         }
 
         if (!pOld || *static_cast<const SvxFirstLineIndentItem*>(pOld) != item
-            || SfxItemState::DONTCARE == GetItemSet().GetItemState(nWhich))
+            || SfxItemState::INVALID == GetItemSet().GetItemState(nWhich))
         {
             rOutSet->Put(item);
             bModified = true;
@@ -483,7 +483,7 @@ bool SvxStdParagraphTabPage::FillItemSet( SfxItemSet* rOutSet )
             bNullTab = true;
 
         if ( !pOld || *static_cast<const SvxLRSpaceItem*>(pOld) != aMargin ||
-             SfxItemState::DONTCARE == GetItemSet().GetItemState( nWhich ) )
+             SfxItemState::INVALID == GetItemSet().GetItemState( nWhich ) )
         {
             rOutSet->Put( aMargin );
             bModified = true;
@@ -1920,7 +1920,7 @@ void SvxExtParagraphTabPage::Reset( const SfxItemSet* rSet )
             m_xPagenumEdit->set_value(nPageNum);
             break;
         }
-        case SfxItemState::DONTCARE:
+        case SfxItemState::INVALID:
         {
             aPageNumState.bTriStateEnabled = true;
             m_xPageNumBox->set_state(TRISTATE_INDET);
@@ -1978,7 +1978,7 @@ void SvxExtParagraphTabPage::Reset( const SfxItemSet* rSet )
                 m_xApplyCollBtn->set_state(TRISTATE_FALSE);
             }
         }
-        else if ( SfxItemState::DONTCARE == eItemState )
+        else if ( SfxItemState::INVALID == eItemState )
         {
             aApplyCollState.bTriStateEnabled = true;
             m_xApplyCollBtn->set_state(TRISTATE_INDET);
@@ -2050,7 +2050,7 @@ void SvxExtParagraphTabPage::Reset( const SfxItemSet* rSet )
                 m_xBreakTypeLB->set_active(nType);
                 m_xBreakPositionLB->set_active(nPosition);
             }
-            else if ( SfxItemState::DONTCARE == eItemState )
+            else if ( SfxItemState::INVALID == eItemState )
                 m_xPageBreakBox->set_state(TRISTATE_INDET);
             else
             {
@@ -2080,7 +2080,7 @@ void SvxExtParagraphTabPage::Reset( const SfxItemSet* rSet )
         else
             m_xKeepParaBox->set_state(TRISTATE_FALSE);
     }
-    else if ( SfxItemState::DONTCARE == eItemState )
+    else if ( SfxItemState::INVALID == eItemState )
         m_xKeepParaBox->set_state(TRISTATE_INDET);
     else
         m_xKeepParaBox->set_sensitive(false);
@@ -2120,7 +2120,7 @@ void SvxExtParagraphTabPage::Reset( const SfxItemSet* rSet )
             m_xWidowBox->set_state(_bEnable ? TRISTATE_TRUE : TRISTATE_FALSE);
             m_xWidowRowNo->set_sensitive(_bEnable);
         }
-        else if ( SfxItemState::DONTCARE == eTmpState )
+        else if ( SfxItemState::INVALID == eTmpState )
             m_xWidowBox->set_state( TRISTATE_INDET );
         else
             m_xWidowBox->set_sensitive(false);
@@ -2142,13 +2142,13 @@ void SvxExtParagraphTabPage::Reset( const SfxItemSet* rSet )
             m_xOrphanRowLabel->set_sensitive(_bEnable);
 
         }
-        else if ( SfxItemState::DONTCARE == eTmpState )
+        else if ( SfxItemState::INVALID == eTmpState )
             m_xOrphanBox->set_state(TRISTATE_INDET);
         else
             m_xOrphanBox->set_sensitive(false);
         aOrphanState.eState = m_xOrphanBox->get_state();
     }
-    else if ( SfxItemState::DONTCARE == eItemState )
+    else if ( SfxItemState::INVALID == eItemState )
         m_xAllowSplitBox->set_state(TRISTATE_INDET);
     else
         m_xAllowSplitBox->set_sensitive(false);
diff --git a/cui/source/tabpages/textattr.cxx b/cui/source/tabpages/textattr.cxx
index d97937f53542..a803efffe5cb 100644
--- a/cui/source/tabpages/textattr.cxx
+++ b/cui/source/tabpages/textattr.cxx
@@ -136,7 +136,7 @@ void SvxTextAttrPage::Reset( const SfxItemSet* rAttrs )
     m_xMtrFldBottom->save_value();
 
     // adjust to height and autogrowsize
-    if ( rAttrs->GetItemState( SDRATTR_TEXT_AUTOGROWHEIGHT ) != SfxItemState::DONTCARE )
+    if ( rAttrs->GetItemState( SDRATTR_TEXT_AUTOGROWHEIGHT ) != SfxItemState::INVALID )
     {
         m_xTsbAutoGrowHeight->set_state( rAttrs->Get( SDRATTR_TEXT_AUTOGROWHEIGHT ).
                         GetValue() ? TRISTATE_TRUE : TRISTATE_FALSE );
@@ -153,7 +153,7 @@ void SvxTextAttrPage::Reset( const SfxItemSet* rAttrs )
     m_xTsbAutoGrowSize->save_state();
 
     // adjust to width
-    if ( rAttrs->GetItemState( SDRATTR_TEXT_AUTOGROWWIDTH ) != SfxItemState::DONTCARE )
+    if ( rAttrs->GetItemState( SDRATTR_TEXT_AUTOGROWWIDTH ) != SfxItemState::INVALID )
     {
         m_xTsbAutoGrowWidth->set_state( rAttrs->Get( SDRATTR_TEXT_AUTOGROWWIDTH ).
                         GetValue() ? TRISTATE_TRUE : TRISTATE_FALSE );
@@ -163,7 +163,7 @@ void SvxTextAttrPage::Reset( const SfxItemSet* rAttrs )
     m_xTsbAutoGrowWidth->save_state();
 
     // wordwrap text
-    if ( rAttrs->GetItemState( SDRATTR_TEXT_WORDWRAP ) != SfxItemState::DONTCARE )
+    if ( rAttrs->GetItemState( SDRATTR_TEXT_WORDWRAP ) != SfxItemState::INVALID )
     {
         m_xTsbWordWrapText->set_state( rAttrs->Get( SDRATTR_TEXT_WORDWRAP ).
                         GetValue() ? TRISTATE_TRUE : TRISTATE_FALSE );
@@ -178,7 +178,7 @@ void SvxTextAttrPage::Reset( const SfxItemSet* rAttrs )
     SfxItemState eVState = rAttrs->GetItemState( SDRATTR_TEXT_VERTADJUST );
     SfxItemState eHState = rAttrs->GetItemState( SDRATTR_TEXT_HORZADJUST );
 
-    if(SfxItemState::DONTCARE != eVState && SfxItemState::DONTCARE != eHState)
+    if(SfxItemState::INVALID != eVState && SfxItemState::INVALID != eHState)
     {
         // VertAdjust and HorAdjust are unequivocal, thus
         SdrTextVertAdjust eTVA = rAttrs->Get(SDRATTR_TEXT_VERTADJUST).GetValue();
@@ -254,7 +254,7 @@ void SvxTextAttrPage::Reset( const SfxItemSet* rAttrs )
     }
 
     // adjust to border
-    if (rAttrs->GetItemState(SDRATTR_TEXT_FITTOSIZE) != SfxItemState::DONTCARE)
+    if (rAttrs->GetItemState(SDRATTR_TEXT_FITTOSIZE) != SfxItemState::INVALID)
     {
         drawing::TextFitToSizeType const eFTS =
                     rAttrs->Get( SDRATTR_TEXT_FITTOSIZE ).GetValue();
@@ -267,7 +267,7 @@ void SvxTextAttrPage::Reset( const SfxItemSet* rAttrs )
         m_xTsbFitToSize->set_state( TRISTATE_INDET );
     m_xTsbFitToSize->save_state();
 
-    if( rAttrs->GetItemState( SDRATTR_TEXT_CONTOURFRAME ) != SfxItemState::DONTCARE )
+    if( rAttrs->GetItemState( SDRATTR_TEXT_CONTOURFRAME ) != SfxItemState::INVALID )
     {
         bool bContour = rAttrs->Get( SDRATTR_TEXT_CONTOURFRAME ).GetValue();
         m_xTsbContour->set_state( bContour ? TRISTATE_TRUE : TRISTATE_FALSE );
@@ -405,7 +405,7 @@ bool SvxTextAttrPage::FillItemSet( SfxItemSet* rAttrs)
             eTVA = SDRTEXTVERTADJUST_BLOCK;
     }
 
-    if ( rOutAttrs.GetItemState( SDRATTR_TEXT_VERTADJUST ) != SfxItemState::DONTCARE )
+    if ( rOutAttrs.GetItemState( SDRATTR_TEXT_VERTADJUST ) != SfxItemState::INVALID )
     {
         SdrTextVertAdjust eOldTVA = rOutAttrs.Get( SDRATTR_TEXT_VERTADJUST ).GetValue();
         if( eOldTVA != eTVA )
@@ -414,7 +414,7 @@ bool SvxTextAttrPage::FillItemSet( SfxItemSet* rAttrs)
     else
         rAttrs->Put( SdrTextVertAdjustItem( eTVA ) );
 
-    if ( rOutAttrs.GetItemState( SDRATTR_TEXT_HORZADJUST ) != SfxItemState::DONTCARE )
+    if ( rOutAttrs.GetItemState( SDRATTR_TEXT_HORZADJUST ) != SfxItemState::INVALID )
     {
         SdrTextHorzAdjust eOldTHA = rOutAttrs.Get( SDRATTR_TEXT_HORZADJUST ).GetValue();
         if( eOldTHA != eTHA )
@@ -630,7 +630,7 @@ IMPL_LINK(SvxTextAttrPage, ClickHdl_Impl, weld::Toggleable&, rButton, void)
     // #103516# Do the setup based on states of hor/ver adjust
     SfxItemState eVState = rOutAttrs.GetItemState( SDRATTR_TEXT_VERTADJUST );
     SfxItemState eHState = rOutAttrs.GetItemState( SDRATTR_TEXT_HORZADJUST );
-    bool bHorAndVer(SfxItemState::DONTCARE == eVState || SfxItemState::DONTCARE == eHState);
+    bool bHorAndVer(SfxItemState::INVALID == eVState || SfxItemState::INVALID == eHState);
 
     // #83698# enable/disable text anchoring dependent of contour
     m_xFlPosition->set_sensitive(!bContour && !bHorAndVer);
@@ -643,7 +643,7 @@ bool SvxTextAttrPage::IsTextDirectionLeftToRight() const
     bool bLeftToRightDirection = true;
     SfxItemState eState = rOutAttrs.GetItemState(SDRATTR_TEXTDIRECTION);
 
-    if(SfxItemState::DONTCARE != eState)
+    if(SfxItemState::INVALID != eState)
     {
         const SvxWritingModeItem& rItem = rOutAttrs.Get(SDRATTR_TEXTDIRECTION);
         if (rItem.GetValue() == css::text::WritingMode_TB_RL)
diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx
index fa6db41d2517..b67990e29625 100644
--- a/cui/source/tabpages/tparea.cxx
+++ b/cui/source/tabpages/tparea.cxx
@@ -167,7 +167,7 @@ SvxAreaTabPage::~SvxAreaTabPage()
 void SvxAreaTabPage::ActivatePage( const SfxItemSet& rSet )
 {
     drawing::FillStyle eXFS = drawing::FillStyle_NONE;
-    if( rSet.GetItemState( XATTR_FILLSTYLE ) != SfxItemState::DONTCARE )
+    if( rSet.GetItemState( XATTR_FILLSTYLE ) != SfxItemState::INVALID )
     {
         XFillStyleItem aFillStyleItem( rSet.Get( GetWhich( XATTR_FILLSTYLE ) ) );
         eXFS = aFillStyleItem.GetValue();
diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx
index 2e142169b6af..2990f4473e91 100644
--- a/cui/source/tabpages/tpbitmap.cxx
+++ b/cui/source/tabpages/tpbitmap.cxx
@@ -298,9 +298,9 @@ void SvxBitmapTabPage::Reset( const SfxItemSet* rAttrs )
     CalculateBitmapPresetSize();
 
     bool bTiled = false; bool bStretched = false;
-    if(rAttrs->GetItemState( XATTR_FILLBMP_TILE ) != SfxItemState::DONTCARE)
+    if(rAttrs->GetItemState( XATTR_FILLBMP_TILE ) != SfxItemState::INVALID)
         bTiled = rAttrs->Get( XATTR_FILLBMP_TILE ).GetValue();
-    if(rAttrs->GetItemState( XATTR_FILLBMP_STRETCH ) != SfxItemState::DONTCARE)
+    if(rAttrs->GetItemState( XATTR_FILLBMP_STRETCH ) != SfxItemState::INVALID)
         bStretched = rAttrs->Get( XATTR_FILLBMP_STRETCH ).GetValue();
 
     if (bTiled)
@@ -313,7 +313,7 @@ void SvxBitmapTabPage::Reset( const SfxItemSet* rAttrs )
     tools::Long nWidth = 0;
     tools::Long nHeight = 0;
 
-    if(rAttrs->GetItemState(XATTR_FILLBMP_SIZELOG) != SfxItemState::DONTCARE)
+    if(rAttrs->GetItemState(XATTR_FILLBMP_SIZELOG) != SfxItemState::INVALID)
     {
         if (rAttrs->Get( XATTR_FILLBMP_SIZELOG ).GetValue())
             m_xTsbScale->set_state(TRISTATE_FALSE);
@@ -324,7 +324,7 @@ void SvxBitmapTabPage::Reset( const SfxItemSet* rAttrs )
         m_xTsbScale->set_state(TRISTATE_INDET);
 
     TriState eRelative = TRISTATE_FALSE;
-    if(rAttrs->GetItemState(XATTR_FILLBMP_SIZEX) != SfxItemState::DONTCARE)
+    if(rAttrs->GetItemState(XATTR_FILLBMP_SIZEX) != SfxItemState::INVALID)
     {
         nWidth = static_cast<const XFillBmpSizeXItem&>( rAttrs->Get( XATTR_FILLBMP_SIZEX ) ).GetValue();
         if(nWidth == 0)
@@ -337,7 +337,7 @@ void SvxBitmapTabPage::Reset( const SfxItemSet* rAttrs )
         }
     }
 
-    if(rAttrs->GetItemState( XATTR_FILLBMP_SIZEY ) != SfxItemState::DONTCARE)
+    if(rAttrs->GetItemState( XATTR_FILLBMP_SIZEY ) != SfxItemState::INVALID)
     {
         nHeight = rAttrs->Get( XATTR_FILLBMP_SIZEY ).GetValue();
         if(nHeight == 0)
@@ -367,13 +367,13 @@ void SvxBitmapTabPage::Reset( const SfxItemSet* rAttrs )
         }
     }
 
-    if( rAttrs->GetItemState( XATTR_FILLBMP_POS ) != SfxItemState::DONTCARE )
+    if( rAttrs->GetItemState( XATTR_FILLBMP_POS ) != SfxItemState::INVALID )
     {
         RectPoint eValue = rAttrs->Get( XATTR_FILLBMP_POS ).GetValue();
         m_xPositionLB->set_active( static_cast< sal_Int32 >(eValue) );
     }
 
-    if( rAttrs->GetItemState( XATTR_FILLBMP_POSOFFSETX ) != SfxItemState::DONTCARE )
+    if( rAttrs->GetItemState( XATTR_FILLBMP_POSOFFSETX ) != SfxItemState::INVALID )
     {
         sal_Int32 nValue = rAttrs->Get( XATTR_FILLBMP_POSOFFSETX ).GetValue();
         m_xPositionOffX->set_value(nValue, FieldUnit::PERCENT);
@@ -381,7 +381,7 @@ void SvxBitmapTabPage::Reset( const SfxItemSet* rAttrs )
     else
         m_xPositionOffX->set_text("");
 
-    if( rAttrs->GetItemState( XATTR_FILLBMP_POSOFFSETY ) != SfxItemState::DONTCARE )
+    if( rAttrs->GetItemState( XATTR_FILLBMP_POSOFFSETY ) != SfxItemState::INVALID )
     {
         sal_Int32 nValue = rAttrs->Get( XATTR_FILLBMP_POSOFFSETY ).GetValue();
         m_xPositionOffY->set_value(nValue, FieldUnit::PERCENT);
@@ -389,7 +389,7 @@ void SvxBitmapTabPage::Reset( const SfxItemSet* rAttrs )
     else
         m_xPositionOffY->set_text("");
 
-    if( rAttrs->GetItemState( XATTR_FILLBMP_TILEOFFSETX ) != SfxItemState::DONTCARE)
+    if( rAttrs->GetItemState( XATTR_FILLBMP_TILEOFFSETX ) != SfxItemState::INVALID)
     {
         sal_Int32 nValue = rAttrs->Get( XATTR_FILLBMP_TILEOFFSETX ).GetValue();
         if(nValue > 0)
@@ -399,7 +399,7 @@ void SvxBitmapTabPage::Reset( const SfxItemSet* rAttrs )
         }
     }
 
-    if( rAttrs->GetItemState( XATTR_FILLBMP_TILEOFFSETY ) != SfxItemState::DONTCARE )
+    if( rAttrs->GetItemState( XATTR_FILLBMP_TILEOFFSETY ) != SfxItemState::INVALID )
     {
         sal_Int32 nValue = rAttrs->Get( XATTR_FILLBMP_TILEOFFSETY ).GetValue();
         if(nValue > 0)
diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx
index b4eb30ac2849..1c1635293823 100644
--- a/cui/source/tabpages/tpline.cxx
+++ b/cui/source/tabpages/tpline.cxx
@@ -914,7 +914,7 @@ void SvxLineTabPage::Reset( const SfxItemSet* rAttrs )
         m_aSymbolLastSize=m_aSymbolSize;
     }
 
-    if( rAttrs->GetItemState( XATTR_LINESTYLE ) != SfxItemState::DONTCARE )
+    if( rAttrs->GetItemState( XATTR_LINESTYLE ) != SfxItemState::INVALID )
     {
         eXLS = rAttrs->Get( XATTR_LINESTYLE ).GetValue();
 
@@ -942,7 +942,7 @@ void SvxLineTabPage::Reset( const SfxItemSet* rAttrs )
     }
 
     // Line strength
-    if( rAttrs->GetItemState( XATTR_LINEWIDTH ) != SfxItemState::DONTCARE )
+    if( rAttrs->GetItemState( XATTR_LINEWIDTH ) != SfxItemState::INVALID )
     {
         SetMetricValue( *m_xMtrLineWidth, rAttrs->Get( XATTR_LINEWIDTH ).GetValue(), m_ePoolUnit );
     }
@@ -952,7 +952,7 @@ void SvxLineTabPage::Reset( const SfxItemSet* rAttrs )
     // Line color
     m_xLbColor->SetNoSelection();
 
-    if ( rAttrs->GetItemState( XATTR_LINECOLOR ) != SfxItemState::DONTCARE )
+    if ( rAttrs->GetItemState( XATTR_LINECOLOR ) != SfxItemState::INVALID )
     {
         Color aCol = rAttrs->Get( XATTR_LINECOLOR ).GetColorValue();
         m_xLbColor->SelectEntry( aCol );
@@ -963,7 +963,7 @@ void SvxLineTabPage::Reset( const SfxItemSet* rAttrs )
     {
         m_xLbStartStyle->set_sensitive(false);
     }
-    else if( rAttrs->GetItemState( XATTR_LINESTART ) != SfxItemState::DONTCARE )
+    else if( rAttrs->GetItemState( XATTR_LINESTART ) != SfxItemState::INVALID )
     {
         // #86265# select entry using list and polygon, not string
         bool bSelected(false);
@@ -995,7 +995,7 @@ void SvxLineTabPage::Reset( const SfxItemSet* rAttrs )
     {
         m_xLbEndStyle->set_sensitive(false);
     }
-    else if( rAttrs->GetItemState( XATTR_LINEEND ) != SfxItemState::DONTCARE )
+    else if( rAttrs->GetItemState( XATTR_LINEEND ) != SfxItemState::INVALID )
     {
         // #86265# select entry using list and polygon, not string
         bool bSelected(false);
@@ -1027,7 +1027,7 @@ void SvxLineTabPage::Reset( const SfxItemSet* rAttrs )
     {
         m_xMtrStartWidth->set_sensitive(false);
     }
-    else if( rAttrs->GetItemState( XATTR_LINESTARTWIDTH ) != SfxItemState::DONTCARE )
+    else if( rAttrs->GetItemState( XATTR_LINESTARTWIDTH ) != SfxItemState::INVALID )
     {
         SetMetricValue( *m_xMtrStartWidth,
                         rAttrs->Get( XATTR_LINESTARTWIDTH ).GetValue(),
@@ -1041,7 +1041,7 @@ void SvxLineTabPage::Reset( const SfxItemSet* rAttrs )
     {
         m_xMtrEndWidth->set_sensitive(false);
     }
-    else if( rAttrs->GetItemState( XATTR_LINEENDWIDTH ) != SfxItemState::DONTCARE )
+    else if( rAttrs->GetItemState( XATTR_LINEENDWIDTH ) != SfxItemState::INVALID )
     {
         SetMetricValue( *m_xMtrEndWidth,
                         rAttrs->Get( XATTR_LINEENDWIDTH ).GetValue(),
@@ -1055,7 +1055,7 @@ void SvxLineTabPage::Reset( const SfxItemSet* rAttrs )
     {
         m_xTsbCenterStart->set_sensitive(false);
     }
-    else if( rAttrs->GetItemState( XATTR_LINESTARTCENTER ) != SfxItemState::DONTCARE )
+    else if( rAttrs->GetItemState( XATTR_LINESTARTCENTER ) != SfxItemState::INVALID )
     {
         if( rAttrs->Get( XATTR_LINESTARTCENTER ).GetValue() )
             m_xTsbCenterStart->set_state(TRISTATE_TRUE);
@@ -1072,7 +1072,7 @@ void SvxLineTabPage::Reset( const SfxItemSet* rAttrs )
     {
         m_xTsbCenterEnd->set_sensitive(false);
     }
-    else if( rAttrs->GetItemState( XATTR_LINEENDCENTER ) != SfxItemState::DONTCARE )
+    else if( rAttrs->GetItemState( XATTR_LINEENDCENTER ) != SfxItemState::INVALID )
     {
         if( rAttrs->Get( XATTR_LINEENDCENTER ).GetValue() )
             m_xTsbCenterEnd->set_state(TRISTATE_TRUE);
@@ -1085,7 +1085,7 @@ void SvxLineTabPage::Reset( const SfxItemSet* rAttrs )
     }
 
     // Transparency
-    if( rAttrs->GetItemState( XATTR_LINETRANSPARENCE ) != SfxItemState::DONTCARE )
+    if( rAttrs->GetItemState( XATTR_LINETRANSPARENCE ) != SfxItemState::INVALID )
     {
         sal_uInt16 nTransp = rAttrs->Get( XATTR_LINETRANSPARENCE ).GetValue();
         m_xMtrTransparent->set_value(nTransp, FieldUnit::PERCENT);
@@ -1115,7 +1115,7 @@ void SvxLineTabPage::Reset( const SfxItemSet* rAttrs )
 //         maFTEdgeStyle.set_sensitive(false);
         m_xLBEdgeStyle->set_sensitive(false);
     }
-    else if(SfxItemState::DONTCARE != rAttrs->GetItemState(XATTR_LINEJOINT))
+    else if(SfxItemState::INVALID != rAttrs->GetItemState(XATTR_LINEJOINT))
     {
         const css::drawing::LineJoint eLineJoint = rAttrs->Get(XATTR_LINEJOINT).GetValue();
 
@@ -1139,7 +1139,7 @@ void SvxLineTabPage::Reset( const SfxItemSet* rAttrs )
     {
         m_xLBCapStyle->set_sensitive(false);
     }
-    else if(SfxItemState::DONTCARE != rAttrs->GetItemState(XATTR_LINECAP))
+    else if(SfxItemState::INVALID != rAttrs->GetItemState(XATTR_LINECAP))
     {
         const css::drawing::LineCap eLineCap(rAttrs->Get(XATTR_LINECAP).GetValue());
 
diff --git a/cui/source/tabpages/tplnedef.cxx b/cui/source/tabpages/tplnedef.cxx
index 702e8f2aafc0..c8c180b047e3 100644
--- a/cui/source/tabpages/tplnedef.cxx
+++ b/cui/source/tabpages/tplnedef.cxx
@@ -256,7 +256,7 @@ bool SvxLineDefTabPage::FillItemSet( SfxItemSet* rAttrs )
 
 void SvxLineDefTabPage::Reset( const SfxItemSet* rAttrs )
 {
-    if( rAttrs->GetItemState( GetWhich( XATTR_LINESTYLE ) ) != SfxItemState::DONTCARE )
+    if( rAttrs->GetItemState( GetWhich( XATTR_LINESTYLE ) ) != SfxItemState::INVALID )
     {
         drawing::LineStyle eXLS = rAttrs->Get( GetWhich( XATTR_LINESTYLE ) ).GetValue();
 
diff --git a/cui/source/tabpages/tpshadow.cxx b/cui/source/tabpages/tpshadow.cxx
index 0f2df7b821ec..ca2bc3b8a574 100644
--- a/cui/source/tabpages/tpshadow.cxx
+++ b/cui/source/tabpages/tpshadow.cxx
@@ -91,27 +91,27 @@ SvxShadowTabPage::SvxShadowTabPage(weld::Container* pPage, weld::DialogControlle
 
     // setting the output device
     drawing::FillStyle eXFS = drawing::FillStyle_SOLID;
-    if( m_rOutAttrs.GetItemState( XATTR_FILLSTYLE ) != SfxItemState::DONTCARE )
+    if( m_rOutAttrs.GetItemState( XATTR_FILLSTYLE ) != SfxItemState::INVALID )
     {
         eXFS = m_rOutAttrs.Get( GetWhich( XATTR_FILLSTYLE ) ).GetValue();
         switch( eXFS )
         {
             case drawing::FillStyle_SOLID:
-                if( SfxItemState::DONTCARE != m_rOutAttrs.GetItemState( XATTR_FILLCOLOR ) )
+                if( SfxItemState::INVALID != m_rOutAttrs.GetItemState( XATTR_FILLCOLOR ) )
                 {
                     m_rXFSet.Put( m_rOutAttrs.Get( XATTR_FILLCOLOR ) );
                 }
             break;
 
             case drawing::FillStyle_GRADIENT:
-                if( SfxItemState::DONTCARE != m_rOutAttrs.GetItemState( XATTR_FILLGRADIENT ) )
+                if( SfxItemState::INVALID != m_rOutAttrs.GetItemState( XATTR_FILLGRADIENT ) )
                 {
                     m_rXFSet.Put( m_rOutAttrs.Get( XATTR_FILLGRADIENT ) );
                 }
             break;
 
             case drawing::FillStyle_HATCH:
-                if( SfxItemState::DONTCARE != m_rOutAttrs.GetItemState( XATTR_FILLHATCH ) )
+                if( SfxItemState::INVALID != m_rOutAttrs.GetItemState( XATTR_FILLHATCH ) )
                 {
                     m_rXFSet.Put( m_rOutAttrs.Get( XATTR_FILLHATCH ) );
                 }
@@ -119,7 +119,7 @@ SvxShadowTabPage::SvxShadowTabPage(weld::Container* pPage, weld::DialogControlle
 
             case drawing::FillStyle_BITMAP:
             {
-                if( SfxItemState::DONTCARE != m_rOutAttrs.GetItemState( XATTR_FILLBITMAP ) )
+                if( SfxItemState::INVALID != m_rOutAttrs.GetItemState( XATTR_FILLBITMAP ) )
                 {
                     m_rXFSet.Put( m_rOutAttrs.Get( XATTR_FILLBITMAP ) );
                 }
@@ -257,18 +257,18 @@ bool SvxShadowTabPage::FillItemSet( SfxItemSet* rAttrs )
         case RectPoint::MM: break;
     }
 
-    // If the values of the shadow distances==SfxItemState::DONTCARE and the displayed
+    // If the values of the shadow distances==SfxItemState::INVALID and the displayed
     // string in the respective MetricField=="", then the comparison of the old
     // and the new distance values would return a wrong result because in such a
     // case the new distance values would match the default values of the MetricField !!!!
     if ( !m_xMtrDistance->get_text().isEmpty() ||
-         m_rOutAttrs.GetItemState( SDRATTR_SHADOWXDIST ) != SfxItemState::DONTCARE ||
-         m_rOutAttrs.GetItemState( SDRATTR_SHADOWYDIST ) != SfxItemState::DONTCARE    )
+         m_rOutAttrs.GetItemState( SDRATTR_SHADOWXDIST ) != SfxItemState::INVALID ||
+         m_rOutAttrs.GetItemState( SDRATTR_SHADOWYDIST ) != SfxItemState::INVALID    )
     {
         sal_Int32 nOldX = 9876543; // impossible value, so DontCare
         sal_Int32 nOldY = 9876543;
-        if( m_rOutAttrs.GetItemState( SDRATTR_SHADOWXDIST ) != SfxItemState::DONTCARE &&
-            m_rOutAttrs.GetItemState( SDRATTR_SHADOWYDIST ) != SfxItemState::DONTCARE )
+        if( m_rOutAttrs.GetItemState( SDRATTR_SHADOWXDIST ) != SfxItemState::INVALID &&
+            m_rOutAttrs.GetItemState( SDRATTR_SHADOWYDIST ) != SfxItemState::INVALID )
         {
             nOldX = m_rOutAttrs.Get( SDRATTR_SHADOWXDIST ).GetValue();
             nOldY = m_rOutAttrs.Get( SDRATTR_SHADOWYDIST ).GetValue();
@@ -338,7 +338,7 @@ void SvxShadowTabPage::Reset( const SfxItemSet* rAttrs )
     // at the moment there are only 8 possible positions where a shadow can be set
 
     // has a shadow been set?
-    if( rAttrs->GetItemState( SDRATTR_SHADOW ) != SfxItemState::DONTCARE )
+    if( rAttrs->GetItemState( SDRATTR_SHADOW ) != SfxItemState::INVALID )
     {
         if( rAttrs->Get( SDRATTR_SHADOW ).GetValue() )
             m_xTsbShowShadow->set_state(TRISTATE_TRUE);
@@ -353,8 +353,8 @@ void SvxShadowTabPage::Reset( const SfxItemSet* rAttrs )
     // distance (only 8 possible positions),
     // so there is only one item evaluated
 
-    if( rAttrs->GetItemState( SDRATTR_SHADOWXDIST ) != SfxItemState::DONTCARE &&
-        rAttrs->GetItemState( SDRATTR_SHADOWYDIST ) != SfxItemState::DONTCARE )
+    if( rAttrs->GetItemState( SDRATTR_SHADOWXDIST ) != SfxItemState::INVALID &&
+        rAttrs->GetItemState( SDRATTR_SHADOWYDIST ) != SfxItemState::INVALID )
     {
         sal_Int32 nX = rAttrs->Get( SDRATTR_SHADOWXDIST ).GetValue();
         sal_Int32 nY = rAttrs->Get( SDRATTR_SHADOWYDIST ).GetValue();
@@ -394,14 +394,14 @@ void SvxShadowTabPage::Reset( const SfxItemSet* rAttrs )
         m_aCtlPosition.SetActualRP( RectPoint::MM );
     }
 
-    if( rAttrs->GetItemState( SDRATTR_SHADOWCOLOR ) != SfxItemState::DONTCARE )
+    if( rAttrs->GetItemState( SDRATTR_SHADOWCOLOR ) != SfxItemState::INVALID )
     {
         m_xLbShadowColor->SelectEntry( rAttrs->Get( SDRATTR_SHADOWCOLOR ).GetColorValue() );
     }
     else
         m_xLbShadowColor->SetNoSelection();
 
-    if( rAttrs->GetItemState( SDRATTR_SHADOWTRANSPARENCE ) != SfxItemState::DONTCARE )
+    if( rAttrs->GetItemState( SDRATTR_SHADOWTRANSPARENCE ) != SfxItemState::INVALID )
     {
         sal_uInt16 nTransp = rAttrs->Get( SDRATTR_SHADOWTRANSPARENCE ).GetValue();
         m_xMtrTransparent->set_value(nTransp, FieldUnit::PERCENT);
@@ -409,7 +409,7 @@ void SvxShadowTabPage::Reset( const SfxItemSet* rAttrs )
     else
         m_xMtrTransparent->set_text("");
 
-    if( rAttrs->GetItemState( SDRATTR_SHADOWBLUR ) != SfxItemState::DONTCARE )
+    if( rAttrs->GetItemState( SDRATTR_SHADOWBLUR ) != SfxItemState::INVALID )
     {
         sal_uInt16 nBlur = rAttrs->Get( SDRATTR_SHADOWBLUR ).GetValue();
         m_xLbShadowBlurMetric->set_value(nBlur, FieldUnit::MM_100TH);
diff --git a/cui/source/tabpages/tptrans.cxx b/cui/source/tabpages/tptrans.cxx
index 04cbdfb6b24a..b2d6a10dea0a 100644
--- a/cui/source/tabpages/tptrans.cxx
+++ b/cui/source/tabpages/tptrans.cxx
@@ -250,8 +250,8 @@ bool SvxTransparenceTabPage::FillItemSet(SfxItemSet* rAttrs)
     bool bGradActive = (eStateGradient == SfxItemState::SET && static_cast<const XFillFloatTransparenceItem*>(pGradientItem)->IsEnabled());
     bool bLinearActive = (eStateLinear == SfxItemState::SET && static_cast<const XFillTransparenceItem*>(pLinearItem)->GetValue() != 0);
 
-    bool bGradUsed = (eStateGradient == SfxItemState::DONTCARE);
-    bool bLinearUsed = (eStateLinear == SfxItemState::DONTCARE);
+    bool bGradUsed = (eStateGradient == SfxItemState::INVALID);
+    bool bLinearUsed = (eStateLinear == SfxItemState::INVALID);
 
     bool bModified(false);
     bool bSwitchOffLinear(false);