From 94614dc88d78c68d687222d2eb205605e1bd0c51 Mon Sep 17 00:00:00 2001 From: Maxim Monastirsky Date: Mon, 30 Jul 2018 00:27:20 +0300 Subject: tdf#108461 Correct use of the default style The underlying issue was fixed by Miklos in commit 9d754a59154c40235c240bb0e7f47a2006fa85bd ("sw: give the 'Default Style' char style a programmatic name"). What left is to actually use the internal name in various UI elements. Also removed a comment that tells to not rename the default style, which isn't relevant anymore, as we no longer write the UI name into files. Change-Id: Ie2ab632e40b4fc6295f2c9d1a1f1f2358ab38e52 Reviewed-on: https://gerrit.libreoffice.org/58311 Tested-by: Jenkins Reviewed-by: Maxim Monastirsky --- officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu | 4 ++-- sw/inc/strings.hrc | 1 - sw/uiconfig/sglobal/menubar/menubar.xml | 2 +- sw/uiconfig/sweb/menubar/menubar.xml | 2 +- sw/uiconfig/swriter/menubar/menubar.xml | 2 +- sw/uiconfig/swriter/popupmenu/table.xml | 2 +- sw/uiconfig/swriter/popupmenu/text.xml | 2 +- sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui | 2 +- sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui | 2 +- sw/uiconfig/swriter/ui/notebookbar_groups.ui | 2 +- sw/uiconfig/swxform/menubar/menubar.xml | 2 +- 11 files changed, 11 insertions(+), 12 deletions(-) diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu index 286f44343fa9..b185aac57576 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu @@ -3053,7 +3053,7 @@ 9 - + Default ~Character @@ -3066,7 +3066,7 @@ Default Character Style - .uno:StyleApply?Style:string=Default Style&FamilyName:string=CharacterStyles + .uno:StyleApply?Style:string=Standard&FamilyName:string=CharacterStyles 9 diff --git a/sw/inc/strings.hrc b/sw/inc/strings.hrc index 9be1de51bfe9..7a35d1ebe1d2 100644 --- a/sw/inc/strings.hrc +++ b/sw/inc/strings.hrc @@ -59,7 +59,6 @@ #define STR_POOLFRM_WATERSIGN NC_("STR_POOLFRM_WATERSIGN", "Watermark") #define STR_POOLFRM_LABEL NC_("STR_POOLFRM_LABEL", "Labels") // Template names -// tdf#107211 please don't change STANDARD, except back to "Default" #define STR_POOLCOLL_STANDARD NC_("STR_POOLCOLL_STANDARD", "Default Style") #define STR_POOLCOLL_TEXT NC_("STR_POOLCOLL_TEXT", "Text Body") #define STR_POOLCOLL_TEXT_IDENT NC_("STR_POOLCOLL_TEXT_IDENT", "First Line Indent") diff --git a/sw/uiconfig/sglobal/menubar/menubar.xml b/sw/uiconfig/sglobal/menubar/menubar.xml index c889ba6f87c2..4e3b76f70398 100644 --- a/sw/uiconfig/sglobal/menubar/menubar.xml +++ b/sw/uiconfig/sglobal/menubar/menubar.xml @@ -557,7 +557,7 @@ - + diff --git a/sw/uiconfig/sweb/menubar/menubar.xml b/sw/uiconfig/sweb/menubar/menubar.xml index 1b5624f22169..99dba081a7f3 100644 --- a/sw/uiconfig/sweb/menubar/menubar.xml +++ b/sw/uiconfig/sweb/menubar/menubar.xml @@ -432,7 +432,7 @@ - + diff --git a/sw/uiconfig/swriter/menubar/menubar.xml b/sw/uiconfig/swriter/menubar/menubar.xml index f2148b3fa3fe..532e8b8d6c73 100644 --- a/sw/uiconfig/swriter/menubar/menubar.xml +++ b/sw/uiconfig/swriter/menubar/menubar.xml @@ -557,7 +557,7 @@ - + diff --git a/sw/uiconfig/swriter/popupmenu/table.xml b/sw/uiconfig/swriter/popupmenu/table.xml index bdd835d4960c..92d143884e9d 100644 --- a/sw/uiconfig/swriter/popupmenu/table.xml +++ b/sw/uiconfig/swriter/popupmenu/table.xml @@ -78,7 +78,7 @@ - + diff --git a/sw/uiconfig/swriter/popupmenu/text.xml b/sw/uiconfig/swriter/popupmenu/text.xml index 3c020ef793a7..a8462627225b 100644 --- a/sw/uiconfig/swriter/popupmenu/text.xml +++ b/sw/uiconfig/swriter/popupmenu/text.xml @@ -48,7 +48,7 @@ - + diff --git a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui index 4835169624e6..7f82770797ba 100644 --- a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui +++ b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui @@ -2716,7 +2716,7 @@ True False - .uno:StyleApply?Style:string=Default Style&FamilyName:string=CharacterStyles + .uno:StyleApply?Style:string=Standard&FamilyName:string=CharacterStyles diff --git a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui index 28180fc77101..d5841adec13f 100644 --- a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui +++ b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui @@ -2737,7 +2737,7 @@ True False - .uno:StyleApply?Style:string=Default Style&FamilyName:string=CharacterStyles + .uno:StyleApply?Style:string=Standard&FamilyName:string=CharacterStyles diff --git a/sw/uiconfig/swriter/ui/notebookbar_groups.ui b/sw/uiconfig/swriter/ui/notebookbar_groups.ui index 3830b30994a0..315e8e8a2a9d 100644 --- a/sw/uiconfig/swriter/ui/notebookbar_groups.ui +++ b/sw/uiconfig/swriter/ui/notebookbar_groups.ui @@ -366,7 +366,7 @@ True False Default Character - .uno:StyleApply?Style:string=Default Style&FamilyName:string=CharacterStyles + .uno:StyleApply?Style:string=Standard&FamilyName:string=CharacterStyles True diff --git a/sw/uiconfig/swxform/menubar/menubar.xml b/sw/uiconfig/swxform/menubar/menubar.xml index fe7d7e652a2d..4faa10e6adce 100644 --- a/sw/uiconfig/swxform/menubar/menubar.xml +++ b/sw/uiconfig/swxform/menubar/menubar.xml @@ -557,7 +557,7 @@ - + -- cgit v1.2.3