diff options
| author | Kohei Yoshida <kohei.yoshida@collabora.com> | 2014-03-03 17:58:11 -0500 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2014-03-07 08:37:49 +0200 |
| commit | 9ec1c955533c8506d996e95fa312e3463898dd09 (patch) | |
| tree | 0541d1ad0e1b4c006c37b53d130d8b3e7f0101b1 /include | |
| parent | 46df72612da749dc6d58bad0f33c0f9e82d389b3 (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.
(cherry picked from commit 2c62596cf264ef10749d8bfdb2bb2ebef2d98fbc)
Conflicts:
cui/source/tabpages/border.cxx
sc/qa/unit/subsequent_export-test.cxx
sc/source/ui/view/tabvwsha.cxx
sw/source/core/layout/paintfrm.cxx
xmloff/source/style/bordrhdl.cxx
Change-Id: Iaaa353b6e4f998b524262bea59260b4333e0cdb4
Reviewed-on: https://gerrit.libreoffice.org/8464
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'include')
| -rw-r--r-- | include/svtools/ctrlbox.hxx | 9 | ||||
| -rw-r--r-- | include/xmloff/xmltoken.hxx | 1 |
2 files changed, 7 insertions, 3 deletions
diff --git a/include/svtools/ctrlbox.hxx b/include/svtools/ctrlbox.hxx index 19eea12b24b1..659909139e70 100644 --- a/include/svtools/ctrlbox.hxx +++ b/include/svtools/ctrlbox.hxx @@ -317,6 +317,9 @@ class SVT_DLLPUBLIC LineListBox : public ListBox sal_uInt16 GetStylePos( sal_uInt16 nListPos, long nWidth ); public: + typedef Color (*ColorFunc)(Color); + typedef Color (*ColorDistFunc)(Color, Color); + LineListBox( Window* pParent, WinBits nWinStyle = WB_BORDER ); virtual ~LineListBox(); @@ -330,9 +333,9 @@ public: /** Insert a listbox entry with all widths in Twips. */ void InsertEntry( BorderWidthImpl aWidthImpl, sal_uInt16 nStyle, long nMinWidth = 0, - Color (*pColor1Fn)(Color) = &sameColor, - Color (*pColor2Fn)( Color ) = &sameColor, - Color (*pColorDistFn)( Color, Color ) = &sameDistColor ); + ColorFunc pColor1Fn = &sameColor, + ColorFunc pColor2Fn = &sameColor, + ColorDistFunc pColorDistFn = &sameDistColor ); using ListBox::RemoveEntry; virtual void RemoveEntry( sal_uInt16 nPos ); diff --git a/include/xmloff/xmltoken.hxx b/include/xmloff/xmltoken.hxx index d288c8848843..09bc908e72c9 100644 --- a/include/xmloff/xmltoken.hxx +++ b/include/xmloff/xmltoken.hxx @@ -647,6 +647,7 @@ namespace xmloff { namespace token { XML_DOTTED, XML_DOUBLE, XML_DOUBLE_SIDED, + XML_DOUBLE_THIN, XML_DOWN, XML_DRAFT, XML_DRAW, |