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

[Justin Luth (via logerrit)]

 sw/source/filter/ww8/wrtw8nds.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit d6fe7099092ed74b3a2580e0d95ed9229e262212
Author:     Justin Luth <justin.luth at collabora.com>
AuthorDate: Sat Aug 8 16:05:07 2020 +0300
Commit:     Xisco Fauli <xiscofauli at libreoffice.org>
CommitDate: Thu Dec 17 13:41:32 2020 +0100

    tdf#135329 revert sw MS export: prevent skipping at-char anchors
    
    ...because Step 2 solved the problem, and I don't want to mask
    any future issues that miss an anchor position.
    
    This reverts LO 7.1 commit d4045509e58180768368db7a77479fc027ff7c42
        tdf#135329 sw MS export: prevent skipping at-char anchors
            This patch is step 1 - write out bypassed flies.
            Step 2 - don't bypass fly positions.
    
    Change-Id: I5246ea531897de493eb050625cebcdcc2488605b
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100390
    Tested-by: Justin Luth <justin_luth at sil.org>
    Reviewed-by: Justin Luth <justin_luth at sil.org>
    (cherry picked from commit 9a8126262a8afba46efbfac5160b5f8cf13c9bd6)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107386
    Tested-by: Jenkins
    Reviewed-by: Xisco Fauli <xiscofauli at libreoffice.org>

diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx
index 407c5182e997..fc75ac5ff02a 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -708,7 +708,8 @@ FlyProcessingState SwWW8AttrIter::OutFlys(sal_Int32 nSwPos)
         const SwPosition &rAnchor = maFlyIter->GetPosition();
         const sal_Int32 nPos = rAnchor.nContent.GetIndex();
 
-        if ( nPos > nSwPos )
+        assert(nPos >= nSwPos && "a fly must get flagged as a nextAttr/CurrentPos");
+        if ( nPos != nSwPos )
             return FLY_NOT_PROCESSED ; // We haven't processed the fly
 
         const SdrObject* pSdrObj = maFlyIter->GetFrameFormat().FindRealSdrObject();