Attachment 56151 Details for Bug 38542 – prevents wrong overriding of the style:border-line-width attributes

[patch] prevents wrong overriding of the style:border-line-width attributes

0002-fdo-38542-sw-ODF-import-prevent-border-width-overrid.patch (text/plain), 2.48 KB, created by Michael Stahl (allotropia) on 2012-01-25 09:05:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Stahl (allotropia)

Created: 2012-01-25 09:05:19 UTC

Size: 2.48 KB

patch

obsolete

>From b8855734a8dfe7a39f02bbae3f3b51145fbd6478 Mon Sep 17 00:00:00 2001
>From: Michael Stahl <mstahl@redhat.com>
>Date: Wed, 25 Jan 2012 17:56:08 +0100
>Subject: [PATCH 2/2] fdo#38542: sw: ODF import: prevent border width
> overriding:
>
>If there is a width in fo:border{,-left,-right,-top,-bottom}, then
>it should not override the values from
>style:border-line-width{,-left,-right,-top,-bottom}, which are more
>specific in case of "double" borders.
>---
> sw/source/filter/xml/xmlithlp.cxx |   37 +++++++++++++++++++++----------------
> 1 files changed, 21 insertions(+), 16 deletions(-)
>
>diff --git a/sw/source/filter/xml/xmlithlp.cxx b/sw/source/filter/xml/xmlithlp.cxx
>index cd383b5..8de48ab 100644
>--- a/sw/source/filter/xml/xmlithlp.cxx
>+++ b/sw/source/filter/xml/xmlithlp.cxx
>@@ -198,23 +198,28 @@ sal_Bool lcl_frmitems_setXMLBorder( SvxBorderLine*& rpLine,
>        sal_Bool bDouble = (bHasWidth && API_LINE_DOUBLE == nStyle ) ||
>            rpLine->GetDistance();
> 
>-       // The width has to be changed
>-       if( bHasWidth && USHRT_MAX != nNamedWidth )
>+       // fdo#38542: for double borders, do not override the width
>+       // set via style:border-line-width{,-left,-right,-top,-bottom}
>+       if (!bDouble || !rpLine->GetWidth())
>        {
>-           if ( bDouble )
>-               rpLine->SetStyle( ::editeng::DOUBLE );
>-           rpLine->SetWidth( aBorderWidths[nNamedWidth] );
>-       }
>-       else
>-       {
>-           if( !bHasWidth )
>-               nWidth = rpLine->GetInWidth() + rpLine->GetDistance() +
>-                   rpLine->GetOutWidth();
>-
>-           rpLine->SetWidth( nWidth );
>-           if (bDouble)
>-           {   // fdo#38542: divide width by 3 for outer line, gap, inner line
>-               rpLine->ScaleMetrics(1, 3);
>+           // The width has to be changed
>+           if (bHasWidth && USHRT_MAX != nNamedWidth)
>+           {
>+               if (bDouble)
>+                   rpLine->SetStyle( ::editeng::DOUBLE );
>+               rpLine->SetWidth( aBorderWidths[nNamedWidth] );
>+           }
>+           else
>+           {
>+               if (!bHasWidth)
>+                   nWidth = rpLine->GetInWidth() + rpLine->GetDistance() +
>+                       rpLine->GetOutWidth();
>+
>+               rpLine->SetWidth( nWidth );
>+               if (bDouble)
>+               { // fdo#38542: divide width by 3 for outer line, gap, inner line
>+                   rpLine->ScaleMetrics(1, 3);
>+               }
>            }
>        }
>        lcl_frmitems_setXMLBorderStyle( *rpLine, nStyle );
>-- 
>1.7.7.6
>

Actions: View

Attachments on bug 38542: 48258 | 48259 | 48504 | 49327 | 55271 | 55272 | 55448 | 55449 | 55450 | 56150 | 56151 | 56161