diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-05-02 15:42:39 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-05-03 08:25:55 +0200 |
commit | b66ba0f0f297f7190f8d969486e07ede52987188 (patch) | |
tree | c4876c8891ac860b263c562f280a8b69784b6037 /connectivity/source/inc | |
parent | ae680f7c7d45b7f6cff4dc458d5ad37c5f777948 (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/inc')
-rw-r--r-- | connectivity/source/inc/dbase/DIndex.hxx | 2 | ||||
-rw-r--r-- | connectivity/source/inc/dbase/DTable.hxx | 2 | ||||
-rw-r--r-- | connectivity/source/inc/file/FTable.hxx | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/connectivity/source/inc/dbase/DIndex.hxx b/connectivity/source/inc/dbase/DIndex.hxx index 6e4356c4c3ee..bcb273aec506 100644 --- a/connectivity/source/inc/dbase/DIndex.hxx +++ b/connectivity/source/inc/dbase/DIndex.hxx @@ -68,7 +68,7 @@ namespace connectivity }; private: - SvStream* m_pFileStream; // Stream to read/write the index + std::unique_ptr<SvStream> m_pFileStream; // Stream to read/write the index NDXHeader m_aHeader; std::vector<ONDXPage*> m_aCollector; // Pool of obsolete pages diff --git a/connectivity/source/inc/dbase/DTable.hxx b/connectivity/source/inc/dbase/DTable.hxx index 962a66a48f63..1a1e45c64e99 100644 --- a/connectivity/source/inc/dbase/DTable.hxx +++ b/connectivity/source/inc/dbase/DTable.hxx @@ -107,7 +107,7 @@ namespace connectivity std::vector<sal_Int32> m_aRealFieldLengths; DBFHeader m_aHeader; DBFMemoHeader m_aMemoHeader; - SvStream* m_pMemoStream; + std::unique_ptr<SvStream> m_pMemoStream; rtl_TextEncoding m_eEncoding; void alterColumn(sal_Int32 index, diff --git a/connectivity/source/inc/file/FTable.hxx b/connectivity/source/inc/file/FTable.hxx index a13437a052fd..3495c79c24c9 100644 --- a/connectivity/source/inc/file/FTable.hxx +++ b/connectivity/source/inc/file/FTable.hxx @@ -39,7 +39,7 @@ namespace connectivity { protected: OConnection* m_pConnection; - SvStream* m_pFileStream; + std::unique_ptr<SvStream> m_pFileStream; ::rtl::Reference<OSQLColumns> m_aColumns; sal_Int32 m_nFilePos; // current IResultSetHelper::Movement sal_uInt8* m_pBuffer; @@ -100,7 +100,7 @@ namespace connectivity // creates a stream using ::utl::UcbStreamHelper::CreateStream, but the error is simplified // (NULL or non-NULL is returned) - static SvStream* createStream_simpleError( const OUString& _rFileName, StreamMode _eOpenMode); + static std::unique_ptr<SvStream> createStream_simpleError( const OUString& _rFileName, StreamMode _eOpenMode); }; } } |