commit 4fe32e65cc56cec959af811a9a99348e764e4966
author Gabor Kelemen <kelemen.gabor2@nisz.hu> Thu Jul 25 12:49:15 2019 +0200
committer Andras Timar <andras.timar@collabora.com> Tue Jul 30 16:48:06 2019 +0200
tree 062f414376f456801e5566894b36ed28a15afb84
parent ee1900a01c61e656de5b3c14446b9513cf83c7fc

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@collabora.com>

chart2/inc/strings.hrc

diff --git a/chart2/inc/strings.hrc b/chart2/inc/strings.hrc
index c991de0..163b0f4 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")

sw/qa/extras/layout/layout.cxx

diff --git a/sw/qa/extras/layout/layout.cxx b/sw/qa/extras/layout/layout.cxx
index eec90ca..84728d8 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.
}