core.git: 2 commits - editeng/source sw/source

[Caolán McNamara (via logerrit)]

 editeng/source/rtf/svxrtf.cxx  |    6 ------
 sw/source/core/text/possiz.hxx |    4 ----
 2 files changed, 10 deletions(-)

New commits:
commit fcd60a02137f7669fabb8841503e6ad5cdbd00a8
Author:     Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Sat Jan 18 19:55:47 2025 +0000
Commit:     Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Mon Jan 20 09:29:10 2025 +0100

    drop coverity std::optional workaround
    
    Change-Id: Ie1b61fc4a8a8219e9ba3d4c8f77c27b8c725407e
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/180490
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>

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)
commit 7e62220a58461499b1e22530fa8a7e931425958c
Author:     Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Sat Jan 18 19:58:12 2025 +0000
Commit:     Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Mon Jan 20 09:29:00 2025 +0100

    drop coverity workaround
    
    Change-Id: I6085b9af2cc16114f61ba06fdeece601add50885
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/180489
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>

diff --git a/sw/source/core/text/possiz.hxx b/sw/source/core/text/possiz.hxx
index dd7e940bd0eb..fa803fcc467e 100644
--- a/sw/source/core/text/possiz.hxx
+++ b/sw/source/core/text/possiz.hxx
@@ -37,11 +37,7 @@ public:
         , m_nHeight(SwTwips(rSize.Height()))
     {
     }
-#if defined(__COVERITY__) && __COVERITY_MAJOR__ <= 2023
-    virtual ~SwPosSize() COVERITY_NOEXCEPT_FALSE {}
-#else
     virtual ~SwPosSize() {}
-#endif
     SwPosSize(SwPosSize const &) = default;
     SwPosSize(SwPosSize &&) = default;
     SwPosSize & operator =(SwPosSize const &) = default;