diff options
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/filter/excel/xestyle.cxx | 5 | ||||
| -rw-r--r-- | sc/source/filter/excel/xistyle.cxx | 2 | ||||
| -rw-r--r-- | sc/source/filter/inc/xlconst.hxx | 6 | ||||
| -rw-r--r-- | sc/source/filter/oox/stylesbuffer.cxx | 2 |
4 files changed, 8 insertions, 7 deletions
diff --git a/sc/source/filter/excel/xestyle.cxx b/sc/source/filter/excel/xestyle.cxx index 0623ae549779..c3ab137eddc3 100644 --- a/sc/source/filter/excel/xestyle.cxx +++ b/sc/source/filter/excel/xestyle.cxx @@ -1575,12 +1575,13 @@ void lclGetBorderLine( case table::BorderLineStyle::DOTTED: rnXclLine = EXC_LINE_DOTTED; break; + case table::BorderLineStyle::FINE_DASHED: + rnXclLine = EXC_LINE_HAIR; + break; default: break; } } - else if( nOuterWidth >= EXC_BORDER_HAIR ) - rnXclLine = EXC_LINE_HAIR; else rnXclLine = EXC_LINE_NONE; } diff --git a/sc/source/filter/excel/xistyle.cxx b/sc/source/filter/excel/xistyle.cxx index 81586528d819..a22ef9b08dfb 100644 --- a/sc/source/filter/excel/xistyle.cxx +++ b/sc/source/filter/excel/xistyle.cxx @@ -904,7 +904,7 @@ bool lclConvertBorderLine( ::editeng::SvxBorderLine& rLine, const XclImpPalette& { EXC_BORDER_THIN, table::BorderLineStyle::DOTTED }, // 4 = dotted { EXC_BORDER_THICK, table::BorderLineStyle::SOLID }, // 5 = thick { EXC_BORDER_THIN, table::BorderLineStyle::DOUBLE }, // 6 = double - { EXC_BORDER_HAIR, table::BorderLineStyle::SOLID }, // 7 = hair + { EXC_BORDER_HAIR, table::BorderLineStyle::FINE_DASHED }, // 7 = hair { EXC_BORDER_MEDIUM, table::BorderLineStyle::DASHED }, // 8 = med dash { EXC_BORDER_THIN, table::BorderLineStyle::SOLID }, // 9 = thin dashdot { EXC_BORDER_MEDIUM, table::BorderLineStyle::SOLID }, // A = med dashdot diff --git a/sc/source/filter/inc/xlconst.hxx b/sc/source/filter/inc/xlconst.hxx index f8ccaeca9e3b..fc7a6627a333 100644 --- a/sc/source/filter/inc/xlconst.hxx +++ b/sc/source/filter/inc/xlconst.hxx @@ -254,9 +254,9 @@ const sal_uInt16 EXC_FUTUREREC_ALERT = 0x0002; // TODO: These values are approximate; we should probably tweak these values // further to better match Excel's border thickness. -const sal_uInt16 EXC_BORDER_THICK = 16; -const sal_uInt16 EXC_BORDER_MEDIUM = 12; -const sal_uInt16 EXC_BORDER_THIN = 4; +const sal_uInt16 EXC_BORDER_THICK = 30; +const sal_uInt16 EXC_BORDER_MEDIUM = 20; +const sal_uInt16 EXC_BORDER_THIN = 1; const sal_uInt16 EXC_BORDER_HAIR = 1; // ============================================================================ diff --git a/sc/source/filter/oox/stylesbuffer.cxx b/sc/source/filter/oox/stylesbuffer.cxx index e06f075742ca..e34080eca1f9 100644 --- a/sc/source/filter/oox/stylesbuffer.cxx +++ b/sc/source/filter/oox/stylesbuffer.cxx @@ -1834,7 +1834,7 @@ bool Border::convertBorderLine( BorderLine2& rBorderLine, const BorderLineModel& break; } case XML_double: lclSetBorderLineWidth( rBorderLine, API_LINE_THIN, API_LINE_THIN, API_LINE_THIN ); break; - case XML_hair: lclSetBorderLineWidth( rBorderLine, API_LINE_HAIR ); break; + case XML_hair: lclSetBorderLineWidth( rBorderLine, API_LINE_HAIR ); rBorderLine.LineStyle = API_FINE_LINE_DASHED; break; case XML_medium: lclSetBorderLineWidth( rBorderLine, API_LINE_MEDIUM ); break; case XML_mediumDashDot: lclSetBorderLineWidth( rBorderLine, API_LINE_MEDIUM ); break; case XML_mediumDashDotDot: lclSetBorderLineWidth( rBorderLine, API_LINE_MEDIUM ); break; |