From d42f519be7bcc8e194899a6b3225bcee7e54bc16 Mon Sep 17 00:00:00 2001 From: Justin Luth Date: Fri, 26 May 2023 09:48:42 -0400 Subject: tdf#60683 tdf#55946 doc import: use style's anchor info make CppunitTest_sw_ww8export CPPUNIT_TEST_NAME=testBnc787942 Change-Id: Ie1dc179fc3954b5eed73f3ee1f6dc95f4785f3e4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152331 Reviewed-by: Justin Luth Tested-by: Jenkins --- sw/source/filter/ww8/ww8par2.cxx | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'sw/source') diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx index ee70150ccfc8..71fd71997eac 100644 --- a/sw/source/filter/ww8/ww8par2.cxx +++ b/sw/source/filter/ww8/ww8par2.cxx @@ -418,11 +418,12 @@ ApoTestResults SwWW8ImplReader::TestApo(int nCellLevel, bool bTableRowEnd, to see if we are still in that frame. */ - aRet.m_bHasSprm37 = m_xPlcxMan->HasParaSprm(m_bVer67 ? 37 : 0x2423).pSprm != nullptr; - SprmResult aSrpm29 = m_xPlcxMan->HasParaSprm(m_bVer67 ? 29 : 0x261B); + aRet.m_bHasSprm37 = m_xPlcxMan->HasParaSprm(m_bVer67 ? 37 : 0x2423).pSprm != nullptr; // sprmPWr + SprmResult aSrpm29 = m_xPlcxMan->HasParaSprm(m_bVer67 ? 29 : 0x261B); // sprmPPc const sal_uInt8 *pSrpm29 = aSrpm29.pSprm; aRet.m_bHasSprm29 = pSrpm29 != nullptr; - aRet.m_nSprm29 = (pSrpm29 && aSrpm29.nRemainingData >= 1) ? *pSrpm29 : 0; + const sal_Int16 nTPc = aRet.mpStyleApo ? aRet.mpStyleApo->nTPc : 0; + aRet.m_nSprm29 = (pSrpm29 && aSrpm29.nRemainingData >= 1) ? *pSrpm29 : nTPc; // Is there some frame data here bool bNowApo = aRet.HasFrame() || pTopLevelTable; -- cgit