diff options
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, |