editeng/source/items/borderline.cxx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
New commits: commit 3d180f2cdb6a8e4c40b912b4091623e94971a628 Author: Michael Stahl <[email protected]> Date: Fri Mar 14 19:03:09 2014 +0100 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 <[email protected]> Tested-by: Miklos Vajna <[email protected]> diff --git a/editeng/source/items/borderline.cxx b/editeng/source/items/borderline.cxx index 70ff353..874f381 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 _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
