[Libreoffice-commits] core.git: 2 commits - editeng/source include/editeng sc/inc

[Caolán McNamara (via logerrit)]

 editeng/source/items/frmitems.cxx |    2 +-
 include/editeng/brushitem.hxx     |    2 +-
 sc/inc/address.hxx                |    6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit c6c8de5a94bb0d96e9cde3859462dfb3f70812ff
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Sat Aug 24 20:20:05 2019 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Sun Aug 25 11:30:22 2019 +0200

    cid#1452761 Uncaught exception
    
    Change-Id: I58b94aa58bb96e69539e24d2ae53d6add6ad3593
    Reviewed-on: https://gerrit.libreoffice.org/78068
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx
index 6dbfcc57f2ca..0d49c25681b6 100644
--- a/editeng/source/items/frmitems.cxx
+++ b/editeng/source/items/frmitems.cxx
@@ -2819,7 +2819,7 @@ SvxBrushItem::SvxBrushItem(const SvxBrushItem& rItem)
 {
 }
 
-SvxBrushItem::SvxBrushItem(SvxBrushItem&& rItem) noexcept
+SvxBrushItem::SvxBrushItem(SvxBrushItem&& rItem)
     : SfxPoolItem(std::move(rItem))
     , aColor(std::move(rItem.aColor))
     , nShadingValue(std::move(rItem.nShadingValue))
diff --git a/include/editeng/brushitem.hxx b/include/editeng/brushitem.hxx
index 944b481d7973..3bc6327da9c8 100644
--- a/include/editeng/brushitem.hxx
+++ b/include/editeng/brushitem.hxx
@@ -69,7 +69,7 @@ public:
     SvxBrushItem( const OUString& rLink, const OUString& rFilter,
                   SvxGraphicPosition ePos, sal_uInt16 nWhich );
     SvxBrushItem( const SvxBrushItem& );
-    SvxBrushItem(SvxBrushItem&&) noexcept;
+    SvxBrushItem(SvxBrushItem&&);
 
     virtual ~SvxBrushItem() override;
 
commit 36133d203baa93e0ac34f92543e6403489ee1378
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Sat Aug 24 20:51:33 2019 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Sun Aug 25 11:29:46 2019 +0200

    cid#1242793 Untrusted value as argument
    
    help coverity know this is sanitizing its argument
    
    Change-Id: I54eb64bae73ef55e7431f6764536304c298a28c9
    Reviewed-on: https://gerrit.libreoffice.org/78070
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sc/inc/address.hxx b/sc/inc/address.hxx
index b7baaa4c0bc0..df26f12c1408 100644
--- a/sc/inc/address.hxx
+++ b/sc/inc/address.hxx
@@ -125,17 +125,17 @@ const SCROW SCROW_REPEAT_NONE = SCROW_MAX;
 
 [[nodiscard]] inline SCCOL SanitizeCol( SCCOL nCol )
 {
-    return nCol < 0 ? 0 : std::min(nCol, MAXCOL);
+    return nCol < 0 ? 0 : (nCol > MAXCOL ? MAXCOL : nCol);
 }
 
 [[nodiscard]] inline SCROW SanitizeRow( SCROW nRow )
 {
-    return nRow < 0 ? 0 : std::min(nRow, MAXROW);
+    return nRow < 0 ? 0 : (nRow > MAXROW ? MAXROW : nRow);
 }
 
 [[nodiscard]] inline SCTAB SanitizeTab( SCTAB nTab )
 {
-    return nTab < 0 ? 0 : std::min(nTab, MAXTAB);
+    return nTab < 0 ? 0 : (nTab > MAXTAB ? MAXTAB : nTab);
 }
 
 // The result of ConvertRef() is a bit group of the following: