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 /starmath/source/unomodel.cxx | |
| 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 'starmath/source/unomodel.cxx')
| -rw-r--r-- | starmath/source/unomodel.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/starmath/source/unomodel.cxx b/starmath/source/unomodel.cxx index 5857c3832579..64ca28e692e1 100644 --- a/starmath/source/unomodel.cxx +++ b/starmath/source/unomodel.cxx @@ -455,8 +455,8 @@ void SmModel::_setPropertyValues(const PropertyMapEntry** ppEntries, const Any* case HANDLE_FONT_NUMBERS_POSTURE : case HANDLE_FONT_TEXT_POSTURE : { - auto bVal = o3tl::tryAccess<bool>(*pValues); - if(!bVal) + std::optional<const bool> bVal = o3tl::tryAccess<bool>(*pValues); + if(!bVal.has_value()) throw IllegalArgumentException(); vcl::Font aNewFont(aFormat.GetFont((*ppEntries)->mnMemberId)); aNewFont.SetItalic(*bVal ? ITALIC_NORMAL : ITALIC_NONE); @@ -472,8 +472,8 @@ void SmModel::_setPropertyValues(const PropertyMapEntry** ppEntries, const Any* case HANDLE_FONT_NUMBERS_WEIGHT : case HANDLE_FONT_TEXT_WEIGHT : { - auto bVal = o3tl::tryAccess<bool>(*pValues); - if(!bVal) + std::optional<const bool> bVal = o3tl::tryAccess<bool>(*pValues); + if(!bVal.has_value()) throw IllegalArgumentException(); vcl::Font aNewFont(aFormat.GetFont((*ppEntries)->mnMemberId)); aNewFont.SetWeight(*bVal ? WEIGHT_BOLD : WEIGHT_NORMAL); |