summaryrefslogtreecommitdiff
path: root/connectivity/source/drivers/file
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2018-05-02 15:42:39 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2018-05-03 08:25:55 +0200
commitb66ba0f0f297f7190f8d969486e07ede52987188 (patch)
treec4876c8891ac860b263c562f280a8b69784b6037 /connectivity/source/drivers/file
parentae680f7c7d45b7f6cff4dc458d5ad37c5f777948 (diff)
make createStream_simpleError return std::unique_ptr
Change-Id: Ifb10f9806eeb3a54f8ed11ec0e65f9465cac3c5d Reviewed-on: https://gerrit.libreoffice.org/53765 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'connectivity/source/drivers/file')
-rw-r--r--connectivity/source/drivers/file/FTable.cxx10
1 files changed, 4 insertions, 6 deletions
diff --git a/connectivity/source/drivers/file/FTable.cxx b/connectivity/source/drivers/file/FTable.cxx
index 9ddadb19b86e..6358874f93f7 100644
--- a/connectivity/source/drivers/file/FTable.cxx
+++ b/connectivity/source/drivers/file/FTable.cxx
@@ -155,8 +155,7 @@ void OFileTable::FileClose()
if (m_pFileStream && m_pFileStream->IsWritable())
m_pFileStream->Flush();
- delete m_pFileStream;
- m_pFileStream = nullptr;
+ m_pFileStream.reset();
if (m_pBuffer)
{
@@ -191,13 +190,12 @@ void OFileTable::dropColumn(sal_Int32 /*_nPos*/)
}
-SvStream* OFileTable::createStream_simpleError( const OUString& _rFileName, StreamMode _eOpenMode)
+std::unique_ptr<SvStream> OFileTable::createStream_simpleError( const OUString& _rFileName, StreamMode _eOpenMode)
{
- SvStream* pReturn = ::utl::UcbStreamHelper::CreateStream( _rFileName, _eOpenMode, bool(_eOpenMode & StreamMode::NOCREATE));
+ std::unique_ptr<SvStream> pReturn(::utl::UcbStreamHelper::CreateStream( _rFileName, _eOpenMode, bool(_eOpenMode & StreamMode::NOCREATE)));
if (pReturn && (ERRCODE_NONE != pReturn->GetErrorCode()))
{
- delete pReturn;
- pReturn = nullptr;
+ pReturn.reset();
}
return pReturn;
}