diff options
| author | Justin Luth <justin.luth@collabora.com> | 2021-01-27 10:46:05 +0300 |
|---|---|---|
| committer | Xisco Fauli <xiscofauli@libreoffice.org> | 2021-03-07 19:37:36 +0100 |
| commit | 7502838f28e4dfca522a61ec7395dc64b8e350c6 (patch) | |
| tree | 3c90873c6c20e52b0abf41cf5df83f3ace394737 /chart2 | |
| parent | a4bdd833a252ed4d942e4478fc820f9f2ee725fe (diff) | |
tdf#139940 oox: mark end before growing largest segment backwards
This fixes a regression in 7.1 (backported to 7.0.1) caused by
commit 73993fdb5d4b507694cd0edf80887d19f7e2bf9a for tdf#134183.
The largest segment has already been found, so we know where the
next segment starts. Now if we grow it backwards, that shouldn't
affect where it ends. So flag the end before growing the start,
otherwise we would have to recalculate the end again.
Change-Id: Iaae401d0438e533c7498be56f48fa153f7d3ff0a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110004
Tested-by: Justin Luth <justin_luth@sil.org>
Reviewed-by: Justin Luth <justin_luth@sil.org>
(cherry picked from commit 247963e53cce24c199a751c8ffb17f58b3a7d473)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111926
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112058
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
Diffstat (limited to 'chart2')
| -rw-r--r-- | chart2/qa/extras/chart2import.cxx | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/chart2/qa/extras/chart2import.cxx b/chart2/qa/extras/chart2import.cxx index 8fd7ca7a2277..3092e1ccaf92 100644 --- a/chart2/qa/extras/chart2import.cxx +++ b/chart2/qa/extras/chart2import.cxx @@ -846,6 +846,16 @@ void Chart2ImportTest::testBnc889755() CPPUNIT_ASSERT_EQUAL(OUString("Nov-13"), aRowLabels[13]); CPPUNIT_ASSERT_EQUAL(OUString("Dec-13"), aRowLabels[14]); CPPUNIT_ASSERT_EQUAL(OUString("Jan-14"), aRowLabels[15]); + + //tdf#139940 - the title's gradient was lost and was filled with solid blue, instead of a "blue underline". + uno::Reference<drawing::XDrawPagesSupplier> xDoc(mxComponent, uno::UNO_QUERY_THROW); + uno::Reference<drawing::XDrawPage> xPage(xDoc->getDrawPages()->getByIndex(0), uno::UNO_QUERY_THROW); + // Shape "Title 3" + uno::Reference<beans::XPropertySet> xShapeProps(xPage->getByIndex(5), uno::UNO_QUERY_THROW); + awt::Gradient aTransparence; + xShapeProps->getPropertyValue("FillTransparenceGradient") >>= aTransparence; + CPPUNIT_ASSERT(aTransparence.StartColor != aTransparence.EndColor); + CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(0xffffff), aTransparence.StartColor); } void Chart2ImportTest::testBnc882383() |