summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2013-12-02 22:20:25 +0100
committerCaolán McNamara <caolanm@redhat.com>2013-12-04 04:27:46 -0600
commit20cd30da8ecf0a41c9bbd7d7311f8f54d6ac0fa8 (patch)
tree9138cb2b9fdf64e8d450aa041e187694b68ba8ae
parent7418a5ab18955a76b38512ef757c873d149d6c02 (diff)
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 <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit 6dfc6b717b5e625cbc48c856b73573719c511c8a) Reviewed-on: https://gerrit.libreoffice.org/6910 Reviewed-by: Eike Rathke <erack@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r--sw/source/filter/ww8/ww8par.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index bf5bea0953b4..223de68f417d 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;
}