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

[Heiko Tietze (via logerrit)]

 include/svx/strings.hrc        |    2 ++
 svx/source/svdraw/svdograf.cxx |   22 ++++++++++++++++------
 2 files changed, 18 insertions(+), 6 deletions(-)

New commits:
commit 22c88a039a557343ab11fbf7abc8f2a087e1a3c2
Author:     Heiko Tietze <tietze.heiko at gmail.com>
AuthorDate: Thu Oct 29 11:24:20 2020 +0100
Commit:     Tomaž Vajngerl <quikee at gmail.com>
CommitDate: Mon Nov 2 09:36:57 2020 +0100

    Resolves tdf#137813 - Status bar info 'PDF selected'
    
    Change-Id: I60cc75dfe8e63d7d545211a9bf58efc9d34d51ac
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104996
    Tested-by: Jenkins
    Reviewed-by: Tomaž Vajngerl <quikee at gmail.com>

diff --git a/include/svx/strings.hrc b/include/svx/strings.hrc
index 1e8b33826120..1c1f02c9dce4 100644
--- a/include/svx/strings.hrc
+++ b/include/svx/strings.hrc
@@ -116,6 +116,8 @@
 #define STR_ObjNamePluralGRAFWMF                            NC_("STR_ObjNamePluralGRAFWMF", "WMFs")
 #define STR_ObjNameSingulGRAFEMF                            NC_("STR_ObjNameSingulGRAFEMF", "EMF")
 #define STR_ObjNamePluralGRAFEMF                            NC_("STR_ObjNamePluralGRAFEMF", "EMFs")
+#define STR_ObjNameSingulGRAFPDF                            NC_("STR_ObjNameSingulGRAFEMF", "PDF")
+#define STR_ObjNamePluralGRAFPDF                            NC_("STR_ObjNamePluralGRAFEMF", "PDFs")
 #define STR_ObjNameSingulOLE2                               NC_("STR_ObjNameSingulOLE2", "embedded object (OLE)")
 #define STR_ObjNamePluralOLE2                               NC_("STR_ObjNamePluralOLE2", "Embedded objects (OLE)")
 #define STR_ObjNameSingulUno                                NC_("STR_ObjNameSingulUno", "Control")
diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx
index 3bea3d14b642..2359380c95e0 100644
--- a/svx/source/svdraw/svdograf.cxx
+++ b/svx/source/svdraw/svdograf.cxx
@@ -561,6 +561,11 @@ OUString SdrGrafObj::TakeObjNameSingul() const
     {
         switch (rVectorGraphicDataPtr->getVectorGraphicDataType())
         {
+        case VectorGraphicDataType::Svg:
+        {
+            sName.append(SvxResId(STR_ObjNameSingulGRAFSVG));
+            break;
+        }
         case VectorGraphicDataType::Wmf:
         {
             sName.append(SvxResId(STR_ObjNameSingulGRAFWMF));
@@ -571,12 +576,12 @@ OUString SdrGrafObj::TakeObjNameSingul() const
             sName.append(SvxResId(STR_ObjNameSingulGRAFEMF));
             break;
         }
-        default: // case VectorGraphicDataType::Svg:
+        case VectorGraphicDataType::Pdf:
         {
-            sName.append(SvxResId(STR_ObjNameSingulGRAFSVG));
+            sName.append(SvxResId(STR_ObjNameSingulGRAFPDF));
             break;
         }
-        }
+        } //no default, see tdf#137813
     }
     else
     {
@@ -631,6 +636,11 @@ OUString SdrGrafObj::TakeObjNamePlural() const
     {
         switch (rVectorGraphicDataPtr->getVectorGraphicDataType())
         {
+        case VectorGraphicDataType::Svg:
+        {
+            sName.append(SvxResId(STR_ObjNamePluralGRAFSVG));
+            break;
+        }
         case VectorGraphicDataType::Wmf:
         {
             sName.append(SvxResId(STR_ObjNamePluralGRAFWMF));
@@ -641,12 +651,12 @@ OUString SdrGrafObj::TakeObjNamePlural() const
             sName.append(SvxResId(STR_ObjNamePluralGRAFEMF));
             break;
         }
-        default: // case VectorGraphicDataType::Svg:
+        case VectorGraphicDataType::Pdf:
         {
-            sName.append(SvxResId(STR_ObjNamePluralGRAFSVG));
+            sName.append(SvxResId(STR_ObjNamePluralGRAFPDF));
             break;
         }
-        }
+        } //no default, see tdf#137813
     }
     else
     {