sw/qa/extras/uiwriter/uiwriter2.cxx | 6 ++++++ sw/source/core/crsr/bookmrk.cxx | 9 ++++++++- 2 files changed, 14 insertions(+), 1 deletion(-)
New commits: commit e3b29128fc23a2168cda642b559112c6c73af6ff Author: Tamás Zolnai <tamas.zol...@collabora.com> AuthorDate: Wed Jul 17 12:00:16 2019 +0200 Commit: Aron Budea <aron.bu...@collabora.com> CommitDate: Thu Aug 1 05:24:30 2019 +0200 Disable testDateFormFieldCurrentDateInvalidation test only for Windows Change-Id: Id267d118b509177f93f3c440a03d05feb532cd34 Reviewed-on: https://gerrit.libreoffice.org/75613 Tested-by: Jenkins Reviewed-by: Tamás Zolnai <tamas.zol...@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/75620 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com> Reviewed-by: Aron Budea <aron.bu...@collabora.com> diff --git a/sw/qa/extras/uiwriter/uiwriter2.cxx b/sw/qa/extras/uiwriter/uiwriter2.cxx index 07f0214c4b40..358a2c1cf5b7 100644 --- a/sw/qa/extras/uiwriter/uiwriter2.cxx +++ b/sw/qa/extras/uiwriter/uiwriter2.cxx @@ -66,7 +66,9 @@ public: void testDateFormFieldInsertion(); void testDateFormFieldContentOperations(); void testDateFormFieldCurrentDateHandling(); +#if !defined(_WIN32) void testDateFormFieldCurrentDateInvalidation(); +#endif void testShapePageMove(); CPPUNIT_TEST_SUITE(SwUiWriterTest2); @@ -85,7 +87,9 @@ public: CPPUNIT_TEST(testDateFormFieldInsertion); CPPUNIT_TEST(testDateFormFieldContentOperations); CPPUNIT_TEST(testDateFormFieldCurrentDateHandling); +#if !defined(_WIN32) CPPUNIT_TEST(testDateFormFieldCurrentDateInvalidation); +#endif CPPUNIT_TEST(testShapePageMove); CPPUNIT_TEST_SUITE_END(); @@ -783,6 +787,7 @@ void SwUiWriterTest2::testDateFormFieldCurrentDateHandling() CPPUNIT_ASSERT_EQUAL(OUString("2031-06-01"), sCurrentDate); } +#if !defined(_WIN32) void SwUiWriterTest2::testDateFormFieldCurrentDateInvalidation() { SwDoc* pDoc = createDoc(); @@ -840,6 +845,7 @@ void SwUiWriterTest2::testDateFormFieldCurrentDateInvalidation() } CPPUNIT_ASSERT_EQUAL(OUString(""), sCurrentDate); } +#endif void SwUiWriterTest2::testShapePageMove() { commit 19cbe9b3c2190994c3df93e300d0368453737a78 Author: Tamás Zolnai <tamas.zol...@collabora.com> AuthorDate: Tue Jul 16 11:14:45 2019 +0100 Commit: Aron Budea <aron.bu...@collabora.com> CommitDate: Thu Aug 1 05:24:20 2019 +0200 tdf#126414: MSForms: fix flickering of date field button on Windows Need to ignore empty paint area parameters. Change-Id: I195d7bf9b3914199984f4a732d7616520d51dbba Reviewed-on: https://gerrit.libreoffice.org/75708 Tested-by: Jenkins Reviewed-by: Tamás Zolnai <tamas.zol...@collabora.com> (cherry picked from commit 13a2db4941447001b81b077ee587903ae84cfc91) Reviewed-on: https://gerrit.libreoffice.org/75762 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com> Reviewed-by: Aron Budea <aron.bu...@collabora.com> diff --git a/sw/source/core/crsr/bookmrk.cxx b/sw/source/core/crsr/bookmrk.cxx index b524aa05aef7..d46e41cac22d 100644 --- a/sw/source/core/crsr/bookmrk.cxx +++ b/sw/source/core/crsr/bookmrk.cxx @@ -584,19 +584,26 @@ namespace sw { namespace mark { if(!m_pButton) m_pButton = VclPtr<DateFormFieldButton>::Create(pEditWin, *this, m_pNumberFormatter); - m_pButton->CalcPosAndSize(m_aPaintAreaEnd); + SwRect aPaintArea(m_aPaintAreaStart.TopLeft(), m_aPaintAreaEnd.BottomRight()); + m_pButton->CalcPosAndSize(aPaintArea); m_pButton->Show(); } } void DateFieldmark::SetPortionPaintAreaStart(const SwRect& rPortionPaintArea) { + if (rPortionPaintArea.IsEmpty()) + return; + m_aPaintAreaStart = rPortionPaintArea; InvalidateCurrentDateParam(); } void DateFieldmark::SetPortionPaintAreaEnd(const SwRect& rPortionPaintArea) { + if (rPortionPaintArea.IsEmpty()) + return; + if(m_aPaintAreaEnd == rPortionPaintArea && m_pButton && m_pButton->IsVisible()) return; _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits