From fcd60a02137f7669fabb8841503e6ad5cdbd00a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Sat, 18 Jan 2025 19:55:47 +0000 Subject: [PATCH] drop coverity std::optional workaround MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ie1b61fc4a8a8219e9ba3d4c8f77c27b8c725407e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/180490 Tested-by: Jenkins Reviewed-by: Caolán McNamara --- editeng/source/rtf/svxrtf.cxx | 6 ------ 1 file changed, 6 deletions(-) diff --git a/editeng/source/rtf/svxrtf.cxx b/editeng/source/rtf/svxrtf.cxx index b437cb5598d4..3753d1066827 100644 --- a/editeng/source/rtf/svxrtf.cxx +++ b/editeng/source/rtf/svxrtf.cxx @@ -985,10 +985,7 @@ SvxRTFItemStackType::SvxRTFItemStackType( const EditPosition& rPos ) : aAttrSet( rPool, pWhichRange ) , mxStartNodeIdx(rPos.MakeNodeIdx()) -#if !defined(__COVERITY__) || __COVERITY_MAJOR__ > 2023 - // coverity 2020 has difficulty wrt std::optional leading to bogus 'Uninitialized scalar variable' , mxEndNodeIdx(mxStartNodeIdx) -#endif , nSttCnt(rPos.GetCntIdx()) , nEndCnt(nSttCnt) , nStyleNo(0) @@ -1001,10 +998,7 @@ SvxRTFItemStackType::SvxRTFItemStackType( bool const bCopyAttr ) : aAttrSet( *rCpy.aAttrSet.GetPool(), rCpy.aAttrSet.GetRanges() ) , mxStartNodeIdx(rPos.MakeNodeIdx()) -#if !defined(__COVERITY__) || __COVERITY_MAJOR__ > 2023 - // coverity 2020 has difficulty wrt std::optional leading to bogus 'Uninitialized scalar variable' , mxEndNodeIdx(mxStartNodeIdx) -#endif , nSttCnt(rPos.GetCntIdx()) , nEndCnt(nSttCnt) , nStyleNo(rCpy.nStyleNo)