[Libreoffice-commits] .: Branch 'libreoffice-4-0' - sw/source

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Wed Jan 16 02:55:12 PST 2013


 sw/source/filter/ww8/docxattributeoutput.cxx |    9 ---------
 1 file changed, 9 deletions(-)

New commits:
commit 98eff42e9adabc26b128e9ca25b8fd0d909c3f96
Author: Pierre-Eric Pelloux-Prayer <pierre-eric at lanedo.com>
Date:   Wed Jan 16 00:48:28 2013 +0100

    fdo#59275: docx export: fix regression on table borders export
    
    The removed code was supposed to allow LO to write cell borders only
    if they were different from default cell border.
    Bug #59275 show that this is incorrect.
    
    Change-Id: If31914c412480fdadb775ca6675999ecde3e6bba
    (cherry picked from commit 6819f9b834581acd5507cd2301bda8b5395b937d)
    
    Signed-off-by: Michael Stahl <mstahl at redhat.com>

diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index 475645b..fb0b396 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -1466,15 +1466,6 @@ static void impl_pageBorders( FSHelperPtr pSerializer, const SvxBoxItem& rBox, s
     for( int i = 0; i < 4; ++i, ++pBrd )
     {
         const SvxBorderLine* pLn = rBox.GetLine( *pBrd );
-        if ( pDefaultBorders && pLn )
-        {
-            const SvxBorderLine* pRefLn = pDefaultBorders->GetLine( *pBrd );
-
-            // If border is equal to default border: do not output
-            if ( pRefLn && *pLn == *pRefLn) {
-                continue;
-            }
-        }
 
         if (!tagWritten && bWriteTag) {
             pSerializer->startElementNS( XML_w, tag, FSEND );


More information about the Libreoffice-commits mailing list