fdo#55526: fix import of RTF \brdrhair:
This is a hairline border that should be mapped to a non-zero width border given that LO doesn't have hairline borders as such. Change-Id: I4a2d2f983ac8e016b2ddb6b38435f5562e545c72
This commit is contained in:
parent
ecd70a727d
commit
59ab112fe9
1 changed files with 16 additions and 2 deletions
|
@ -126,7 +126,7 @@ ConvertBorderStyleFromWord(int const nWordLineStyle)
|
||||||
// First the single lines
|
// First the single lines
|
||||||
case 1:
|
case 1:
|
||||||
case 2: // thick line
|
case 2: // thick line
|
||||||
case 5:
|
case 5: // hairline
|
||||||
// and the unsupported special cases which we map to a single line
|
// and the unsupported special cases which we map to a single line
|
||||||
case 8:
|
case 8:
|
||||||
case 9:
|
case 9:
|
||||||
|
@ -208,9 +208,23 @@ ConvertBorderWidthFromWord(SvxBorderStyle const eStyle, double const fWidth,
|
||||||
{
|
{
|
||||||
// Single lines
|
// Single lines
|
||||||
case SOLID:
|
case SOLID:
|
||||||
|
switch (nWordLineStyle)
|
||||||
|
{
|
||||||
|
case 2:
|
||||||
|
return (fWidth * 2.0); // thick
|
||||||
|
break;
|
||||||
|
case 5: // fdo#55526: map 0 hairline width to > 0
|
||||||
|
return (fWidth > 1.0) ? fWidth : 1.0;
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
return fWidth;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
|
||||||
case DOTTED:
|
case DOTTED:
|
||||||
case DASHED:
|
case DASHED:
|
||||||
return (2 == nWordLineStyle) ? (fWidth * 2.0) : fWidth;
|
return fWidth;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
// Double lines
|
// Double lines
|
||||||
|
|
Loading…
Reference in a new issue