commit 9a8126262a8afba46efbfac5160b5f8cf13c9bd6
author Justin Luth <justin.luth@collabora.com> Sat Aug 08 16:05:07 2020 +0300
committer Justin Luth <justin_luth@sil.org> Tue Dec 08 09:03:29 2020 +0100
tree 1485593cd5dfe0add878570edfcaa9b7c347e7ad
parent 29993781ac991e85bfbd61f9e076c9d8088cd3ab

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@sil.org>
Reviewed-by: Justin Luth <justin_luth@sil.org>

sw/source/filter/ww8/wrtw8nds.cxx

diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx
index 407c518..fc75ac5 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();