sw/source/filter/ww8/ww8par6.cxx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
New commits: commit f7ae11ce60c0d1d63e09041e621f9e95bb952847 Author: Caolán McNamara <caol...@redhat.com> Date: Thu Sep 15 11:14:18 2016 +0100 untangle this a bit, not immediately clear what it did Change-Id: I36e7cf246707ff6b8bbf19dbb2c750fe183e897c diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx index a73c1a1..fb22f8a 100644 --- a/sw/source/filter/ww8/ww8par6.cxx +++ b/sw/source/filter/ww8/ww8par6.cxx @@ -4977,10 +4977,10 @@ void SwWW8ImplReader::Read_ApoPPC( sal_uInt16, const sal_uInt8* pData, short ) if (m_pAktColl && m_nAktColl < m_vColl.size()) // only for Styledef, sonst anders geloest { SwWW8StyInf& rSI = m_vColl[m_nAktColl]; - WW8FlyPara* pFly = rSI.m_pWWFly ? rSI.m_pWWFly : new WW8FlyPara(m_bVer67); - m_vColl[m_nAktColl].m_pWWFly = pFly; - pFly->Read(*pData, m_pStyles); - if (pFly->IsEmpty()) + if (!rSI.m_pWWFly) + rSI.m_pWWFly = new WW8FlyPara(m_bVer67); + rSI.m_pWWFly->Read(*pData, m_pStyles); + if (rSI.m_pWWFly->IsEmpty()) { delete m_vColl[m_nAktColl].m_pWWFly; m_vColl[m_nAktColl].m_pWWFly = nullptr;
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits