From cdaf72c31b3e021443bdc6b654621be5eff7dadd Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Sat, 6 Jan 2018 15:23:11 +0000 Subject: ofz#4990 Direct-leak MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I697edeacd286f1786d55ec53a781e53122acbdbe Reviewed-on: https://gerrit.libreoffice.org/47502 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- lotuswordpro/source/filter/lwppara.cxx | 66 +++++++++++++++++----------------- 1 file changed, 33 insertions(+), 33 deletions(-) (limited to 'lotuswordpro') diff --git a/lotuswordpro/source/filter/lwppara.cxx b/lotuswordpro/source/filter/lwppara.cxx index cb1b40eb3c3b..af39a79bea70 100644 --- a/lotuswordpro/source/filter/lwppara.cxx +++ b/lotuswordpro/source/filter/lwppara.cxx @@ -352,16 +352,16 @@ void LwpPara::RegisterStyle() m_pIndentOverride = pIndentOverride.release(); } - XFParaStyle* pOverStyle = nullptr; + std::unique_ptr xOverStyle; bool noSpacing = true; LwpParaProperty* pBulletProps = nullptr, *pNumberingProps = nullptr; if (m_pProps != nullptr) { bool noIndent = true; - pOverStyle = new XFParaStyle; - *pOverStyle = *pBaseStyle; - pOverStyle->SetStyleName(""); + xOverStyle.reset(new XFParaStyle); + *xOverStyle = *pBaseStyle; + xOverStyle->SetStyleName(""); LwpParaProperty* pProps = m_pProps; sal_uInt32 PropType; LwpParaStyle& rParaStyle = dynamic_cast(*m_ParaStyle.obj()); @@ -376,14 +376,14 @@ void LwpPara::RegisterStyle() if (pAlignment) { if (!rParaStyle.GetAlignment()) - OverrideAlignment(nullptr, pAlignment, pOverStyle); + OverrideAlignment(nullptr, pAlignment, xOverStyle.get()); else { std::unique_ptr const pAlign( rParaStyle.GetAlignment()->clone()); OverrideAlignment(pAlign.get(), pAlignment, - pOverStyle); + xOverStyle.get()); } } break; @@ -395,9 +395,9 @@ void LwpPara::RegisterStyle() if (pIndent) { if (!rParaStyle.GetIndent()) - OverrideIndent(nullptr, pIndent, pOverStyle); + OverrideIndent(nullptr, pIndent, xOverStyle.get()); else - OverrideIndent(m_pIndentOverride, pIndent, pOverStyle); + OverrideIndent(m_pIndentOverride, pIndent, xOverStyle.get()); } break; } @@ -408,24 +408,24 @@ void LwpPara::RegisterStyle() if (pSpacing) { if (!rParaStyle.GetSpacing()) - OverrideSpacing(nullptr, pSpacing, pOverStyle); + OverrideSpacing(nullptr, pSpacing, xOverStyle.get()); else { std::unique_ptr const pNewSpacing(rParaStyle.GetSpacing()->clone()); - OverrideSpacing(pNewSpacing.get(), pSpacing, pOverStyle); + OverrideSpacing(pNewSpacing.get(), pSpacing, xOverStyle.get()); } } break; } case PP_LOCAL_BORDER: { - OverrideParaBorder(pProps, pOverStyle); + OverrideParaBorder(pProps, xOverStyle.get()); break; } case PP_LOCAL_BREAKS: { - OverrideParaBreaks(pProps, pOverStyle); + OverrideParaBreaks(pProps, xOverStyle.get()); break; } case PP_LOCAL_BULLET: @@ -453,7 +453,7 @@ void LwpPara::RegisterStyle() if (rBGStuff.IsPatternFill()) { XFBGImage* pXFBGImage = rBGStuff.GetFillPattern(); - pOverStyle->SetBackImage(pXFBGImage); + xOverStyle->SetBackImage(pXFBGImage); } else { @@ -461,7 +461,7 @@ void LwpPara::RegisterStyle() if (pColor && pColor->IsValidColor()) { XFColor aXFColor( pColor->To24Color()); - pOverStyle->SetBackColor( aXFColor ); + xOverStyle->SetBackColor( aXFColor ); } } } @@ -478,12 +478,12 @@ void LwpPara::RegisterStyle() { if (m_pIndentOverride->IsUseRelative() && GetParent()) { - OverrideIndent(nullptr,m_pIndentOverride,pOverStyle); + OverrideIndent(nullptr,m_pIndentOverride,xOverStyle.get()); } } if (!m_ParentStyleName.isEmpty()) - pOverStyle->SetParentStyleName(m_ParentStyleName); - m_StyleName = pXFStyleManager->AddStyle(pOverStyle).m_pStyle->GetStyleName(); + xOverStyle->SetParentStyleName(m_ParentStyleName); + m_StyleName = pXFStyleManager->AddStyle(xOverStyle.release()).m_pStyle->GetStyleName(); } else //use named style @@ -492,12 +492,12 @@ void LwpPara::RegisterStyle() { if (m_pIndentOverride->IsUseRelative() && GetParent()) { - pOverStyle = new XFParaStyle; - *pOverStyle = *pBaseStyle; - OverrideIndent(nullptr,m_pIndentOverride,pOverStyle); + xOverStyle.reset(new XFParaStyle); + *xOverStyle = *pBaseStyle; + OverrideIndent(nullptr,m_pIndentOverride,xOverStyle.get()); if (!m_ParentStyleName.isEmpty()) - pOverStyle->SetParentStyleName(m_ParentStyleName); - m_StyleName = pXFStyleManager->AddStyle(pOverStyle).m_pStyle->GetStyleName(); + xOverStyle->SetParentStyleName(m_ParentStyleName); + m_StyleName = pXFStyleManager->AddStyle(xOverStyle.release()).m_pStyle->GetStyleName(); } } } @@ -507,12 +507,12 @@ void LwpPara::RegisterStyle() XFParaStyle* pOldStyle = pXFStyleManager->FindParaStyle(m_StyleName); if (pOldStyle->GetNumberRight()) { - pOverStyle = new XFParaStyle; - *pOverStyle = *pOldStyle; - pOverStyle->SetAlignType(enumXFAlignStart); + xOverStyle.reset(new XFParaStyle); + *xOverStyle = *pOldStyle; + xOverStyle->SetAlignType(enumXFAlignStart); if (!m_ParentStyleName.isEmpty()) - pOverStyle->SetParentStyleName(m_ParentStyleName); - m_StyleName = pXFStyleManager->AddStyle(pOverStyle).m_pStyle->GetStyleName(); + xOverStyle->SetParentStyleName(m_ParentStyleName); + m_StyleName = pXFStyleManager->AddStyle(xOverStyle.release()).m_pStyle->GetStyleName(); } } @@ -714,13 +714,13 @@ void LwpPara::RegisterStyle() LwpPara* pPrePara = dynamic_cast(GetPrevious().obj().get()); if (pPrePara && pPrePara->GetBelowSpacing()!=0) { - pOverStyle = new XFParaStyle; - *pOverStyle = *GetXFParaStyle(); - XFMargins* pMargin = &pOverStyle->GetMargins(); + xOverStyle.reset(new XFParaStyle); + *xOverStyle = *GetXFParaStyle(); + XFMargins* pMargin = &xOverStyle->GetMargins(); pMargin->SetTop(pMargin->GetTop()+pPrePara->GetBelowSpacing()); if (!m_ParentStyleName.isEmpty()) - pOverStyle->SetParentStyleName(m_ParentStyleName); - m_StyleName = pXFStyleManager->AddStyle(pOverStyle).m_pStyle->GetStyleName(); + xOverStyle->SetParentStyleName(m_ParentStyleName); + m_StyleName = pXFStyleManager->AddStyle(xOverStyle.release()).m_pStyle->GetStyleName(); } } @@ -729,7 +729,7 @@ void LwpPara::RegisterStyle() { std::unique_ptr xNewParaStyle(new XFParaStyle); *xNewParaStyle = *GetXFParaStyle(); - //pOverStyle->SetStyleName(""); + //xOverStyle->SetStyleName(""); RegisterTabStyle(xNewParaStyle.get()); if (!m_ParentStyleName.isEmpty()) xNewParaStyle->SetParentStyleName(m_ParentStyleName); -- cgit tion value='distro/vector/vtext-6.5'>distro/vector/vtext-6.5 LibreOffice 核心代码仓库文档基金会
summaryrefslogtreecommitdiff
path: root/i18nlangtag
diff options
context:
space:
mode:
authorEike Rathke <erack@redhat.com>2013-10-12 00:48:05 +0200
committerEike Rathke <erack@redhat.com>2013-10-12 00:52:16 +0200
commit57f394688449e8feacb480440900cc50e1d58280 (patch)
treee18b938fc24dca53fe28a7b467a7091928fac4f3 /i18nlangtag
parentf7ff594a9c879ea3ae437e0f7602ef26642e6fc7 (diff)
don't sync vars twice