[Libreoffice-commits] core.git: cui/source editeng/source
Armin Le Grand (Allotropia) (via logerrit)
logerrit at kemper.freedesktop.org
Tue Jun 8 15:07:00 UTC 2021
cui/source/tabpages/align.cxx | 6 ------
cui/source/tabpages/chardlg.cxx | 9 ---------
editeng/source/uno/unotext.cxx | 3 ---
3 files changed, 18 deletions(-)
New commits:
commit b60a9bec769339f5f0fe008ef4985263d0cf689e
Author: Armin Le Grand (Allotropia) <armin.le.grand at me.com>
AuthorDate: Tue Jun 8 14:17:23 2021 +0200
Commit: Julien Nabet <serval2412 at yahoo.fr>
CommitDate: Tue Jun 8 17:06:15 2021 +0200
Addendum to: Remove SfxItemState::READONLY
unfortunately forgot to remove some of the out-commented
lines in f3b737ab76efaf1a70dfb22c6b60b08b340cf343, thanks
to Julien for hinting me to that. So this is no semantic
change at all, just syntax.
Change-Id: If45b0cf1aeed870723914c2c02f6060d8f1bbfb4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116838
Tested-by: Jenkins
Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>
diff --git a/cui/source/tabpages/align.cxx b/cui/source/tabpages/align.cxx
index 5ca1e49c8178..5937a2b28995 100644
--- a/cui/source/tabpages/align.cxx
+++ b/cui/source/tabpages/align.cxx
@@ -436,7 +436,6 @@ void AlignmentTabPage::Reset(const SfxItemSet* pCoreAttrs)
m_xLbHorAlign->hide();
break;
case SfxItemState::DISABLED:
-// case SfxItemState::READONLY:
m_xLbHorAlign->set_sensitive(false);
break;
case SfxItemState::DONTCARE:
@@ -480,7 +479,6 @@ void AlignmentTabPage::Reset(const SfxItemSet* pCoreAttrs)
m_xFtIndent->hide();
break;
case SfxItemState::DISABLED:
-// case SfxItemState::READONLY:
m_xEdIndent->set_sensitive(false);
break;
case SfxItemState::DONTCARE:
@@ -504,7 +502,6 @@ void AlignmentTabPage::Reset(const SfxItemSet* pCoreAttrs)
m_xFtVerAlign->hide();
break;
case SfxItemState::DISABLED:
-// case SfxItemState::READONLY:
m_xLbVerAlign->set_sensitive(false);
break;
case SfxItemState::DONTCARE:
@@ -545,7 +542,6 @@ void AlignmentTabPage::Reset(const SfxItemSet* pCoreAttrs)
m_xCtrlDialWin->hide();
break;
case SfxItemState::DISABLED:
-// case SfxItemState::READONLY:
m_xNfRotate->set_sensitive(false);
m_xCtrlDialWin->set_sensitive(false);
break;
@@ -569,7 +565,6 @@ void AlignmentTabPage::Reset(const SfxItemSet* pCoreAttrs)
m_xVsRefEdge->hide();
break;
case SfxItemState::DISABLED:
-// case SfxItemState::READONLY:
m_xVsRefEdge->set_sensitive(false);
break;
case SfxItemState::DONTCARE:
@@ -608,7 +603,6 @@ void AlignmentTabPage::Reset(const SfxItemSet* pCoreAttrs)
m_xLbFrameDir->hide();
break;
case SfxItemState::DISABLED:
-// case SfxItemState::READONLY:
m_xLbFrameDir->set_sensitive(false);
break;
case SfxItemState::DONTCARE:
diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx
index 9755bb7024af..a4cc33265a18 100644
--- a/cui/source/tabpages/chardlg.cxx
+++ b/cui/source/tabpages/chardlg.cxx
@@ -794,7 +794,6 @@ void SvxCharNamePage::Reset_Impl( const SfxItemSet& rSet, LanguageGroup eLangGrp
break;
case SfxItemState::DISABLED:
-// case SfxItemState::READONLY:
pLangFT->set_sensitive(false);
pLangBox->set_sensitive(false);
break;
@@ -1521,7 +1520,6 @@ void SvxCharEffectsPage::ResetColor_Impl( const SfxItemSet& rSet )
break;
case SfxItemState::DISABLED:
-// case SfxItemState::READONLY:
m_xFontColorFT->set_sensitive(false);
m_xFontColorLB->set_sensitive(false);
break;
@@ -1806,7 +1804,6 @@ void SvxCharEffectsPage::Reset( const SfxItemSet* rSet )
break;
case SfxItemState::DISABLED:
-// case SfxItemState::READONLY:
m_aIndividualWordsState.bTriStateEnabled = false;
m_xIndividualWordsBtn->set_sensitive(false);
break;
@@ -1860,7 +1857,6 @@ void SvxCharEffectsPage::Reset( const SfxItemSet* rSet )
m_xEmphasisFT->hide();
m_xEmphasisLB->hide();
}
-// else // SfxItemState::DISABLED or SfxItemState::READONLY
else // SfxItemState::DISABLED
{
m_xEmphasisFT->set_sensitive(false);
@@ -1885,7 +1881,6 @@ void SvxCharEffectsPage::Reset( const SfxItemSet* rSet )
break;
case SfxItemState::DISABLED:
-// case SfxItemState::READONLY:
m_xEffectsFT->set_sensitive(false);
m_xEffectsLB->set_sensitive(false);
break;
@@ -1915,7 +1910,6 @@ void SvxCharEffectsPage::Reset( const SfxItemSet* rSet )
break;
case SfxItemState::DISABLED:
-// case SfxItemState::READONLY:
m_xReliefFT->set_sensitive(false);
m_xReliefLB->set_sensitive(false);
break;
@@ -1945,7 +1939,6 @@ void SvxCharEffectsPage::Reset( const SfxItemSet* rSet )
break;
case SfxItemState::DISABLED:
-// case SfxItemState::READONLY:
m_aOutlineState.bTriStateEnabled = false;
m_xOutlineBtn->set_sensitive(false);
break;
@@ -1977,7 +1970,6 @@ void SvxCharEffectsPage::Reset( const SfxItemSet* rSet )
break;
case SfxItemState::DISABLED:
-// case SfxItemState::READONLY:
m_aShadowState.bTriStateEnabled = false;
m_xShadowBtn->set_sensitive(false);
break;
@@ -2009,7 +2001,6 @@ void SvxCharEffectsPage::Reset( const SfxItemSet* rSet )
break;
case SfxItemState::DISABLED:
-// case SfxItemState::READONLY:
m_aHiddenState.bTriStateEnabled = false;
m_xHiddenBtn->set_sensitive(false);
break;
diff --git a/editeng/source/uno/unotext.cxx b/editeng/source/uno/unotext.cxx
index 68f3319d1b69..0c4a01c748d1 100644
--- a/editeng/source/uno/unotext.cxx
+++ b/editeng/source/uno/unotext.cxx
@@ -1003,7 +1003,6 @@ beans::PropertyState SvxUnoTextRangeBase::_getPropertyState(const SfxItemPropert
case SfxItemState::DONTCARE:
case SfxItemState::DISABLED:
return beans::PropertyState_AMBIGUOUS_VALUE;
-// case SfxItemState::READONLY:
case SfxItemState::SET:
return beans::PropertyState_DIRECT_VALUE;
case SfxItemState::DEFAULT:
@@ -1094,7 +1093,6 @@ bool SvxUnoTextRangeBase::_getOnePropertyStates(const SfxItemSet* pSet, const Sf
}
break;
-// case SfxItemState::READONLY:
case SfxItemState::SET:
if( eItemState != SfxItemState::SET )
{
@@ -1130,7 +1128,6 @@ bool SvxUnoTextRangeBase::_getOnePropertyStates(const SfxItemSet* pSet, const Sf
switch( eItemState )
{
-// case SfxItemState::READONLY:
case SfxItemState::SET:
rState = beans::PropertyState_DIRECT_VALUE;
break;
More information about the Libreoffice-commits
mailing list