From 9eae3a528e64668f2d8734fa94ffb2e2f643ad49 Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Mon, 18 Nov 2019 10:50:41 +0000
Subject: cid#1399260 Uncaught exception
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: I975716ae1f7406af57cc4141f4cbdb9e5e4c4bd2
Reviewed-on: https://gerrit.libreoffice.org/83074
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
---
 sc/inc/colcontainer.hxx          | 2 +-
 sc/inc/column.hxx                | 2 +-
 sc/inc/table.hxx                 | 4 ++--
 sc/source/core/data/column.cxx   | 2 +-
 sc/source/core/data/document.cxx | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'sc')

diff --git a/sc/inc/colcontainer.hxx b/sc/inc/colcontainer.hxx
index c7b72e082a96..a3a871a8787d 100644
--- a/sc/inc/colcontainer.hxx
+++ b/sc/inc/colcontainer.hxx
@@ -29,7 +29,7 @@
 class ScColContainer
 {
 public:
-    typedef std::vector<std::unique_ptr<ScColumn>> ScColumnVector;
+    typedef std::vector<std::unique_ptr<ScColumn, o3tl::default_delete<ScColumn>>> ScColumnVector;
 
     ScColContainer( const size_t nSize );
     ~ScColContainer() COVERITY_NOEXCEPT_FALSE;
diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index 18cf3de6231f..9b3231ddd48f 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -174,7 +174,7 @@ public:
     };
 
     ScColumn();
-    ~ScColumn() COVERITY_NOEXCEPT_FALSE;
+    ~ScColumn();
 
     void        Init(SCCOL nNewCol, SCTAB nNewTab, ScDocument* pDoc, bool bEmptyAttrArray);
 
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index 6da491aba9cc..a31e6191eb6e 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -120,7 +120,7 @@ class ScColumnsRange final
  public:
     class Iterator final
     {
-        std::vector<std::unique_ptr<ScColumn>>::const_iterator maColIter;
+        std::vector<std::unique_ptr<ScColumn, o3tl::default_delete<ScColumn>>>::const_iterator maColIter;
     public:
         typedef std::input_iterator_tag iterator_category;
         typedef SCCOL value_type;
@@ -128,7 +128,7 @@ class ScColumnsRange final
         typedef const SCCOL* pointer;
         typedef SCCOL reference;
 
-        explicit Iterator(const std::vector<std::unique_ptr<ScColumn>>::const_iterator& colIter) : maColIter(colIter) {}
+        explicit Iterator(const std::vector<std::unique_ptr<ScColumn, o3tl::default_delete<ScColumn>>>::const_iterator& colIter) : maColIter(colIter) {}
 
         Iterator& operator++() { ++maColIter; return *this;}
         Iterator& operator--() { --maColIter; return *this;}
diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index d1b10c128344..ba17b3de4a75 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -89,7 +89,7 @@ ScColumn::ScColumn() :
     maCells.resize(MAXROWCOUNT);
 }
 
-ScColumn::~ScColumn() COVERITY_NOEXCEPT_FALSE
+ScColumn::~ScColumn()
 {
     FreeAll();
 }
diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index 4c550e670863..ac2a1e786939 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -2508,7 +2508,7 @@ ScColumnsRange ScDocument::GetColumnsRange( SCTAB nTab, SCCOL nColBegin, SCCOL n
 {
     if (!TableExists(nTab))
     {
-        std::vector<std::unique_ptr<ScColumn>> aEmptyVector;
+        std::vector<std::unique_ptr<ScColumn, o3tl::default_delete<ScColumn>>> aEmptyVector;
         return ScColumnsRange(ScColumnsRange::Iterator(aEmptyVector.begin()),
                               ScColumnsRange::Iterator(aEmptyVector.end()));
     }
-- 
cgit