[Libreoffice-commits] core.git: Branch 'libreoffice-7-3' - sfx2/source

[Kevin Suo (via logerrit)]

 sfx2/source/doc/doctempl.cxx |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

New commits:
commit ddd45141f5d20dcba22a379797be62eab7b93d73
Author:     Kevin Suo <suokunl...@126.com>
AuthorDate: Fri Sep 30 14:21:10 2022 +0800
Commit:     Adolfo Jayme Barrientos <fit...@ubuntu.com>
CommitDate: Wed Oct 5 05:33:44 2022 +0200

    Templates: Make localized names for "Simple" and "BPMN" show on the UI
    
    Currently there are 32 localized template name strings defined in:
    include/sfx2/strings.hrc. However, in sfx2/source/doc/doctempl.cxx
    only 30 were used. This makes STR_TEMPLATE_NAME31 ("Simple") and
    STR_TEMPLATE_NAME32 ("BPMN"), although already localized, not show up
    on the Template Manager UI.
    
    This patch adds these two strings in the sfx2/source/doc/doctempl.cxx,
    so that they properly show as localized strings on the UI.
    
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140785
    Tested-by: Jenkins
    Reviewed-by: Rafael Lima <rafael.palma.l...@gmail.com>
    Reviewed-by: Laurent Balland <laurent.ball...@mailo.fr>
    (cherry picked from commit 244063d03117119d048376c84e22cf47c4abd250)
    
    Conflicts:
            sfx2/source/doc/doctempl.cxx
    
    Change-Id: I64bb28cfe0a4d3b4b41c9114de7223014f6a3cfe
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140945
    Tested-by: Jenkins
    Reviewed-by: Adolfo Jayme Barrientos <fit...@ubuntu.com>

diff --git a/sfx2/source/doc/doctempl.cxx b/sfx2/source/doc/doctempl.cxx
index a7fcb4c8b3fd..edb401aa7363 100644
--- a/sfx2/source/doc/doctempl.cxx
+++ b/sfx2/source/doc/doctempl.cxx
@@ -492,7 +492,9 @@ OUString SfxDocumentTemplates::ConvertResourceString(const 
OUString& rString)
         u"" STR_TEMPLATE_NAME27_DEF,
         u"" STR_TEMPLATE_NAME28_DEF,
         u"" STR_TEMPLATE_NAME29_DEF,
-        u"" STR_TEMPLATE_NAME30_DEF
+        u"" STR_TEMPLATE_NAME30_DEF,
+        u"" STR_TEMPLATE_NAME31_DEF,
+        u"" STR_TEMPLATE_NAME32_DEF,
     };
 
     TranslateId STR_TEMPLATE_NAME[] =
@@ -526,7 +528,9 @@ OUString SfxDocumentTemplates::ConvertResourceString(const 
OUString& rString)
         STR_TEMPLATE_NAME27,
         STR_TEMPLATE_NAME28,
         STR_TEMPLATE_NAME29,
-        STR_TEMPLATE_NAME30
+        STR_TEMPLATE_NAME30,
+        STR_TEMPLATE_NAME31,
+        STR_TEMPLATE_NAME32,
     };
 
     static_assert(SAL_N_ELEMENTS(aTemplateNames) == 
SAL_N_ELEMENTS(STR_TEMPLATE_NAME));