filter/source/config/fragments/filters/OOXML_Text.xcu | 2 +-
filter/source/config/fragments/filters/OOXML_Text_Template.xcu | 2 +-
filter/source/config/fragments/types/writer_OOXML.xcu | 2 +-
filter/source/config/fragments/types/writer_OOXML_Template.xcu | 2 +-
sw/qa/uitest/writer_tests3/save_readonly_with_password.py | 2 +-
sw/qa/uitest/writer_tests7/tdf131936.py | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
New commits:
commit 7391942099d4a76639c1aa8e559643b2702da2b7
Author: Michael Stahl <michael.st...@allotropia.de>
AuthorDate: Fri Mar 3 11:20:14 2023 +0100
Commit: Michael Stahl <michael.st...@allotropia.de>
CommitDate: Fri Mar 3 16:49:30 2023 +0000
tdf#137883 filter: use en-dash instead of hyphen in UINames
(regression from commit ed0476b0625c4361df5ff040a6661a9634588cea)
Change-Id: I7c380a9871cf16623031751bd735f456a7ea200f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148167
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.st...@allotropia.de>
diff --git a/filter/source/config/fragments/filters/OOXML_Text.xcu
b/filter/source/config/fragments/filters/OOXML_Text.xcu
index be5089123828..bbcceb1713d8 100644
--- a/filter/source/config/fragments/filters/OOXML_Text.xcu
+++ b/filter/source/config/fragments/filters/OOXML_Text.xcu
@@ -21,7 +21,7 @@
<prop
oor:name="FilterService"><value>com.sun.star.comp.Writer.WriterFilter</value></prop>
<prop oor:name="UserData"><value></value></prop>
<prop oor:name="UIName">
- <value xml:lang="en-US">Word 2010-365 Document</value>
+ <value xml:lang="en-US">Word 2010–365 Document</value>
</prop>
<!-- ISO/IEC 29500:2008 -->
<prop oor:name="FileFormatVersion"><value>1</value></prop>
diff --git a/filter/source/config/fragments/filters/OOXML_Text_Template.xcu
b/filter/source/config/fragments/filters/OOXML_Text_Template.xcu
index abd511768ea6..55d326563bf6 100644
--- a/filter/source/config/fragments/filters/OOXML_Text_Template.xcu
+++ b/filter/source/config/fragments/filters/OOXML_Text_Template.xcu
@@ -21,7 +21,7 @@
<prop
oor:name="FilterService"><value>com.sun.star.comp.Writer.WriterFilter</value></prop>
<prop oor:name="UserData"><value></value></prop>
<prop oor:name="UIName">
- <value xml:lang="en-US">Word 2010-365 Template</value>
+ <value xml:lang="en-US">Word 2010–365 Template</value>
</prop>
<!-- ISO/IEC 29500:2008 -->
<prop oor:name="FileFormatVersion"><value>1</value></prop>
diff --git a/filter/source/config/fragments/types/writer_OOXML.xcu
b/filter/source/config/fragments/types/writer_OOXML.xcu
index f3c99f7cbda6..079a6421f072 100644
--- a/filter/source/config/fragments/types/writer_OOXML.xcu
+++ b/filter/source/config/fragments/types/writer_OOXML.xcu
@@ -23,7 +23,7 @@
<prop oor:name="Preferred"><value>true</value></prop>
<prop oor:name="PreferredFilter"><value>Office Open XML
Text</value></prop>
<prop oor:name="UIName">
- <value>Word 2010-365 Document</value>
+ <value>Word 2010–365 Document</value>
</prop>
<prop oor:name="ClipboardFormat"><value>MSWordDoc</value></prop>
</node>
diff --git a/filter/source/config/fragments/types/writer_OOXML_Template.xcu
b/filter/source/config/fragments/types/writer_OOXML_Template.xcu
index 3c1fa82c6fe6..a9d424b967b4 100644
--- a/filter/source/config/fragments/types/writer_OOXML_Template.xcu
+++ b/filter/source/config/fragments/types/writer_OOXML_Template.xcu
@@ -23,7 +23,7 @@
<prop oor:name="Preferred"><value>true</value></prop>
<prop oor:name="PreferredFilter"><value>Office Open XML Text
Template</value></prop>
<prop oor:name="UIName">
- <value>Word 2010-365 Template</value>
+ <value>Word 2010–365 Template</value>
</prop>
<prop oor:name="ClipboardFormat"><value>MSWordDoc</value></prop>
</node>
diff --git a/sw/qa/uitest/writer_tests3/save_readonly_with_password.py
b/sw/qa/uitest/writer_tests3/save_readonly_with_password.py
index 0591ad9e0c91..e9a6140103f4 100644
--- a/sw/qa/uitest/writer_tests3/save_readonly_with_password.py
+++ b/sw/qa/uitest/writer_tests3/save_readonly_with_password.py
@@ -30,7 +30,7 @@ class save_readonly_with_password(UITestCase):
xFileName.executeAction("TYPE",
mkPropertyValues({"KEYCODE":"BACKSPACE"}))
xFileName.executeAction("TYPE", mkPropertyValues({"TEXT":
xFilePath}))
xFileTypeCombo = xSaveDialog.getChild("file_type")
- select_by_text(xFileTypeCombo, "Word 2010-365 Document
(.docx)")
+ select_by_text(xFileTypeCombo, "Word 2010–365 Document
(.docx)")
xPasswordCheckButton = xSaveDialog.getChild("password")
xPasswordCheckButton.executeAction("CLICK", tuple())
xOpen = xSaveDialog.getChild("open")
diff --git a/sw/qa/uitest/writer_tests7/tdf131936.py
b/sw/qa/uitest/writer_tests7/tdf131936.py
index c7bf9e13cd83..2d929c07d993 100644
--- a/sw/qa/uitest/writer_tests7/tdf131936.py
+++ b/sw/qa/uitest/writer_tests7/tdf131936.py
@@ -18,7 +18,7 @@ class tdf131936(UITestCase):
with self.ui_test.execute_dialog_through_command(".uno:SaveAs",
close_button="cancel") as xDialog:
xFileTypeCombo = xDialog.getChild("file_type")
state = get_state_as_dict(xFileTypeCombo)
- self.assertEqual(state["SelectEntryText"], "Word 2010-365
Document (.docx)")
+ self.assertEqual(state["SelectEntryText"], "Word 2010–365
Document (.docx)")
# vim: set shiftwidth=4 softtabstop=4 expandtab:
