diff options
| author | Noel <noel.grandin@collabora.co.uk> | 2021-01-15 14:49:12 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-01-16 10:07:07 +0100 |
| commit | 63a68064bb33f180b8a231f7524d99405d910226 (patch) | |
| tree | 7ecf05b057c5ca4d80a48af045998a4b34484561 /reportdesign/source/ui/dlg/Condition.cxx | |
| parent | d534a4c7b45ff254b339e806c6a11f13d9ff0043 (diff) | |
make the Color constructors explicitly specify transparency
to reduce the churn, we leave the existing constructor in place,
and add a clang plugin to detect when the value passed to the
existing constructor may contain transparency/alpha data.
i.e. we leave expressions like Color(0xffffff) alone, but
warn about any non-constant expression, and any expression
like Color(0xff000000)
Change-Id: Id2ce58e08882d9b7bd0b9f88eca97359dcdbcc8c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109362
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'reportdesign/source/ui/dlg/Condition.cxx')
| -rw-r--r-- | reportdesign/source/ui/dlg/Condition.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/reportdesign/source/ui/dlg/Condition.cxx b/reportdesign/source/ui/dlg/Condition.cxx index baa7a948f37e..3f440f3494be 100644 --- a/reportdesign/source/ui/dlg/Condition.cxx +++ b/reportdesign/source/ui/dlg/Condition.cxx @@ -323,9 +323,9 @@ void Condition::updateToolbar(const uno::Reference< report::XReportControlFormat aFont.SetFontHeight(OutputDevice::LogicToLogic(Size(0, aFont.GetFontHeight()), MapMode(MapUnit::MapPoint), MapMode(MapUnit::MapTwip)).Height()); aFont.SetEmphasisMark( static_cast< FontEmphasisMark >( _xReportControlFormat->getControlTextEmphasis() ) ); aFont.SetRelief( static_cast< FontRelief >( _xReportControlFormat->getCharRelief() ) ); - aFont.SetColor( Color(_xReportControlFormat->getCharColor()) ); + aFont.SetColor( Color(ColorTransparency, _xReportControlFormat->getCharColor()) ); m_aPreview.SetFont( aFont, aFont, aFont ); - m_aPreview.SetTextLineColor( Color( _xReportControlFormat->getCharUnderlineColor() ) ); + m_aPreview.SetTextLineColor( Color( ColorTransparency, _xReportControlFormat->getCharUnderlineColor() ) ); } catch( const Exception& ) { |