cui/source/tabpages/tpgradnt.cxx | 1 -
uitest/writer_tests/backgrounds.py | 4 ++--
2 files changed, 2 insertions(+), 3 deletions(-)
New commits:
commit 93d58279cd56fd026db4dfb68d04fc22edba1abc
Author: Katarina Behrens <katarina.behr...@cib.de>
Date: Thu Apr 13 10:58:03 2017 +0200
Related tdf#105922: step increment is a property of the shape
not of the gradient. Therefore don't reset selection in the gradient
list if step increment changes.
This hopefully fixes also the failing UI test
Change-Id: Ia3da23d80ee9601b40309a2f213bd3b2c850ff5a
Reviewed-on: https://gerrit.libreoffice.org/36508
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Katarina Behrens <katarina.behr...@cib.de>
diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx
index 505d156b4b3c..c1cc8ada0c8f 100644
--- a/cui/source/tabpages/tpgradnt.cxx
+++ b/cui/source/tabpages/tpgradnt.cxx
@@ -318,7 +318,6 @@ IMPL_LINK_NOARG( SvxGradientTabPage,
ChangeAutoStepHdl_Impl, CheckBox&, void )
m_pMtrIncrement->Enable();
}
ModifiedHdl_Impl(m_pMtrIncrement);
- m_pGradientLB->SetNoSelection();
}
void SvxGradientTabPage::ModifiedHdl_Impl( void* pControl )
diff --git a/uitest/writer_tests/backgrounds.py
b/uitest/writer_tests/backgrounds.py
index 0e9d6a592c26..da49a7526dc2 100644
--- a/uitest/writer_tests/backgrounds.py
+++ b/uitest/writer_tests/backgrounds.py
@@ -43,8 +43,8 @@ class WriterBackgrounds(UITestCase):
document.StyleFamilies.PageStyles.Standard.FillGradient.StartIntensity, 100)
self.assertEqual(
document.StyleFamilies.PageStyles.Standard.FillGradient.EndIntensity, 100)
- #self.assertEqual(
- #document.StyleFamilies.PageStyles.Standard.FillGradientName,
'Tango Green')
+ self.assertEqual(
+ document.StyleFamilies.PageStyles.Standard.FillGradientName,
'Tango Green')
elif btn == 'btnhatch':
self.assertEqual(
document.StyleFamilies.PageStyles.Standard.FillHatch.Style,
SINGLE )
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
