Revert "tdf#117994 ww8export: extend Chp over CR"

This reverts commit 091aedc63de2f6c8f0f4c60dd1fa93fe4c6ddde4.

It was a regression-prone code area, so this was expected,
but disappointing.

Change-Id: Ibf0702dd634ba19bce9c0c5b2d2bd8b668f736c6
Reviewed-on: https://gerrit.libreoffice.org/59779
Tested-by: Jenkins
Reviewed-by: Justin Luth <justin_luth@sil.org>

4 files changed, 5 insertions, 6 deletions

diff --git a/sw/qa/extras/ww8export/ww8export.cxx b/sw/qa/extras/ww8export/ww8export.cxx
index 25af135a35f7..a53525a5ece7 100644
--- a/sw/qa/extras/ww8export/ww8export.cxx
+++ b/sw/qa/extras/ww8export/ww8export.cxx
@@ -675,8 +675,7 @@ DECLARE_WW8EXPORT_TEST(testTdf59896, "tdf59896.doc")
 DECLARE_WW8EXPORT_TEST(testTdf102334, "tdf102334.doc")
 {
     // This was false, i.e. the first run wasn't hidden, when it should have been
-    // But this looks different (less hidden) in MSWord
-    // CPPUNIT_ASSERT_EQUAL(true, getProperty<bool>(getRun(getParagraph(7), 1), "CharHidden"));
+    CPPUNIT_ASSERT_EQUAL(true, getProperty<bool>(getRun(getParagraph(7), 1), "CharHidden"));
 }
 
 DECLARE_WW8EXPORT_TEST(testTdf38778, "tdf38778_properties_in_run_for_field.doc")
diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index 3541c4711bd3..158c0bc15a27 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -995,7 +995,7 @@ sal_uInt8 *WW8_WrPlcPn::CopyLastSprms(sal_uInt8 &rLen)
     return rF.CopyLastSprms(rLen);
 }
 
-void WW8_WrPlcPn::AppendFkpEntry(WW8_FC nEndFc,short nVarLen,const sal_uInt8* pSprms, const bool bExpandEmpty)
+void WW8_WrPlcPn::AppendFkpEntry(WW8_FC nEndFc,short nVarLen,const sal_uInt8* pSprms)
 {
     WW8_WrFkp* pF = m_Fkps.back().get();
 
@@ -1024,7 +1024,7 @@ void WW8_WrPlcPn::AppendFkpEntry(WW8_FC nEndFc,short nVarLen,const sal_uInt8* pS
         pF->MergeToNew( nVarLen, pNewSprms );
     // has the prev EndFC an empty sprm and the current is empty too, then
     // expand only the old EndFc to the new EndFc
-    else if( !nVarLen && (bExpandEmpty || pF->IsEmptySprm()) )
+    else if( !nVarLen && pF->IsEmptySprm() )
     {
         pF->SetNewEnd( nEndFc );
         return ;
diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx
index 03e6411475d2..1b96c9aab0cb 100644
--- a/sw/source/filter/ww8/wrtww8.hxx
+++ b/sw/source/filter/ww8/wrtww8.hxx
@@ -1287,7 +1287,7 @@ private:
 public:
     WW8_WrPlcPn( WW8Export& rWrt, ePLCFT ePl, WW8_FC nStartFc );
     ~WW8_WrPlcPn();
-    void AppendFkpEntry(WW8_FC nEndFc,short nVarLen = 0,const sal_uInt8* pSprms = nullptr, const bool bExpandEmpty=false);
+    void AppendFkpEntry(WW8_FC nEndFc,short nVarLen = 0,const sal_uInt8* pSprms = nullptr);
     void WriteFkps();
     void WritePlc();
     sal_uInt8 *CopyLastSprms(sal_uInt8 &rLen);
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index c5cab3f6edf6..15ef3cae7c54 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -1061,7 +1061,7 @@ void WW8AttributeOutput::OutputFKP(bool bForce)
     if (!m_rWW8Export.pO->empty() || bForce)
     {
         m_rWW8Export.m_pChpPlc->AppendFkpEntry( m_rWW8Export.Strm().Tell(),
-                m_rWW8Export.pO->size(), m_rWW8Export.pO->data(), m_rWW8Export.pO->empty() );
+                m_rWW8Export.pO->size(), m_rWW8Export.pO->data() );
         m_rWW8Export.pO->clear();
     }
 }