diff options
| -rw-r--r-- | cui/qa/uitest/dialogs/chardlg.py | 21 | ||||
| -rw-r--r-- | cui/source/tabpages/chardlg.cxx | 2 |
2 files changed, 22 insertions, 1 deletions
diff --git a/cui/qa/uitest/dialogs/chardlg.py b/cui/qa/uitest/dialogs/chardlg.py index 26aff0f4a5be..2545d268274a 100644 --- a/cui/qa/uitest/dialogs/chardlg.py +++ b/cui/qa/uitest/dialogs/chardlg.py @@ -79,4 +79,25 @@ class Test(UITestCase): self.assertEqual(paragraph.CharTransparence, 5) self.ui_test.close_doc() + def testSvxCharEffectsPageWriterAutomatic(self): + # Start Writer. + self.ui_test.create_doc_in_start_center("writer") + doc = self.xUITest.getTopFocusWindow() + editWin = doc.getChild("writer_edit") + + # Use Format -> Character. + self.ui_test.execute_dialog_through_command(".uno:FontDialog") + xDialog = self.xUITest.getTopFocusWindow() + xTabs = xDialog.getChild("tabcontrol") + # Select RID_SVXPAGE_CHAR_EFFECTS. + select_pos(xTabs, "1") + xFontColorLB = xDialog.getChild("fontcolorlb") + # Without the accompanying fix in place, this test would have failed with: + # AssertionError: 'White' != 'Automatic' + # i.e. the auto color lost its alpha component and appeared as white. + self.assertEqual(get_state_as_dict(xFontColorLB)["Text"], "Automatic") + + self.ui_test.close_dialog_through_button(xDialog.getChild("ok")) + self.ui_test.close_doc() + # vim: set shiftwidth=4 softtabstop=4 expandtab: diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx index 211ec9e15679..3d4f85b7d199 100644 --- a/cui/source/tabpages/chardlg.cxx +++ b/cui/source/tabpages/chardlg.cxx @@ -1565,7 +1565,7 @@ void SvxCharEffectsPage::ResetColor_Impl( const SfxItemSet& rSet ) m_aPreviewWin.Invalidate(); Color aRGBColor = aColor; - if (aRGBColor.GetTransparency()) + if (aRGBColor.GetTransparency() && aColor != COL_AUTO) { aRGBColor.SetTransparency(0); } |