diff options
| author | Kohei Yoshida <kohei.yoshida@collabora.com> | 2014-03-03 17:58:11 -0500 |
|---|---|---|
| committer | Kohei Yoshida <kohei.yoshida@collabora.com> | 2014-03-04 22:02:37 -0500 |
| commit | 2c62596cf264ef10749d8bfdb2bb2ebef2d98fbc (patch) | |
| tree | 1311156cb36884d0dde2b022467d7d0de6d799df /xmloff/source | |
| parent | fb052ae6174e4c96157ef6973f02c1d3cd4d9ba2 (diff) | |
fdo#75260: Correctly draw double lines for both Writer and Calc.
Fix all sorts of incorrect double line handling in drawinglayer in order to
draw thick-thin double line types correctly. Also change handling of border
lines in writer tables. There are still some outstanding issues but it's
much better than how it was before.
Also realized that Word and Excel handle simple thin double lines differently;
Word varies widths of all of the lines and the gap whereas Excel only has one
fixed size for its double line. For this reason I decided to add a separate
double line type (DOUBLE_THIN) to handle Excel's double line.
Change-Id: Iaaa353b6e4f998b524262bea59260b4333e0cdb4
Diffstat (limited to 'xmloff/source')
| -rw-r--r-- | xmloff/source/core/xmltoken.cxx | 1 | ||||
| -rw-r--r-- | xmloff/source/style/bordrhdl.cxx | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/xmloff/source/core/xmltoken.cxx b/xmloff/source/core/xmltoken.cxx index 1e35261a7b33..56148dc5d094 100644 --- a/xmloff/source/core/xmltoken.cxx +++ b/xmloff/source/core/xmltoken.cxx @@ -651,6 +651,7 @@ namespace xmloff { namespace token { TOKEN( "dotted", XML_DOTTED ), TOKEN( "double", XML_DOUBLE ), TOKEN( "double-sided", XML_DOUBLE_SIDED ), + TOKEN( "double-thin", XML_DOUBLE_THIN ), TOKEN( "down", XML_DOWN ), TOKEN( "draft", XML_DRAFT ), TOKEN( "draw", XML_DRAW ), diff --git a/xmloff/source/style/bordrhdl.cxx b/xmloff/source/style/bordrhdl.cxx index 7ec68c028185..6d6caf2aeefa 100644 --- a/xmloff/source/style/bordrhdl.cxx +++ b/xmloff/source/style/bordrhdl.cxx @@ -43,6 +43,7 @@ SvXMLEnumMapEntry pXML_BorderStyles[] = { XML_HIDDEN, table::BorderLineStyle::NONE }, { XML_SOLID, table::BorderLineStyle::SOLID }, { XML_DOUBLE, table::BorderLineStyle::DOUBLE }, + { XML_DOUBLE_THIN, table::BorderLineStyle::DOUBLE_THIN }, { XML_DOTTED, table::BorderLineStyle::DOTTED }, { XML_DASHED, table::BorderLineStyle::DASHED }, { XML_GROOVE, table::BorderLineStyle::ENGRAVED }, @@ -136,6 +137,7 @@ bool XMLBorderWidthHdl::exportXML( OUString& rStrExpValue, const uno::Any& rValu switch ( aBorderLine.LineStyle ) { case table::BorderLineStyle::DOUBLE: + case table::BorderLineStyle::DOUBLE_THIN: case table::BorderLineStyle::THINTHICK_SMALLGAP: case table::BorderLineStyle::THINTHICK_MEDIUMGAP: case table::BorderLineStyle::THINTHICK_LARGEGAP: @@ -323,6 +325,9 @@ bool XMLBorderHdl::exportXML( OUString& rStrExpValue, const uno::Any& rValue, co case table::BorderLineStyle::FINE_DASHED: eStyleToken = XML_FINE_DASHED; break; + case table::BorderLineStyle::DOUBLE_THIN: + eStyleToken = XML_DOUBLE_THIN; + break; case table::BorderLineStyle::SOLID: default: break; |