mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

-Werror,-Wunused-but-set-variable (Clang 13 trunk)

Browse Source 
The (only) use of lineColor at

>         //m_pImpl->bUseGridLines ? _rDevice.SetLineColor( lineColor ) : _rDevice.SetLineColor();

had been commented out in 8578ba4dc736b53c3ca8461516e4024d276b3b05 "gridsort:
consolidated and fixed table cell rendering" and then cleaned away completely
with f4147a39374c7692728e8506961f23e59a069c45 "refactor TableControl to use
RenderContext"

Change-Id: I817800b26f4996a73a38fece22149ae87c2f9c01
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116824
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
This commit is contained in:
Stephan Bergmann 2021-06-08 11:49:05 +02:00
parent 1541ac5081
commit 85582c40bc
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
svtools/source/table/gridtablerenderer.cxx
View File

@ -309,9 +309,6 @@ namespace svt::table
Color backgroundColor = _rStyle.GetFieldColor(); Color backgroundColor = _rStyle.GetFieldColor();
std::optional<Color> const aLineColor( m_pImpl->rModel.getLineColor() );
Color lineColor = !aLineColor ? _rStyle.GetSeparatorColor() : *aLineColor;
Color const activeSelectionBackColor = lcl_getEffectiveColor(m_pImpl->rModel.getActiveSelectionBackColor(), Color const activeSelectionBackColor = lcl_getEffectiveColor(m_pImpl->rModel.getActiveSelectionBackColor(),
_rStyle, &StyleSettings::GetHighlightColor); _rStyle, &StyleSettings::GetHighlightColor);
if (_bSelected) if (_bSelected)
@ -320,8 +317,6 @@ namespace svt::table
backgroundColor = i_hasControlFocus backgroundColor = i_hasControlFocus
? activeSelectionBackColor ? activeSelectionBackColor
: lcl_getEffectiveColor(m_pImpl->rModel.getInactiveSelectionBackColor(), _rStyle, &StyleSettings::GetDeactiveColor); : lcl_getEffectiveColor(m_pImpl->rModel.getInactiveSelectionBackColor(), _rStyle, &StyleSettings::GetDeactiveColor);
if (!aLineColor)
lineColor = backgroundColor;
} }
else else
{ {