From 05adc066ec8cbc0609e26ba0ddb2d8e766549309 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Fri, 9 Sep 2016 10:12:44 +0200 Subject: use std::unique_ptr Change-Id: Idd19671bb2eab12cac2011160c617bf3f43659d7 --- writerperfect/qa/unit/DirectoryStreamTest.cxx | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'writerperfect') diff --git a/writerperfect/qa/unit/DirectoryStreamTest.cxx b/writerperfect/qa/unit/DirectoryStreamTest.cxx index 9201cdd9d85f..79646ed4e6fa 100644 --- a/writerperfect/qa/unit/DirectoryStreamTest.cxx +++ b/writerperfect/qa/unit/DirectoryStreamTest.cxx @@ -13,6 +13,8 @@ #include +#include + #include #include @@ -62,14 +64,14 @@ static const char g_aDirPath[] = "/writerperfect/qa/unit/data/stream/test.dir"; static const char g_aNondirPath[] = "/writerperfect/qa/unit/data/stream/test.dir/mimetype"; static const char g_aNonexistentPath[] = "/writerperfect/qa/unit/data/stream/foo/bar"; -DirectoryStream *createForParent(const css::uno::Reference &xContent) +std::unique_ptr createForParent(const css::uno::Reference &xContent) { try { if (!xContent.is()) return nullptr; - DirectoryStream *pDir(nullptr); + unique_ptr pDir; const uno::Reference xChild(xContent, uno::UNO_QUERY); if (xChild.is()) @@ -77,12 +79,9 @@ DirectoryStream *createForParent(const css::uno::Reference & const uno::Reference xDirContent(xChild->getParent(), uno::UNO_QUERY); if (xDirContent.is()) { - pDir = new writerperfect::DirectoryStream(xDirContent); + pDir = o3tl::make_unique(xDirContent); if (!pDir->isStructured()) - { - delete pDir; - pDir = nullptr; - } + pDir.reset(); } } -- cgit