summaryrefslogtreecommitdiff
path: root/xmloff
diff options
context:
space:
mode:
authorKohei Yoshida <kohei.yoshida@collabora.com>2014-03-18 23:28:42 -0400
committerKohei Yoshida <kohei.yoshida@collabora.com>2014-03-19 00:28:16 -0400
commit402fffa1b42e8b54704bab5442590d192dea67ca (patch)
tree441a1df96a103551ee949942516b3328059c3cc9 /xmloff
parent22c7da0ca5438b69165609db2a1ef219aa167dc2 (diff)
Add dash-dot and dash-dot-dot line styles.
We need these for Excel interop. Change-Id: I91450c1d205f28636edfb4392aa6ae5091b1d7b7
Diffstat (limited to 'xmloff')
-rw-r--r--xmloff/source/core/xmltoken.cxx2
-rw-r--r--xmloff/source/style/bordrhdl.cxx8
2 files changed, 10 insertions, 0 deletions
diff --git a/xmloff/source/core/xmltoken.cxx b/xmloff/source/core/xmltoken.cxx
index c3559d324388..cedae8843972 100644
--- a/xmloff/source/core/xmltoken.cxx
+++ b/xmloff/source/core/xmltoken.cxx
@@ -536,6 +536,8 @@ namespace xmloff { namespace token {
TOKEN( "cylinder", XML_CYLINDER ),
TOKEN( "d", XML_D ),
TOKEN( "dash", XML_DASH ),
+ TOKEN( "dash-dot", XML_DASH_DOT ),
+ TOKEN( "dash-dot-dot", XML_DASH_DOT_DOT ),
TOKEN( "dashed", XML_DASHED ),
TOKEN( "data", XML_DATA ),
TOKEN( "data-bar", XML_DATA_BAR ),
diff --git a/xmloff/source/style/bordrhdl.cxx b/xmloff/source/style/bordrhdl.cxx
index 6d6caf2aeefa..41b94c926a1f 100644
--- a/xmloff/source/style/bordrhdl.cxx
+++ b/xmloff/source/style/bordrhdl.cxx
@@ -51,6 +51,8 @@ SvXMLEnumMapEntry pXML_BorderStyles[] =
{ XML_INSET, table::BorderLineStyle::INSET },
{ XML_OUTSET, table::BorderLineStyle::OUTSET },
{ XML_FINE_DASHED, table::BorderLineStyle::FINE_DASHED },
+ { XML_DASH_DOT, table::BorderLineStyle::DASH_DOT },
+ { XML_DASH_DOT_DOT, table::BorderLineStyle::DASH_DOT_DOT },
{ XML_TOKEN_INVALID, 0 }
};
@@ -325,6 +327,12 @@ bool XMLBorderHdl::exportXML( OUString& rStrExpValue, const uno::Any& rValue, co
case table::BorderLineStyle::FINE_DASHED:
eStyleToken = XML_FINE_DASHED;
break;
+ case table::BorderLineStyle::DASH_DOT:
+ eStyleToken = XML_DASH_DOT;
+ break;
+ case table::BorderLineStyle::DASH_DOT_DOT:
+ eStyleToken = XML_DASH_DOT_DOT;
+ break;
case table::BorderLineStyle::DOUBLE_THIN:
eStyleToken = XML_DOUBLE_THIN;
break;