diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-09-22 17:03:32 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-09-23 22:28:18 +0200 |
| commit | f18106b4cb120af673e39c89f661fe6bc6db6a2c (patch) | |
| tree | 09cdd3dfc8acb6468329e2ab39c506630e8a5f80 /sw/inc | |
| parent | 40287a71f8be03ba2fefc8500509bb37c74cd5b4 (diff) | |
coverity#1401334 Uncaught exception
Change-Id: Id6dad66b3c55e5b3049f57e65c857db5abce50b1
Reviewed-on: https://gerrit.libreoffice.org/60901
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sw/inc')
| -rw-r--r-- | sw/inc/docsh.hxx | 5 | ||||
| -rw-r--r-- | sw/inc/shellio.hxx | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/sw/inc/docsh.hxx b/sw/inc/docsh.hxx index 21344ca76cf7..e3d4e352ad1b 100644 --- a/sw/inc/docsh.hxx +++ b/sw/inc/docsh.hxx @@ -30,8 +30,8 @@ #include "shellid.hxx" #include <svl/lstner.hxx> - #include <sfx2/StyleManager.hxx> +#include <o3tl/deleter.hxx> class SwDoc; class SfxDocumentInfoDialog; @@ -43,6 +43,7 @@ class SwWrtShell; class SwFEShell; class Reader; class SwReader; +typedef std::unique_ptr<SwReader, o3tl::default_delete<SwReader>> SwReaderPtr; class SwCursorShell; class SwSrcView; class SwPaM; @@ -231,7 +232,7 @@ public: { return const_cast<SwDocShell*>(this)->GetFEShell(); } /// For inserting document. - Reader* StartConvertFrom(SfxMedium& rMedium, std::unique_ptr<SwReader>& rpRdr, + Reader* StartConvertFrom(SfxMedium& rMedium, SwReaderPtr& rpRdr, SwCursorShell const * pCursorSh = nullptr, SwPaM* pPaM = nullptr); #if defined(_WIN32) diff --git a/sw/inc/shellio.hxx b/sw/inc/shellio.hxx index 219975ff7e86..194ce40d0686 100644 --- a/sw/inc/shellio.hxx +++ b/sw/inc/shellio.hxx @@ -29,6 +29,7 @@ #include <tools/ref.hxx> #include <rtl/ref.hxx> #include <osl/thread.h> +#include <o3tl/deleter.hxx> #include <o3tl/typed_flags_set.hxx> #include "swdllapi.h" #include "docfac.hxx" @@ -172,6 +173,8 @@ protected: void SetSkipImages( bool bSkipImages ) { mbSkipImages = bSkipImages; } }; +typedef std::unique_ptr<SwReader, o3tl::default_delete<SwReader>> SwReaderPtr; + // Special Readers can be both!! (Excel, W4W, .. ). enum class SwReaderType { NONE = 0x00, |