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

[Gabor Kelemen (via logerrit)]

 chart2/inc/strings.hrc         |    4 ++--
 sw/qa/extras/layout/layout.cxx |   15 ++++++---------
 2 files changed, 8 insertions(+), 11 deletions(-)

New commits:
commit 4fe32e65cc56cec959af811a9a99348e764e4966
Author:     Gabor Kelemen <kelemen.gabor2 at nisz.hu>
AuthorDate: Thu Jul 25 12:49:15 2019 +0200
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Tue Jul 30 16:48:06 2019 +0200

    tdf#126524 Use shorter default name for unnamed data series
    
    Change-Id: I2c67a50c36f6b09dc15d70ec44b95d47792b33e2
    Reviewed-on: https://gerrit.libreoffice.org/76298
    Tested-by: Jenkins
    Reviewed-by: Andras Timar <andras.timar at collabora.com>

diff --git a/chart2/inc/strings.hrc b/chart2/inc/strings.hrc
index c991de019bc2..163b0f44e902 100644
--- a/chart2/inc/strings.hrc
+++ b/chart2/inc/strings.hrc
@@ -134,8 +134,8 @@
 #define STR_DATA_ROLE_MIN                           NC_("STR_DATA_ROLE_MIN", "Low Values")
 #define STR_DATA_ROLE_MAX                           NC_("STR_DATA_ROLE_MAX", "High Values")
 #define STR_DATA_ROLE_CATEGORIES                    NC_("STR_DATA_ROLE_CATEGORIES", "Categories")
-#define STR_DATA_UNNAMED_SERIES                     NC_("STR_DATA_UNNAMED_SERIES", "Unnamed Series")
-#define STR_DATA_UNNAMED_SERIES_WITH_INDEX          NC_("STR_DATA_UNNAMED_SERIES_WITH_INDEX", "Unnamed Series %NUMBER")
+#define STR_DATA_UNNAMED_SERIES                     NC_("STR_DATA_UNNAMED_SERIES", "Series")
+#define STR_DATA_UNNAMED_SERIES_WITH_INDEX          NC_("STR_DATA_UNNAMED_SERIES_WITH_INDEX", "Series%NUMBER")
 #define STR_DATA_SELECT_RANGE_FOR_SERIES            NC_("STR_DATA_SELECT_RANGE_FOR_SERIES", "Select Range for %VALUETYPE of %SERIESNAME")
 #define STR_DATA_SELECT_RANGE_FOR_CATEGORIES        NC_("STR_DATA_SELECT_RANGE_FOR_CATEGORIES", "Select Range for Categories")
 #define STR_DATA_SELECT_RANGE_FOR_DATALABELS        NC_("STR_DATA_SELECT_RANGE_FOR_DATALABELS", "Select Range for data labels")
diff --git a/sw/qa/extras/layout/layout.cxx b/sw/qa/extras/layout/layout.cxx
index eec90ca933b8..84728d8e2254 100644
--- a/sw/qa/extras/layout/layout.cxx
+++ b/sw/qa/extras/layout/layout.cxx
@@ -2230,17 +2230,14 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf75659)
     xmlDocPtr pXmlDoc = dumpAndParse(dumper, *xMetaFile);
     CPPUNIT_ASSERT(pXmlDoc);
 
-    assertXPathContent(pXmlDoc,
-                       "/metafile/push[1]/push[1]/push[1]/push[4]/push[1]/textarray[17]/text",
-                       "Unnamed Series 1");
+    assertXPathContent(
+        pXmlDoc, "/metafile/push[1]/push[1]/push[1]/push[4]/push[1]/textarray[17]/text", "Series1");
 
-    assertXPathContent(pXmlDoc,
-                       "/metafile/push[1]/push[1]/push[1]/push[4]/push[1]/textarray[18]/text",
-                       "Unnamed Series 2");
+    assertXPathContent(
+        pXmlDoc, "/metafile/push[1]/push[1]/push[1]/push[4]/push[1]/textarray[18]/text", "Series2");
 
-    assertXPathContent(pXmlDoc,
-                       "/metafile/push[1]/push[1]/push[1]/push[4]/push[1]/textarray[19]/text",
-                       "Unnamed Series 3");
+    assertXPathContent(
+        pXmlDoc, "/metafile/push[1]/push[1]/push[1]/push[4]/push[1]/textarray[19]/text", "Series3");
     // These failed, if the legend names are empty strings.
 }