diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2023-08-23 13:47:40 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2023-08-28 09:43:40 +0200 |
| commit | 68e797402692c5c8abf1b2c4374e12a8d2707d07 (patch) | |
| tree | d10643f2ce00efe809de0e9548a2c38943e2d11f /cppcanvas/source/mtfrenderer | |
| parent | 5733cdba90b099637805648b193510268def74be (diff) | |
new loplugin:optionalbool
which warns against using the 'operator bool' conversion of
std::optional<bool> which can lead to interesting bugs
The bugs that this plugin have been submitted independantly,
so this change is just using has_value() in relevant places.
Change-Id: I259b837feeecddcb8cd1d7e5db1e85bf505907cb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155978
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'cppcanvas/source/mtfrenderer')
| -rw-r--r-- | cppcanvas/source/mtfrenderer/implrenderer.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cppcanvas/source/mtfrenderer/implrenderer.cxx b/cppcanvas/source/mtfrenderer/implrenderer.cxx index 9d224f1146c4..e898d739d216 100644 --- a/cppcanvas/source/mtfrenderer/implrenderer.cxx +++ b/cppcanvas/source/mtfrenderer/implrenderer.cxx @@ -1495,7 +1495,7 @@ namespace cppcanvas::internal // TODO(Q2): define and use appropriate enumeration types rState.textReliefStyle = rFont.GetRelief(); rState.textOverlineStyle = static_cast<sal_Int8>(rFont.GetOverline()); - rState.textUnderlineStyle = rParms.maFontUnderline ? + rState.textUnderlineStyle = rParms.maFontUnderline.has_value() ? (*rParms.maFontUnderline ? sal_Int8(LINESTYLE_SINGLE) : sal_Int8(LINESTYLE_NONE)) : static_cast<sal_Int8>(rFont.GetUnderline()); rState.textStrikeoutStyle = static_cast<sal_Int8>(rFont.GetStrikeout()); @@ -2932,7 +2932,7 @@ namespace cppcanvas::internal if( rParams.maFontName || rParams.maFontWeight || rParams.maFontLetterForm || - rParams.maFontUnderline ) + rParams.maFontUnderline.has_value() ) { ::cppcanvas::internal::OutDevState& rState = aStateStack.getState(); |