sw/source/filter/ww8/ww8par2.cxx | 5 +++--
sw/source/filter/ww8/ww8scan.hxx | 2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
New commits:
commit 33a3a5a7eb52ed6a883216cbba83f620f00f61b1
Author: Michael Stahl <mst...@redhat.com>
Date: Wed Feb 22 21:36:51 2017 +0100
sw: fix import of table in ooo44732-2.doc
The problem is that the first call to SwWW8ImplReader::TestApo()
from WW8TabDesc::WW8TabDesc() wrongly uses style 1 to construct the
Apo, when the actual style on the first cell of the 2nd row is 4.
Here style 1 contains PDxaWidth and PWHeightAbs sprms, which are
both overridden by the 1st paragraph, 1st cell, 1st row to 0.
The reason is that during the WW8TabDesc, apparently nothing actually
updates m_nAktColl, so it's always the style of the 1st cell, 1st row.
Clearly when called from WW8TabDesc this should not be using m_nAktColl,
but it's not clear to me if calling GetColl() here always works.
Change-Id: I3e3ac0c243112154d40d99684149e1c5f0e51129
diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index fabd439..b0bb013 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -488,8 +488,9 @@ ApoTestResults SwWW8ImplReader::TestApo(int nCellLevel,
bool bTableRowEnd,
ApoTestResults aRet;
// Frame in Style Definition (word appears to ignore them if inside an
// text autoshape)
- if (!m_bTxbxFlySection && m_nAktColl < m_vColl.size())
- aRet.mpStyleApo = StyleExists(m_nAktColl) ?
m_vColl[m_nAktColl].m_xWWFly.get() : nullptr;
+ sal_uInt16 const nStyle(m_pPlcxMan->GetColl());
+ if (!m_bTxbxFlySection && nStyle < m_vColl.size())
+ aRet.mpStyleApo = StyleExists(nStyle) ? m_vColl[nStyle].m_xWWFly.get()
: nullptr;
/*
#i1140#
commit 953f10c45900c407f7d7866d6d7a50e00dec160c
Author: Michael Stahl <mst...@redhat.com>
Date: Wed Feb 22 21:30:05 2017 +0100
sw: typo
Change-Id: I2ed1925d26abee04bed530260e26511f278f97b7
diff --git a/sw/source/filter/ww8/ww8scan.hxx b/sw/source/filter/ww8/ww8scan.hxx
index d841ee9..5747ca9 100644
--- a/sw/source/filter/ww8/ww8scan.hxx
+++ b/sw/source/filter/ww8/ww8scan.hxx
@@ -513,7 +513,7 @@ public:
long nItemSize; // either 1 Byte or a complete BX
- // Offset in Stream where last read of 52 bytes took place
+ // Offset in Stream where last read of 512 bytes took place
long nFilePos;
sal_uInt8 mnIdx; // Pos marker
ePLCFT ePLCF;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
