diff options
| author | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2023-01-27 15:03:09 +0900 |
|---|---|---|
| committer | Tomaž Vajngerl <quikee@gmail.com> | 2023-02-17 05:23:43 +0000 |
| commit | 126d0db2c2315565d45e3b0408576d40ab97a443 (patch) | |
| tree | d4a541c53ad3b9675dc51712f53978f0625bb8d3 /cui | |
| parent | 7ba71ec27f9eca53cf0645d2b6bbfb37155efac4 (diff) | |
sd: use XTheme to transport the theme to xmloff import/export
Refactor the existing places and tests in Impress code (sd) to
use it instead.
Also keep the old property of construction and view of the theme
with a sequence of property values, but under the new property
named "ThemeUnoRepresentation". This is needed by the UI tests
currently.
Change-Id: I484567f4a603f1a5e2e03955fdd2b63132dcc66e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146225
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
(cherry picked from commit 75c0d7827625c683d52a9e2f3a7c514df890107b)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146450
Tested-by: Tomaž Vajngerl <quikee@gmail.com>
Diffstat (limited to 'cui')
| -rw-r--r-- | cui/qa/uitest/dialogs/chardlg.py | 2 | ||||
| -rw-r--r-- | cui/qa/uitest/tabpages/themepage.py | 4 | ||||
| -rw-r--r-- | cui/qa/uitest/tabpages/tpcolor.py | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/cui/qa/uitest/dialogs/chardlg.py b/cui/qa/uitest/dialogs/chardlg.py index c52664f36d0e..4a756cf6c979 100644 --- a/cui/qa/uitest/dialogs/chardlg.py +++ b/cui/qa/uitest/dialogs/chardlg.py @@ -74,7 +74,7 @@ class Test(UITestCase): 0x000000, # folHlink ]) }) - master.Theme = theme + master.ThemeUnoRepresentation = theme # Select the title shape. editWin.executeAction("TYPE", mkPropertyValues({"KEYCODE": "TAB"})) diff --git a/cui/qa/uitest/tabpages/themepage.py b/cui/qa/uitest/tabpages/themepage.py index f85af965f626..0145f0345492 100644 --- a/cui/qa/uitest/tabpages/themepage.py +++ b/cui/qa/uitest/tabpages/themepage.py @@ -41,7 +41,7 @@ class Test(UITestCase): 0x000000, # folHlink ]) }) - master.Theme = theme + master.ThemeUnoRepresentation = theme # When changing the name of the theme: self.xUITest.executeCommand(".uno:SlideMasterPage") @@ -71,7 +71,7 @@ class Test(UITestCase): # Without the accompanying fix in place, this test would have failed with: # AssertionError: 'nameA' != 'nameB' # i.e. the UI didn't update the theme name. - theme = convert_property_values_to_dict(master.Theme) + theme = convert_property_values_to_dict(master.ThemeUnoRepresentation) self.assertEqual(theme["Name"], "nameB") # Without the accompanying fix in place, this test would have failed with: # AssertionError: 'colorSetA' != 'colorSetB' diff --git a/cui/qa/uitest/tabpages/tpcolor.py b/cui/qa/uitest/tabpages/tpcolor.py index e6ae91adaac3..ad52711857e4 100644 --- a/cui/qa/uitest/tabpages/tpcolor.py +++ b/cui/qa/uitest/tabpages/tpcolor.py @@ -41,7 +41,7 @@ class Test(UITestCase): 0x000000, # folHlink ]) }) - master.Theme = theme + master.ThemeUnoRepresentation = theme # Select the title shape. editWin.executeAction("TYPE", mkPropertyValues({"KEYCODE": "TAB"})) |