anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-11 05:33:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix logic of method

Browse Source 
The last return statement was unreachable

Coverity issue 102063.
This commit is contained in:
Jean-Marc 2015-09-12 19:01:18 +02:00
parent 41cb3bbc0e
commit ab1e642ef1
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/insets/InsetBox.cpp
View File

@ -204,21 +204,21 @@ ColorCode InsetBox::backgroundColor(PainterInfo const &) const
// we only support background color for 3 types
if (params_.type != "Shaded" && params_.type != "Frameless" && params_.type != "Boxed")
return getLayout().bgcolor();
if (params_.type == "Shaded") {
// FIXME: This hardcoded color is a hack!
if (buffer().params().boxbgcolor == lyx::rgbFromHexName("#ff0000"))
return getLayout().bgcolor();
ColorCode c = lcolor.getFromLyXName("boxbgcolor");
if (c == Color_none)
return getLayout().bgcolor();
return c;
} else {
if (params_.backgroundcolor == "none")
return getLayout().bgcolor();
ColorCode boxbackground = lcolor.getFromLaTeXName(params_.backgroundcolor);
return boxbackground;
}
if (params_.backgroundcolor != "none")
return lcolor.getFromLaTeXName(params_.backgroundcolor);
return getLayout().bgcolor();
}