[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - sw/source

[Miklos Vajna (via logerrit)]

 sw/source/filter/ww8/ww8par.hxx  |   15 ++++++++-------
 sw/source/filter/ww8/ww8par2.cxx |   10 +++++-----
 sw/source/filter/ww8/ww8par6.cxx |    4 ++--
 3 files changed, 15 insertions(+), 14 deletions(-)

New commits:
commit 0ee831e39e44c0df1fff7c344bf0c9393ce57734
Author:     Miklos Vajna <vmik...@collabora.com>
AuthorDate: Thu Aug 10 13:46:04 2023 +0200
Commit:     Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Mon Aug 14 10:55:58 2023 +0200

    sw: improve naming of ApoTestResults members
    
    - Sp29 -> PPc or TPc (paragraph or table position code)
    - Sp37 -> PWr (paragraph wrap)
    
    (cherry picked from commit d7cd82948a4afe0f2049acaf68890d22f14e4396)
    
    Conflicts:
            sw/source/filter/ww8/ww8par2.cxx
    
    Change-Id: I49400cc325e9981586490f5221a6a5f5d59c0084
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155651
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
    Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>

diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx
index 94baf8c186c3..41695a70481a 100644
--- a/sw/source/filter/ww8/ww8par.hxx
+++ b/sw/source/filter/ww8/ww8par.hxx
@@ -216,7 +216,7 @@ struct WW8FlyPara
     WW8FlyPara(bool bIsVer67, const WW8FlyPara* pSrc = nullptr);
     bool operator==(const WW8FlyPara& rSrc) const;
     void Read(sal_uInt8 nSprmTPc, WW8PLCFx_Cp_FKP* pPap);
-    void ReadFull(sal_uInt8 nSprm29, SwWW8ImplReader* pIo);
+    void ReadFull(sal_uInt8 nOrigSprmTPc, SwWW8ImplReader* pIo);
     void Read(sal_uInt8 nSprmTPc, WW8RStyle const * pStyle);
     void ApplyTabPos(const WW8_TablePos *pTabPos);
     bool IsEmpty() const;
@@ -1006,15 +1006,16 @@ struct ApoTestResults
 {
     bool mbStartApo;
     bool mbStopApo;
-    bool m_bHasSprm37;
-    bool m_bHasSprm29;
-    sal_uInt8 m_nSprm29;
+    bool m_bHasSprmPWr;
+    bool m_bHasSprmPPc;
+    /// sprmPPc if m_bHasSprmPPc is true, sprmTPc otherwise.
+    sal_uInt8 m_nSprmPPc;
     WW8FlyPara* mpStyleApo;
     ApoTestResults()
-        : mbStartApo(false), mbStopApo(false), m_bHasSprm37(false)
-        , m_bHasSprm29(false), m_nSprm29(0), mpStyleApo(nullptr) {}
+        : mbStartApo(false), mbStopApo(false), m_bHasSprmPWr(false)
+        , m_bHasSprmPPc(false), m_nSprmPPc(0), mpStyleApo(nullptr) {}
     bool HasStartStop() const { return (mbStartApo || mbStopApo); }
-    bool HasFrame() const { return (m_bHasSprm29 || m_bHasSprm37 || 
mpStyleApo); }
+    bool HasFrame() const { return (m_bHasSprmPPc || m_bHasSprmPWr || 
mpStyleApo); }
 };
 
 struct ANLDRuleMap
diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index 863ca7d6370b..d73b02dbb208 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -455,11 +455,11 @@ 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);
-    const sal_uInt8 *pSrpm29 = aSrpm29.pSprm;
-    aRet.m_bHasSprm29 = pSrpm29 != nullptr;
-    aRet.m_nSprm29 = (pSrpm29 && aSrpm29.nRemainingData >= 1) ? *pSrpm29 : 0;
+    aRet.m_bHasSprmPWr = m_xPlcxMan->HasParaSprm(m_bVer67 ? 37 : 0x2423).pSprm 
!= nullptr;
+    SprmResult aSrpmPPc = m_xPlcxMan->HasParaSprm(m_bVer67 ? 29 : 0x261B);
+    const sal_uInt8 *pSrpmPPc = aSrpmPPc.pSprm;
+    aRet.m_bHasSprmPPc = pSrpmPPc != nullptr;
+    aRet.m_nSprmPPc = (pSrpmPPc && aSrpmPPc.nRemainingData >= 1) ? *pSrpmPPc : 
0;
 
     // Is there some frame data here
     bool bNowApo = aRet.HasFrame() || pTopLevelTable;
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index a863c048e53a..299e06461c36 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -2419,7 +2419,7 @@ std::unique_ptr<WW8FlyPara> 
SwWW8ImplReader::ConstructApo(const ApoTestResults &
 
     // find APO parameter and test for bGrafApo
     if (rApo.HasFrame())
-        pRet->ReadFull(rApo.m_nSprm29, this);
+        pRet->ReadFull(rApo.m_nSprmPPc, this);
 
     pRet->ApplyTabPos(pTabPos);
 
@@ -2809,7 +2809,7 @@ bool SwWW8ImplReader::TestSameApo(const ApoTestResults 
&rApo,
     WW8FlyPara aF(m_bVer67, rApo.mpStyleApo);
     // WWPara for current para
     if (rApo.HasFrame())
-        aF.Read(rApo.m_nSprm29, m_xPlcxMan->GetPapPLCF());
+        aF.Read(rApo.m_nSprmPPc, m_xPlcxMan->GetPapPLCF());
     aF.ApplyTabPos(pTabPos);
 
     return aF == *m_xWFlyPara;