[Libreoffice-commits] core.git: sc/source sw/source

[Libreoffice Gerrit user]

 sc/source/ui/inc/docsh.hxx     |    3 ++-
 sw/source/core/text/itratr.hxx |    4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 8203e556a9863d0a5562269f667e323bd39fcb9a
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Sun Jul 15 21:19:19 2018 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Mon Jul 16 14:10:48 2018 +0200

    coverity#1401328 Uncaught exception
    
    Change-Id: I08c91c9c84d53f567332e5780b14173b8c8e5fb1
    Reviewed-on: https://gerrit.libreoffice.org/57462
    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/source/ui/inc/docsh.hxx b/sc/source/ui/inc/docsh.hxx
index 3e4bf487127f..fe8dac8a1ef5 100644
--- a/sc/source/ui/inc/docsh.hxx
+++ b/sc/source/ui/inc/docsh.hxx
@@ -21,6 +21,7 @@
 #define INCLUDED_SC_SOURCE_UI_INC_DOCSH_HXX
 
 #include <ooo/vba/excel/XWorkbook.hpp>
+#include <o3tl/deleter.hxx>
 #include <sfx2/objsh.hxx>
 #include <sfx2/docfac.hxx>
 #include <sfx2/sfxmodelfactory.hxx>
@@ -113,7 +114,7 @@ class SC_DLLPUBLIC ScDocShell final: public SfxObjectShell, public SfxListener
     std::unique_ptr<ScSheetSaveData>    m_pSheetSaveData;
     std::unique_ptr<ScFormatSaveData>   m_pFormatSaveData;
 
-    std::unique_ptr<ScDocShellModificator> m_pModificator; // #109979#; is used to load XML (created in BeforeXMLLoading and destroyed in AfterXMLLoading)
+    std::unique_ptr<ScDocShellModificator, o3tl::default_delete<ScDocShellModificator>> m_pModificator; // #109979#; is used to load XML (created in BeforeXMLLoading and destroyed in AfterXMLLoading)
 
     css::uno::Reference< ooo::vba::excel::XWorkbook> mxAutomationWorkbookObject;
 
diff --git a/sw/source/core/text/itratr.hxx b/sw/source/core/text/itratr.hxx
index 568a5ed53f26..d6e0d7f24a56 100644
--- a/sw/source/core/text/itratr.hxx
+++ b/sw/source/core/text/itratr.hxx
@@ -18,8 +18,8 @@
  */
 #ifndef INCLUDED_SW_SOURCE_CORE_TEXT_ITRATR_HXX
 #define INCLUDED_SW_SOURCE_CORE_TEXT_ITRATR_HXX
+#include <o3tl/deleter.hxx>
 #include "atrhndl.hxx"
-
 #include <swtypes.hxx>
 #include <swfont.hxx>
 #include "porlay.hxx"
@@ -49,7 +49,7 @@ private:
     VclPtr<OutputDevice> m_pLastOut;
     /// count currently open hints, redlines, ext-input
     short m_nChgCnt;
-    std::unique_ptr<SwRedlineItr> m_pRedline;
+    std::unique_ptr<SwRedlineItr, o3tl::default_delete<SwRedlineItr>> m_pRedline;
     /// current iteration index in HintStarts
     size_t m_nStartIndex;
     /// current iteration index in HintEnds