diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-09-11 15:55:15 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-09-12 08:56:19 +0200 |
commit | 7e69b971a5453e7092e5c3ef5ca197261227479e (patch) | |
tree | c8f1a2b8ee157a69d9840af3827d771f63412bd5 /sc | |
parent | e1d3ecb498c9b28731392a6cb8557fe73fcfb5e9 (diff) |
loplugin:useuniqueptr in ScFormatFilter
Change-Id: I04745351e28e0d41b2b4c668d8207538dd489704
Reviewed-on: https://gerrit.libreoffice.org/60320
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sc')
-rw-r--r-- | sc/inc/filter.hxx | 5 | ||||
-rw-r--r-- | sc/source/filter/html/htmlimp.cxx | 4 | ||||
-rw-r--r-- | sc/source/filter/inc/ftools.hxx | 4 | ||||
-rw-r--r-- | sc/source/filter/rtf/rtfimp.cxx | 5 | ||||
-rw-r--r-- | sc/source/ui/docshell/impex.cxx | 6 |
5 files changed, 12 insertions, 12 deletions
diff --git a/sc/inc/filter.hxx b/sc/inc/filter.hxx index 770d35e91350..3739a0ec1953 100644 --- a/sc/inc/filter.hxx +++ b/sc/inc/filter.hxx @@ -25,6 +25,7 @@ #include <vcl/errcode.hxx> #include "scdllapi.h" +#include <memory> class SfxMedium; class SvStream; @@ -71,8 +72,8 @@ class SAL_DLLPUBLIC_RTTI ScFormatFilterPlugin { bool bCalcWidthHeight, SvNumberFormatter* pFormatter, bool bConvertDate ) = 0; // various import helpers - virtual ScEEAbsImport *CreateRTFImport( ScDocument* pDoc, const ScRange& rRange ) = 0; - virtual ScEEAbsImport *CreateHTMLImport( ScDocument* pDocP, const OUString& rBaseURL, const ScRange& rRange ) = 0; + virtual std::unique_ptr<ScEEAbsImport> CreateRTFImport( ScDocument* pDoc, const ScRange& rRange ) = 0; + virtual std::unique_ptr<ScEEAbsImport> CreateHTMLImport( ScDocument* pDocP, const OUString& rBaseURL, const ScRange& rRange ) = 0; virtual OUString GetHTMLRangeNameList( ScDocument* pDoc, const OUString& rOrigName ) = 0; // various export filters diff --git a/sc/source/filter/html/htmlimp.cxx b/sc/source/filter/html/htmlimp.cxx index e75f8421c9ad..adaff22fd834 100644 --- a/sc/source/filter/html/htmlimp.cxx +++ b/sc/source/filter/html/htmlimp.cxx @@ -54,9 +54,9 @@ ErrCode ScFormatFilterPluginImpl::ScImportHTML( SvStream &rStream, const OUStrin return nErr; } -ScEEAbsImport *ScFormatFilterPluginImpl::CreateHTMLImport( ScDocument* pDocP, const OUString& rBaseURL, const ScRange& rRange ) +std::unique_ptr<ScEEAbsImport> ScFormatFilterPluginImpl::CreateHTMLImport( ScDocument* pDocP, const OUString& rBaseURL, const ScRange& rRange ) { - return new ScHTMLImport( pDocP, rBaseURL, rRange, true/*bCalcWidthHeight*/ ); + return o3tl::make_unique<ScHTMLImport>( pDocP, rBaseURL, rRange, true/*bCalcWidthHeight*/ ); } ScHTMLImport::ScHTMLImport( ScDocument* pDocP, const OUString& rBaseURL, const ScRange& rRange, bool bCalcWidthHeight ) : diff --git a/sc/source/filter/inc/ftools.hxx b/sc/source/filter/inc/ftools.hxx index d24bc99ae841..0c67a9613c17 100644 --- a/sc/source/filter/inc/ftools.hxx +++ b/sc/source/filter/inc/ftools.hxx @@ -275,8 +275,8 @@ public: double nOutputFactor, bool bCalcWidthHeight, SvNumberFormatter* pFormatter, bool bConvertDate ) override; - virtual ScEEAbsImport *CreateRTFImport( ScDocument* pDoc, const ScRange& rRange ) override; - virtual ScEEAbsImport *CreateHTMLImport( ScDocument* pDocP, const OUString& rBaseURL, const ScRange& rRange ) override; + virtual std::unique_ptr<ScEEAbsImport> CreateRTFImport( ScDocument* pDoc, const ScRange& rRange ) override; + virtual std::unique_ptr<ScEEAbsImport> CreateHTMLImport( ScDocument* pDocP, const OUString& rBaseURL, const ScRange& rRange ) override; virtual OUString GetHTMLRangeNameList( ScDocument* pDoc, const OUString& rOrigName ) override; // various export filters diff --git a/sc/source/filter/rtf/rtfimp.cxx b/sc/source/filter/rtf/rtfimp.cxx index 98009c72c98a..ebe1a1cf9d50 100644 --- a/sc/source/filter/rtf/rtfimp.cxx +++ b/sc/source/filter/rtf/rtfimp.cxx @@ -24,6 +24,7 @@ #include <rtfimp.hxx> #include <rtfparse.hxx> #include <ftools.hxx> +#include <o3tl/make_unique.hxx> ErrCode ScFormatFilterPluginImpl::ScImportRTF( SvStream &rStream, const OUString& rBaseURL, ScDocument *pDoc, ScRange& rRange ) { @@ -35,9 +36,9 @@ ErrCode ScFormatFilterPluginImpl::ScImportRTF( SvStream &rStream, const OUString return nErr; } -ScEEAbsImport *ScFormatFilterPluginImpl::CreateRTFImport( ScDocument* pDoc, const ScRange& rRange ) +std::unique_ptr<ScEEAbsImport> ScFormatFilterPluginImpl::CreateRTFImport( ScDocument* pDoc, const ScRange& rRange ) { - return new ScRTFImport( pDoc, rRange ); + return o3tl::make_unique<ScRTFImport>( pDoc, rRange ); } ScRTFImport::ScRTFImport( ScDocument* pDocP, const ScRange& rRange ) : diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx index e30139cf11b9..324d147293ed 100644 --- a/sc/source/ui/docshell/impex.cxx +++ b/sc/source/ui/docshell/impex.cxx @@ -2265,7 +2265,7 @@ bool ScImportExport::Dif2Doc( SvStream& rStrm ) bool ScImportExport::RTF2Doc( SvStream& rStrm, const OUString& rBaseURL ) { - ScEEAbsImport *pImp = ScFormatFilter::Get().CreateRTFImport( pDoc, aRange ); + std::unique_ptr<ScEEAbsImport> pImp = ScFormatFilter::Get().CreateRTFImport( pDoc, aRange ); if (!pImp) return false; pImp->Read( rStrm, rBaseURL ); @@ -2279,13 +2279,12 @@ bool ScImportExport::RTF2Doc( SvStream& rStrm, const OUString& rBaseURL ) pImp->WriteToDocument(); EndPaste(); } - delete pImp; return bOk; } bool ScImportExport::HTML2Doc( SvStream& rStrm, const OUString& rBaseURL ) { - ScEEAbsImport *pImp = ScFormatFilter::Get().CreateHTMLImport( pDoc, rBaseURL, aRange); + std::unique_ptr<ScEEAbsImport> pImp = ScFormatFilter::Get().CreateHTMLImport( pDoc, rBaseURL, aRange); if (!pImp) return false; pImp->Read( rStrm, rBaseURL ); @@ -2316,7 +2315,6 @@ bool ScImportExport::HTML2Doc( SvStream& rStrm, const OUString& rBaseURL ) EndPaste(); } - delete pImp; return bOk; } |