diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-02-28 14:56:04 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-03-05 07:27:59 +0100 |
| commit | 3a561cac82bcccda4f5685645f865e3176e6a005 (patch) | |
| tree | 95c015b43701a359a6f5feb0e3d7a805e0560865 /svx | |
| parent | c2452e52f644649723df10e3cd6bbd48d6bafb49 (diff) | |
loplugin:useuniqueptr in SvXMLGraphicOutputStream
Change-Id: I44a5dbb244301181019ad09aebed46b0054c3b4b
Reviewed-on: https://gerrit.libreoffice.org/50690
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/xml/xmlgrhlp.cxx | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/svx/source/xml/xmlgrhlp.cxx b/svx/source/xml/xmlgrhlp.cxx index ddac8dbbe812..f8f690747959 100644 --- a/svx/source/xml/xmlgrhlp.cxx +++ b/svx/source/xml/xmlgrhlp.cxx @@ -358,11 +358,11 @@ private: private: - ::utl::TempFile* mpTmp; - SvStream* mpOStm; - Reference< XOutputStream > mxStmWrapper; - std::unique_ptr<GraphicObject> mxGrfObj; - bool mbClosed; + std::unique_ptr<::utl::TempFile> mpTmp; + std::unique_ptr<SvStream> mpOStm; + Reference< XOutputStream > mxStmWrapper; + std::unique_ptr<GraphicObject> mxGrfObj; + bool mbClosed; public: @@ -383,7 +383,7 @@ SvXMLGraphicOutputStream::SvXMLGraphicOutputStream() { mpTmp->EnableKillingFile(); - mpOStm = ::utl::UcbStreamHelper::CreateStream( mpTmp->GetURL(), StreamMode::WRITE | StreamMode::TRUNC ); + mpOStm.reset( ::utl::UcbStreamHelper::CreateStream( mpTmp->GetURL(), StreamMode::WRITE | StreamMode::TRUNC ) ); if( mpOStm ) mxStmWrapper = new ::utl::OOutputStreamWrapper( *mpOStm ); @@ -391,8 +391,8 @@ SvXMLGraphicOutputStream::SvXMLGraphicOutputStream() SvXMLGraphicOutputStream::~SvXMLGraphicOutputStream() { - delete mpTmp; - delete mpOStm; + mpTmp.reset(); + mpOStm.reset(); } void SAL_CALL SvXMLGraphicOutputStream::writeBytes( const Sequence< sal_Int8 >& rData ) @@ -484,11 +484,9 @@ Graphic SvXMLGraphicOutputStream::GetGraphic() if (aGraphic.GetType() != GraphicType::NONE) { - delete mpOStm; - mpOStm = nullptr; - delete mpTmp; - mpTmp = nullptr; - } + mpOStm.reset(); + mpTmp.reset(); + } return aGraphic; } |