sc/source/core/data/sortparam.cxx | 4 ++-- sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 12 ++++++++---- sw/qa/extras/rtfimport/rtfimport.cxx | 5 ++--- 3 files changed, 12 insertions(+), 9 deletions(-)
New commits: commit d2c07c22309224b6f0ee8701b4c8f83eb38aa251 Author: Thorsten Behrens <thorsten.behr...@cib.de> Date: Thu Feb 8 14:06:43 2018 +0100 Pull in corresponding changes from master's ooxmlexport10.cxx Fixup for 4b282dc07884f39d31edffb256e608e91eb266b3 This is probably c829e01e973ac32fb625925ce83f843ad30d94db and 893698741a78e56d74b87caff24f67742ddd892b from master. Change-Id: I21b8de56c0b8fd1ebf20452e2cc018ef0176f3f5 diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx index f7190f0d77e0..7c7b284cab6a 100644 --- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx +++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx @@ -3029,14 +3029,18 @@ DECLARE_OOXMLIMPORT_TEST(testTdf60351, "tdf60351.docx") DECLARE_OOXMLIMPORT_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()); // paragraph with numbering and section break was removed by writerfilter // but its numbering was copied to all following paragraphs - CPPUNIT_ASSERT_MESSAGE("first paragraph missing numbering", - getProperty<uno::Reference<container::XIndexAccess>>(getParagraph(1), "NumberingRules").is()); - uno::Reference<beans::XPropertySet> const xProps(getParagraph(2), uno::UNO_QUERY_THROW); - CPPUNIT_ASSERT_MESSAGE("second paragraph erroneous numbering", + CPPUNIT_ASSERT_MESSAGE("2nd page: first paragraph missing numbering", + getProperty<uno::Reference<container::XIndexAccess>>(getParagraph(2), "NumberingRules").is()); + xProps = uno::Reference<beans::XPropertySet>(getParagraph(3), uno::UNO_QUERY_THROW); + CPPUNIT_ASSERT_MESSAGE("2nd page: second paragraph erroneous numbering", !xProps->getPropertyValue("NumberingRules").hasValue()); + CPPUNIT_ASSERT_EQUAL(2, getPages()); } DECLARE_OOXMLIMPORT_TEST(testTdf95970, "tdf95970.docx") commit 04fbef2cfd7ced957454c60f32d0f8e3c8c7827f Author: Thorsten Behrens <thorsten.behr...@cib.de> Date: Thu Feb 8 14:07:39 2018 +0100 Pull in rest of master fix for tdf#72942 This is the part of deaa16bd24fba4a3a6b072ab2b94542a7dbd41c6 that touched sw/qa/extras/rtfexport/rtfexport2.cxx Change-Id: If27eb46b0acc48dfb368775224a72a8bbe63d96b diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx b/sw/qa/extras/rtfimport/rtfimport.cxx index 2d1b1b4b32cb..ded9c987929a 100644 --- a/sw/qa/extras/rtfimport/rtfimport.cxx +++ b/sw/qa/extras/rtfimport/rtfimport.cxx @@ -1591,9 +1591,8 @@ DECLARE_RTFIMPORT_TEST(testFdo69384, "hello.rtf") uno::Reference<text::XTextRange> xEnd = xText->getEnd(); paste("fdo69384-paste.rtf", xEnd); - // Import got interrupted in the middle of style sheet table import, - // resulting in missing styles and text. - getStyles("ParagraphStyles")->getByName("Text body justified"); + // During insert of the RTF document we do not insert new styles + CPPUNIT_ASSERT(!getStyles("ParagraphStyles")->hasByName("Text body justified")); } DECLARE_RTFIMPORT_TEST(testFdo70221, "fdo70221.rtf") commit 6a656eae1aad3f7692b70073707ac4932edbde8a Author: Thorsten Behrens <thorsten.behr...@cib.de> Date: Thu Feb 8 14:05:20 2018 +0100 sc: fix WaE Followup to f92fd273e0319b18ab9b453b5ce753b865b37a1f tdf#98931 Add option to sort boundary image-only columns Backport broke order of initialisation Change-Id: I20d3934578cffcda58ed2bf17383ee794acb1fdc diff --git a/sc/source/core/data/sortparam.cxx b/sc/source/core/data/sortparam.cxx index f55fc42b86ca..c8c46882f1e9 100644 --- a/sc/source/core/data/sortparam.cxx +++ b/sc/source/core/data/sortparam.cxx @@ -35,8 +35,8 @@ ScSortParam::ScSortParam() ScSortParam::ScSortParam( const ScSortParam& r ) : nCol1(r.nCol1),nRow1(r.nRow1),nCol2(r.nCol2),nRow2(r.nRow2),nUserIndex(r.nUserIndex), bHasHeader(r.bHasHeader),bByRow(r.bByRow),bCaseSens(r.bCaseSens), - bNaturalSort(r.bNaturalSort),bUserDef(r.bUserDef),bIncludeGraphicObjects(r.bIncludeGraphicObjects), - bIncludePattern(r.bIncludePattern),bInplace(r.bInplace), + bNaturalSort(r.bNaturalSort),bIncludeGraphicObjects(r.bIncludeGraphicObjects), + bUserDef(r.bUserDef),bIncludePattern(r.bIncludePattern),bInplace(r.bInplace), nDestTab(r.nDestTab),nDestCol(r.nDestCol),nDestRow(r.nDestRow), maKeyState( r.maKeyState ), aCollatorLocale( r.aCollatorLocale ), aCollatorAlgorithm( r.aCollatorAlgorithm ), _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits