diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-09-15 11:14:18 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-09-15 11:17:12 +0100 |
| commit | f7ae11ce60c0d1d63e09041e621f9e95bb952847 (patch) | |
| tree | 88b69c0d1b5b5465280a467e4744e9adb76c7165 /sw | |
| parent | 86f6fc069f6ad8afea4092fb493014d2b69467d6 (diff) | |
untangle this a bit, not immediately clear what it did
Change-Id: I36e7cf246707ff6b8bbf19dbb2c750fe183e897c
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/filter/ww8/ww8par6.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx index a73c1a18e04b..fb22f8aa5bec 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; |