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

[andreas kainz (via logerrit)]

 extras/source/palettes/standard.sop |binary
 include/svx/strings.hrc             |    3 +++
 svx/inc/strings.hxx                 |    3 +++
 writerfilter/source/ooxml/model.xml |    6 ++++++
 4 files changed, 12 insertions(+)

New commits:
commit 3bd487c578f780cb41dd5efa128248edf1a10157
Author:     andreas kainz <kainz.a at gmail.com>
AuthorDate: Mon Mar 2 17:09:17 2020 +0100
Commit:     andreas_kainz <kainz.a at gmail.com>
CommitDate: Fri Mar 6 10:20:16 2020 +0100

    tdf#130928 Area fill update pattern
    
    Change-Id: I309cb3ccd5e870c6624b1a5b4838ee05c56538d7
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89843
    Tested-by: Jenkins
    Reviewed-by: andreas_kainz <kainz.a at gmail.com>

diff --git a/extras/source/palettes/standard.sop b/extras/source/palettes/standard.sop
index 2084fd984a36..ad9534b19f57 100644
Binary files a/extras/source/palettes/standard.sop and b/extras/source/palettes/standard.sop differ
diff --git a/include/svx/strings.hrc b/include/svx/strings.hrc
index b208d88605a4..8c0d3aec38b4 100644
--- a/include/svx/strings.hrc
+++ b/include/svx/strings.hrc
@@ -880,6 +880,9 @@
 #define RID_SVXSTR_BMP73                                    NC_("RID_SVXSTR_BMP73", "Upward Diagonal")
 #define RID_SVXSTR_BMP74                                    NC_("RID_SVXSTR_BMP74", "Cross")
 #define RID_SVXSTR_BMP75                                    NC_("RID_SVXSTR_BMP75", "Diagonal Cross")
+#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")
diff --git a/svx/inc/strings.hxx b/svx/inc/strings.hxx
index 0162a333a650..5dc5bbd04e86 100644
--- a/svx/inc/strings.hxx
+++ b/svx/inc/strings.hxx
@@ -293,6 +293,9 @@
 #define RID_SVXSTR_BMP73_DEF                        "Upward Diagonal"
 #define RID_SVXSTR_BMP74_DEF                        "Cross"
 #define RID_SVXSTR_BMP75_DEF                        "Diagonal Cross"
+#define RID_SVXSTR_BMP76_DEF                        "Dashed Dotted"
+#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"
diff --git a/writerfilter/source/ooxml/model.xml b/writerfilter/source/ooxml/model.xml
index b36aa89527f9..9c0610715218 100644
--- a/writerfilter/source/ooxml/model.xml
+++ b/writerfilter/source/ooxml/model.xml
@@ -1858,6 +1858,12 @@
           <value>trellis</value>
           <!-- Zig Zag -->
           <value>zigZag</value>
+          <!-- Dashed Dotted -->
+          <value>dashDot</value>
+          <!-- Dashed Dotted Upward Diagonal -->
+          <value>dashdotUpDiag</value>
+          <!-- Solid Dotted -->
+          <value>lsolidDoted</value>
         </choice>
       </define>
       <define name="CT_PatternFillProperties">