summaryrefslogtreecommitdiff
path: root/xmloff
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2018-04-25 10:52:46 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2018-04-30 08:39:04 +0200
commitb0631cc1454d99cbaa948e54c3b0c246bd27bf1c (patch)
tree3cfcb2ae2e43f37395d33ba319194f8a6162d6e9 /xmloff
parentaf73d613118bb141a51e56e4c8da405cc3e1298f (diff)
loplugin:useuniqueptr in XMLTextParagraphExport
Change-Id: I753bbfc60172a36e1f3ba08398dc17ee14e0c551 Reviewed-on: https://gerrit.libreoffice.org/53604 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'xmloff')
-rw-r--r--xmloff/qa/unit/uxmloff.cxx8
-rw-r--r--xmloff/source/text/txtparae.cxx7
2 files changed, 7 insertions, 8 deletions
diff --git a/xmloff/qa/unit/uxmloff.cxx b/xmloff/qa/unit/uxmloff.cxx
index 71a1b371f006..c2460dc496d5 100644
--- a/xmloff/qa/unit/uxmloff.cxx
+++ b/xmloff/qa/unit/uxmloff.cxx
@@ -43,7 +43,7 @@ public:
CPPUNIT_TEST(testMetaGenerator);
CPPUNIT_TEST_SUITE_END();
private:
- SvXMLExport *pExport;
+ std::unique_ptr<SvXMLExport> pExport;
};
Test::Test()
@@ -55,14 +55,14 @@ void Test::setUp()
{
BootstrapFixture::setUp();
- pExport = new SchXMLExport(
+ pExport.reset(new SchXMLExport(
comphelper::getProcessComponentContext(), "SchXMLExport.Compact",
- SvXMLExportFlags::ALL);
+ SvXMLExportFlags::ALL));
}
void Test::tearDown()
{
- delete pExport;
+ pExport.reset();
BootstrapFixture::tearDown();
}
diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx
index 2e7349780ed2..36c161abc79c 100644
--- a/xmloff/source/text/txtparae.cxx
+++ b/xmloff/source/text/txtparae.cxx
@@ -3844,18 +3844,17 @@ void XMLTextParagraphExport::PreventExportOfControlsInMuteSections(
void XMLTextParagraphExport::PushNewTextListsHelper()
{
- mpTextListsHelper = new XMLTextListsHelper();
- maTextListsHelperStack.push_back( mpTextListsHelper );
+ maTextListsHelperStack.emplace_back( new XMLTextListsHelper() );
+ mpTextListsHelper = maTextListsHelperStack.back().get();
}
void XMLTextParagraphExport::PopTextListsHelper()
{
- delete mpTextListsHelper;
mpTextListsHelper = nullptr;
maTextListsHelperStack.pop_back();
if ( !maTextListsHelperStack.empty() )
{
- mpTextListsHelper = maTextListsHelperStack.back();
+ mpTextListsHelper = maTextListsHelperStack.back().get();
}
}