[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - sw/Module_sw.mk sw/qa sw/source sw/UITest_sw_ui_fmtui.mk

[Miklos Vajna (via logerrit)]

 sw/Module_sw.mk                |    1 +
 sw/UITest_sw_ui_fmtui.mk       |   16 ++++++++++++++++
 sw/qa/uitest/ui/fmtui/fmtui.py |   39 +++++++++++++++++++++++++++++++++++++++
 sw/source/ui/fmtui/tmpdlg.cxx  |    2 +-
 4 files changed, 57 insertions(+), 1 deletion(-)

New commits:
commit fedd85fea513deaab608c813784aeee6e2c49e91
Author:     Miklos Vajna <vmiklos at collabora.com>
AuthorDate: Mon May 25 21:03:56 2020 +0200
Commit:     Miklos Vajna <vmiklos at collabora.com>
CommitDate: Tue Sep 22 10:43:17 2020 +0200

    tdf#130456 sw: enable semi-transparent text for char style dialog
    
    The code is shared, so this fixed the para style dialog as well.
    
    (cherry picked from commit 5202771939da66ac85ca3221d69e7e5f5cca8da7)
    
    Change-Id: I742231bf76c562b3255700fc4eeb4c870c3deb6b
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103137
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.com>

diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk
index 0f45dc0cb91e..a3958d4c4b65 100644
--- a/sw/Module_sw.mk
+++ b/sw/Module_sw.mk
@@ -167,6 +167,7 @@ $(eval $(call gb_Module_add_uicheck_targets,sw,\
 	UITest_chapterNumbering \
 	UITest_librelogo \
 	UITest_options \
+	UITest_sw_ui_fmtui \
 	UITest_classification \
 	UITest_writer_macro_tests \
 	UITest_writer_dialogs \
diff --git a/sw/UITest_sw_ui_fmtui.mk b/sw/UITest_sw_ui_fmtui.mk
new file mode 100644
index 000000000000..e31e34c45cf4
--- /dev/null
+++ b/sw/UITest_sw_ui_fmtui.mk
@@ -0,0 +1,16 @@
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call 	gb_UITest_UITest,sw_ui_fmtui))
+
+$(eval $(call gb_UITest_add_modules,sw_ui_fmtui,$(SRCDIR)/sw/qa/uitest,\
+	ui/fmtui/ \
+))
+
+$(eval $(call gb_UITest_set_defs,sw_ui_fmtui, \
+    TDOC="$(SRCDIR)/sw/qa/uitest/ui/fmtui/data" \
+))
diff --git a/sw/qa/uitest/ui/fmtui/fmtui.py b/sw/qa/uitest/ui/fmtui/fmtui.py
new file mode 100644
index 000000000000..d147022635fb
--- /dev/null
+++ b/sw/qa/uitest/ui/fmtui/fmtui.py
@@ -0,0 +1,39 @@
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+"""Covers sw/source/ui/fmtui/ fixes."""
+
+from uitest.framework import UITestCase
+from libreoffice.uno.propertyvalue import mkPropertyValues
+from uitest.debug import sleep
+from uitest.uihelper.common import get_state_as_dict
+from uitest.uihelper.common import select_pos
+
+class TestTmpdlg(UITestCase):
+
+    def test_para_style_semi_transparent_text(self):
+
+        self.ui_test.create_doc_in_start_center("writer")
+        xWriterDoc = self.xUITest.getTopFocusWindow()
+        document = self.ui_test.get_component()
+        self.ui_test.execute_dialog_through_command(".uno:EditStyle")
+        xDialog = self.xUITest.getTopFocusWindow()
+
+        xTabs = xDialog.getChild("tabcontrol")
+        # Select RID_SVXPAGE_CHAR_EFFECTS.
+        select_pos(xTabs, "1")
+        xFontTransparency = xDialog.getChild("fonttransparencymtr")
+        # Without the accompanying fix in place, this test would have failed with:
+        # AssertionError: 'false' != 'true'
+        # i.e. the control was hidden in the paragraph style dialog.
+        self.assertEqual(get_state_as_dict(xFontTransparency)["Visible"], "true")
+
+        xCancBtn = xDialog.getChild("cancel")
+        self.ui_test.close_dialog_through_button(xCancBtn)
+        self.ui_test.close_doc()
+
+# vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/sw/source/ui/fmtui/tmpdlg.cxx b/sw/source/ui/fmtui/tmpdlg.cxx
index 41f8d0948d6e..891784931d56 100644
--- a/sw/source/ui/fmtui/tmpdlg.cxx
+++ b/sw/source/ui/fmtui/tmpdlg.cxx
@@ -291,7 +291,7 @@ void SwTemplateDlgController::PageCreated(const OString& rId, SfxTabPage &rPage
     }
     else if (rId == "fonteffect")
     {
-        sal_uInt32 nFlags = SVX_ENABLE_FLASH;
+        sal_uInt32 nFlags = SVX_ENABLE_FLASH | SVX_ENABLE_CHAR_TRANSPARENCY;
         if( SfxStyleFamily::Char == nType )
             nFlags = nFlags|SVX_PREVIEW_CHARACTER;
         aSet.Put (SfxUInt32Item(SID_FLAG_TYPE, nFlags));