summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2014-03-14 19:03:09 +0100
committerMiklos Vajna <vmiklos@collabora.co.uk>2014-03-14 20:42:22 +0000
commit3d180f2cdb6a8e4c40b912b4091623e94971a628 (patch)
tree6f2c64dfef40e6f4129cfda9c99820f162a80877
parent9cd8fb08f47bc0900e49a32eaee165b956406096 (diff)
fdo#68779: RTF import: set borders without explicit width
Word reportedly uses 0.75pt as a default if \brdrw is missing. (cherry picked from commit 84f4de3b65cd0f861e80c69b773004f28f9f8d9f) Conflicts: sw/qa/extras/rtfimport/rtfimport.cxx Change-Id: I263c56f756c65ff6bb30870aa70806564d5826a6 Reviewed-on: https://gerrit.libreoffice.org/8595 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
-rw-r--r--editeng/source/items/borderline.cxx4
1 files changed, 3 insertions, 1 deletions
diff --git a/editeng/source/items/borderline.cxx b/editeng/source/items/borderline.cxx
index 70ff3539871e..874f381defa9 100644
--- a/editeng/source/items/borderline.cxx
+++ b/editeng/source/items/borderline.cxx
@@ -177,9 +177,11 @@ static const double OUTSET_line1 = 15.0;
static const double INSET_line2 = 15.0;
double
-ConvertBorderWidthFromWord(SvxBorderStyle const eStyle, double const fWidth,
+ConvertBorderWidthFromWord(SvxBorderStyle const eStyle, double const i_fWidth,
int const nWordLineStyle)
{
+ // fdo#68779: at least for RTF, 0.75pt is the default if width is missing
+ double const fWidth((i_fWidth == 0.0) ? 15.0 : i_fWidth);
switch (eStyle)
{
// Single lines