summaryrefslogtreecommitdiff
path: root/starmath
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2019-01-17 16:48:49 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2019-01-18 13:52:20 +0100
commit484591a0c4a8f006701cb2ced75e279aacdd69c1 (patch)
treecd53549f265d0abf699008a9efee9ab5264fe3b0 /starmath
parentac513ca0e0731753823a8a2b27d692b01b804d01 (diff)
use unique_ptr in SmXMLExport
Change-Id: I081ef638f35fb47f1ca2705eff53fc27f1900008 Reviewed-on: https://gerrit.libreoffice.org/66572 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'starmath')
-rw-r--r--starmath/source/mathmlexport.cxx46
1 files changed, 23 insertions, 23 deletions
diff --git a/starmath/source/mathmlexport.cxx b/starmath/source/mathmlexport.cxx
index da372cf76a26..cec8022bb0d6 100644
--- a/starmath/source/mathmlexport.cxx
+++ b/starmath/source/mathmlexport.cxx
@@ -861,7 +861,7 @@ void SmXMLExport::ExportSubSupScript(const SmNode *pNode, int nLevel)
const SmNode *pCSup = nullptr;
const SmNode *pLSub = nullptr;
const SmNode *pLSup = nullptr;
- SvXMLElementExport *pThing2 = nullptr;
+ std::unique_ptr<SvXMLElementExport> pThing2;
//if we have prescripts at all then we must use the tensor notation
@@ -879,18 +879,18 @@ void SmXMLExport::ExportSubSupScript(const SmNode *pNode, int nLevel)
if (nullptr != (pCSub = pNode->GetSubNode(CSUB+1))
&& nullptr != (pCSup = pNode->GetSubNode(CSUP+1)))
{
- pThing2 = new SvXMLElementExport(*this, XML_NAMESPACE_MATH,
- XML_MUNDEROVER, true, true);
+ pThing2.reset(new SvXMLElementExport(*this, XML_NAMESPACE_MATH,
+ XML_MUNDEROVER, true, true));
}
else if (nullptr != (pCSub = pNode->GetSubNode(CSUB+1)))
{
- pThing2 = new SvXMLElementExport(*this, XML_NAMESPACE_MATH,
- XML_MUNDER, true, true);
+ pThing2.reset(new SvXMLElementExport(*this, XML_NAMESPACE_MATH,
+ XML_MUNDER, true, true));
}
else if (nullptr != (pCSup = pNode->GetSubNode(CSUP+1)))
{
- pThing2 = new SvXMLElementExport(*this, XML_NAMESPACE_MATH,
- XML_MOVER, true, true);
+ pThing2.reset(new SvXMLElementExport(*this, XML_NAMESPACE_MATH,
+ XML_MOVER, true, true));
}
ExportNodes(pNode->GetSubNode(0), nLevel+1); //Main Term
@@ -899,7 +899,7 @@ void SmXMLExport::ExportSubSupScript(const SmNode *pNode, int nLevel)
ExportNodes(pCSub, nLevel+1);
if (pCSup)
ExportNodes(pCSup, nLevel+1);
- delete pThing2;
+ pThing2.reset();
pSub = pNode->GetSubNode(RSUB+1);
pSup = pNode->GetSubNode(RSUP+1);
@@ -944,39 +944,39 @@ void SmXMLExport::ExportSubSupScript(const SmNode *pNode, int nLevel)
}
else
{
- SvXMLElementExport *pThing = nullptr;
+ std::unique_ptr<SvXMLElementExport> pThing;
if (nullptr != (pSub = pNode->GetSubNode(RSUB+1)) &&
nullptr != (pSup = pNode->GetSubNode(RSUP+1)))
{
- pThing = new SvXMLElementExport(*this, XML_NAMESPACE_MATH,
- XML_MSUBSUP, true, true);
+ pThing.reset(new SvXMLElementExport(*this, XML_NAMESPACE_MATH,
+ XML_MSUBSUP, true, true));
}
else if (nullptr != (pSub = pNode->GetSubNode(RSUB+1)))
{
- pThing = new SvXMLElementExport(*this, XML_NAMESPACE_MATH, XML_MSUB,
- true, true);
+ pThing.reset(new SvXMLElementExport(*this, XML_NAMESPACE_MATH, XML_MSUB,
+ true, true));
}
else if (nullptr != (pSup = pNode->GetSubNode(RSUP+1)))
{
- pThing = new SvXMLElementExport(*this, XML_NAMESPACE_MATH, XML_MSUP,
- true, true);
+ pThing.reset(new SvXMLElementExport(*this, XML_NAMESPACE_MATH, XML_MSUP,
+ true, true));
}
if (nullptr != (pCSub = pNode->GetSubNode(CSUB+1))
&& nullptr != (pCSup=pNode->GetSubNode(CSUP+1)))
{
- pThing2 = new SvXMLElementExport(*this, XML_NAMESPACE_MATH,
- XML_MUNDEROVER, true, true);
+ pThing2.reset(new SvXMLElementExport(*this, XML_NAMESPACE_MATH,
+ XML_MUNDEROVER, true, true));
}
else if (nullptr != (pCSub = pNode->GetSubNode(CSUB+1)))
{
- pThing2 = new SvXMLElementExport(*this, XML_NAMESPACE_MATH,
- XML_MUNDER, true, true);
+ pThing2.reset(new SvXMLElementExport(*this, XML_NAMESPACE_MATH,
+ XML_MUNDER, true, true));
}
else if (nullptr != (pCSup = pNode->GetSubNode(CSUP+1)))
{
- pThing2 = new SvXMLElementExport(*this, XML_NAMESPACE_MATH,
- XML_MOVER, true, true);
+ pThing2.reset(new SvXMLElementExport(*this, XML_NAMESPACE_MATH,
+ XML_MOVER, true, true));
}
ExportNodes(pNode->GetSubNode(0), nLevel+1); //Main Term
@@ -984,13 +984,13 @@ void SmXMLExport::ExportSubSupScript(const SmNode *pNode, int nLevel)
ExportNodes(pCSub, nLevel+1);
if (pCSup)
ExportNodes(pCSup, nLevel+1);
- delete pThing2;
+ pThing2.reset();
if (pSub)
ExportNodes(pSub, nLevel+1);
if (pSup)
ExportNodes(pSup, nLevel+1);
- delete pThing;
+ pThing.reset();
}
}