tdf#137180 RTF import: fix bad left margin with direct format/para style/num

This is a case when a left margin appears as direct formatting on a
paragraph, the paragraph has a style and the style has the same left
margin. But the paragraph has a numbering as well: so it's not valid to
deduplicate the left margin from the direct formatting, because then the
left margin from the numbering will be used, which can be a different
value.

Change-Id: I5e27502b8d505bdfddfdc910858f62e501db35a5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104220
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>

3 files changed, 20 insertions, 12 deletions

diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index bbcec8792bc1..02aa834c38ef 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -525,7 +525,7 @@ RTFDocumentImpl::getProperties(const RTFSprms& rAttributes, RTFSprms const& rSpr
         }
 
         // Get rid of direct formatting what is already in the style.
-        RTFSprms const sprms(aSprms.cloneAndDeduplicate(aStyleSprms, nStyleType, true));
+        RTFSprms const sprms(aSprms.cloneAndDeduplicate(aStyleSprms, nStyleType, true, &aSprms));
         RTFSprms const attributes(
             rAttributes.cloneAndDeduplicate(aStyleAttributes, nStyleType, true));
         return new RTFReferenceProperties(attributes, sprms);
diff --git a/writerfilter/source/rtftok/rtfsprm.cxx b/writerfilter/source/rtftok/rtfsprm.cxx
index d281187277de..8c54fe95e345 100644
--- a/writerfilter/source/rtftok/rtfsprm.cxx
+++ b/writerfilter/source/rtftok/rtfsprm.cxx
@@ -196,7 +196,7 @@ static RTFValue::Pointer_t getDefaultSPRM(Id const id, Id nStyleType)
 }
 
 /// Is it problematic to deduplicate this SPRM?
-static bool isSPRMDeduplicateDenylist(Id nId)
+static bool isSPRMDeduplicateDenylist(Id nId, RTFSprms* pDirect)
 {
     switch (nId)
     {
@@ -223,6 +223,11 @@ static bool isSPRMDeduplicateDenylist(Id nId)
         case NS_ooxml::LN_CT_Border_themeTint:
         case NS_ooxml::LN_CT_Border_themeColor:
             return true;
+        // Removing \fi and \li if the style has the same value would mean taking these values from
+        // \ls, while deduplication would be done to take the values from the style.
+        case NS_ooxml::LN_CT_Ind_firstLine:
+        case NS_ooxml::LN_CT_Ind_left:
+            return pDirect && pDirect->find(NS_ooxml::LN_CT_PPrBase_numPr);
 
         default:
             return false;
@@ -252,22 +257,24 @@ static bool isSPRMChildrenExpected(Id nId)
 
 /// Does the clone / deduplication of a single sprm.
 static void cloneAndDeduplicateSprm(std::pair<Id, RTFValue::Pointer_t> const& rSprm, RTFSprms& ret,
-                                    Id nStyleType)
+                                    Id nStyleType, RTFSprms* pDirect = nullptr)
 {
     RTFValue::Pointer_t const pValue(ret.find(rSprm.first));
     if (pValue)
     {
         if (rSprm.second->equals(*pValue))
         {
-            if (!isSPRMDeduplicateDenylist(rSprm.first))
+            if (!isSPRMDeduplicateDenylist(rSprm.first, pDirect))
+            {
                 ret.erase(rSprm.first); // duplicate to style
+            }
         }
         else if (!rSprm.second->getSprms().empty() || !rSprm.second->getAttributes().empty())
         {
-            RTFSprms const sprms(
-                pValue->getSprms().cloneAndDeduplicate(rSprm.second->getSprms(), nStyleType));
+            RTFSprms const sprms(pValue->getSprms().cloneAndDeduplicate(
+                rSprm.second->getSprms(), nStyleType, /*bImplicitPPr =*/false, pDirect));
             RTFSprms const attributes(pValue->getAttributes().cloneAndDeduplicate(
-                rSprm.second->getAttributes(), nStyleType));
+                rSprm.second->getAttributes(), nStyleType, /*bImplicitPPr =*/false, pDirect));
             // Don't copy the sprm in case we expect it to have children but it doesn't have some.
             if (!isSPRMChildrenExpected(rSprm.first) || !sprms.empty() || !attributes.empty())
                 ret.set(rSprm.first,
@@ -377,7 +384,7 @@ void RTFSprms::duplicateList(const RTFValue::Pointer_t& pAbstract)
 }
 
 RTFSprms RTFSprms::cloneAndDeduplicate(RTFSprms& rReference, Id const nStyleType,
-                                       bool const bImplicitPPr) const
+                                       bool const bImplicitPPr, RTFSprms* pDirect) const
 {
     RTFSprms ret(*this);
     ret.ensureCopyBeforeWrite();
@@ -393,10 +400,10 @@ RTFSprms RTFSprms::cloneAndDeduplicate(RTFSprms& rReference, Id const nStyleType
         if (bImplicitPPr && rSprm.first == NS_ooxml::LN_CT_Style_pPr)
         {
             for (const auto& i : rSprm.second->getSprms())
-                cloneAndDeduplicateSprm(i, ret, nStyleType);
+                cloneAndDeduplicateSprm(i, ret, nStyleType, pDirect);
         }
         else
-            cloneAndDeduplicateSprm(rSprm, ret, nStyleType);
+            cloneAndDeduplicateSprm(rSprm, ret, nStyleType, pDirect);
     }
     return ret;
 }
diff --git a/writerfilter/source/rtftok/rtfsprm.hxx b/writerfilter/source/rtftok/rtfsprm.hxx
index 1b489fcd5864..a84e57642c0f 100644
--- a/writerfilter/source/rtftok/rtfsprm.hxx
+++ b/writerfilter/source/rtftok/rtfsprm.hxx
@@ -61,8 +61,9 @@ public:
     /// Also insert default values to override attributes of style
     /// (yes, really; that's what Word does).
     /// @param bImplicitPPr implicit dereference of top-level pPr SPRM
-    RTFSprms cloneAndDeduplicate(RTFSprms& rReference, Id nStyleType,
-                                 bool bImplicitPPr = false) const;
+    /// @param pDirect pointer to the root of the direct formatting SPRM tree, if any
+    RTFSprms cloneAndDeduplicate(RTFSprms& rReference, Id nStyleType, bool bImplicitPPr = false,
+                                 RTFSprms* pDirect = nullptr) const;
     /// Inserts default values to override attributes of pAbstract.
     void duplicateList(const RTFValue::Pointer_t& pAbstract);
     /// Removes duplicated values based on in-list properties.