include/svx/strings.hrc | 35 ++++++++++++++++++++++-------------
svx/inc/strings.hxx | 35 ++++++++++++++++++++++-------------
svx/source/unodraw/unoprov.cxx | 22 ++++++++++++++++++++--
svx/source/xoutdev/xattr.cxx | 2 +-
4 files changed, 65 insertions(+), 29 deletions(-)
New commits:
commit 637df9463d0d901616a5d588c71da84a99b9cb42
Author: Julien Nabet <serval2...@yahoo.fr>
AuthorDate: Sat Feb 1 00:42:41 2020 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Thu Mar 26 15:24:36 2020 +0100
tdf#130074: add missing translations (line styles part)
+resorting to follow extras/source/palettes/standard.sod order
Change-Id: I3246490578fb4b1af46bfe99b59bbb1e8a36ea8f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87792
Tested-by: Jenkins
Tested-by: Caolán McNamara <caol...@redhat.com>
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/include/svx/strings.hrc b/include/svx/strings.hrc
index 6f42e0eec77a..b03d2daa4206 100644
--- a/include/svx/strings.hrc
+++ b/include/svx/strings.hrc
@@ -883,19 +883,28 @@
#define RID_SVXSTR_BMP76
NC_("RID_SVXSTR_BMP76", "Dashed Dotted")
#define RID_SVXSTR_BMP77
NC_("RID_SVXSTR_BMP77", "Dashed Dotted Upward Diagonal")
#define RID_SVXSTR_BMP78
NC_("RID_SVXSTR_BMP78", "Solid Dotted")
-#define RID_SVXSTR_DASH0
NC_("RID_SVXSTR_DASH0", "Ultrafine Dashed")
-#define RID_SVXSTR_DASH1
NC_("RID_SVXSTR_DASH1", "Fine Dashed")
-#define RID_SVXSTR_DASH2
NC_("RID_SVXSTR_DASH2", "2 Dots 3 Dashes")
-#define RID_SVXSTR_DASH3
NC_("RID_SVXSTR_DASH3", "Fine Dotted")
-#define RID_SVXSTR_DASH4
NC_("RID_SVXSTR_DASH4", "Line with Fine Dots")
-#define RID_SVXSTR_DASH5
NC_("RID_SVXSTR_DASH5", "Fine Dashed")
-#define RID_SVXSTR_DASH6
NC_("RID_SVXSTR_DASH6", "3 Dashes 3 Dots")
-#define RID_SVXSTR_DASH7
NC_("RID_SVXSTR_DASH7", "Ultrafine Dotted")
-#define RID_SVXSTR_DASH8
NC_("RID_SVXSTR_DASH8", "Line Style 9")
-#define RID_SVXSTR_DASH9
NC_("RID_SVXSTR_DASH9", "2 Dots 1 Dash")
-#define RID_SVXSTR_DASH10
NC_("RID_SVXSTR_DASH10", "Dashed")
-#define RID_SVXSTR_DASH11
NC_("RID_SVXSTR_DASH11", "Dashed")
-#define RID_SVXSTR_DASH12
NC_("RID_SVXSTR_DASH12", "Line Style")
+#define RID_SVXSTR_DASH0
NC_("RID_SVXSTR_DASH0", "Dot")
+#define RID_SVXSTR_DASH1
NC_("RID_SVXSTR_DASH1", "Long Dot")
+#define RID_SVXSTR_DASH2
NC_("RID_SVXSTR_DASH2", "Double Dot")
+#define RID_SVXSTR_DASH3
NC_("RID_SVXSTR_DASH3", "Dash")
+#define RID_SVXSTR_DASH4
NC_("RID_SVXSTR_DASH4", "Long Dash")
+#define RID_SVXSTR_DASH5
NC_("RID_SVXSTR_DASH5", "Double Dash")
+#define RID_SVXSTR_DASH6
NC_("RID_SVXSTR_DASH6", "Long Dash Dot")
+#define RID_SVXSTR_DASH7
NC_("RID_SVXSTR_DASH7", "Double Dash Dot")
+#define RID_SVXSTR_DASH8
NC_("RID_SVXSTR_DASH8", "Double Dash Dot Dot")
+#define RID_SVXSTR_DASH9
NC_("RID_SVXSTR_DASH9", "Ultrafine Dotted")
+#define RID_SVXSTR_DASH10
NC_("RID_SVXSTR_DASH10", "Fine Dotted")
+#define RID_SVXSTR_DASH11
NC_("RID_SVXSTR_DASH11", "Ultrafine Dashed")
+#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_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")
+#define RID_SVXSTR_DASH19
NC_("RID_SVXSTR_DASH19", "Line with Fine Dots")
+#define RID_SVXSTR_DASH20
NC_("RID_SVXSTR_DASH20", "Dashed")
+#define RID_SVXSTR_DASH21
NC_("RID_SVXSTR_DASH21", "Line Style")
#define RID_SVXSTR_IMAP_ALL_FILTER
NC_("RID_SVXSTR_IMAP_ALL_FILTER", "All formats")
#define RID_SVXSTR_LEND0
NC_("RID_SVXSTR_LEND0", "Arrow concave")
#define RID_SVXSTR_LEND1
NC_("RID_SVXSTR_LEND1", "Square 45")
diff --git a/svx/inc/strings.hxx b/svx/inc/strings.hxx
index 5dc5bbd04e86..df6d4083b11f 100644
--- a/svx/inc/strings.hxx
+++ b/svx/inc/strings.hxx
@@ -297,19 +297,28 @@
#define RID_SVXSTR_BMP77_DEF "Dashed Dotted Upward
Diagonal"
#define RID_SVXSTR_BMP78_DEF "Solid Dotted"
// Reference-strings for standard-dash-table
-#define RID_SVXSTR_DASH0_DEF "Ultrafine Dashed"
-#define RID_SVXSTR_DASH1_DEF "Fine Dashed"
-#define RID_SVXSTR_DASH2_DEF "Ultrafine 2 Dots 3 Dashes"
-#define RID_SVXSTR_DASH3_DEF "Fine Dotted"
-#define RID_SVXSTR_DASH4_DEF "Line with Fine Dots"
-#define RID_SVXSTR_DASH5_DEF "Fine Dashed (var)"
-#define RID_SVXSTR_DASH6_DEF "3 Dashes 3 Dots (var)"
-#define RID_SVXSTR_DASH7_DEF "Ultrafine Dotted (var)"
-#define RID_SVXSTR_DASH8_DEF "Line Style 9"
-#define RID_SVXSTR_DASH9_DEF "2 Dots 1 Dash"
-#define RID_SVXSTR_DASH10_DEF "Dashed (var)"
-#define RID_SVXSTR_DASH11_DEF "Dash"
-#define RID_SVXSTR_DASH12_DEF "Line Style"
+#define RID_SVXSTR_DASH0_DEF "Dot"
+#define RID_SVXSTR_DASH1_DEF "Long Dot"
+#define RID_SVXSTR_DASH2_DEF "Double Dot"
+#define RID_SVXSTR_DASH3_DEF "Dash"
+#define RID_SVXSTR_DASH4_DEF "Long Dash"
+#define RID_SVXSTR_DASH5_DEF "Double Dash"
+#define RID_SVXSTR_DASH6_DEF "Long Dash Dot"
+#define RID_SVXSTR_DASH7_DEF "Double Dash Dot"
+#define RID_SVXSTR_DASH8_DEF "Double Dash Dot Dot"
+#define RID_SVXSTR_DASH9_DEF "Ultrafine Dotted (var)"
+#define RID_SVXSTR_DASH10_DEF "Fine Dotted"
+#define RID_SVXSTR_DASH11_DEF "Ultrafine Dashed"
+#define RID_SVXSTR_DASH12_DEF "Fine Dashed"
+#define RID_SVXSTR_DASH13_DEF "Fine Dashed (var)"
+#define RID_SVXSTR_DASH14_DEF "Dashed (var)"
+#define RID_SVXSTR_DASH15_DEF "Line Style 9"
+#define RID_SVXSTR_DASH16_DEF "3 Dashes 3 Dots (var)"
+#define RID_SVXSTR_DASH17_DEF "Ultrafine 2 Dots 3 Dashes"
+#define RID_SVXSTR_DASH18_DEF "2 Dots 1 Dash"
+#define RID_SVXSTR_DASH19_DEF "Line with Fine Dots"
+#define RID_SVXSTR_DASH20_DEF "Dash"
+#define RID_SVXSTR_DASH21_DEF "Line Style"
// Reference-strings for standard-line-end-table
#define RID_SVXSTR_LEND0_DEF "Arrow concave"
#define RID_SVXSTR_LEND1_DEF "Square 45"
diff --git a/svx/source/unodraw/unoprov.cxx b/svx/source/unodraw/unoprov.cxx
index 50be008cd5a2..5b1e82470006 100644
--- a/svx/source/unodraw/unoprov.cxx
+++ b/svx/source/unodraw/unoprov.cxx
@@ -1191,7 +1191,16 @@ static const char* RID_SVXSTR_DASH_DEF[] =
RID_SVXSTR_DASH9_DEF,
RID_SVXSTR_DASH10_DEF,
RID_SVXSTR_DASH11_DEF,
- RID_SVXSTR_DASH12_DEF
+ RID_SVXSTR_DASH12_DEF,
+ RID_SVXSTR_DASH13_DEF,
+ RID_SVXSTR_DASH14_DEF,
+ RID_SVXSTR_DASH15_DEF,
+ RID_SVXSTR_DASH16_DEF,
+ RID_SVXSTR_DASH17_DEF,
+ RID_SVXSTR_DASH18_DEF,
+ RID_SVXSTR_DASH19_DEF,
+ RID_SVXSTR_DASH20_DEF,
+ RID_SVXSTR_DASH21_DEF
};
static const char* RID_SVXSTR_DASH[] =
@@ -1208,7 +1217,16 @@ static const char* RID_SVXSTR_DASH[] =
RID_SVXSTR_DASH9,
RID_SVXSTR_DASH10,
RID_SVXSTR_DASH11,
- RID_SVXSTR_DASH12
+ RID_SVXSTR_DASH12,
+ RID_SVXSTR_DASH13,
+ RID_SVXSTR_DASH14,
+ RID_SVXSTR_DASH15,
+ RID_SVXSTR_DASH16,
+ RID_SVXSTR_DASH17,
+ RID_SVXSTR_DASH18,
+ RID_SVXSTR_DASH19,
+ RID_SVXSTR_DASH20,
+ RID_SVXSTR_DASH21
};
static const char* RID_SVXSTR_LEND_DEF[] =
diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx
index 2fc8ff28f861..5de523490104 100644
--- a/svx/source/xoutdev/xattr.cxx
+++ b/svx/source/xoutdev/xattr.cxx
@@ -878,7 +878,7 @@ std::unique_ptr<XLineDashItem>
XLineDashItem::checkForUniqueItem( SdrModel* pMod
{
const OUString aUniqueName = NameOrIndex::CheckNamedItem(
this, XATTR_LINEDASH, &pModel->GetItemPool(),
- XLineDashItem::CompareValueFunc, RID_SVXSTR_DASH11,
+ XLineDashItem::CompareValueFunc, RID_SVXSTR_DASH20,
pModel->GetPropertyList( XPropertyListType::Dash ) );
// if the given name is not valid, replace it!
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
