diff options
| author | Xisco Fauli <xiscofauli@libreoffice.org> | 2020-11-05 20:35:09 +0100 |
|---|---|---|
| committer | Xisco Fauli <xiscofauli@libreoffice.org> | 2020-11-06 09:53:04 +0100 |
| commit | a5b3211f072d982e1ee136e864f153836c76a5ca (patch) | |
| tree | 5a84e41458aa7a1bf3c1e700b96c3b8e647af8ac /sc/qa | |
| parent | 538a3463f424adae8b48db50ca11f27704fe0be2 (diff) | |
tdf#134161: Revert "tdf#132137 Rename Default Style in Calc."
This reverts 4111ed76906bf6be05b704bf52fa91353dfef183
the document would also hang if
define STR_STYLENAME_STANDARD NC_("STR_STYLENAME_STANDARD", "Default");
is replaced by
define STR_STYLENAME_STANDARD NC_("STR_STYLENAME_STANDARD", "DefaultTest");
meaning somewhere in the code 'Default' is harcoded
as git grep "\"Default\"" sc/source/ shows
Reverting for now so we can backport it to libreoffice-7-0
while a better solution is provided for tdf#132137
Some other problems of the reverted commit are mentioned
in comment 4 and comment 5 of tdf#134161
I'm adding a unittest in another commit so this one
can be easily reverted in the future
Change-Id: Ib7c4a99ff4957eba7ec0b644e989c7a08b46f2a8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105381
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
Tested-by: Xisco Fauli <xiscofauli@libreoffice.org>
Diffstat (limited to 'sc/qa')
| -rw-r--r-- | sc/qa/extras/scautoformatobj.cxx | 2 | ||||
| -rw-r--r-- | sc/qa/extras/scautoformatsobj.cxx | 2 | ||||
| -rw-r--r-- | sc/qa/uitest/calc_tests6/tdf91726.py | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/sc/qa/extras/scautoformatobj.cxx b/sc/qa/extras/scautoformatobj.cxx index 23abaa956f1c..76db8c6a3592 100644 --- a/sc/qa/extras/scautoformatobj.cxx +++ b/sc/qa/extras/scautoformatobj.cxx @@ -88,7 +88,7 @@ ScAutoFormatObj::ScAutoFormatObj() : CalcUnoApiTest("/sc/qa/extras/testdocuments") , XElementAccess(cppu::UnoType<beans::XPropertySet>::get()) , XIndexAccess(16) - , XNamed("Default Cell Style") + , XNamed("Default") , XServiceInfo("ScAutoFormatObj", "com.sun.star.sheet.TableAutoFormat") { } diff --git a/sc/qa/extras/scautoformatsobj.cxx b/sc/qa/extras/scautoformatsobj.cxx index 769478608506..ed799c018ef4 100644 --- a/sc/qa/extras/scautoformatsobj.cxx +++ b/sc/qa/extras/scautoformatsobj.cxx @@ -89,7 +89,7 @@ ScAutoFormatsObj::ScAutoFormatsObj() : CalcUnoApiTest("/sc/qa/extras/testdocuments") , XElementAccess(cppu::UnoType<container::XNamed>::get()) , XIndexAccess(2) - , XNameAccess("Default Cell Style") + , XNameAccess("Default") , XNameContainer("ScAutoFormatsObj") , XNameReplace("ScAutoFormatsObj") , XServiceInfo("stardiv.StarCalc.ScAutoFormatsObj", "com.sun.star.sheet.TableAutoFormats") diff --git a/sc/qa/uitest/calc_tests6/tdf91726.py b/sc/qa/uitest/calc_tests6/tdf91726.py index 4dccc7c697ec..38703cb7e34a 100644 --- a/sc/qa/uitest/calc_tests6/tdf91726.py +++ b/sc/qa/uitest/calc_tests6/tdf91726.py @@ -28,7 +28,7 @@ class tdf91726(UITestCase): xadd = xDialog.getChild("add") def handle_name_dlg(dialog): nameEntry = dialog.getChild("name_entry") - nameEntry.executeAction("TYPE", mkPropertyValues({"TEXT":"Default Cell Style"})) + nameEntry.executeAction("TYPE", mkPropertyValues({"TEXT":"Default"})) xOKBtn = dialog.getChild("ok") def handle_error_dlg(dialog2): #Error message: You have entered an invalid name. @@ -43,7 +43,7 @@ class tdf91726(UITestCase): xDialog = self.xUITest.getTopFocusWindow() nameEntry = xDialog.getChild("name_entry") #back to name dialog, LO should not crash - self.assertEqual(get_state_as_dict(nameEntry)["Text"], "Default Cell Style") + self.assertEqual(get_state_as_dict(nameEntry)["Text"], "Default") xCanceltn = xDialog.getChild("cancel") self.ui_test.close_dialog_through_button(xCanceltn) |