Kaydet (Commit) 52b8739f authored tarafından Kohei Yoshida's avatar Kohei Yoshida Kaydeden (comit) Kohei Yoshida

Let's return std::unique_ptr<...> directly.

It's only used at one call site, which already uses
std::unique_ptr.

Change-Id: I5ff528ebc560bb6eb8783d20002cea40a451761e
Reviewed-on: https://gerrit.libreoffice.org/32946Reviewed-by: 's avatarKohei Yoshida <libreoffice@kohei.us>
Tested-by: 's avatarKohei Yoshida <libreoffice@kohei.us>
üst a544fd5f
...@@ -33,6 +33,8 @@ ...@@ -33,6 +33,8 @@
#include <mutexholder.hxx> #include <mutexholder.hxx>
#include <memory>
namespace com { namespace sun { namespace star { namespace com { namespace sun { namespace star {
namespace uno { class XComponentContext; } namespace uno { class XComponentContext; }
namespace ucb { class XProgressHandler; } namespace ucb { class XProgressHandler; }
...@@ -159,7 +161,7 @@ public: ...@@ -159,7 +161,7 @@ public:
const OUString& aMediaType, const OUString& aMediaType,
const rtl::Reference<SotMutexHolder>& aMutexHolder ); const rtl::Reference<SotMutexHolder>& aMutexHolder );
ZipEnumeration* entries(); std::unique_ptr<ZipEnumeration> entries();
}; };
#endif #endif
......
...@@ -32,6 +32,7 @@ ...@@ -32,6 +32,7 @@
#include <comphelper/processfactory.hxx> #include <comphelper/processfactory.hxx>
#include <rtl/digest.h> #include <rtl/digest.h>
#include <osl/diagnose.h> #include <osl/diagnose.h>
#include <o3tl/make_unique.hxx>
#include <algorithm> #include <algorithm>
#include <vector> #include <vector>
...@@ -518,9 +519,9 @@ uno::Reference< XInputStream > ZipFile::createUnbufferedStream( ...@@ -518,9 +519,9 @@ uno::Reference< XInputStream > ZipFile::createUnbufferedStream(
return new XUnbufferedStream ( m_xContext, aMutexHolder, rEntry, xStream, rData, nStreamMode, bIsEncrypted, aMediaType, bRecoveryMode ); return new XUnbufferedStream ( m_xContext, aMutexHolder, rEntry, xStream, rData, nStreamMode, bIsEncrypted, aMediaType, bRecoveryMode );
} }
ZipEnumeration* ZipFile::entries() std::unique_ptr<ZipEnumeration> ZipFile::entries()
{ {
return new ZipEnumeration ( aEntries ); return o3tl::make_unique<ZipEnumeration>(aEntries);
} }
uno::Reference< XInputStream > SAL_CALL ZipFile::getInputStream( ZipEntry& rEntry, uno::Reference< XInputStream > SAL_CALL ZipFile::getInputStream( ZipEntry& rEntry,
......
...@@ -486,7 +486,7 @@ void ZipPackage::parseContentType() ...@@ -486,7 +486,7 @@ void ZipPackage::parseContentType()
void ZipPackage::getZipFileContents() void ZipPackage::getZipFileContents()
{ {
std::unique_ptr < ZipEnumeration > xEnum(m_pZipFile->entries()); std::unique_ptr<ZipEnumeration> xEnum = m_pZipFile->entries();
ZipPackageStream *pPkgStream; ZipPackageStream *pPkgStream;
ZipPackageFolder *pPkgFolder, *pCurrent; ZipPackageFolder *pPkgFolder, *pCurrent;
OUString sTemp, sDirName; OUString sTemp, sDirName;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment