[Libreoffice-commits] core.git: Branch 'libreoffice-4-1-4' - sw/source

[Michael Stahl]

 sw/source/filter/ww8/ww8par.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 20cd30da8ecf0a41c9bbd7d7311f8f54d6ac0fa8
Author: Michael Stahl <mst...@redhat.com>
Date:   Mon Dec 2 22:20:25 2013 +0100

    fdo#71749: sw: WW8: don't loop on tables in footnotes
    
    (regression from ee1db992b98378b5e2f5e9aa8af0e36c375e582f)
    
    Change-Id: Id10b6fb8e9e3697b10a1df605cb48d94a55ad207
    (cherry picked from commit 790896d9a557d34ea91d6e5926471de66503be7a)
    Reviewed-on: https://gerrit.libreoffice.org/6905
    Reviewed-by: Miklos Vajna <vmik...@collabora.co.uk>
    Tested-by: Miklos Vajna <vmik...@collabora.co.uk>
    (cherry picked from commit 6dfc6b717b5e625cbc48c856b73573719c511c8a)
    Reviewed-on: https://gerrit.libreoffice.org/6910
    Reviewed-by: Eike Rathke <er...@redhat.com>
    Reviewed-by: Caolán McNamara <caol...@redhat.com>
    Tested-by: Caolán McNamara <caol...@redhat.com>

diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index bf5bea0..223de68 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -2383,7 +2383,7 @@ bool SwWW8ImplReader::ProcessSpecial(bool &rbReSync, 
WW8_CP nStartCp)
                 pPlcxMan->GetPap()->Restore( aSave );
             }
         }
-    } while (nInTable < nCellLevel);
+    } while (!bFtnEdn && (nInTable < nCellLevel));
     return bTableRowEnd;
 }
 

_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits