[Libreoffice-commits] .: Branch 'libreoffice-3-6' - sw/source

[Libreoffice Gerrit user]

 sw/source/filter/xml/xmltble.cxx |   11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

New commits:
commit bcc65a92293fa8ad78c891c79ac433ff96767d82
Author: Michael Stahl <mstahl at redhat.com>
Date:   Wed Sep 12 23:19:57 2012 +0200

    fdo#45700: sw ODF export: workaround corrupted table model:
    
    do not export invalid table:number-columns-spanned="0"
    
    (cherry picked from commit c45c64e3de51d9f56c9d9789729b6f7952547a61)
    
    Conflicts:
    	sw/source/filter/xml/xmltble.cxx
    
    Change-Id: I7e286a9fcb6ed3df7222c83fe73e870e69561649
    Reviewed-on: https://gerrit.libreoffice.org/611
    Reviewed-by: Miklos Vajna <vmiklos at suse.cz>
    Tested-by: Miklos Vajna <vmiklos at suse.cz>

diff --git a/sw/source/filter/xml/xmltble.cxx b/sw/source/filter/xml/xmltble.cxx
index ba8d4a9..1991770 100644
--- a/sw/source/filter/xml/xmltble.cxx
+++ b/sw/source/filter/xml/xmltble.cxx
@@ -980,14 +980,9 @@ void SwXMLExport::ExportTableLine( const SwTableLine& rLine,
             if ( nCol < nOldCol )
             {
                 OSL_FAIL( "table and/or table information seems to be corrupted." );
-                if ( nBox == nBoxes - 1 )
-                {
-                    nCol = rLines.GetColumns().Count() - 1;
-                }
-                else
-                {
-                    nCol = nOldCol;
-                }
+                // NOTE: nOldCol is not necessarily a valid index into
+                // GetColumns(), but that doesn't matter here
+                nCol = nOldCol;
             }
 
             sal_uInt16 nColSpan = nCol - nOldCol + 1U;