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>
This commit is contained in:
@@ -109,7 +109,7 @@ class XMLOFF_DLLPUBLIC XMLTextParagraphExport : public XMLStyleExport
|
||||
bool bOpenRuby;
|
||||
|
||||
XMLTextListsHelper* mpTextListsHelper;
|
||||
::std::vector< XMLTextListsHelper* > maTextListsHelperStack;
|
||||
::std::vector< std::unique_ptr<XMLTextListsHelper> > maTextListsHelperStack;
|
||||
|
||||
enum class FrameType { Text, Graphic, Embedded, Shape };
|
||||
public:
|
||||
|
@@ -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();
|
||||
}
|
||||
|
||||
|
@@ -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();
|
||||
}
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user