Resolves tdf#155926 - Rename "Line Style 9"
Sparse dash
Change-Id: Ia676358ea0de4437dd2e5f210b26a4e97f8d8758
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156090
Tested-by: Jenkins
Reviewed-by: Heiko Tietze <heiko.tietze@documentfoundation.org>
diff --git a/extras/source/palettes/standard.sod b/extras/source/palettes/standard.sod
index 7b68ea0..e664ff5 100644
--- a/extras/source/palettes/standard.sod
+++ b/extras/source/palettes/standard.sod
@@ -28,7 +28,7 @@
<draw:stroke-dash draw:name="Fine Dashed" draw:style="rect" draw:dots1="1" draw:dots1-length="0.2inch" draw:dots2="1" draw:dots2-length="0.2inch" draw:distance="0.2inch"/>
<draw:stroke-dash draw:name="Fine Dashed (var)" draw:style="rect" draw:dots1="1" draw:dots1-length="197%" draw:distance="197%"/>
<draw:stroke-dash draw:name="Dashed (var)" draw:style="rect" draw:dots1="1" draw:dots1-length="197%" draw:distance="127%"/>
<draw:stroke-dash draw:name="Line Style 9" draw:style="rect" draw:dots1="1" draw:dots1-length="197%" draw:distance="120%"/>
<draw:stroke-dash draw:name="Sparse Dash" draw:style="rect" draw:dots1="1" draw:dots1-length="197%" draw:distance="120%"/>
<draw:stroke-dash draw:name="3 Dashes 3 Dots (var)" draw:style="rect" draw:dots1="3" draw:dots1-length="197%" draw:dots2="3" draw:distance="100%"/>
<draw:stroke-dash draw:name="Ultrafine 2 Dots 3 Dashes" draw:style="rect" draw:dots1="2" draw:dots1-length="0.0201inch" draw:dots2="3" draw:dots2-length="0.1inch" draw:distance="0.05inch"/>
diff --git a/filter/source/xslt/import/uof/uof2odf_spreadsheet.xsl b/filter/source/xslt/import/uof/uof2odf_spreadsheet.xsl
index 95d0d6b..dbd1f54 100644
--- a/filter/source/xslt/import/uof/uof2odf_spreadsheet.xsl
+++ b/filter/source/xslt/import/uof/uof2odf_spreadsheet.xsl
@@ -522,7 +522,7 @@
<draw:stroke-dash draw:name="Fine_20_Dashed_20__28_var_29_" draw:display-name="Fine Dashed (var)" draw:style="rect" draw:dots1="1" draw:dots1-length="197%" draw:distance="197%"/>
<draw:stroke-dash draw:name="Fine_20_Dotted" draw:display-name="Fine Dotted" draw:style="rect" draw:dots1="1" draw:distance="0.457cm"/>
<draw:stroke-dash draw:name="Line_20_with_20_Fine_20_Dots" draw:display-name="Line with Fine Dots" draw:style="rect" draw:dots1="1" draw:dots1-length="2.007cm" draw:dots2="10" draw:distance="0.152cm"/>
<draw:stroke-dash draw:name="Line_20_Style_20_9" draw:display-name="Line Style 9" draw:style="rect" draw:dots1="1" draw:dots1-length="197%" draw:distance="120%"/>
<draw:stroke-dash draw:name="Sparse_20_Dash" draw:display-name="Sparse Dash" draw:style="rect" draw:dots1="1" draw:dots1-length="197%" draw:distance="120%"/>
<draw:stroke-dash draw:name="_33__20_Dashes_20_3_20_Dots_20__28_var_29_" draw:display-name="3 Dashes 3 Dots (var)" draw:style="rect" draw:dots1="3" draw:dots1-length="197%" draw:dots2="3" draw:distance="100%"/>
<draw:stroke-dash draw:name="_32__20_Dots_20_1_20_Dash" draw:display-name="2 Dots 1 Dash" draw:style="rect" draw:dots1="2" draw:dots2="1" draw:dots2-length="0.203cm" draw:distance="0.203cm"/>
<draw:stroke-dash draw:name="Ultrafine_20_Dotted_20__28_var_29_" draw:display-name="Ultrafine Dotted (var)" draw:style="rect" draw:dots1="1" draw:distance="50%"/>
@@ -6779,7 +6779,7 @@
<draw:stroke-dash draw:name="Fine_20_Dashed_20__28_var_29_" draw:display-name="Fine Dashed (var)" draw:style="rect" draw:dots1="1" draw:dots1-length="197%" draw:distance="197%"/>
<draw:stroke-dash draw:name="Fine_20_Dotted" draw:display-name="Fine Dotted" draw:style="rect" draw:dots1="1" draw:distance="0.457cm"/>
<draw:stroke-dash draw:name="Line_20_with_20_Fine_20_Dots" draw:display-name="Line with Fine Dots" draw:style="rect" draw:dots1="1" draw:dots1-length="2.007cm" draw:dots2="10" draw:distance="0.152cm"/>
<draw:stroke-dash draw:name="Line_20_Style_20_9" draw:display-name="Line Style 9" draw:style="rect" draw:dots1="1" draw:dots1-length="197%" draw:distance="120%"/>
<draw:stroke-dash draw:name="Sparse_20_Dash" draw:display-name="Sparse Dash" draw:style="rect" draw:dots1="1" draw:dots1-length="197%" draw:distance="120%"/>
<draw:stroke-dash draw:name="_33__20_Dashes_20_3_20_Dots_20__28_var_29_" draw:display-name="3 Dashes 3 Dots (var)" draw:style="rect" draw:dots1="3" draw:dots1-length="197%" draw:dots2="3" draw:distance="100%"/>
<draw:stroke-dash draw:name="_32__20_Dots_20_1_20_Dash" draw:display-name="2 Dots 1 Dash" draw:style="rect" draw:dots1="2" draw:dots2="1" draw:dots2-length="0.203cm" draw:distance="0.203cm"/>
<draw:stroke-dash draw:name="Ultrafine_20_Dotted_20__28_var_29_" draw:display-name="Ultrafine Dotted (var)" draw:style="rect" draw:dots1="1" draw:distance="50%"/>
diff --git a/include/svx/strings.hrc b/include/svx/strings.hrc
index 80066b3..d0a7390 100644
--- a/include/svx/strings.hrc
+++ b/include/svx/strings.hrc
@@ -920,7 +920,7 @@
#define RID_SVXSTR_DASH12 NC_("RID_SVXSTR_DASH12", "Fine Dashed")
#define RID_SVXSTR_DASH13 NC_("RID_SVXSTR_DASH13", "Fine Dashed")
#define RID_SVXSTR_DASH14 NC_("RID_SVXSTR_DASH14", "Dashed")
#define RID_SVXSTR_DASH15 NC_("RID_SVXSTR_DASH15", "Line Style 9")
#define RID_SVXSTR_DASH15 NC_("RID_SVXSTR_DASH15", "Sparse Dash")
#define RID_SVXSTR_DASH16 NC_("RID_SVXSTR_DASH16", "3 Dashes 3 Dots")
#define RID_SVXSTR_DASH17 NC_("RID_SVXSTR_DASH17", "Ultrafine 2 Dots 3 Dashes")
#define RID_SVXSTR_DASH18 NC_("RID_SVXSTR_DASH18", "2 Dots 1 Dash")
diff --git a/oox/source/drawingml/lineproperties.cxx b/oox/source/drawingml/lineproperties.cxx
index 5d818a2..d52bf07 100644
--- a/oox/source/drawingml/lineproperties.cxx
+++ b/oox/source/drawingml/lineproperties.cxx
@@ -130,7 +130,7 @@ void lclRecoverStandardDashStyles(LineDash& orLineDash, sal_Int32 nLineWidth)
// Use same ersatz for hairline as in export.
double fWidthHelp = nLineWidth == 0 ? 26.95/100.0 : nLineWidth / 100.0;
// start with (var) cases, because they have no rounding problems
// "Fine Dashed", "Line Style 9" and "Dashed (var)" need no recover
// "Fine Dashed", "Sparse Dash" and "Dashed (var)" need no recover
if (nDots == 3 && nDotLen == 197 &&nDashes == 3 && nDashLen == 100 && nDistance == 100)
{ // "3 Dashes 3 Dots (var)"
orLineDash.DashLen = 0;
diff --git a/svx/inc/strings.hxx b/svx/inc/strings.hxx
index 17302aa..a9bd9eb 100644
--- a/svx/inc/strings.hxx
+++ b/svx/inc/strings.hxx
@@ -331,7 +331,7 @@ inline constexpr OUStringLiteral RID_SVXSTR_DASH11_DEF = u
inline constexpr OUStringLiteral RID_SVXSTR_DASH12_DEF = u"Fine Dashed";
inline constexpr OUStringLiteral RID_SVXSTR_DASH13_DEF = u"Fine Dashed (var)";
inline constexpr OUStringLiteral RID_SVXSTR_DASH14_DEF = u"Dashed (var)";
inline constexpr OUStringLiteral RID_SVXSTR_DASH15_DEF = u"Line Style 9";
inline constexpr OUStringLiteral RID_SVXSTR_DASH15_DEF = u"Sparse Dash";
inline constexpr OUStringLiteral RID_SVXSTR_DASH16_DEF = u"3 Dashes 3 Dots (var)";
inline constexpr OUStringLiteral RID_SVXSTR_DASH17_DEF = u"Ultrafine 2 Dots 3 Dashes";
inline constexpr OUStringLiteral RID_SVXSTR_DASH18_DEF = u"2 Dots 1 Dash";
