From a5b3211f072d982e1ee136e864f153836c76a5ca Mon Sep 17 00:00:00 2001 From: Xisco Fauli Date: Thu, 5 Nov 2020 20:35:09 +0100 Subject: 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 Tested-by: Xisco Fauli --- sc/inc/globstr.hrc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'sc/inc/globstr.hrc') diff --git a/sc/inc/globstr.hrc b/sc/inc/globstr.hrc index 9cc238bee9ba..93972e0a1044 100644 --- a/sc/inc/globstr.hrc +++ b/sc/inc/globstr.hrc @@ -269,8 +269,7 @@ #define STR_EXPORT_DBF NC_("STR_EXPORT_DBF", "DBase export") #define STR_EXPORT_DIF NC_("STR_EXPORT_DIF", "Dif Export") #define STR_IMPORT_DIF NC_("STR_IMPORT_DIF", "Dif Import") -#define STR_STYLENAME_STANDARD_CELL NC_("STR_STYLENAME_STANDARD", "Default Cell Style") -#define STR_STYLENAME_STANDARD_PAGE NC_("STR_STYLENAME_STANDARD", "Default Page Style") +#define STR_STYLENAME_STANDARD NC_("STR_STYLENAME_STANDARD", "Default") #define STR_STYLENAME_HEADING NC_("STR_STYLENAME_HEADING", "Heading") #define STR_STYLENAME_HEADING_1 NC_("STR_STYLENAME_HEADING_1", "Heading 1") #define STR_STYLENAME_HEADING_2 NC_("STR_STYLENAME_HEADING_2", "Heading 2") -- cgit v1.2.3