[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - include/xmloff xmloff/source

[Julien Nabet]

 include/xmloff/xmltoken.hxx     |    1 +
 xmloff/source/core/xmltoken.cxx |    1 +
 xmloff/source/token/tokens.txt  |    1 +
 3 files changed, 3 insertions(+)

New commits:
commit 4b29ee6a6a5620610de816b27dccd9c0121e49be
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Mon Feb 5 14:07:06 2018 +0100

    tdf#115429: declare fill-rule
    
    Change-Id: I5eb93d08b1dd56db19038132b560ddf7ba174bc6
    Reviewed-on: https://gerrit.libreoffice.org/49242
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
    (cherry picked from commit 5222383c29d190218108c7c9e362a5a55af73a2f)
    Reviewed-on: https://gerrit.libreoffice.org/50480

diff --git a/include/xmloff/xmltoken.hxx b/include/xmloff/xmltoken.hxx
index 175187ae6897..72d8d034a403 100644
--- a/include/xmloff/xmltoken.hxx
+++ b/include/xmloff/xmltoken.hxx
@@ -777,6 +777,7 @@ namespace xmloff { namespace token {
         XML_FILL_IMAGE_REF_POINT_X,
         XML_FILL_IMAGE_REF_POINT_Y,
         XML_FILL_IMAGE_WIDTH,
+        XML_FILL_RULE,
         XML_FILTER,
         XML_FILTER_AND,
         XML_FILTER_CONDITION,
diff --git a/xmloff/source/core/xmltoken.cxx b/xmloff/source/core/xmltoken.cxx
index 3d33a489493a..e1e67af750b6 100644
--- a/xmloff/source/core/xmltoken.cxx
+++ b/xmloff/source/core/xmltoken.cxx
@@ -777,6 +777,7 @@ namespace xmloff { namespace token {
         TOKEN( "fill-image-ref-point-x",          XML_FILL_IMAGE_REF_POINT_X ),
         TOKEN( "fill-image-ref-point-y",          XML_FILL_IMAGE_REF_POINT_Y ),
         TOKEN( "fill-image-width",                XML_FILL_IMAGE_WIDTH ),
+        TOKEN( "fill-rule",                       XML_FILL_RULE ),
         TOKEN( "filter",                          XML_FILTER ),
         TOKEN( "filter-and",                      XML_FILTER_AND ),
         TOKEN( "filter-condition",                XML_FILTER_CONDITION ),
diff --git a/xmloff/source/token/tokens.txt b/xmloff/source/token/tokens.txt
index 4e58356c7c07..cc0b35ad084c 100644
--- a/xmloff/source/token/tokens.txt
+++ b/xmloff/source/token/tokens.txt
@@ -700,6 +700,7 @@ fill-image-ref-point
 fill-image-ref-point-x
 fill-image-ref-point-y
 fill-image-width
+fill-rule
 filter
 filter-and
 filter-condition