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-05 11:07:18 -0500 |
commit | c909ebf6ea9ce3251ddb69fd0c57d00c3f361f88 (patch) | |
tree | a52cc1da17b0264f408fd521eca4ebc648a2b848 /svtools/source | |
parent | 02a67e46c99f90cbfda417b771f4dc3f29849e17 (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
Conflicts:
cui/source/tabpages/border.cxx
sw/source/core/layout/paintfrm.cxx
xmloff/source/style/bordrhdl.cxx
Change-Id: Iaaa353b6e4f998b524262bea59260b4333e0cdb4
Diffstat (limited to 'svtools/source')
-rw-r--r-- | svtools/source/control/ctrlbox.cxx | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx index ab78c4b3a826..41974a7dacda 100644 --- a/svtools/source/control/ctrlbox.cxx +++ b/svtools/source/control/ctrlbox.cxx @@ -860,14 +860,11 @@ sal_uInt16 LineListBox::InsertEntry( const XubString& rStr, sal_uInt16 nPos ) // ----------------------------------------------------------------------- void LineListBox::InsertEntry( - BorderWidthImpl aWidthImpl, - sal_uInt16 nStyle, long nMinWidth, - Color ( *pColor1Fn )( Color ), Color ( *pColor2Fn )( Color ), - Color ( *pColorDistFn )( Color, Color ) ) + BorderWidthImpl aWidthImpl, sal_uInt16 nStyle, long nMinWidth, + ColorFunc pColor1Fn, ColorFunc pColor2Fn, ColorDistFunc pColorDistFn ) { ImpLineListData* pData = new ImpLineListData( - aWidthImpl, nStyle, nMinWidth, - pColor1Fn, pColor2Fn, pColorDistFn ); + aWidthImpl, nStyle, nMinWidth, pColor1Fn, pColor2Fn, pColorDistFn); pLineList->push_back( pData ); } |