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

[Seth Chaiklin (via logerrit)]

 sw/inc/strings.hrc                  |    4 ++--
 sw/source/uibase/utlui/attrdesc.cxx |    3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

New commits:
commit f92510321dc860f43e471473db67167c0fefcbea
Author:     Seth Chaiklin <sdc.blanco at youmail.dk>
AuthorDate: Tue Mar 9 11:43:55 2021 +0100
Commit:     Seth Chaiklin <sdc.blanco at youmail.dk>
CommitDate: Thu Mar 11 15:37:42 2021 +0100

    tdf#140845 labelling improvements for List Styles in Contains
    
       move hard-coded formatting of liststyle out of
       sw/source/uibase/utlui/attrdesc.cxx and into sw/inc/strings.hrc,
       so that translators can customize as needed.
    
       In sw/inc/strings.hrc:
          * "Numbering" -> "List Style: (%LISTSTYLENAME)"
          * "no numbering" -> "List Style: (None)"
               (to be consistent with setting in "List Style" control
                and to keep consistent appearance in Contains)
    
       Thanks to Mike Kaganski for assistance.
    
    Change-Id: I9d2b6507082fea06665d0d8a3465c314a5d894c9
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112213
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>
    Reviewed-by: Seth Chaiklin <sdc.blanco at youmail.dk>
    Tested-by: Seth Chaiklin <sdc.blanco at youmail.dk>

diff --git a/sw/inc/strings.hrc b/sw/inc/strings.hrc
index 4d81ef4fd966..008b077781a1 100644
--- a/sw/inc/strings.hrc
+++ b/sw/inc/strings.hrc
@@ -1126,8 +1126,8 @@
 #define STR_MAX_FTN_HEIGHT                      NC_("STR_MAX_FTN_HEIGHT", "Max. footnote area:")
 #define STR_EDIT_IN_READONLY                    NC_("STR_EDIT_IN_READONLY", "Editable in read-only document")
 #define STR_LAYOUT_SPLIT                        NC_("STR_LAYOUT_SPLIT", "Split")
-#define STR_NUMRULE_ON                          NC_("STR_NUMRULE_ON", "Numbering")
-#define STR_NUMRULE_OFF                         NC_("STR_NUMRULE_OFF", "no numbering")
+#define STR_NUMRULE_ON                          NC_("STR_NUMRULE_ON", "List Style: (%LISTSTYLENAME)")
+#define STR_NUMRULE_OFF                         NC_("STR_NUMRULE_OFF", "List Style: (None)")
 #define STR_CONNECT1                            NC_("STR_CONNECT1", "linked to ")
 #define STR_CONNECT2                            NC_("STR_CONNECT2", "and ")
 #define STR_LINECOUNT                           NC_("STR_LINECOUNT", "Count lines")
diff --git a/sw/source/uibase/utlui/attrdesc.cxx b/sw/source/uibase/utlui/attrdesc.cxx
index 861697d5e329..e35e8d31e01c 100644
--- a/sw/source/uibase/utlui/attrdesc.cxx
+++ b/sw/source/uibase/utlui/attrdesc.cxx
@@ -190,8 +190,7 @@ bool SwNumRuleItem::GetPresentation
 )   const
 {
     if( !GetValue().isEmpty() )
-        rText = SwResId( STR_NUMRULE_ON ) +
-            "(" + GetValue() + ")";
+        rText = SwResId( STR_NUMRULE_ON ).replaceFirst("%LISTSTYLENAME", GetValue());
     else
         rText = SwResId( STR_NUMRULE_OFF );
     return true;