summaryrefslogtreecommitdiff
path: root/sd/source/ui
diff options
context:
space:
mode:
Diffstat (limited to 'sd/source/ui')
-rw-r--r--sd/source/ui/dlg/tpaction.cxx4
-rw-r--r--sd/source/ui/func/fuconrec.cxx2
-rw-r--r--sd/source/ui/unoidl/unopback.cxx2
-rw-r--r--sd/source/ui/view/drtxtob.cxx4
-rw-r--r--sd/source/ui/view/drtxtob1.cxx2
-rw-r--r--sd/source/ui/view/drviews2.cxx6
-rw-r--r--sd/source/ui/view/drviewsf.cxx8
7 files changed, 13 insertions, 15 deletions
diff --git a/sd/source/ui/dlg/tpaction.cxx b/sd/source/ui/dlg/tpaction.cxx
index e8b6f55bc049..e778d5533f4c 100644
--- a/sd/source/ui/dlg/tpaction.cxx
+++ b/sd/source/ui/dlg/tpaction.cxx
@@ -287,7 +287,7 @@ void SdTPAction::Reset( const SfxItemSet* rAttrs )
OUString aFileName;
// m_xLbAction
- if( rAttrs->GetItemState( ATTR_ACTION ) != SfxItemState::DONTCARE )
+ if( rAttrs->GetItemState( ATTR_ACTION ) != SfxItemState::INVALID )
{
eCA = static_cast<presentation::ClickAction>( rAttrs->
Get( ATTR_ACTION ).GetValue());
@@ -297,7 +297,7 @@ void SdTPAction::Reset( const SfxItemSet* rAttrs )
m_xLbAction->set_active(-1);
// m_xEdtSound
- if( rAttrs->GetItemState( ATTR_ACTION_FILENAME ) != SfxItemState::DONTCARE )
+ if( rAttrs->GetItemState( ATTR_ACTION_FILENAME ) != SfxItemState::INVALID )
{
aFileName = rAttrs->Get( ATTR_ACTION_FILENAME ).GetValue();
SetEditText( aFileName );
diff --git a/sd/source/ui/func/fuconrec.cxx b/sd/source/ui/func/fuconrec.cxx
index ddd432a6bb8a..a23f463b6d7f 100644
--- a/sd/source/ui/func/fuconrec.cxx
+++ b/sd/source/ui/func/fuconrec.cxx
@@ -732,7 +732,7 @@ void FuConstructRectangle::SetLineEnds(SfxItemSet& rAttr, SdrObject const & rObj
::tools::Long nWidth = 300; // (1/100th mm)
// determine line width and calculate with it the line end width
- if( aSet.GetItemState( XATTR_LINEWIDTH ) != SfxItemState::DONTCARE )
+ if( aSet.GetItemState( XATTR_LINEWIDTH ) != SfxItemState::INVALID )
{
::tools::Long nValue = aSet.Get( XATTR_LINEWIDTH ).GetValue();
if( nValue > 0 )
diff --git a/sd/source/ui/unoidl/unopback.cxx b/sd/source/ui/unoidl/unopback.cxx
index 1dc535b6e1f8..1d436d794eda 100644
--- a/sd/source/ui/unoidl/unopback.cxx
+++ b/sd/source/ui/unoidl/unopback.cxx
@@ -323,7 +323,7 @@ beans::PropertyState SAL_CALL SdUnoPageBackground::getPropertyState( const OUStr
case SfxItemState::DEFAULT:
return beans::PropertyState_DEFAULT_VALUE;
default:
-// case SfxItemState::DONTCARE:
+// case SfxItemState::INVALID:
// case SfxItemState::DISABLED:
return beans::PropertyState_AMBIGUOUS_VALUE;
}
diff --git a/sd/source/ui/view/drtxtob.cxx b/sd/source/ui/view/drtxtob.cxx
index 15ceef57a572..01a1e94d74bf 100644
--- a/sd/source/ui/view/drtxtob.cxx
+++ b/sd/source/ui/view/drtxtob.cxx
@@ -134,7 +134,7 @@ void TextObjectBar::GetCharState( SfxItemSet& rSet )
rSet.Put(aKern);
SfxItemState eState = aCharAttrSet.GetItemState( EE_CHAR_KERNING );
- if ( eState == SfxItemState::DONTCARE )
+ if ( eState == SfxItemState::INVALID )
{
rSet.InvalidateItem(EE_CHAR_KERNING);
}
@@ -591,7 +591,7 @@ void TextObjectBar::GetAttrState( SfxItemSet& rSet )
//Added by xuxu
SfxItemState eState = aAttrSet.GetItemState( EE_PARA_LRSPACE );
- if ( eState == SfxItemState::DONTCARE )
+ if ( eState == SfxItemState::INVALID )
{
rSet.InvalidateItem(EE_PARA_LRSPACE);
rSet.InvalidateItem(SID_ATTR_PARA_LRSPACE);
diff --git a/sd/source/ui/view/drtxtob1.cxx b/sd/source/ui/view/drtxtob1.cxx
index b3787fe12edc..e7deb15750a3 100644
--- a/sd/source/ui/view/drtxtob1.cxx
+++ b/sd/source/ui/view/drtxtob1.cxx
@@ -491,8 +491,6 @@ void TextObjectBar::Execute( SfxRequest &rReq )
if( !pArgs )
{
- //aNewAttr.InvalidateAllItems(); <- produces problems (#35465#)
-
switch ( nSlot )
{
case SID_ATTR_CHAR_WEIGHT:
diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx
index 93d4cca8cc6e..94ddb161ea88 100644
--- a/sd/source/ui/view/drviews2.cxx
+++ b/sd/source/ui/view/drviews2.cxx
@@ -4059,7 +4059,7 @@ void DrawViewShell::GetStatePropPanelAttr(SfxItemSet& rSet)
case SID_TABLE_VERT_BOTTOM:
bool bContour = false;
SfxItemState eConState = aAttrs.GetItemState( SDRATTR_TEXT_CONTOURFRAME );
- if( eConState != SfxItemState::DONTCARE )
+ if( eConState != SfxItemState::INVALID )
{
bContour = aAttrs.Get( SDRATTR_TEXT_CONTOURFRAME ).GetValue();
}
@@ -4068,8 +4068,8 @@ void DrawViewShell::GetStatePropPanelAttr(SfxItemSet& rSet)
SfxItemState eVState = aAttrs.GetItemState( SDRATTR_TEXT_VERTADJUST );
//SfxItemState eHState = aAttrs.GetItemState( SDRATTR_TEXT_HORZADJUST );
- //if(SfxItemState::DONTCARE != eVState && SfxItemState::DONTCARE != eHState)
- if(SfxItemState::DONTCARE != eVState)
+ //if(SfxItemState::INVALID != eVState && SfxItemState::INVALID != eHState)
+ if(SfxItemState::INVALID != eVState)
{
SdrTextVertAdjust eTVA = aAttrs.Get(SDRATTR_TEXT_VERTADJUST).GetValue();
bool bSet = (nSlotId == SID_TABLE_VERT_NONE && eTVA == SDRTEXTVERTADJUST_TOP) ||
diff --git a/sd/source/ui/view/drviewsf.cxx b/sd/source/ui/view/drviewsf.cxx
index ac7f5a062982..2d6d35913e6a 100644
--- a/sd/source/ui/view/drviewsf.cxx
+++ b/sd/source/ui/view/drviewsf.cxx
@@ -749,19 +749,19 @@ void DrawViewShell::GetAttrState( SfxItemSet& rSet )
}
SfxItemState eState = pSet->GetItemState( EE_PARA_LRSPACE );
- if ( eState == SfxItemState::DONTCARE )
+ if ( eState == SfxItemState::INVALID )
{
rSet.InvalidateItem(EE_PARA_LRSPACE);
rSet.InvalidateItem(SID_ATTR_PARA_LRSPACE);
}
eState = pSet->GetItemState( EE_PARA_SBL );
- if ( eState == SfxItemState::DONTCARE )
+ if ( eState == SfxItemState::INVALID )
{
rSet.InvalidateItem(EE_PARA_SBL);
rSet.InvalidateItem(SID_ATTR_PARA_LINESPACE);
}
eState = pSet->GetItemState( EE_PARA_ULSPACE );
- if ( eState == SfxItemState::DONTCARE )
+ if ( eState == SfxItemState::INVALID )
{
rSet.InvalidateItem(EE_PARA_ULSPACE);
rSet.InvalidateItem(SID_ATTR_PARA_ULSPACE);
@@ -775,7 +775,7 @@ void DrawViewShell::GetAttrState( SfxItemSet& rSet )
rSet.Put(SfxBoolItem(SID_SET_SMALL_CAPS, eCaseMap == SvxCaseMap::SmallCaps));
eState = pSet->GetItemState( EE_CHAR_KERNING );
- if ( eState == SfxItemState::DONTCARE )
+ if ( eState == SfxItemState::INVALID )
{
rSet.InvalidateItem(EE_CHAR_KERNING);
rSet.InvalidateItem(SID_ATTR_CHAR_KERNING);
generated by cgit (git 2.34.1) at 2025-02-10 00:49:06 +0000