sw/source/core/layout/atrfrm.cxx | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
New commits:
commit c2fac48373cab503c19aad00d1136053f82f3ae2
Author: Michael Stahl <mst...@redhat.com>
Date: Wed May 13 18:13:33 2015 +0200
sw: fix wrong assert for broken documents like abi11860-2.odt
... that have page anchor type without text:anchor-page-number, so the
import stores a temporary anchor position that MakeFrms() cleans up.
Change-Id: I440d3a138659933e54f671d87bc418d5ba1059fb
diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx
index d5611be..2a885f5 100644
--- a/sw/source/core/layout/atrfrm.cxx
+++ b/sw/source/core/layout/atrfrm.cxx
@@ -3516,7 +3516,10 @@ void CheckAnchoredFlyConsistency(SwDoc const& rDoc)
SwFmtAnchor const& rAnchor((**it).GetAnchor(false));
if (FLY_AT_PAGE == rAnchor.GetAnchorId())
{
- assert(!rAnchor.GetCntntAnchor());
+ assert(!rAnchor.GetCntntAnchor()
+ // for invalid documents that lack text:anchor-page-number
+ // it may have an anchor before MakeFrms() is called
+ || (!SwIterator<SwFrm, SwFrmFmt>(**it).First()));
}
else
{
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
