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

[Justin Luth]

 sw/qa/extras/ooxmlexport/ooxmlexport8.cxx    |    4 ++--
 writerfilter/source/dmapper/DomainMapper.cxx |    4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

New commits:
commit a21035c779167ec0e84ac21b9e5cdf6f2553ab30
Author: Justin Luth <justin_luth at sil.org>
Date:   Tue Dec 20 13:51:26 2016 +0300

    related to tdf#97417: fix unit test's early para numbering
    
    The unit test's first blank page already started the paragraph
    numbering. Setting it so that a contentless, single paragraph
    section will not display numbering.  In fact, no dummy paragraph
    should have numbering, but that would get complicated.
    
    This is in preparation for tdf#104710.
    
    Change-Id: I98c9926cb3cd1e3fe3cd43bf46cab22bfbec7eba
    Reviewed-on: https://gerrit.libreoffice.org/32235
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
    (cherry picked from commit c829e01e973ac32fb625925ce83f843ad30d94db)
    Reviewed-on: https://gerrit.libreoffice.org/32326
    Reviewed-by: Justin Luth <justin_luth at sil.org>

diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport8.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport8.cxx
index 52e6806..732730f 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport8.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport8.cxx
@@ -2017,8 +2017,8 @@ DECLARE_OOXMLEXPORT_TEST(testTdf92157, "tdf92157.docx")
 DECLARE_OOXMLEXPORT_TEST(testTdf97417, "section_break_numbering.docx")
 {
     uno::Reference<beans::XPropertySet> xProps(getParagraph(1), uno::UNO_QUERY_THROW);
-//    CPPUNIT_ASSERT_MESSAGE("1st page: first paragraph erroneous numbering",
-//        !xProps->getPropertyValue("NumberingRules").hasValue());
+    CPPUNIT_ASSERT_MESSAGE("1st page: first paragraph erroneous numbering",
+        !xProps->getPropertyValue("NumberingRules").hasValue());
     // paragraph with numbering and section break was removed by writerfilter
     // but its numbering was copied to all following paragraphs
     CPPUNIT_ASSERT_MESSAGE("2nd page: first paragraph missing numbering",
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx
index 45f2764..f79ad82 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -3281,7 +3281,9 @@ void DomainMapper::lcl_utext(const sal_uInt8 * data_, size_t len)
                            && !( pContext && pContext->isSet(PROP_BREAK_TYPE) )
                            && !m_pImpl->GetIsDummyParaAddedForTableInSection()
                            && !m_pImpl->GetIsPreviousParagraphFramed();
-            PropertyMapPtr xContext = bRemove ? m_pImpl->GetTopContextOfType(CONTEXT_PARAGRAPH) : PropertyMapPtr();
+
+            const bool bNoNumbering = bRemove || (!m_pImpl->GetParaChanged() && m_pImpl->GetParaSectpr() && bSingleParagraph);
+            PropertyMapPtr xContext = bNoNumbering ? m_pImpl->GetTopContextOfType(CONTEXT_PARAGRAPH) : PropertyMapPtr();
             if (xContext)
             {
                 // tdf#97417 delete numbering of the paragraph