[Libreoffice-commits] core.git: include/svx svx/source

[Armin Le Grand (Allotropia) (via logerrit)]

 include/svx/strings.hrc       |    1 +
 svx/source/svdraw/svdogrp.cxx |    7 ++++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 419fa8b13eef10297a5fd44012e89fd7af53cf9d
Author:     Armin Le Grand (Allotropia) <armin.le.gr...@me.com>
AuthorDate: Fri Feb 25 15:08:00 2022 +0100
Commit:     Armin Le Grand <armin.le.gr...@me.com>
CommitDate: Fri Feb 25 18:09:04 2022 +0100

    Advanced Diagram support: Support Diagram info at ObjName
    
    Change-Id: I30b1ca95d09ec73d3c21503cc3506141e845bac3
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130537
    Tested-by: Jenkins
    Reviewed-by: Armin Le Grand <armin.le.gr...@me.com>

diff --git a/include/svx/strings.hrc b/include/svx/strings.hrc
index a368a4c77906..37b9359959b4 100644
--- a/include/svx/strings.hrc
+++ b/include/svx/strings.hrc
@@ -25,6 +25,7 @@
 #define STR_ObjNameSingulNONE                               
NC_("STR_ObjNameSingulNONE", "Drawing object")
 #define STR_ObjNamePluralNONE                               
NC_("STR_ObjNamePluralNONE", "Drawing objects")
 #define STR_ObjNameSingulGRUP                               
NC_("STR_ObjNameSingulGRUP", "Group object")
+#define STR_ObjNameSingulDIAGRAM                            
NC_("STR_ObjNameSingulDIAGAM", "Diagram")
 #define STR_ObjNamePluralGRUP                               
NC_("STR_ObjNamePluralGRUP", "Group objects")
 #define STR_ObjNameSingulGRUPEMPTY                          
NC_("STR_ObjNameSingulGRUPEMPTY", "Blank group object")
 #define STR_ObjNamePluralGRUPEMPTY                          
NC_("STR_ObjNamePluralGRUPEMPTY", "Blank group objects")
diff --git a/svx/source/svdraw/svdogrp.cxx b/svx/source/svdraw/svdogrp.cxx
index dae41c92b2e8..d4b7d08c3328 100644
--- a/svx/source/svdraw/svdogrp.cxx
+++ b/svx/source/svdraw/svdogrp.cxx
@@ -276,7 +276,10 @@ OUString SdrObjGroup::TakeObjNameSingul() const
     }
     else
     {
-        sName = SvxResId(STR_ObjNameSingulGRUP);
+        if(isDiagram())
+            sName = SvxResId(STR_ObjNameSingulDIAGRAM);
+        else
+            sName = SvxResId(STR_ObjNameSingulGRUP);
     }
 
     const OUString aName(GetName());
@@ -292,6 +295,8 @@ OUString SdrObjGroup::TakeObjNamePlural() const
 {
     if(0 == GetObjCount())
         return SvxResId(STR_ObjNamePluralGRUPEMPTY);
+    if(isDiagram())
+        return SvxResId(RID_GALLERYSTR_THEME_DIAGRAMS);
     return SvxResId(STR_ObjNamePluralGRUP);
 }