diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-09-14 14:43:18 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-09-14 19:32:42 +0000 |
| commit | 33cddeea1352688af9a42b53024e32a4536d5860 (patch) | |
| tree | c113962c0dd2a936b08ce0e64721f7b4617e757b /chart2/qa/extras | |
| parent | f10691acf1be60167c042b4b4a60200b4defcd88 (diff) | |
boost->std
Change-Id: Iff14f69c200217c5d868978e8ffc06962b99ac09
Reviewed-on: https://gerrit.libreoffice.org/18568
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'chart2/qa/extras')
| -rw-r--r-- | chart2/qa/extras/chart2export.cxx | 4 | ||||
| -rw-r--r-- | chart2/qa/extras/charttest.hxx | 9 |
2 files changed, 6 insertions, 7 deletions
diff --git a/chart2/qa/extras/chart2export.cxx b/chart2/qa/extras/chart2export.cxx index 7004e97a3368..575e230c1130 100644 --- a/chart2/qa/extras/chart2export.cxx +++ b/chart2/qa/extras/chart2export.cxx @@ -214,13 +214,13 @@ OUString findChartFile(const OUString& rDir, uno::Reference< container::XNameAcc xmlDocPtr Chart2ExportTest::parseExport(const OUString& rDir, const OUString& rFilterFormat) { - boost::shared_ptr<utl::TempFile> pTempFile = reload(rFilterFormat); + std::shared_ptr<utl::TempFile> pTempFile = reload(rFilterFormat); // Read the XML stream we're interested in. uno::Reference<packages::zip::XZipFileAccess2> xNameAccess = packages::zip::ZipFileAccess::createWithURL(comphelper::getComponentContext(m_xSFactory), pTempFile->GetURL()); uno::Reference<io::XInputStream> xInputStream(xNameAccess->getByName(findChartFile(rDir, xNameAccess)), uno::UNO_QUERY); CPPUNIT_ASSERT(xInputStream.is()); - boost::shared_ptr<SvStream> pStream(utl::UcbStreamHelper::CreateStream(xInputStream, true)); + std::shared_ptr<SvStream> pStream(utl::UcbStreamHelper::CreateStream(xInputStream, true)); return parseXmlStream(pStream.get()); } diff --git a/chart2/qa/extras/charttest.hxx b/chart2/qa/extras/charttest.hxx index 6e7be740183d..0cf5ccd6abbb 100644 --- a/chart2/qa/extras/charttest.hxx +++ b/chart2/qa/extras/charttest.hxx @@ -57,12 +57,11 @@ #include <unonames.hxx> #include <iostream> +#include <memory> #include <libxml/xmlwriter.h> #include <libxml/xpath.h> -#include <boost/shared_ptr.hpp> -#include <boost/make_shared.hpp> using namespace css; using namespace css::uno; @@ -72,7 +71,7 @@ class ChartTest : public test::BootstrapFixture, public unotest::MacrosTest public: ChartTest():mbSkipValidation(false) {} void load( const OUString& rDir, const OUString& rFileName ); - boost::shared_ptr<utl::TempFile> reload( const OUString& rFileName ); + std::shared_ptr<utl::TempFile> reload( const OUString& rFileName ); uno::Sequence < OUString > getImpressChartColumnDescriptions( const char* pDir, const char* pName ); OUString getFileExtension( const OUString& rFileName ); @@ -118,13 +117,13 @@ void ChartTest::load( const OUString& aDir, const OUString& aName ) CPPUNIT_ASSERT(mxComponent.is()); } -boost::shared_ptr<utl::TempFile> ChartTest::reload(const OUString& rFilterName) +std::shared_ptr<utl::TempFile> ChartTest::reload(const OUString& rFilterName) { uno::Reference<frame::XStorable> xStorable(mxComponent, uno::UNO_QUERY); auto aArgs(::comphelper::InitPropertySequence({ { "FilterName", makeAny(rFilterName) } })); - boost::shared_ptr<utl::TempFile> pTempFile = boost::make_shared<utl::TempFile>(); + std::shared_ptr<utl::TempFile> pTempFile = std::make_shared<utl::TempFile>(); pTempFile->EnableKillingFile(); xStorable->storeToURL(pTempFile->GetURL(), aArgs); mxComponent->dispose(); |