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 /forms | |
| 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 'forms')
| -rw-r--r-- | forms/source/component/Grid.cxx | 2 | ||||
| -rw-r--r-- | forms/source/component/navigationbar.cxx | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/forms/source/component/Grid.cxx b/forms/source/component/Grid.cxx index 10b210b7b1bf..0677420f0bea 100644 --- a/forms/source/component/Grid.cxx +++ b/forms/source/component/Grid.cxx @@ -953,7 +953,7 @@ void OGridControlModel::read(const Reference<XObjectInputStream>& _rxInStream) if (nAnyMask & TEXTCOLOR) { sal_Int32 nValue = _rxInStream->readLong(); - setTextColor( ::Color(nValue) ); + setTextColor( ::Color(ColorTransparency, nValue) ); } // new since version 6 if (nVersion > 5) diff --git a/forms/source/component/navigationbar.cxx b/forms/source/component/navigationbar.cxx index 3d602d2abfa0..368ab62d3fa9 100644 --- a/forms/source/component/navigationbar.cxx +++ b/forms/source/component/navigationbar.cxx @@ -280,12 +280,12 @@ namespace frm m_aBackgroundColor.clear(); if ( nNonVoids & PERSIST_TEXTCOLOR ) - setTextColor( ::Color(_rxInStream->readLong()) ); + setTextColor( ::Color(ColorTransparency, _rxInStream->readLong()) ); else clearTextColor(); if ( nNonVoids & PERSIST_TEXTLINECOLOR ) - setTextLineColor( ::Color(_rxInStream->readLong()) ); + setTextLineColor( ::Color(ColorTransparency, _rxInStream->readLong()) ); else clearTextLineColor(); } |