sw/source/filter/ww8/ww8par.cxx | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 40d663adac040a419b3ac3a303958ba49bc8712e
Author: Caolán McNamara <caol...@redhat.com>
Date: Wed Oct 18 17:05:27 2017 +0100
ofz+ubsan: downcast does not point to SwTextFormatColl
sw/source/filter/ww8/ww8par.cxx:1654:20: runtime error: downcast of address
0x000012e4a730 which does not point to an object of type 'const
SwTextFormatColl'
0x000012e4a730: note: object is of type 'SwCharFormat'
Change-Id: Idc44902b0602af13fbc021c8f40a0c0dca0e46b3
Reviewed-on: https://gerrit.libreoffice.org/43514
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index ad8c23f0312f..2eff10a2af13 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -1645,19 +1645,19 @@ void SwWW8ImplReader::Read_Tab(sal_uInt16 , const
sal_uInt8* pData, short nLen)
SvxTabStopItem aAttr(0, 0, SvxTabAdjust::Default, RES_PARATR_TABSTOP);
- const SwTextFormatColl* pSty = nullptr;
+ const SwFormat * pSty = nullptr;
sal_uInt16 nTabBase;
if (m_pAktColl && m_nAktColl < m_vColl.size()) // StyleDef
{
nTabBase = m_vColl[m_nAktColl].m_nBase;
if (nTabBase < m_vColl.size()) // Based On
- pSty = static_cast<const
SwTextFormatColl*>(m_vColl[nTabBase].m_pFormat);
+ pSty = m_vColl[nTabBase].m_pFormat;
}
else
{ // Text
nTabBase = m_nAktColl;
if (m_nAktColl < m_vColl.size())
- pSty = static_cast<const
SwTextFormatColl*>(m_vColl[m_nAktColl].m_pFormat);
+ pSty = m_vColl[m_nAktColl].m_pFormat;
//TODO: figure out else here
}
@@ -1687,7 +1687,7 @@ void SwWW8ImplReader::Read_Tab(sal_uInt16 , const
sal_uInt8* pData, short nLen)
// current one (prevent loop)
aLoopWatch.insert(reinterpret_cast<size_t>(pSty));
if (nTabBase < m_vColl.size())
- pSty = static_cast<const
SwTextFormatColl*>(m_vColl[nTabBase].m_pFormat);
+ pSty = m_vColl[nTabBase].m_pFormat;
//TODO figure out the else branch
if (aLoopWatch.find(reinterpret_cast<size_t>(pSty)) !=
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
