[Libreoffice-commits] core.git: lotuswordpro/source
Caolán McNamara
caolanm at redhat.com
Mon Feb 27 15:33:07 UTC 2017
lotuswordpro/source/filter/lwppagelayout.cxx | 16 +++++++---------
1 file changed, 7 insertions(+), 9 deletions(-)
New commits:
commit aee31a4e8fa6c6f49f70945c5675085d938651ef
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Feb 27 15:32:28 2017 +0000
ofz: fix leak
Change-Id: I682b4e2750658efded5f4167d4f7026ed5fac8dc
diff --git a/lotuswordpro/source/filter/lwppagelayout.cxx b/lotuswordpro/source/filter/lwppagelayout.cxx
index 2d95ac7..078ea71 100644
--- a/lotuswordpro/source/filter/lwppagelayout.cxx
+++ b/lotuswordpro/source/filter/lwppagelayout.cxx
@@ -919,23 +919,21 @@ void LwpFooterLayout::Read()
void LwpFooterLayout::RegisterStyle(XFPageMaster* pm1)
{
- XFFooterStyle* pFooterStyle = new XFFooterStyle();
+ std::unique_ptr<XFFooterStyle> xFooterStyle(new XFFooterStyle());
//Modify page bottom margin
//page bottom margin: from bottom of footer to the bottom edge
double bottom = GetMarginsValue(MARGIN_BOTTOM);
pm1->SetMargins(-1, -1, -1, bottom);
- ParseMargins(pFooterStyle);
- ParseBorder(pFooterStyle);
- ParseShadow(pFooterStyle);
- ParseBackGround(pFooterStyle);
-// ParseBackColor(pFooterStyle);
+ ParseMargins(xFooterStyle.get());
+ ParseBorder(xFooterStyle.get());
+ ParseShadow(xFooterStyle.get());
+ ParseBackGround(xFooterStyle.get());
- ParseWaterMark(pFooterStyle);
- //End by
+ ParseWaterMark(xFooterStyle.get());
- pm1->SetFooterStyle(pFooterStyle);
+ pm1->SetFooterStyle(xFooterStyle.release());
}
void LwpFooterLayout::ParseMargins(XFFooterStyle* pFooterStyle)
More information about the Libreoffice-commits
mailing list