cui/inc/strings.hrc | 1 - cui/source/options/appearance.cxx | 1 - include/svtools/colorcfg.hxx | 2 -- officecfg/registry/data/org/openoffice/Office/UI.xcu | 15 --------------- officecfg/registry/schema/org/openoffice/Office/UI.xcs | 10 ---------- svtools/source/config/colorcfg.cxx | 1 - sw/inc/viewopt.hxx | 6 ++---- sw/source/core/text/inftxt.cxx | 2 +- sw/source/uibase/config/viewopt.cxx | 7 ++----- 9 files changed, 5 insertions(+), 40 deletions(-)
New commits: commit c6c9cf48ad78153e907b995193d8ba8c4b1d433a Author: Heiko Tietze <[email protected]> AuthorDate: Wed Sep 24 14:12:20 2025 +0200 Commit: Heiko Tietze <[email protected]> CommitDate: Fri Sep 26 10:14:24 2025 +0200 Resolves tdf#167162 - Remove color customization for Script Indicator Probably not used at all with some dead code Change-Id: I51f1b86bc27277496afcaeae4440da9b9ac12e22 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/191442 Reviewed-by: Heiko Tietze <[email protected]> Tested-by: Jenkins diff --git a/cui/inc/strings.hrc b/cui/inc/strings.hrc index 3bd7fe4d0bc7..09d731c62ce6 100644 --- a/cui/inc/strings.hrc +++ b/cui/inc/strings.hrc @@ -475,7 +475,6 @@ #define REG_WRITERFIELDSHADINGS NC_("REG_WRITERFIELDSHADINGS", "Field shadings") #define REG_WRITERIDXSHADINGS NC_("REG_WRITERIDXSHADINGS", "Index and table shadings") #define REG_WRITERDIRECTCURSOR NC_("REG_WRITERDIRECTCURSOR", "Direct cursor") -#define REG_WRITERSCRIPTINDICATOR NC_("REG_WRITERSCRIPTINDICATOR", "Script indicator") #define REG_WRITERSECTIONBOUNDARIES NC_("REG_WRITERSECTIONBOUNDARIES", "Section boundaries") #define REG_WRITERHEADERFOOTERMARK NC_("REG_WRITERHEADERFOOTERMARK", "Header and footer delimiter") #define REG_WRITERPAGEBREAKS NC_("REG_WRITERPAGEBREAKS", "Page and column breaks") diff --git a/cui/source/options/appearance.cxx b/cui/source/options/appearance.cxx index 970cf4b16707..80063c0a4237 100644 --- a/cui/source/options/appearance.cxx +++ b/cui/source/options/appearance.cxx @@ -743,7 +743,6 @@ void SvxAppearanceTabPage::FillItemsList() { WRITERFIELDSHADINGS, CuiResId(REG_WRITERFIELDSHADINGS) }, { WRITERIDXSHADINGS, CuiResId(REG_WRITERIDXSHADINGS) }, { WRITERDIRECTCURSOR, CuiResId(REG_WRITERDIRECTCURSOR) }, - { WRITERSCRIPTINDICATOR, CuiResId(REG_WRITERSCRIPTINDICATOR) }, { WRITERSECTIONBOUNDARIES, CuiResId(REG_WRITERSECTIONBOUNDARIES) }, { WRITERHEADERFOOTERMARK, CuiResId(REG_WRITERHEADERFOOTERMARK) }, { WRITERPAGEBREAKS, CuiResId(REG_WRITERPAGEBREAKS) }, diff --git a/include/svtools/colorcfg.hxx b/include/svtools/colorcfg.hxx index abf7ff44f244..0a1e020464a9 100644 --- a/include/svtools/colorcfg.hxx +++ b/include/svtools/colorcfg.hxx @@ -46,7 +46,6 @@ enum ColorConfigEntry : int WRITERFIELDSHADINGS , WRITERIDXSHADINGS , WRITERDIRECTCURSOR , // unused - WRITERSCRIPTINDICATOR, WRITERSECTIONBOUNDARIES, WRITERHEADERFOOTERMARK, WRITERPAGEBREAKS, @@ -157,7 +156,6 @@ namespace { { std::u16string_view(u"WriterFieldShadings"), true }, { std::u16string_view(u"WriterIdxShadings"), true }, { std::u16string_view(u"WriterDirectCursor"), true }, - { std::u16string_view(u"WriterScriptIndicator"), false }, { std::u16string_view(u"WriterSectionBoundaries"), false }, { std::u16string_view(u"WriterHeaderFooterMark"), false }, { std::u16string_view(u"WriterPageBreaks"), false }, diff --git a/officecfg/registry/data/org/openoffice/Office/UI.xcu b/officecfg/registry/data/org/openoffice/Office/UI.xcu index 7622afab3f43..6c0abca5d2c5 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI.xcu @@ -232,11 +232,6 @@ <value xsi:nil="true"/> </prop> </node> - <node oor:name="WriterScriptIndicator"> - <prop oor:name="Color"> - <value xsi:nil="true"/> - </prop> - </node> <node oor:name="WriterSectionBoundaries"> <prop oor:name="Color"> <value xsi:nil="true"/> @@ -723,11 +718,6 @@ <value xsi:nil="true"/> </prop> </node> - <node oor:name="WriterScriptIndicator"> - <prop oor:name="Color"> - <value xsi:nil="true"/> - </prop> - </node> <node oor:name="WriterSectionBoundaries"> <prop oor:name="Color"> <value xsi:nil="true"/> @@ -1214,11 +1204,6 @@ <value xsi:nil="true"/> </prop> </node> - <node oor:name="WriterScriptIndicator"> - <prop oor:name="Color"> - <value xsi:nil="true"/> - </prop> - </node> <node oor:name="WriterSectionBoundaries"> <prop oor:name="Color"> <value xsi:nil="true"/> diff --git a/officecfg/registry/schema/org/openoffice/Office/UI.xcs b/officecfg/registry/schema/org/openoffice/Office/UI.xcs index 1ce8bed49350..c6bdc3bf1e90 100644 --- a/officecfg/registry/schema/org/openoffice/Office/UI.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/UI.xcs @@ -232,16 +232,6 @@ </info> </prop> </group> - <group oor:name="WriterScriptIndicator"> - <info> - <desc>Specifies the settings for script indicators in Writer.</desc> - </info> - <prop oor:name="Color" oor:type="xs:int"> - <info> - <desc>Specifies the color for the script indicators in Writer.</desc> - </info> - </prop> - </group> <group oor:name="WriterSectionBoundaries"> <info> <desc>Specifies the settings for section boundaries in Writer.</desc> diff --git a/svtools/source/config/colorcfg.cxx b/svtools/source/config/colorcfg.cxx index 6fcf2d9bfc05..c7ad2b0b8847 100644 --- a/svtools/source/config/colorcfg.cxx +++ b/svtools/source/config/colorcfg.cxx @@ -540,7 +540,6 @@ Color ColorConfig::GetDefaultColor(ColorConfigEntry eEntry, int nMod) { COL_LIGHTGRAY, COL_LIGHTGRAY }, // WRITERFIELDSHADING { COL_LIGHTGRAY, Color(0x1C1C1C) }, // WRITERIDXSHADINGS { COL_BLACK, COL_BLACK }, // WRITERDIRECTCURSOR - { COL_GREEN, Color(0x1E6A39) }, // WRITERSCRIPTINDICATOR { COL_LIGHTGRAY, Color(0x808080) }, // WRITERSECTIONBOUNDARIES { Color(0x0369a3), Color(0xB4C7DC) }, // WRITERHEADERFOOTERMARK { COL_BLUE, Color(0x729FCF) }, // WRITERPAGEBREAKS diff --git a/sw/inc/viewopt.hxx b/sw/inc/viewopt.hxx index fecb5e204f32..9b62e330963f 100644 --- a/sw/inc/viewopt.hxx +++ b/sw/inc/viewopt.hxx @@ -238,7 +238,6 @@ struct SwViewColors && m_aSectionBoundColor == rOther.m_aSectionBoundColor && m_aPageBreakColor == rOther.m_aPageBreakColor && m_aNonPrintingCharacterColor == rOther.m_aNonPrintingCharacterColor - && m_aScriptIndicatorColor == rOther.m_aScriptIndicatorColor && m_aShadowColor == rOther.m_aShadowColor && m_aHeaderFooterMarkColor == rOther.m_aHeaderFooterMarkColor && m_nAppearanceFlags == rOther.m_nAppearanceFlags; @@ -259,7 +258,6 @@ struct SwViewColors Color m_aSectionBoundColor; Color m_aPageBreakColor; Color m_aNonPrintingCharacterColor; - Color m_aScriptIndicatorColor; Color m_aShadowColor; Color m_aHeaderFooterMarkColor; ViewOptFlags m_nAppearanceFlags; @@ -461,8 +459,8 @@ public: void SetResolvedPostIts( bool b ) { SetUIOption(b, ViewOptFlags2::ResolvedPostits); } - void PaintPostIts( OutputDevice *pOut, const SwRect &rRect, - bool bIsScript ) const; + static void PaintPostIts( OutputDevice *pOut, const SwRect &rRect, + bool bIsScript ); static SwTwips GetPostItsWidth(const OutputDevice* pOut); //show/hide tooltips on tracked changes diff --git a/sw/source/core/text/inftxt.cxx b/sw/source/core/text/inftxt.cxx index 4f6eca343c12..9e7d36ed5fde 100644 --- a/sw/source/core/text/inftxt.cxx +++ b/sw/source/core/text/inftxt.cxx @@ -1203,7 +1203,7 @@ void SwTextPaintInfo::DrawPostIts( bool bScript ) const if ( GetTextFrame()->IsVertical() ) GetTextFrame()->SwitchHorizontalToVertical( aTmpRect ); - GetOpt().PaintPostIts(m_pOut, aTmpRect, bScript); + SwViewOption::PaintPostIts(m_pOut, aTmpRect, bScript); } diff --git a/sw/source/uibase/config/viewopt.cxx b/sw/source/uibase/config/viewopt.cxx index 495c1c2156d6..5cfd149b1122 100644 --- a/sw/source/uibase/config/viewopt.cxx +++ b/sw/source/uibase/config/viewopt.cxx @@ -60,7 +60,6 @@ SwViewColors::SwViewColors() : m_aSectionBoundColor(COL_LIGHTGRAY), m_aPageBreakColor(COL_BLUE), m_aNonPrintingCharacterColor(Color(0x268bd2)), - m_aScriptIndicatorColor(COL_GREEN), m_aShadowColor(COL_GRAY), m_aHeaderFooterMarkColor(COL_BLUE), m_nAppearanceFlags(ViewOptFlags::NONE) @@ -123,8 +122,6 @@ SwViewColors::SwViewColors(const svtools::ColorConfig& rConfig) aValue = rConfig.GetColorValue(svtools::WRITERHEADERFOOTERMARK); m_aHeaderFooterMarkColor = aValue.nColor; - - m_aScriptIndicatorColor = rConfig.GetColorValue(svtools::WRITERSCRIPTINDICATOR).nColor; } bool SwViewOption::IsEqualFlags( const SwViewOption &rOpt ) const @@ -203,7 +200,7 @@ SwTwips SwViewOption::GetPostItsWidth(const OutputDevice* pOut) return pOut->GetTextWidth(u" "_ustr); } -void SwViewOption::PaintPostIts( OutputDevice *pOut, const SwRect &rRect, bool bIsScript ) const +void SwViewOption::PaintPostIts( OutputDevice *pOut, const SwRect &rRect, bool bIsScript ) { if( !(pOut && bIsScript) ) return; @@ -217,7 +214,7 @@ void SwViewOption::PaintPostIts( OutputDevice *pOut, const SwRect &rRect, bool b const Point aTopLeft( rRect.Left() + nPix, rRect.Top() + nPix ); const Point aBotRight( rRect.Right() - nPix, rRect.Bottom() - nPix ); const SwRect aRect( aTopLeft, aBotRight ); - DrawRect( pOut, aRect, m_aColorConfig.m_aScriptIndicatorColor ); + DrawRect( pOut, aRect, COL_GREEN ); pOut->SetLineColor( aOldLineColor ); }
