summaryrefslogtreecommitdiff
path: root/sw/source/filter/basflt/fltshell.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'sw/source/filter/basflt/fltshell.cxx')
-rw-r--r--sw/source/filter/basflt/fltshell.cxx47
1 files changed, 22 insertions, 25 deletions
diff --git a/sw/source/filter/basflt/fltshell.cxx b/sw/source/filter/basflt/fltshell.cxx
index 901614897f18..aa11df926e9e 100644
--- a/sw/source/filter/basflt/fltshell.cxx
+++ b/sw/source/filter/basflt/fltshell.cxx
@@ -51,14 +51,13 @@
using namespace com::sun::star;
-static SwContentNode* GetContentNode(SwDoc& rDoc, SwPosition& rPos, bool bNext)
+static SwContentNode* GetContentNode(SwPosition& rPos, bool bNext)
{
SwContentNode * pCNd = rPos.GetNode().GetContentNode();
- if(!pCNd && nullptr == (pCNd = bNext ? rDoc.GetNodes().GoNext(&rPos)
+ if (!pCNd && nullptr == (pCNd = bNext ? SwNodes::GoNext(&rPos)
: SwNodes::GoPrevious(&rPos)))
{
- pCNd = bNext ? SwNodes::GoPrevious(&rPos)
- : rDoc.GetNodes().GoNext(&rPos);
+ pCNd = bNext ? SwNodes::GoPrevious(&rPos) : SwNodes::GoNext(&rPos);
OSL_ENSURE(pCNd, "no ContentNode found");
}
return pCNd;
@@ -102,7 +101,7 @@ void SwFltStackEntry::SetEndPos(const SwPosition& rEndPos)
m_aPtPos.FromSwPosition(rEndPos);
}
-bool SwFltStackEntry::MakeRegion(SwDoc& rDoc, SwPaM& rRegion, RegionMode const eCheck,
+bool SwFltStackEntry::MakeRegion(SwPaM& rRegion, RegionMode const eCheck,
const SwFltPosition &rMkPos, const SwFltPosition &rPtPos,
sal_uInt16 nWhich)
{
@@ -124,7 +123,7 @@ bool SwFltStackEntry::MakeRegion(SwDoc& rDoc, SwPaM& rRegion, RegionMode const e
}
// The content indices always apply to the node!
rRegion.GetPoint()->Assign( rMkPos.m_nNode.GetIndex() + 1 );
- SwContentNode* pCNd = GetContentNode(rDoc, *rRegion.GetPoint(), true);
+ SwContentNode* pCNd = GetContentNode(*rRegion.GetPoint(), true);
SAL_WARN_IF(pCNd->Len() < rMkPos.m_nContent, "sw.ww8",
"invalid content index " << rMkPos.m_nContent << " but text node has only " << pCNd->Len());
@@ -137,7 +136,7 @@ bool SwFltStackEntry::MakeRegion(SwDoc& rDoc, SwPaM& rRegion, RegionMode const e
if (n >= rNodes.Count())
return false;
rRegion.GetPoint()->Assign(n);
- pCNd = GetContentNode(rDoc, *rRegion.GetPoint(), false);
+ pCNd = GetContentNode(*rRegion.GetPoint(), false);
}
SAL_WARN_IF(pCNd->Len() < rPtPos.m_nContent, "sw.ww8",
"invalid content index " << rPtPos.m_nContent << " but text node has only " << pCNd->Len());
@@ -158,9 +157,9 @@ bool SwFltStackEntry::MakeRegion(SwDoc& rDoc, SwPaM& rRegion, RegionMode const e
return bRet;
}
-bool SwFltStackEntry::MakeRegion(SwDoc& rDoc, SwPaM& rRegion, RegionMode eCheck) const
+bool SwFltStackEntry::MakeRegion(SwPaM& rRegion, RegionMode eCheck) const
{
- return MakeRegion(rDoc, rRegion, eCheck, m_aMkPos, m_aPtPos, m_pAttr->Which());
+ return MakeRegion(rRegion, eCheck, m_aMkPos, m_aPtPos, m_pAttr->Which());
}
SwFltControlStack::SwFltControlStack(SwDoc& rDo, sal_uLong nFieldFl)
@@ -423,8 +422,7 @@ SwFltStackEntry* SwFltControlStack::SetAttr(const SwPosition& rPos,
return pRet;
}
-static bool MakePoint(const SwFltStackEntry& rEntry, SwDoc& rDoc,
- SwPaM& rRegion)
+static bool MakePoint(const SwFltStackEntry& rEntry, SwPaM& rRegion)
{
// the anchor is the Pam's Point. It's modified when inserting
// text, etc.; therefore it is kept on the stack. Only the
@@ -437,7 +435,7 @@ static bool MakePoint(const SwFltStackEntry& rEntry, SwDoc& rDoc,
return false;
rRegion.GetPoint()->Assign(nMk);
- GetContentNode(rDoc, *rRegion.GetPoint(), true);
+ GetContentNode(*rRegion.GetPoint(), true);
rRegion.GetPoint()->SetContent(rEntry.m_aMkPos.m_nContent);
return true;
}
@@ -445,10 +443,9 @@ static bool MakePoint(const SwFltStackEntry& rEntry, SwDoc& rDoc,
// MakeBookRegionOrPoint() behaves like MakeRegionOrPoint, except that
// it adheres to certain restrictions on bookmarks in tables (cannot
// span more than one cell)
-static bool MakeBookRegionOrPoint(const SwFltStackEntry& rEntry, SwDoc& rDoc,
- SwPaM& rRegion )
+static bool MakeBookRegionOrPoint(const SwFltStackEntry& rEntry, SwPaM& rRegion )
{
- if (rEntry.MakeRegion(rDoc, rRegion, SwFltStackEntry::RegionMode::CheckNodes))
+ if (rEntry.MakeRegion(rRegion, SwFltStackEntry::RegionMode::CheckNodes))
{
if (rRegion.GetPoint()->GetNode().FindTableBoxStartNode()
!= rRegion.GetMark()->GetNode().FindTableBoxStartNode())
@@ -458,7 +455,7 @@ static bool MakeBookRegionOrPoint(const SwFltStackEntry& rEntry, SwDoc& rDoc,
}
return true;
}
- return MakePoint(rEntry, rDoc, rRegion);
+ return MakePoint(rEntry, rRegion);
}
// IterateNumrulePiece() looks for the first range valid for Numrules
@@ -499,7 +496,7 @@ void SwFltControlStack::SetAttrInDoc(const SwPosition& rTmpPos,
SwFrameFormat* pFormat = static_cast<SwFltAnchor*>(rEntry.m_pAttr.get())->GetFrameFormat();
if (pFormat != nullptr)
{
- MakePoint(rEntry, m_rDoc, aRegion);
+ MakePoint(rEntry, aRegion);
SwFormatAnchor aAnchor(pFormat->GetAnchor());
aAnchor.SetAnchor(aRegion.GetPoint());
pFormat->SetFormatAttr(aAnchor);
@@ -528,7 +525,7 @@ void SwFltControlStack::SetAttrInDoc(const SwPosition& rTmpPos,
SwNumRule* pNumRule = m_rDoc.FindNumRulePtr( rNumNm );
if( pNumRule )
{
- if (rEntry.MakeRegion(m_rDoc, aRegion, SwFltStackEntry::RegionMode::CheckNodes))
+ if (rEntry.MakeRegion(aRegion, SwFltStackEntry::RegionMode::CheckNodes))
{
SwNodeIndex aTmpStart( aRegion.Start()->GetNode() );
SwNodeIndex aTmpEnd( aTmpStart );
@@ -565,14 +562,14 @@ void SwFltControlStack::SetAttrInDoc(const SwPosition& rTmpPos,
}
SwSetExpField aField(static_cast<SwSetExpFieldType*>(pFT), pB->GetValSys());
aField.SetSubType( nsSwExtendedSubType::SUB_INVISIBLE );
- MakePoint(rEntry, m_rDoc, aRegion);
+ MakePoint(rEntry, aRegion);
m_rDoc.getIDocumentContentOperations().InsertPoolItem(aRegion, SwFormatField(aField));
MoveAttrs( *(aRegion.GetPoint()) );
}
if ( ( !IsFlagSet(HYPO) || IsFlagSet(BOOK_AND_REF) ) &&
!rEntry.m_bConsumedByField )
{
- MakeBookRegionOrPoint(rEntry, m_rDoc, aRegion);
+ MakeBookRegionOrPoint(rEntry, aRegion);
// #i120879# - create a cross reference heading bookmark if appropriate.
const IDocumentMarkAccess::MarkType eBookmarkType =
( pB->IsTOCBookmark() &&
@@ -585,7 +582,7 @@ void SwFltControlStack::SetAttrInDoc(const SwPosition& rTmpPos,
break;
case RES_FLTR_ANNOTATIONMARK:
{
- if (MakeBookRegionOrPoint(rEntry, m_rDoc, aRegion))
+ if (MakeBookRegionOrPoint(rEntry, aRegion))
{
SwTextNode const*const pTextNode(
aRegion.End()->GetNode().GetTextNode());
@@ -627,7 +624,7 @@ void SwFltControlStack::SetAttrInDoc(const SwPosition& rTmpPos,
break;
case RES_FLTR_RDFMARK:
{
- if (MakeBookRegionOrPoint(rEntry, m_rDoc, aRegion))
+ if (MakeBookRegionOrPoint(rEntry, aRegion))
{
SwFltRDFMark* pMark = static_cast<SwFltRDFMark*>(rEntry.m_pAttr.get());
if (aRegion.GetPointNode().IsTextNode())
@@ -651,7 +648,7 @@ void SwFltControlStack::SetAttrInDoc(const SwPosition& rTmpPos,
break;
case RES_FLTR_TOX:
{
- MakePoint(rEntry, m_rDoc, aRegion);
+ MakePoint(rEntry, aRegion);
SwPosition* pPoint = aRegion.GetPoint();
@@ -693,7 +690,7 @@ void SwFltControlStack::SetAttrInDoc(const SwPosition& rTmpPos,
break;
case RES_FLTR_REDLINE:
{
- if (rEntry.MakeRegion(m_rDoc, aRegion,
+ if (rEntry.MakeRegion(aRegion,
SwFltStackEntry::RegionMode::CheckNodes|SwFltStackEntry::RegionMode::CheckFieldmark))
{
m_rDoc.getIDocumentRedlineAccess().SetRedlineFlags( RedlineFlags::On
@@ -717,7 +714,7 @@ void SwFltControlStack::SetAttrInDoc(const SwPosition& rTmpPos,
break;
default:
{
- if (rEntry.MakeRegion(m_rDoc, aRegion, SwFltStackEntry::RegionMode::NoCheck))
+ if (rEntry.MakeRegion(aRegion, SwFltStackEntry::RegionMode::NoCheck))
{
m_rDoc.getIDocumentContentOperations().InsertPoolItem(aRegion, *rEntry.m_pAttr);
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-21 18:47:22 +0000