diff options
| -rw-r--r-- | sw/qa/extras/ooxmlexport/ooxmlexport5.cxx | 2 | ||||
| -rw-r--r-- | sw/source/filter/ww8/wrtw8nds.cxx | 15 |
2 files changed, 2 insertions, 15 deletions
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx index 53a88a7e8a8b..3a522bc84891 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx @@ -630,7 +630,7 @@ DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testFDO79915, "fdo79915.docx") { xmlDocUniquePtr pXmlDoc = parseExport("word/document.xml"); - assertXPathContent(pXmlDoc, "/w:document/w:body/w:p[2]/w:r[10]/w:t", "How much buoyancy does the water provide?"); + assertXPathContent(pXmlDoc, "/w:document/w:body/w:p[2]/w:r[9]/w:t", "How much buoyancy does the water provide?"); } DECLARE_OOXMLEXPORT_TEST(testfdo79817, "fdo79817.docx") diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx index 82799abfd9c8..4dd1f15395bb 100644 --- a/sw/source/filter/ww8/wrtw8nds.cxx +++ b/sw/source/filter/ww8/wrtw8nds.cxx @@ -354,13 +354,7 @@ sal_Int32 SwWW8AttrIter::SearchNext( sal_Int32 nStartPos ) IterToCurrent(); } - /* - #i2916# - Check to see if there are any graphics anchored to characters in this - paragraph's text. Set nMinPos to 1 past the placement for anchored to - character because anchors in Word appear after the character they are - anchored to. - */ + // #i2916# Check to see if there are any graphics anchored to characters in this paragraph's text. if (maFlyIter != maFlyFrames.end()) { const SwPosition &rAnchor = maFlyIter->GetPosition(); @@ -368,13 +362,6 @@ sal_Int32 SwWW8AttrIter::SearchNext( sal_Int32 nStartPos ) sal_Int32 nPos = rAnchor.nContent.GetIndex(); if (nPos >= nStartPos && nPos <= nMinPos) nMinPos = nPos; - - if (maFlyIter->GetFrameFormat().GetAnchor().GetAnchorId() == RndStdIds::FLY_AT_CHAR) - { - ++nPos; - if (nPos >= nStartPos && nPos <= nMinPos) - nMinPos = nPos; - } } //nMinPos found and not going to change at this point |