diff options
Diffstat (limited to 'writerperfect')
| -rw-r--r-- | writerperfect/qa/unit/EPUBExportTest.cxx | 6 | ||||
| -rw-r--r-- | writerperfect/qa/unit/WPXSvStreamTest.cxx | 5 | ||||
| -rw-r--r-- | writerperfect/source/impress/KeynoteImportFilter.cxx | 11 |
3 files changed, 12 insertions, 10 deletions
diff --git a/writerperfect/qa/unit/EPUBExportTest.cxx b/writerperfect/qa/unit/EPUBExportTest.cxx index c6518433de0e..cf50d2d9da52 100644 --- a/writerperfect/qa/unit/EPUBExportTest.cxx +++ b/writerperfect/qa/unit/EPUBExportTest.cxx @@ -111,7 +111,7 @@ void EPUBExportTest::createDoc(const OUString& rFile, xmlDocPtr EPUBExportTest::parseExport(const OUString& rName) { uno::Reference<io::XInputStream> xInputStream(mxZipFile->getByName(rName), uno::UNO_QUERY); - std::shared_ptr<SvStream> pStream(utl::UcbStreamHelper::CreateStream(xInputStream, true)); + std::unique_ptr<SvStream> pStream(utl::UcbStreamHelper::CreateStream(xInputStream, true)); return parseXmlStream(pStream.get()); } @@ -120,7 +120,7 @@ std::map<OUString, std::vector<OUString>> EPUBExportTest::parseCss(const OUStrin std::map<OUString, std::vector<OUString>> aRet; uno::Reference<io::XInputStream> xInputStream(mxZipFile->getByName(rName), uno::UNO_QUERY); - std::shared_ptr<SvStream> pStream(utl::UcbStreamHelper::CreateStream(xInputStream, true)); + std::unique_ptr<SvStream> pStream(utl::UcbStreamHelper::CreateStream(xInputStream, true)); // Minimal CSS handler till orcus is up to our needs. OString aLine; @@ -797,7 +797,7 @@ CPPUNIT_TEST_FIXTURE(EPUBExportTest, testSVG) CPPUNIT_ASSERT(mxZipFile->hasByName("OEBPS/images/image0001.svg")); uno::Reference<io::XInputStream> xInputStream( mxZipFile->getByName("OEBPS/images/image0001.svg"), uno::UNO_QUERY); - std::shared_ptr<SvStream> pStream(utl::UcbStreamHelper::CreateStream(xInputStream, true)); + std::unique_ptr<SvStream> pStream(utl::UcbStreamHelper::CreateStream(xInputStream, true)); SvMemoryStream aMemoryStream; aMemoryStream.WriteStream(*pStream); diff --git a/writerperfect/qa/unit/WPXSvStreamTest.cxx b/writerperfect/qa/unit/WPXSvStreamTest.cxx index 368a8223368e..e9680510b43a 100644 --- a/writerperfect/qa/unit/WPXSvStreamTest.cxx +++ b/writerperfect/qa/unit/WPXSvStreamTest.cxx @@ -31,6 +31,7 @@ namespace ucb = com::sun::star::ucb; namespace uno = com::sun::star::uno; using std::shared_ptr; +using std::unique_ptr; using librevenge::RVNGInputStream; using librevenge::RVNG_SEEK_CUR; @@ -303,7 +304,7 @@ void WPXSvStreamTest::testStructured() // check for existing substream CPPUNIT_ASSERT(pInput->existsSubStream("WordDocument")); - shared_ptr<RVNGInputStream> pSubStream(pInput->getSubStreamByName("WordDocument")); + unique_ptr<RVNGInputStream> pSubStream(pInput->getSubStreamByName("WordDocument")); CPPUNIT_ASSERT(bool(pSubStream)); CPPUNIT_ASSERT(!pSubStream->isEnd()); @@ -325,7 +326,7 @@ void WPXSvStreamTest::testStructured() // check for existing substream CPPUNIT_ASSERT(pInput->existsSubStream("content.xml")); - shared_ptr<RVNGInputStream> pSubStream(pInput->getSubStreamByName("content.xml")); + unique_ptr<RVNGInputStream> pSubStream(pInput->getSubStreamByName("content.xml")); CPPUNIT_ASSERT(bool(pSubStream)); CPPUNIT_ASSERT(!pSubStream->isEnd()); diff --git a/writerperfect/source/impress/KeynoteImportFilter.cxx b/writerperfect/source/impress/KeynoteImportFilter.cxx index 1e69e85dc883..c212c5ab85d0 100644 --- a/writerperfect/source/impress/KeynoteImportFilter.cxx +++ b/writerperfect/source/impress/KeynoteImportFilter.cxx @@ -97,8 +97,8 @@ KeynoteImportFilter::detect(css::uno::Sequence<css::beans::PropertyValue>& Descr if (!xInputStream.is()) return OUString(); - std::shared_ptr<librevenge::RVNGInputStream> input - = std::make_shared<WPXSvInputStream>(xInputStream); + std::unique_ptr<librevenge::RVNGInputStream> input + = std::make_unique<WPXSvInputStream>(xInputStream); /* Apple Keynote documents come in two variants: * * actual files (zip), only produced by Keynote 5 (at least with @@ -121,7 +121,7 @@ KeynoteImportFilter::detect(css::uno::Sequence<css::beans::PropertyValue>& Descr { if (aContent.isFolder()) { - input = std::make_shared<writerperfect::DirectoryStream>(xContent); + input = std::make_unique<writerperfect::DirectoryStream>(xContent); bIsPackage = true; } } @@ -143,9 +143,10 @@ KeynoteImportFilter::detect(css::uno::Sequence<css::beans::PropertyValue>& Descr if (bIsPackage) // we passed a directory stream, but the filter claims it's APXL file? return OUString(); - const std::shared_ptr<writerperfect::DirectoryStream> pDir + std::unique_ptr<writerperfect::DirectoryStream> xDir = writerperfect::DirectoryStream::createForParent(xContent); - input = pDir; + auto pDir = xDir.get(); + input = std::move(xDir); if (bool(input)) { if (libetonyek::EtonyekDocument::CONFIDENCE_EXCELLENT |