[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - sw/qa writerfilter/source

[Miklos Vajna]

 sw/qa/extras/rtfimport/data/tdf108416.rtf         |   18 ++++++++++++++++++
 sw/qa/extras/rtfimport/rtfimport.cxx              |    8 ++++++++
 writerfilter/source/dmapper/DomainMapper_Impl.cxx |    4 +++-
 3 files changed, 29 insertions(+), 1 deletion(-)

New commits:
commit 24446c610a178f77f9a39d2713b9ac90677abd94
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Mon Jun 19 21:43:10 2017 +0200

    tdf#108416 RTF import: fix unexpected bold list numbering
    
    Some paragraph-level run properties affect the current list style since
    commit 2123ede032ca64f696ef54af4ad3238974ca2b5d (n#758883 dmapper:
    paragraph-level run props should affect numberings as well, 2012-06-19).
    This was extended for any run properties in case of RTF since commit
    c1f8437dbed0e8b989e41a345ef7e658a6e8a4cd (fdo#83465 RTF import: handle
    font of numbering, 2014-09-25), as RTF doesn't really separate the
    paragraph-level and the other run properties.
    
    However, field formatting clearly should affect only the field itself,
    so disable this mechanism in that context.
    
    (cherry picked from commit 67a0889450daa6b9c9c799dab2d9da3a5044cb5d)
    
    Change-Id: I6df7488e99e44f3ba7e17bf09ce590c88151e043
    Reviewed-on: https://gerrit.libreoffice.org/39013
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/sw/qa/extras/rtfimport/data/tdf108416.rtf b/sw/qa/extras/rtfimport/data/tdf108416.rtf
new file mode 100644
index 000000000000..5d38d0741068
--- /dev/null
+++ b/sw/qa/extras/rtfimport/data/tdf108416.rtf
@@ -0,0 +1,18 @@
+{\rtf1\adeflang1025
+{\*\listtable
+{\list\listtemplateid492320832\listhybrid
+{\listlevel\levelnfc0\levelnfcn0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\leveltext\leveltemplateid510954734\'03(\'00);}{\levelnumbers\'02;}\rtlch\fcs1\af0}
+{\listname ;}\listid1847935044}
+}
+{\*\listoverridetable
+{\listoverride\listid1847935044\listoverridecount0\ls3}
+}
+\pard\plain asdf asdf asdf asdf asdf asdf asdf asdf\par
+\pard \ls3
+{before field }
+{\field
+{\*\fldinst {\b  MERGEFIELD "ZADDFIELDCON_BEGDADE" }}
+{\fldrslt {\b 01.08.2017}}
+}
+{ after\par }
+}
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx b/sw/qa/extras/rtfimport/rtfimport.cxx
index 03dbbcfb024f..6bed73db7d7a 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -2430,6 +2430,14 @@ DECLARE_RTFIMPORT_TEST(testTdf86814, "tdf86814.rtf")
     CPPUNIT_ASSERT_EQUAL(awt::FontWeight::BOLD, getProperty<float>(getRun(getParagraph(1), 1), "CharWeight"));
 }
 
+DECLARE_RTFIMPORT_TEST(testTdf108416, "tdf108416.rtf")
+{
+    uno::Reference<container::XNameAccess> xCharacterStyles(getStyles("CharacterStyles"));
+    uno::Reference<beans::XPropertySet> xListLabel(xCharacterStyles->getByName("ListLabel 1"), uno::UNO_QUERY);
+    // This was awt::FontWeight::BOLD, list numbering got an unexpected bold formatting.
+    CPPUNIT_ASSERT_EQUAL(awt::FontWeight::NORMAL, getProperty<float>(xListLabel, "CharWeight"));
+}
+
 DECLARE_RTFIMPORT_TEST(testTdf90315, "tdf90315.rtf")
 {
     uno::Reference<text::XTextSectionsSupplier> xTextSectionsSupplier(mxComponent, uno::UNO_QUERY);
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 0b29a1a5a523..7c496d20e106 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -5289,11 +5289,13 @@ uno::Reference<beans::XPropertySet> DomainMapper_Impl::GetCurrentNumberingCharSt
         if (!xLevels.is())
         {
             PropertyMapPtr pContext = m_pTopContext;
-            if (IsRTFImport())
+            if (IsRTFImport() && !IsOpenField())
             {
                 // Looking up the paragraph context explicitly (and not just taking
                 // the top context) is necessary for RTF, where formatting of a run
                 // and of the paragraph mark is not separated.
+                // We know that the formatting inside a field won't affect the
+                // paragraph marker formatting, though.
                 pContext = GetTopContextOfType(CONTEXT_PARAGRAPH);
                 if (!pContext)
                     return xRet;