[Libreoffice-commits] core.git: sw/inc sw/qa

[Roman Kuznetsov (via logerrit)]

 sw/inc/strings.hrc                            |   15 ++++++++++-----
 sw/qa/uitest/writer_tests2/formatParagraph.py |    4 ++--
 2 files changed, 12 insertions(+), 7 deletions(-)

New commits:
commit 43c44f7c82fdcf7e5e6eccb0a80d5bb0e1e3a86c
Author:     Roman Kuznetsov <antilibreoffice at gmail.com>
AuthorDate: Tue Apr 2 08:30:17 2019 +0100
Commit:     Mike Kaganski <mike.kaganski at collabora.com>
CommitDate: Thu Apr 4 12:42:00 2019 +0200

    tdf#124471 Change bullet styles names in Style section of Sidebar
    
    Change-Id: I1a6acd3b9496cf83cd0e1ef6d808443cd40ae2c3
    Reviewed-on: https://gerrit.libreoffice.org/70121
    Tested-by: Jenkins
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>

diff --git a/sw/inc/strings.hrc b/sw/inc/strings.hrc
index 93a8fcc1fcd2..5ee7196700e5 100644
--- a/sw/inc/strings.hrc
+++ b/sw/inc/strings.hrc
@@ -203,11 +203,16 @@
 #define STR_POOLNUMRULE_NUM3                    NC_("STR_POOLNUMRULE_NUM3", "Numbering abc")
 #define STR_POOLNUMRULE_NUM4                    NC_("STR_POOLNUMRULE_NUM4", "Numbering IVX")
 #define STR_POOLNUMRULE_NUM5                    NC_("STR_POOLNUMRULE_NUM5", "Numbering ivx")
-#define STR_POOLNUMRULE_BUL1                    NC_("STR_POOLNUMRULE_BUL1", "List 1")
-#define STR_POOLNUMRULE_BUL2                    NC_("STR_POOLNUMRULE_BUL2", "List 2")
-#define STR_POOLNUMRULE_BUL3                    NC_("STR_POOLNUMRULE_BUL3", "List 3")
-#define STR_POOLNUMRULE_BUL4                    NC_("STR_POOLNUMRULE_BUL4", "List 4")
-#define STR_POOLNUMRULE_BUL5                    NC_("STR_POOLNUMRULE_BUL5", "List 5")
+//Bullet \u2022
+#define STR_POOLNUMRULE_BUL1                    NC_("STR_POOLNUMRULE_BUL1", "Bullet •")
+//Bullet \u2013
+#define STR_POOLNUMRULE_BUL2                    NC_("STR_POOLNUMRULE_BUL2", "Bullet –")
+//Bullet \uE4C4
+#define STR_POOLNUMRULE_BUL3                    NC_("STR_POOLNUMRULE_BUL3", "Bullet ")
+//Bullet \uE49E
+#define STR_POOLNUMRULE_BUL4                    NC_("STR_POOLNUMRULE_BUL4", "Bullet ")
+//Bullet \uE20B
+#define STR_POOLNUMRULE_BUL5                    NC_("STR_POOLNUMRULE_BUL5", "Bullet ")
 #define STR_COLUMN_VALUESET_ITEM0               NC_("STR_COLUMN_VALUESET_ITEM0", "1 column")
 #define STR_COLUMN_VALUESET_ITEM1               NC_("STR_COLUMN_VALUESET_ITEM1", "2 columns with equal size")
 #define STR_COLUMN_VALUESET_ITEM2               NC_("STR_COLUMN_VALUESET_ITEM2", "3 columns with equal size")
diff --git a/sw/qa/uitest/writer_tests2/formatParagraph.py b/sw/qa/uitest/writer_tests2/formatParagraph.py
index 22f985caed9e..916d6ce71c97 100644
--- a/sw/qa/uitest/writer_tests2/formatParagraph.py
+++ b/sw/qa/uitest/writer_tests2/formatParagraph.py
@@ -281,7 +281,7 @@ class formatParagraph(UITestCase):
         props = {"TEXT": "Level 1"}
         actionProps = mkPropertyValues(props)
         xOutline.executeAction("SELECT", actionProps)
-        props2 = {"TEXT": "List 1"}
+        props2 = {"TEXT": "Bullet •"}
         actionProps2 = mkPropertyValues(props2)
         xNumbering.executeAction("SELECT", actionProps2)
         xPara.executeAction("CLICK", tuple())
@@ -301,7 +301,7 @@ class formatParagraph(UITestCase):
         xParaSpin = xDialog.getChild("spinNF_RESTART_PARA")
 
         self.assertEqual(get_state_as_dict(xOutline)["SelectEntryText"], "Level 1")
-        self.assertEqual(get_state_as_dict(xNumbering)["SelectEntryText"], "List 1")
+        self.assertEqual(get_state_as_dict(xNumbering)["SelectEntryText"], "Bullet •")
         self.assertEqual(get_state_as_dict(xPara)["Selected"], "true")
         self.assertEqual(get_state_as_dict(xParaSpin)["Text"], "2")