diff options
Diffstat (limited to 'sw/source/filter/ww8')
| -rw-r--r-- | sw/source/filter/ww8/writerhelper.cxx | 2 | ||||
| -rw-r--r-- | sw/source/filter/ww8/wrtw8nds.cxx | 2 | ||||
| -rw-r--r-- | sw/source/filter/ww8/wrtww8.cxx | 2 | ||||
| -rw-r--r-- | sw/source/filter/ww8/ww8atr.cxx | 2 | ||||
| -rw-r--r-- | sw/source/filter/ww8/ww8glsy.cxx | 2 | ||||
| -rw-r--r-- | sw/source/filter/ww8/ww8par.cxx | 4 | ||||
| -rw-r--r-- | sw/source/filter/ww8/ww8par6.cxx | 2 |
7 files changed, 8 insertions, 8 deletions
diff --git a/sw/source/filter/ww8/writerhelper.cxx b/sw/source/filter/ww8/writerhelper.cxx index 6746264854cc..3336b7df9b70 100644 --- a/sw/source/filter/ww8/writerhelper.cxx +++ b/sw/source/filter/ww8/writerhelper.cxx @@ -790,7 +790,7 @@ namespace sw void SetInDocAndDelete::operator()(std::unique_ptr<SwFltStackEntry>& pEntry) { SwPaM aRegion(pEntry->m_aMkPos.m_nNode); - if (pEntry->MakeRegion(mrDoc, aRegion, + if (pEntry->MakeRegion(aRegion, SwFltStackEntry::RegionMode::CheckNodes|SwFltStackEntry::RegionMode::CheckFieldmark) && (*aRegion.GetPoint() != *aRegion.GetMark()) ) diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx index ff3b4e5c049f..062bbe4edfb8 100644 --- a/sw/source/filter/ww8/wrtw8nds.cxx +++ b/sw/source/filter/ww8/wrtw8nds.cxx @@ -2439,7 +2439,7 @@ void MSWordExportBase::OutputTextNode( SwTextNode& rNode ) { pTOXSect = &pTOXSectNd->GetSection(); - const SwNode* pNxt = rNode.GetNodes().GoNext( &aIdx ); + const SwNode* pNxt = SwNodes::GoNext(&aIdx); if( pNxt && pNxt->FindSectionNode() == pTOXSectNd ) pTOXSect = nullptr; } diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx index d9f17936efe4..e471f64a0afa 100644 --- a/sw/source/filter/ww8/wrtww8.cxx +++ b/sw/source/filter/ww8/wrtww8.cxx @@ -2078,7 +2078,7 @@ static sal_uInt16 lcl_TCFlags(SwDoc &rDoc, const SwTableBox * pBox, sal_Int32 nR if(pSttNd) { SwNodeIndex aIdx( *pSttNd ); - const SwContentNode * pCNd = pSttNd->GetNodes().GoNext( &aIdx ); + const SwContentNode* pCNd = SwNodes::GoNext(&aIdx); if( pCNd && pCNd->IsTextNode()) { SfxItemSetFixed<RES_CHRATR_ROTATE, RES_CHRATR_ROTATE> aCoreSet(rDoc.GetAttrPool()); diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx index fa6531caed92..30fbebc4fbc3 100644 --- a/sw/source/filter/ww8/ww8atr.cxx +++ b/sw/source/filter/ww8/ww8atr.cxx @@ -542,7 +542,7 @@ void MSWordExportBase::OutputSectionBreaks( const SfxItemSet *pSet, const SwNode SwNodeIndex aDocEnd(m_rDoc.GetNodes().GetEndOfContent()); SwNodeIndex aStart(*aDocEnd.GetNode().StartOfSectionNode()); // Set aStart to the first content node in the section - m_rDoc.GetNodes().GoNext(&aStart); + SwNodes::GoNext(&aStart); assert(aStart <= aDocEnd && "impossible: end section must have one content node"); if (rNd.GetIndex() > aStart.GetNode().GetIndex()) AttrOutput().OutputItem(SvxFormatBreakItem(SvxBreak::PageBefore, RES_BREAK)); diff --git a/sw/source/filter/ww8/ww8glsy.cxx b/sw/source/filter/ww8/ww8glsy.cxx index 838102e68cc0..4b50d48b7742 100644 --- a/sw/source/filter/ww8/ww8glsy.cxx +++ b/sw/source/filter/ww8/ww8glsy.cxx @@ -217,7 +217,7 @@ bool WW8Glossary::Load( SwTextBlocks &rBlocks, bool bSaveRelFile ) if( !aIdx.GetNode().IsTextNode() ) { OSL_ENSURE( false, "Where is the TextNode?" ); - pD->GetNodes().GoNext( &aIdx ); + SwNodes::GoNext(&aIdx); } SwPaM aPamo( aIdx ); std::unique_ptr<SwWW8ImplReader> xRdr(new SwWW8ImplReader( diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index c831e5956bce..827fe755a003 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -1355,7 +1355,7 @@ void SwWW8FltControlStack::SetAttrInDoc(const SwPosition& rTmpPos, paragraph indent to be relative to the new paragraph indent */ SwPaM aRegion(rTmpPos); - if (rEntry.MakeRegion(m_rDoc, aRegion, SwFltStackEntry::RegionMode::NoCheck)) + if (rEntry.MakeRegion(aRegion, SwFltStackEntry::RegionMode::NoCheck)) { SvxFirstLineIndentItem firstLineNew(RES_MARGIN_FIRSTLINE); SvxTextLeftMarginItem leftMarginNew(RES_MARGIN_TEXTLEFT); @@ -1449,7 +1449,7 @@ void SwWW8FltControlStack::SetAttrInDoc(const SwPosition& rTmpPos, case RES_TXTATR_INETFMT: { SwPaM aRegion(rTmpPos); - if (rEntry.MakeRegion(m_rDoc, aRegion, SwFltStackEntry::RegionMode::NoCheck)) + if (rEntry.MakeRegion(aRegion, SwFltStackEntry::RegionMode::NoCheck)) { SwFrameFormat *pFrame; // If we have just one single inline graphic then diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx index a82dffcc9d5d..6b33ac0d5bd6 100644 --- a/sw/source/filter/ww8/ww8par6.cxx +++ b/sw/source/filter/ww8/ww8par6.cxx @@ -3536,7 +3536,7 @@ bool SwWW8ImplReader::ConvertSubToGraphicPlacement() SwFltPosition aPtPos(*m_pPaM->GetPoint()); SwFrameFormat *pFlyFormat = nullptr; - if (SwFltStackEntry::MakeRegion(m_rDoc, aRegion, SwFltStackEntry::RegionMode::NoCheck, aMkPos, aPtPos) + if (SwFltStackEntry::MakeRegion(aRegion, SwFltStackEntry::RegionMode::NoCheck, aMkPos, aPtPos) && nullptr != (pFlyFormat = ContainsSingleInlineGraphic(aRegion))) { m_xCtrlStck->DeleteAndDestroy(nPos); |