sw/inc/crsrsh.hxx | 2
sw/inc/pam.hxx | 10
sw/qa/core/doc/doc.cxx | 4
sw/qa/core/fields/fields.cxx | 2
sw/qa/core/txtnode/txtnode.cxx | 2
sw/qa/core/unocore/unocore.cxx | 16 -
sw/qa/core/uwriter.cxx | 44 ++--
sw/qa/extras/htmlexport/htmlexport.cxx | 2
sw/qa/extras/htmlimport/htmlimport.cxx | 2
sw/qa/extras/tiledrendering/tiledrendering.cxx | 16 -
sw/qa/extras/uiwriter/uiwriter.cxx | 16 -
sw/qa/extras/uiwriter/uiwriter2.cxx | 30 +-
sw/qa/extras/uiwriter/uiwriter3.cxx | 16 -
sw/qa/extras/uiwriter/uiwriter4.cxx | 4
sw/qa/extras/uiwriter/uiwriter5.cxx | 10
sw/qa/extras/uiwriter/uiwriter6.cxx | 20 +
sw/qa/extras/uiwriter/uiwriter7.cxx | 166 ++++++++--------
sw/qa/extras/unowriter/unowriter.cxx | 2
sw/qa/uibase/wrtsh/wrtsh.cxx | 20 -
sw/source/core/crsr/crsrsh.cxx | 20 -
sw/source/core/crsr/crstrvl.cxx | 8
sw/source/core/crsr/swcrsr.cxx | 34 +--
sw/source/core/crsr/trvlfnfl.cxx | 2
sw/source/core/crsr/trvlreg.cxx | 2
sw/source/core/crsr/trvltbl.cxx | 2
sw/source/core/doc/DocumentContentOperationsManager.cxx | 6
sw/source/core/doc/doc.cxx | 4
sw/source/core/doc/docnew.cxx | 10
sw/source/core/doc/docredln.cxx | 2
sw/source/core/doc/number.cxx | 2
sw/source/core/doc/textboxhelper.cxx | 2
sw/source/core/docnode/ndtbl.cxx | 6
sw/source/core/docnode/ndtbl1.cxx | 2
sw/source/core/edit/acorrect.cxx | 16 -
sw/source/core/edit/autofmt.cxx | 12 -
sw/source/core/edit/edattr.cxx | 2
sw/source/core/edit/eddel.cxx | 8
sw/source/core/edit/editsh.cxx | 24 +-
sw/source/core/edit/edlingu.cxx | 10
sw/source/core/edit/ednumber.cxx | 10
sw/source/core/edit/edtab.cxx | 6
sw/source/core/edit/edws.cxx | 8
sw/source/core/frmedt/fecopy.cxx | 24 +-
sw/source/core/frmedt/fefly1.cxx | 2
sw/source/core/frmedt/fetab.cxx | 4
sw/source/core/frmedt/tblsel.cxx | 6
sw/source/core/layout/trvlfrm.cxx | 10
sw/source/core/table/swnewtable.cxx | 4
sw/source/core/text/frmcrsr.cxx | 12 -
sw/source/core/text/itrform2.cxx | 2
sw/source/core/undo/unattr.cxx | 6
sw/source/core/undo/undel.cxx | 2
sw/source/core/undo/undobj.cxx | 10
sw/source/core/undo/undobj1.cxx | 2
sw/source/core/undo/unmove.cxx | 4
sw/source/core/undo/unovwr.cxx | 4
sw/source/core/undo/unredln.cxx | 4
sw/source/core/undo/unsort.cxx | 2
sw/source/core/undo/unspnd.cxx | 2
sw/source/core/undo/untbl.cxx | 12 -
sw/source/core/unocore/unocrsrhelper.cxx | 36 +--
sw/source/core/unocore/unodraw.cxx | 6
sw/source/core/unocore/unofield.cxx | 4
sw/source/core/unocore/unoframe.cxx | 8
sw/source/core/unocore/unoftn.cxx | 4
sw/source/core/unocore/unolinebreak.cxx | 2
sw/source/core/unocore/unoobj.cxx | 14 -
sw/source/core/unocore/unoobj2.cxx | 14 -
sw/source/core/unocore/unoport.cxx | 2
sw/source/core/unocore/unoportenum.cxx | 2
sw/source/core/unocore/unoredline.cxx | 10
sw/source/core/unocore/unorefmk.cxx | 8
sw/source/core/unocore/unosect.cxx | 4
sw/source/core/unocore/unotbl.cxx | 10
sw/source/core/unocore/unotext.cxx | 38 +--
sw/source/filter/basflt/fltshell.cxx | 4
sw/source/filter/basflt/shellio.cxx | 2
sw/source/filter/docx/swdocxreader.cxx | 2
sw/source/filter/html/htmlatr.cxx | 2
sw/source/filter/html/htmlfld.cxx | 2
sw/source/filter/html/htmlftn.cxx | 2
sw/source/filter/html/htmlgrin.cxx | 6
sw/source/filter/html/htmlnumreader.cxx | 8
sw/source/filter/html/htmlnumwriter.cxx | 4
sw/source/filter/html/htmltab.cxx | 2
sw/source/filter/html/swhtml.cxx | 10
sw/source/filter/html/wrthtml.cxx | 6
sw/source/filter/ww8/docxattributeoutput.cxx | 10
sw/source/filter/ww8/rtfexport.cxx | 2
sw/source/filter/ww8/wrtw8sty.cxx | 10
sw/source/filter/ww8/wrtww8.cxx | 6
sw/source/filter/ww8/ww8atr.cxx | 2
sw/source/filter/ww8/ww8par.cxx | 18 -
sw/source/filter/ww8/ww8par2.cxx | 14 -
sw/source/filter/ww8/ww8par3.cxx | 6
sw/source/filter/ww8/ww8par5.cxx | 4
sw/source/filter/ww8/ww8par6.cxx | 8
sw/source/filter/xml/xmltbli.cxx | 2
sw/source/uibase/app/docsh.cxx | 2
sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx | 8
sw/source/uibase/dochdl/swdtflvr.cxx | 22 +-
sw/source/uibase/shells/basesh.cxx | 4
sw/source/uibase/shells/langhelper.cxx | 2
sw/source/uibase/shells/tabsh.cxx | 2
sw/source/uibase/sidebar/WriterInspectorTextPanel.cxx | 4
sw/source/uibase/uiview/swcli.cxx | 2
sw/source/uibase/uno/unotxdoc.cxx | 2
sw/source/uibase/uno/unotxvw.cxx | 8
sw/source/uibase/wrtsh/delete.cxx | 8
sw/source/uibase/wrtsh/wrtsh1.cxx | 4
110 files changed, 528 insertions(+), 528 deletions(-)
New commits:
commit ab0d9af99b2dc69fa8e7463fb33ca28cbccf484d
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Wed Aug 10 11:47:57 2022 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Sun Aug 14 12:02:57 2022 +0200
rename SwPaM::GetNode to GetPointNode/GetContentNode
Using a parameter to select point/mark makes the code much harder to
read
Change-Id: I4ac8b904ac423e2b99253b7e4b6adc72c8afe1a7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138083
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/sw/inc/crsrsh.hxx b/sw/inc/crsrsh.hxx
index d0770ef65cbc..306acf96f3fc 100644
--- a/sw/inc/crsrsh.hxx
+++ b/sw/inc/crsrsh.hxx
@@ -901,7 +901,7 @@ inline bool SwCursorShell::IsMultiSelection() const
inline const SwTableNode* SwCursorShell::IsCursorInTable() const
{
- return m_pCurrentCursor->GetNode().FindTableNode();
+ return m_pCurrentCursor->GetPointNode().FindTableNode();
}
inline bool SwCursorShell::IsCursorPtAtEnd() const
diff --git a/sw/inc/pam.hxx b/sw/inc/pam.hxx
index f25b9c052551..d5d6c74e7031 100644
--- a/sw/inc/pam.hxx
+++ b/sw/inc/pam.hxx
@@ -230,7 +230,7 @@ public:
{
/** clear the mark position; this helps if mark's SwContentIndex is
registered at some node, and that node is then deleted */
- *m_pMark = SwPosition( GetNode().GetNodes() );
+ *m_pMark = SwPosition( GetPointNode().GetNodes() );
m_pMark = m_pPoint;
}
}
@@ -276,15 +276,13 @@ public:
{ if ((*m_pPoint) <= (*m_pMark)) return { m_pPoint, m_pMark };
else return { m_pMark, m_pPoint }; }
/// @return current Node at Point/Mark
- SwNode & GetNode ( bool bPoint = true ) const
- {
- return ( bPoint ? m_pPoint->nNode : m_pMark->nNode ).GetNode();
- }
+ SwNode& GetPointNode() const { return m_pPoint->nNode.GetNode(); }
+ SwNode& GetMarkNode() const { return m_pMark->nNode.GetNode(); }
/// @return current ContentNode at Point/Mark
SwContentNode* GetContentNode( bool bPoint = true ) const
{
- return GetNode(bPoint).GetContentNode();
+ return (bPoint ? m_pPoint->nNode :
m_pMark->nNode).GetNode().GetContentNode();
}
/**
diff --git a/sw/qa/core/doc/doc.cxx b/sw/qa/core/doc/doc.cxx
index 30bb1ffbf264..87bfd2697621 100644
--- a/sw/qa/core/doc/doc.cxx
+++ b/sw/qa/core/doc/doc.cxx
@@ -90,7 +90,7 @@ CPPUNIT_TEST_FIXTURE(SwCoreDocTest, testNumDownIndent)
SwEditWin& rEditWin = pDocShell->GetView()->GetEditWin();
KeyEvent aKeyEvent(0, KEY_TAB);
rEditWin.KeyInput(aKeyEvent);
- SwTextNode* pTextNode = pWrtShell->GetCursor()->GetNode().GetTextNode();
+ SwTextNode* pTextNode =
pWrtShell->GetCursor()->GetPointNode().GetTextNode();
// Without the accompanying fix in place, this test would have failed with:
// - Expected: \tB
@@ -187,7 +187,7 @@ CPPUNIT_TEST_FIXTURE(SwCoreDocTest, testIMEGrouping)
// Then make sure that gets grouped together to a single undo action:
SwWrtShell* pWrtShell = pDocShell->GetWrtShell();
- SwTextNode* pTextNode = pWrtShell->GetCursor()->GetNode().GetTextNode();
+ SwTextNode* pTextNode =
pWrtShell->GetCursor()->GetPointNode().GetTextNode();
CPPUNIT_ASSERT_EQUAL(OUString("ab"), pTextNode->GetText());
// Without the accompanying fix in place, this test would have failed with:
// - Expected: 1
diff --git a/sw/qa/core/fields/fields.cxx b/sw/qa/core/fields/fields.cxx
index 0c57584939b4..6875b1b2c1ae 100644
--- a/sw/qa/core/fields/fields.cxx
+++ b/sw/qa/core/fields/fields.cxx
@@ -57,7 +57,7 @@ CPPUNIT_TEST_FIXTURE(Test, testAuthorityTooltip)
auto pField = dynamic_cast<SwAuthorityField*>(
SwCursorShell::GetFieldAtCursor(pCursor,
/*bIncludeInputFieldAtStart=*/true));
CPPUNIT_ASSERT(pField);
- SwTextNode* pTextNode = pCursor->GetNode().GetTextNode();
+ SwTextNode* pTextNode = pCursor->GetPointNode().GetTextNode();
const SwTextAttr* pTextAttr = pTextNode->GetSwpHints().Get(0);
const SwRootFrame* pLayout = pWrtShell->GetLayout();
OUString aTooltip = pField->GetAuthority(pTextAttr, pLayout);
diff --git a/sw/qa/core/txtnode/txtnode.cxx b/sw/qa/core/txtnode/txtnode.cxx
index bad6155de8c0..d975c32c10fd 100644
--- a/sw/qa/core/txtnode/txtnode.cxx
+++ b/sw/qa/core/txtnode/txtnode.cxx
@@ -238,7 +238,7 @@ CPPUNIT_TEST_FIXTURE(SwCoreTxtnodeTest,
testCheckboxContentControlKeyboard)
rEditWin.KeyInput(aKeyEvent);
// Then make sure the state is toggled:
- SwTextNode* pTextNode = pWrtShell->GetCursor()->GetNode().GetTextNode();
+ SwTextNode* pTextNode =
pWrtShell->GetCursor()->GetPointNode().GetTextNode();
SwTextAttr* pAttr = pTextNode->GetTextAttrForCharAt(0,
RES_TXTATR_CONTENTCONTROL);
auto pTextContentControl =
static_txtattr_cast<SwTextContentControl*>(pAttr);
auto& rFormatContentControl
diff --git a/sw/qa/core/unocore/unocore.cxx b/sw/qa/core/unocore/unocore.cxx
index 1068892af94b..a8075211d06c 100644
--- a/sw/qa/core/unocore/unocore.cxx
+++ b/sw/qa/core/unocore/unocore.cxx
@@ -238,7 +238,7 @@ CPPUNIT_TEST_FIXTURE(SwCoreUnocoreTest, testLineBreakInsert)
// Then make sure that both the line break and its matching text attribute
is inserted:
SwWrtShell* pWrtShell = pDoc->GetDocShell()->GetWrtShell();
- SwNodeOffset nIndex = pWrtShell->GetCursor()->GetNode().GetIndex();
+ SwNodeOffset nIndex = pWrtShell->GetCursor()->GetPointNode().GetIndex();
SwTextNode* pTextNode = pDoc->GetNodes()[nIndex]->GetTextNode();
// Without the accompanying fix in place, this test would have failed with:
// - Expected: "\n" (newline)
@@ -333,7 +333,7 @@ CPPUNIT_TEST_FIXTURE(SwCoreUnocoreTest,
testContentControlInsert)
// Then make sure that the text attribute is inserted:
SwWrtShell* pWrtShell = pDoc->GetDocShell()->GetWrtShell();
- SwNodeOffset nIndex = pWrtShell->GetCursor()->GetNode().GetIndex();
+ SwNodeOffset nIndex = pWrtShell->GetCursor()->GetPointNode().GetIndex();
SwTextNode* pTextNode = pDoc->GetNodes()[nIndex]->GetTextNode();
SwTextAttr* pAttr = pTextNode->GetTextAttrForCharAt(0,
RES_TXTATR_CONTENTCONTROL);
// Without the accompanying fix in place, this test would have failed, as
the
@@ -421,7 +421,7 @@ CPPUNIT_TEST_FIXTURE(SwCoreUnocoreTest,
testContentControlTextPortionEnum)
// Also test the doc model, make sure that there is a dummy character at
the start and end, so
// the user can explicitly decide if they want to expand the content
control or not:
SwWrtShell* pWrtShell = pDoc->GetDocShell()->GetWrtShell();
- OUString aText =
pWrtShell->GetCursor()->GetNode().GetTextNode()->GetText();
+ OUString aText =
pWrtShell->GetCursor()->GetPointNode().GetTextNode()->GetText();
// Without the accompanying fix in place, this test would have failed with:
// - Expected: ^Atest^A
// - Actual : ^Atest
@@ -455,7 +455,7 @@ CPPUNIT_TEST_FIXTURE(SwCoreUnocoreTest,
testContentControlCheckbox)
// Then make sure that the specified properties are set:
SwWrtShell* pWrtShell = pDoc->GetDocShell()->GetWrtShell();
- SwTextNode* pTextNode = pWrtShell->GetCursor()->GetNode().GetTextNode();
+ SwTextNode* pTextNode =
pWrtShell->GetCursor()->GetPointNode().GetTextNode();
SwTextAttr* pAttr = pTextNode->GetTextAttrForCharAt(0,
RES_TXTATR_CONTENTCONTROL);
auto pTextContentControl =
static_txtattr_cast<SwTextContentControl*>(pAttr);
auto& rFormatContentControl
@@ -506,7 +506,7 @@ CPPUNIT_TEST_FIXTURE(SwCoreUnocoreTest,
testContentControlDropdown)
// Then make sure that the specified properties are set:
SwWrtShell* pWrtShell = pDoc->GetDocShell()->GetWrtShell();
- SwTextNode* pTextNode = pWrtShell->GetCursor()->GetNode().GetTextNode();
+ SwTextNode* pTextNode =
pWrtShell->GetCursor()->GetPointNode().GetTextNode();
SwTextAttr* pAttr = pTextNode->GetTextAttrForCharAt(0,
RES_TXTATR_CONTENTCONTROL);
auto pTextContentControl =
static_txtattr_cast<SwTextContentControl*>(pAttr);
auto& rFormatContentControl
@@ -572,7 +572,7 @@ CPPUNIT_TEST_FIXTURE(SwCoreUnocoreTest,
testContentControlPicture)
// Then make sure that the specified properties are set:
SwWrtShell* pWrtShell = pDoc->GetDocShell()->GetWrtShell();
- SwTextNode* pTextNode = pWrtShell->GetCursor()->GetNode().GetTextNode();
+ SwTextNode* pTextNode =
pWrtShell->GetCursor()->GetPointNode().GetTextNode();
SwTextAttr* pAttr = pTextNode->GetTextAttrForCharAt(0,
RES_TXTATR_CONTENTCONTROL);
auto pTextContentControl =
static_txtattr_cast<SwTextContentControl*>(pAttr);
auto& rFormatContentControl
@@ -619,7 +619,7 @@ CPPUNIT_TEST_FIXTURE(SwCoreUnocoreTest,
testContentControlDate)
// Then make sure that the specified properties are set:
SwWrtShell* pWrtShell = pDoc->GetDocShell()->GetWrtShell();
- SwTextNode* pTextNode = pWrtShell->GetCursor()->GetNode().GetTextNode();
+ SwTextNode* pTextNode =
pWrtShell->GetCursor()->GetPointNode().GetTextNode();
SwTextAttr* pAttr = pTextNode->GetTextAttrForCharAt(0,
RES_TXTATR_CONTENTCONTROL);
auto pTextContentControl =
static_txtattr_cast<SwTextContentControl*>(pAttr);
auto& rFormatContentControl
@@ -701,7 +701,7 @@ CPPUNIT_TEST_FIXTURE(SwCoreUnocoreTest,
testContentControlPlainText)
// Then make sure that the text attribute is inserted:
SwWrtShell* pWrtShell = pDoc->GetDocShell()->GetWrtShell();
- SwNodeOffset nIndex = pWrtShell->GetCursor()->GetNode().GetIndex();
+ SwNodeOffset nIndex = pWrtShell->GetCursor()->GetPointNode().GetIndex();
SwTextNode* pTextNode = pDoc->GetNodes()[nIndex]->GetTextNode();
SwTextAttr* pAttr = pTextNode->GetTextAttrForCharAt(0,
RES_TXTATR_CONTENTCONTROL);
CPPUNIT_ASSERT(pAttr);
diff --git a/sw/qa/core/uwriter.cxx b/sw/qa/core/uwriter.cxx
index 79545969c457..45e35a636716 100644
--- a/sw/qa/core/uwriter.cxx
+++ b/sw/qa/core/uwriter.cxx
@@ -302,7 +302,7 @@ static SwTextNode* getModelToViewTestDocument(SwDoc *pDoc)
pDoc->getIDocumentContentOperations().AppendTextNode(*aPaM.GetPoint());
pDoc->getIDocumentContentOperations().InsertString(aPaM, "AAAAA BBBBB ");
- SwTextNode* pTextNode = aPaM.GetNode().GetTextNode();
+ SwTextNode* pTextNode = aPaM.GetPointNode().GetTextNode();
sal_Int32 nPos = aPaM.GetPoint()->GetContentIndex();
pTextNode->InsertItem(aFootnote, nPos, nPos);
pDoc->getIDocumentContentOperations().InsertString(aPaM, " CCCCC ");
@@ -354,7 +354,7 @@ static SwTextNode* getModelToViewTestDocument2(SwDoc *pDoc)
(*pFieldmark->GetParameters())[ODF_FORMDROPDOWN_LISTENTRY] <<=
vListEntries;
(*pFieldmark->GetParameters())[ODF_FORMDROPDOWN_RESULT] <<= sal_Int32(0);
pDoc->getIDocumentContentOperations().InsertString(aPaM, "CCCCC");
- SwTextNode* pTextNode = aPaM.GetNode().GetTextNode();
+ SwTextNode* pTextNode = aPaM.GetPointNode().GetTextNode();
CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(11),
pTextNode->GetText().getLength());
@@ -581,7 +581,7 @@ void SwDocTest::testSwScanner()
SwNodeIndex aIdx(m_pDoc->GetNodes().GetEndOfContent(), -1);
SwPaM aPaM(aIdx);
- SwTextNode* pTextNode = aPaM.GetNode().GetTextNode();
+ SwTextNode* pTextNode = aPaM.GetPointNode().GetTextNode();
CPPUNIT_ASSERT_MESSAGE("Has Text Node", pTextNode);
@@ -618,7 +618,7 @@ void SwDocTest::testSwScanner()
m_pDoc->getIDocumentContentOperations().InsertPoolItem(aPaM,
aWestLangItem );
SwDocStat aDocStat;
- pTextNode = aPaM.GetNode().GetTextNode();
+ pTextNode = aPaM.GetPointNode().GetTextNode();
pTextNode->CountWords(aDocStat, 0, IDEOGRAPHICFULLSTOP_D.getLength());
CPPUNIT_ASSERT_EQUAL(static_cast<sal_uLong>(2), aDocStat.nChar);
@@ -651,7 +651,7 @@ void SwDocTest::testSwScanner()
m_pDoc->getIDocumentContentOperations().InsertPoolItem(aPaM,
aWestLangItem );
SwDocStat aDocStat;
- pTextNode = aPaM.GetNode().GetTextNode();
+ pTextNode = aPaM.GetPointNode().GetTextNode();
pTextNode->CountWords(aDocStat, 0, test.getLength());
CPPUNIT_ASSERT_EQUAL_MESSAGE("words", static_cast<sal_uLong>(58),
aDocStat.nWord);
CPPUNIT_ASSERT_EQUAL_MESSAGE("Asian characters and Korean syllables",
static_cast<sal_uLong>(43), aDocStat.nAsianWord);
@@ -671,7 +671,7 @@ void SwDocTest::testSwScanner()
m_pDoc->getIDocumentContentOperations().AppendTextNode(*aPaM.GetPoint());
m_pDoc->getIDocumentContentOperations().InsertString(aPaM,
aShouldBeThree);
- pTextNode = aPaM.GetNode().GetTextNode();
+ pTextNode = aPaM.GetPointNode().GetTextNode();
pTextNode->CountWords(aDocStat, 0, aShouldBeThree.getLength());
CPPUNIT_ASSERT_EQUAL(static_cast<sal_uLong>(3), aDocStat.nWord);
@@ -686,7 +686,7 @@ void SwDocTest::testSwScanner()
m_pDoc->getIDocumentContentOperations().AppendTextNode(*aPaM.GetPoint());
m_pDoc->getIDocumentContentOperations().InsertString(aPaM,
aShouldBeFive);
- pTextNode = aPaM.GetNode().GetTextNode();
+ pTextNode = aPaM.GetPointNode().GetTextNode();
aDocStat.Reset();
pTextNode->CountWords(aDocStat, 0, aShouldBeFive.getLength());
CPPUNIT_ASSERT_EQUAL(static_cast<sal_uLong>(5), aDocStat.nWord);
@@ -698,7 +698,7 @@ void SwDocTest::testSwScanner()
m_pDoc->getIDocumentContentOperations().AppendTextNode(*aPaM.GetPoint());
m_pDoc->getIDocumentContentOperations().InsertString(aPaM, "Apple");
- pTextNode = aPaM.GetNode().GetTextNode();
+ pTextNode = aPaM.GetPointNode().GetTextNode();
sal_Int32 nPos = aPaM.GetPoint()->GetContentIndex();
SwFormatFootnote aFootnote;
aFootnote.SetNumStr("banana");
@@ -731,7 +731,7 @@ void SwDocTest::testSwScanner()
m_pDoc->getIDocumentContentOperations().InsertPoolItem(aPaM,
SwFormatField(aPostIt));
m_pDoc->getIDocumentContentOperations().InsertString(aPaM, "Apple");
- pTextNode = aPaM.GetNode().GetTextNode();
+ pTextNode = aPaM.GetPointNode().GetTextNode();
aDocStat.Reset();
pTextNode->CountWords(aDocStat, 0, pTextNode->Len());
CPPUNIT_ASSERT_EQUAL(static_cast<sal_uLong>(1), aDocStat.nWord);
@@ -748,7 +748,7 @@ void SwDocTest::testSwScanner()
static constexpr OUStringLiteral aString = u"Lorem ipsum";
m_pDoc->getIDocumentContentOperations().AppendTextNode(*aPaM.GetPoint());
m_pDoc->getIDocumentContentOperations().InsertString(aPaM, aString);
- pTextNode = aPaM.GetNode().GetTextNode();
+ pTextNode = aPaM.GetPointNode().GetTextNode();
pTextNode->CountWords(aDocStat, 0, pTextNode->Len());
CPPUNIT_ASSERT_EQUAL(static_cast<sal_uLong>(2), aDocStat.nWord);
@@ -809,7 +809,7 @@ void SwDocTest::testSwScanner()
aPaM.GetPoint()->nContent.Assign(aPaM.GetContentNode(), 0);
m_pDoc->getIDocumentContentOperations().InsertString(aPaM,
"redline-new-text ");
aDocStat.Reset();
- pTextNode = aPaM.GetNode().GetTextNode();
+ pTextNode = aPaM.GetPointNode().GetTextNode();
pTextNode->SetWordCountDirty(true);
pTextNode->CountWords(aDocStat, 0, pTextNode->Len());
CPPUNIT_ASSERT_EQUAL(static_cast<sal_uLong>(2), aDocStat.nWord);
@@ -829,7 +829,7 @@ void SwDocTest::testSwScanner()
m_pDoc->getIDocumentContentOperations().AppendTextNode(*aPaM.GetPoint());
m_pDoc->getIDocumentContentOperations().InsertString(aPaM,
sTemplate.replace('X', ' '));
- pTextNode = aPaM.GetNode().GetTextNode();
+ pTextNode = aPaM.GetPointNode().GetTextNode();
pTextNode->CountWords(aDocStat, 0, pTextNode->Len());
CPPUNIT_ASSERT_EQUAL(sal_uLong(4), aDocStat.nWord);
CPPUNIT_ASSERT_EQUAL(sal_uLong(12), aDocStat.nCharExcludingSpaces);
@@ -838,7 +838,7 @@ void SwDocTest::testSwScanner()
m_pDoc->getIDocumentContentOperations().AppendTextNode(*aPaM.GetPoint());
m_pDoc->getIDocumentContentOperations().InsertString(aPaM,
sTemplate.replaceAll("X", " = "));
- pTextNode = aPaM.GetNode().GetTextNode();
+ pTextNode = aPaM.GetPointNode().GetTextNode();
pTextNode->CountWords(aDocStat, 0, pTextNode->Len());
CPPUNIT_ASSERT_EQUAL(sal_uLong(5), aDocStat.nWord);
CPPUNIT_ASSERT_EQUAL(sal_uLong(13), aDocStat.nCharExcludingSpaces);
@@ -847,7 +847,7 @@ void SwDocTest::testSwScanner()
m_pDoc->getIDocumentContentOperations().AppendTextNode(*aPaM.GetPoint());
m_pDoc->getIDocumentContentOperations().InsertString(aPaM,
sTemplate.replaceAll("X", " _ "));
- pTextNode = aPaM.GetNode().GetTextNode();
+ pTextNode = aPaM.GetPointNode().GetTextNode();
pTextNode->CountWords(aDocStat, 0, pTextNode->Len());
CPPUNIT_ASSERT_EQUAL(sal_uLong(5), aDocStat.nWord);
CPPUNIT_ASSERT_EQUAL(sal_uLong(13), aDocStat.nCharExcludingSpaces);
@@ -856,7 +856,7 @@ void SwDocTest::testSwScanner()
m_pDoc->getIDocumentContentOperations().AppendTextNode(*aPaM.GetPoint());
m_pDoc->getIDocumentContentOperations().InsertString(aPaM,
sTemplate.replaceAll("X", " -- "));
- pTextNode = aPaM.GetNode().GetTextNode();
+ pTextNode = aPaM.GetPointNode().GetTextNode();
pTextNode->CountWords(aDocStat, 0, pTextNode->Len());
CPPUNIT_ASSERT_EQUAL(sal_uLong(5), aDocStat.nWord);
CPPUNIT_ASSERT_EQUAL(sal_uLong(14), aDocStat.nCharExcludingSpaces);
@@ -865,7 +865,7 @@ void SwDocTest::testSwScanner()
m_pDoc->getIDocumentContentOperations().AppendTextNode(*aPaM.GetPoint());
m_pDoc->getIDocumentContentOperations().InsertString(aPaM,
sTemplate.replace('X', '_'));
- pTextNode = aPaM.GetNode().GetTextNode();
+ pTextNode = aPaM.GetPointNode().GetTextNode();
pTextNode->CountWords(aDocStat, 0, pTextNode->Len());
CPPUNIT_ASSERT_EQUAL(sal_uLong(3), aDocStat.nWord);
CPPUNIT_ASSERT_EQUAL(sal_uLong(13), aDocStat.nCharExcludingSpaces);
@@ -874,7 +874,7 @@ void SwDocTest::testSwScanner()
m_pDoc->getIDocumentContentOperations().AppendTextNode(*aPaM.GetPoint());
m_pDoc->getIDocumentContentOperations().InsertString(aPaM,
sTemplate.replace('X', '-'));
- pTextNode = aPaM.GetNode().GetTextNode();
+ pTextNode = aPaM.GetPointNode().GetTextNode();
pTextNode->CountWords(aDocStat, 0, pTextNode->Len());
CPPUNIT_ASSERT_EQUAL(sal_uLong(3), aDocStat.nWord);
CPPUNIT_ASSERT_EQUAL(sal_uLong(13), aDocStat.nCharExcludingSpaces);
@@ -883,7 +883,7 @@ void SwDocTest::testSwScanner()
m_pDoc->getIDocumentContentOperations().AppendTextNode(*aPaM.GetPoint());
m_pDoc->getIDocumentContentOperations().InsertString(aPaM,
sTemplate.replace('X', 0x2012));
- pTextNode = aPaM.GetNode().GetTextNode();
+ pTextNode = aPaM.GetPointNode().GetTextNode();
pTextNode->CountWords(aDocStat, 0, pTextNode->Len());
CPPUNIT_ASSERT_EQUAL(sal_uLong(3), aDocStat.nWord);
CPPUNIT_ASSERT_EQUAL(sal_uLong(13), aDocStat.nCharExcludingSpaces);
@@ -892,7 +892,7 @@ void SwDocTest::testSwScanner()
m_pDoc->getIDocumentContentOperations().AppendTextNode(*aPaM.GetPoint());
m_pDoc->getIDocumentContentOperations().InsertString(aPaM,
sTemplate.replace('X', 0x2015));
- pTextNode = aPaM.GetNode().GetTextNode();
+ pTextNode = aPaM.GetPointNode().GetTextNode();
pTextNode->CountWords(aDocStat, 0, pTextNode->Len());
CPPUNIT_ASSERT_EQUAL(sal_uLong(3), aDocStat.nWord);
CPPUNIT_ASSERT_EQUAL(sal_uLong(13), aDocStat.nCharExcludingSpaces);
@@ -903,7 +903,7 @@ void SwDocTest::testSwScanner()
//and endash as word separators for word-counting
m_pDoc->getIDocumentContentOperations().AppendTextNode(*aPaM.GetPoint());
m_pDoc->getIDocumentContentOperations().InsertString(aPaM,
sTemplate.replace('X', 0x2013));
- pTextNode = aPaM.GetNode().GetTextNode();
+ pTextNode = aPaM.GetPointNode().GetTextNode();
pTextNode->CountWords(aDocStat, 0, pTextNode->Len());
CPPUNIT_ASSERT_EQUAL(sal_uLong(4), aDocStat.nWord);
CPPUNIT_ASSERT_EQUAL(sal_uLong(13), aDocStat.nCharExcludingSpaces);
@@ -912,7 +912,7 @@ void SwDocTest::testSwScanner()
m_pDoc->getIDocumentContentOperations().AppendTextNode(*aPaM.GetPoint());
m_pDoc->getIDocumentContentOperations().InsertString(aPaM,
sTemplate.replace('X', 0x2014));
- pTextNode = aPaM.GetNode().GetTextNode();
+ pTextNode = aPaM.GetPointNode().GetTextNode();
pTextNode->CountWords(aDocStat, 0, pTextNode->Len());
CPPUNIT_ASSERT_EQUAL(sal_uLong(4), aDocStat.nWord);
CPPUNIT_ASSERT_EQUAL(sal_uLong(13), aDocStat.nCharExcludingSpaces);
@@ -922,7 +922,7 @@ void SwDocTest::testSwScanner()
static constexpr OUStringLiteral sChunk = u" \u2013 ";
m_pDoc->getIDocumentContentOperations().AppendTextNode(*aPaM.GetPoint());
m_pDoc->getIDocumentContentOperations().InsertString(aPaM,
sTemplate.replaceAll("X", sChunk));
- pTextNode = aPaM.GetNode().GetTextNode();
+ pTextNode = aPaM.GetPointNode().GetTextNode();
pTextNode->CountWords(aDocStat, 0, pTextNode->Len());
CPPUNIT_ASSERT_EQUAL(sal_uLong(4), aDocStat.nWord);
CPPUNIT_ASSERT_EQUAL(sal_uLong(13), aDocStat.nCharExcludingSpaces);
diff --git a/sw/qa/extras/htmlexport/htmlexport.cxx
b/sw/qa/extras/htmlexport/htmlexport.cxx
index d5fabe41245c..e3f2afb6de97 100644
--- a/sw/qa/extras/htmlexport/htmlexport.cxx
+++ b/sw/qa/extras/htmlexport/htmlexport.cxx
@@ -2183,7 +2183,7 @@ CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest,
testTrailingLineBreak)
CPPUNIT_ASSERT(pTextDoc);
pDoc = pTextDoc->GetDocShell()->GetDoc();
pWrtShell = pDoc->GetDocShell()->GetWrtShell();
- OUString aActual =
pWrtShell->GetCursor()->GetNode().GetTextNode()->GetText();
+ OUString aActual =
pWrtShell->GetCursor()->GetPointNode().GetTextNode()->GetText();
// Without the accompanying fix in place, this test would have failed, as
the trailing
// line-break was lost.
CPPUNIT_ASSERT_EQUAL(OUString("test\n"), aActual);
diff --git a/sw/qa/extras/htmlimport/htmlimport.cxx
b/sw/qa/extras/htmlimport/htmlimport.cxx
index 19c776fe687e..866477d5ac30 100644
--- a/sw/qa/extras/htmlimport/htmlimport.cxx
+++ b/sw/qa/extras/htmlimport/htmlimport.cxx
@@ -206,7 +206,7 @@ CPPUNIT_TEST_FIXTURE(HtmlImportTest, testImageWidthAuto)
SwXTextDocument* pTextDoc = dynamic_cast<SwXTextDocument
*>(mxComponent.get());
CPPUNIT_ASSERT(pTextDoc);
SwTextAttr const*const
pAttr(pTextDoc->GetDocShell()->GetDoc()->GetEditShell()->
- GetCursor()->GetNode().GetTextNode()->GetTextAttrForCharAt(0,
RES_TXTATR_FLYCNT));
+ GetCursor()->GetPointNode().GetTextNode()->GetTextAttrForCharAt(0,
RES_TXTATR_FLYCNT));
CPPUNIT_ASSERT(pAttr);
SwFrameFormat const*const pFmt(pAttr->GetFlyCnt().GetFrameFormat());
SwFormatFrameSize const& rSize(pFmt->GetFormatAttr(RES_FRM_SIZE));
diff --git a/sw/qa/extras/tiledrendering/tiledrendering.cxx
b/sw/qa/extras/tiledrendering/tiledrendering.cxx
index 32233cda4349..d4cbf8d60c41 100644
--- a/sw/qa/extras/tiledrendering/tiledrendering.cxx
+++ b/sw/qa/extras/tiledrendering/tiledrendering.cxx
@@ -1193,14 +1193,14 @@ CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest,
testUndoReordering)
pWrtShell2->SplitNode();
SfxLokHelper::setView(nView1);
pWrtShell1->SttEndDoc(/*bStt=*/true);
- SwTextNode* pTextNode1 = pWrtShell1->GetCursor()->GetNode().GetTextNode();
+ SwTextNode* pTextNode1 =
pWrtShell1->GetCursor()->GetPointNode().GetTextNode();
// View 1 types into the first paragraph.
pXTextDocument->postKeyEvent(LOK_KEYEVENT_KEYINPUT, 'a', 0);
pXTextDocument->postKeyEvent(LOK_KEYEVENT_KEYUP, 'a', 0);
Scheduler::ProcessEventsToIdle();
SfxLokHelper::setView(nView2);
pWrtShell2->SttEndDoc(/*bStt=*/false);
- SwTextNode* pTextNode2 = pWrtShell2->GetCursor()->GetNode().GetTextNode();
+ SwTextNode* pTextNode2 =
pWrtShell2->GetCursor()->GetPointNode().GetTextNode();
// View 2 types into the second paragraph.
pXTextDocument->postKeyEvent(LOK_KEYEVENT_KEYINPUT, 'z', 0);
pXTextDocument->postKeyEvent(LOK_KEYEVENT_KEYUP, 'z', 0);
@@ -1238,7 +1238,7 @@ CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest,
testUndoReorderingRedo)
pWrtShell2->SplitNode();
SfxLokHelper::setView(nView1);
pWrtShell1->SttEndDoc(/*bStt=*/true);
- SwTextNode* pTextNode1 = pWrtShell1->GetCursor()->GetNode().GetTextNode();
+ SwTextNode* pTextNode1 =
pWrtShell1->GetCursor()->GetPointNode().GetTextNode();
// View 1 types into the first paragraph, twice.
pXTextDocument->postKeyEvent(LOK_KEYEVENT_KEYINPUT, 'f', 0);
pXTextDocument->postKeyEvent(LOK_KEYEVENT_KEYUP, 'f', 0);
@@ -1250,7 +1250,7 @@ CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest,
testUndoReorderingRedo)
Scheduler::ProcessEventsToIdle();
SfxLokHelper::setView(nView2);
pWrtShell2->SttEndDoc(/*bStt=*/false);
- SwTextNode* pTextNode2 = pWrtShell2->GetCursor()->GetNode().GetTextNode();
+ SwTextNode* pTextNode2 =
pWrtShell2->GetCursor()->GetPointNode().GetTextNode();
// View 2 types into the second paragraph.
pXTextDocument->postKeyEvent(LOK_KEYEVENT_KEYINPUT, 'z', 0);
pXTextDocument->postKeyEvent(LOK_KEYEVENT_KEYUP, 'z', 0);
@@ -1292,14 +1292,14 @@ CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest,
testUndoReorderingMulti)
pWrtShell2->SplitNode();
SfxLokHelper::setView(nView1);
pWrtShell1->SttEndDoc(/*bStt=*/true);
- SwTextNode* pTextNode1 = pWrtShell1->GetCursor()->GetNode().GetTextNode();
+ SwTextNode* pTextNode1 =
pWrtShell1->GetCursor()->GetPointNode().GetTextNode();
// View 1 types into the first paragraph.
pXTextDocument->postKeyEvent(LOK_KEYEVENT_KEYINPUT, 'a', 0);
pXTextDocument->postKeyEvent(LOK_KEYEVENT_KEYUP, 'a', 0);
Scheduler::ProcessEventsToIdle();
SfxLokHelper::setView(nView2);
pWrtShell2->SttEndDoc(/*bStt=*/false);
- SwTextNode* pTextNode2 = pWrtShell2->GetCursor()->GetNode().GetTextNode();
+ SwTextNode* pTextNode2 =
pWrtShell2->GetCursor()->GetPointNode().GetTextNode();
// View 2 types into the second paragraph, twice.
pXTextDocument->postKeyEvent(LOK_KEYEVENT_KEYINPUT, 'x', 0);
pXTextDocument->postKeyEvent(LOK_KEYEVENT_KEYUP, 'x', 0);
@@ -3582,7 +3582,7 @@ CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest,
testDropDownContentControl)
pXTextDocument->executeContentControlEvent(aArguments);
// Then make sure that the document is updated accordingly:
- SwTextNode* pTextNode = pWrtShell->GetCursor()->GetNode().GetTextNode();
+ SwTextNode* pTextNode =
pWrtShell->GetCursor()->GetPointNode().GetTextNode();
// Without the accompanying fix in place, this test would have failed with:
// - Expected: green
// - Actual : choose an item
@@ -3703,7 +3703,7 @@ CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest,
testDateContentControl)
pXTextDocument->executeContentControlEvent(aArguments);
// Then make sure that the document is updated accordingly:
- SwTextNode* pTextNode = pWrtShell->GetCursor()->GetNode().GetTextNode();
+ SwTextNode* pTextNode =
pWrtShell->GetCursor()->GetPointNode().GetTextNode();
// Without the accompanying fix in place, this test would have failed with:
// - Expected: 2022-05-30
// - Actual : choose a date
diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx
b/sw/qa/extras/uiwriter/uiwriter.cxx
index f18b5868a802..d1dc0564daa2 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -148,7 +148,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest, testReplaceForward)
pDoc->getIDocumentContentOperations().InsertString(aPaM,
ORIGINAL_REPLACE_CONTENT);
- SwTextNode* pTextNode = aPaM.GetNode().GetTextNode();
+ SwTextNode* pTextNode = aPaM.GetPointNode().GetTextNode();
lcl_selectCharacters(aPaM, 5, 9);
pDoc->getIDocumentContentOperations().ReplaceRange(aPaM, "toto", false);
@@ -503,7 +503,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest, testReplaceBackward)
SwPaM aPaM(aIdx);
pDoc->getIDocumentContentOperations().InsertString(aPaM, "toto titi tutu");
- SwTextNode* pTextNode = aPaM.GetNode().GetTextNode();
+ SwTextNode* pTextNode = aPaM.GetPointNode().GetTextNode();
lcl_selectCharacters(aPaM, 9, 5);
pDoc->getIDocumentContentOperations().ReplaceRange(aPaM, "toto", false);
@@ -573,7 +573,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest, testImportRTF)
CPPUNIT_ASSERT(pRTFReader != nullptr);
CPPUNIT_ASSERT_EQUAL(ERRCODE_NONE, aReader.Read(*pRTFReader));
- SwNodeOffset nIndex = pWrtShell->GetCursor()->GetNode().GetIndex();
+ SwNodeOffset nIndex = pWrtShell->GetCursor()->GetPointNode().GetIndex();
CPPUNIT_ASSERT_EQUAL(OUString("fooHello world!"), pDoc->GetNodes()[nIndex
- 1]->GetTextNode()->GetText());
CPPUNIT_ASSERT_EQUAL(OUString("bar"),
pDoc->GetNodes()[nIndex]->GetTextNode()->GetText());
}
@@ -1055,7 +1055,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest,
testChineseConversionBlank)
aWrap.Convert();
// Then
- SwTextNode* pTextNode = aPaM.GetNode().GetTextNode();
+ SwTextNode* pTextNode = aPaM.GetPointNode().GetTextNode();
CPPUNIT_ASSERT_EQUAL(OUString(), pTextNode->GetText());
}
@@ -1079,7 +1079,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest,
testChineseConversionNonChineseText)
aWrap.Convert();
// Then
- SwTextNode* pTextNode = aPaM.GetNode().GetTextNode();
+ SwTextNode* pTextNode = aPaM.GetPointNode().GetTextNode();
CPPUNIT_ASSERT_EQUAL(OUString(NON_CHINESE_CONTENT), pTextNode->GetText());
}
@@ -1103,7 +1103,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest,
testChineseConversionTraditionalToSimplifie
aWrap.Convert();
// Then
- SwTextNode* pTextNode = aPaM.GetNode().GetTextNode();
+ SwTextNode* pTextNode = aPaM.GetPointNode().GetTextNode();
CPPUNIT_ASSERT_EQUAL(OUString(CHINESE_SIMPLIFIED_CONTENT),
pTextNode->GetText());
}
@@ -1127,7 +1127,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest,
testChineseConversionSimplifiedToTraditiona
aWrap.Convert();
// Then
- SwTextNode* pTextNode = aPaM.GetNode().GetTextNode();
+ SwTextNode* pTextNode = aPaM.GetPointNode().GetTextNode();
CPPUNIT_ASSERT_EQUAL(OUString(CHINESE_TRADITIONAL_CONTENT),
pTextNode->GetText());
}
@@ -1429,7 +1429,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest, testTdf68183)
SwNodeIndex aIdx(pDoc->GetNodes().GetEndOfContent(), -1);
SwPaM aPaM(aIdx);
- SwTextNode* pTextNode = aPaM.GetNode().GetTextNode();
+ SwTextNode* pTextNode = aPaM.GetPointNode().GetTextNode();
CPPUNIT_ASSERT_EQUAL(false,
pTextNode->GetSwAttrSet().HasItem(RES_PARATR_RSID));
// Then enable storing of RSID and make sure that the attribute is
inserted.
diff --git a/sw/qa/extras/uiwriter/uiwriter2.cxx
b/sw/qa/extras/uiwriter/uiwriter2.cxx
index 8a903e4988af..8be6eb520413 100644
--- a/sw/qa/extras/uiwriter/uiwriter2.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter2.cxx
@@ -832,17 +832,17 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testTdf131912)
pDoc->getIDocumentContentOperations().ReplaceRange(*pCursor, "blahblah",
false);
CPPUNIT_ASSERT_EQUAL(size_t(1), pDoc->GetFlyCount(FLYCNTTYPE_FRM));
- CPPUNIT_ASSERT_EQUAL(OUString("blahblah"),
pCursor->GetNode().GetTextNode()->GetText());
+ CPPUNIT_ASSERT_EQUAL(OUString("blahblah"),
pCursor->GetPointNode().GetTextNode()->GetText());
rUndoManager.Undo();
CPPUNIT_ASSERT_EQUAL(size_t(1), pDoc->GetFlyCount(FLYCNTTYPE_FRM));
- CPPUNIT_ASSERT_EQUAL(OUString("foo"),
pCursor->GetNode().GetTextNode()->GetText());
+ CPPUNIT_ASSERT_EQUAL(OUString("foo"),
pCursor->GetPointNode().GetTextNode()->GetText());
rUndoManager.Redo();
CPPUNIT_ASSERT_EQUAL(size_t(1), pDoc->GetFlyCount(FLYCNTTYPE_FRM));
- CPPUNIT_ASSERT_EQUAL(OUString("blahblah"),
pCursor->GetNode().GetTextNode()->GetText());
+ CPPUNIT_ASSERT_EQUAL(OUString("blahblah"),
pCursor->GetPointNode().GetTextNode()->GetText());
rUndoManager.Undo();
@@ -853,17 +853,17 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testTdf131912)
pDoc->getIDocumentContentOperations().ReplaceRange(*pCursor, "x", false);
CPPUNIT_ASSERT_EQUAL(size_t(1), pDoc->GetFlyCount(FLYCNTTYPE_FRM));
- CPPUNIT_ASSERT_EQUAL(OUString("x"),
pCursor->GetNode().GetTextNode()->GetText());
+ CPPUNIT_ASSERT_EQUAL(OUString("x"),
pCursor->GetPointNode().GetTextNode()->GetText());
rUndoManager.Undo();
CPPUNIT_ASSERT_EQUAL(size_t(1), pDoc->GetFlyCount(FLYCNTTYPE_FRM));
- CPPUNIT_ASSERT_EQUAL(OUString("foo"),
pCursor->GetNode().GetTextNode()->GetText());
+ CPPUNIT_ASSERT_EQUAL(OUString("foo"),
pCursor->GetPointNode().GetTextNode()->GetText());
rUndoManager.Redo();
CPPUNIT_ASSERT_EQUAL(size_t(1), pDoc->GetFlyCount(FLYCNTTYPE_FRM));
- CPPUNIT_ASSERT_EQUAL(OUString("x"),
pCursor->GetNode().GetTextNode()->GetText());
+ CPPUNIT_ASSERT_EQUAL(OUString("x"),
pCursor->GetPointNode().GetTextNode()->GetText());
rUndoManager.Undo();
@@ -876,14 +876,14 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testTdf131912)
CPPUNIT_ASSERT_EQUAL(size_t(1), pDoc->GetFlyCount(FLYCNTTYPE_FRM));
pWrtShell->StartOfSection(false);
CPPUNIT_ASSERT_EQUAL(OUString("xyz"),
-
pWrtShell->GetCursor()->GetNode().GetTextNode()->GetText());
+
pWrtShell->GetCursor()->GetPointNode().GetTextNode()->GetText());
pWrtShell->EndOfSection(true);
CPPUNIT_ASSERT_EQUAL(OUString("xyz\n\nquux\n"),
pWrtShell->GetCursor()->GetText());
rUndoManager.Undo();
CPPUNIT_ASSERT_EQUAL(size_t(1), pDoc->GetFlyCount(FLYCNTTYPE_FRM));
- CPPUNIT_ASSERT_EQUAL(OUString("foo"),
pCursor->GetNode().GetTextNode()->GetText());
+ CPPUNIT_ASSERT_EQUAL(OUString("foo"),
pCursor->GetPointNode().GetTextNode()->GetText());
pWrtShell->StartOfSection(false);
pWrtShell->EndOfSection(true);
CPPUNIT_ASSERT_EQUAL(OUString("foo"), pWrtShell->GetCursor()->GetText());
@@ -893,7 +893,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testTdf131912)
CPPUNIT_ASSERT_EQUAL(size_t(1), pDoc->GetFlyCount(FLYCNTTYPE_FRM));
pWrtShell->StartOfSection(false);
CPPUNIT_ASSERT_EQUAL(OUString("xyz"),
-
pWrtShell->GetCursor()->GetNode().GetTextNode()->GetText());
+
pWrtShell->GetCursor()->GetPointNode().GetTextNode()->GetText());
pWrtShell->EndOfSection(true);
CPPUNIT_ASSERT_EQUAL(OUString("xyz\n\nquux\n"),
pWrtShell->GetCursor()->GetText());
@@ -905,7 +905,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testTdf131912)
CPPUNIT_ASSERT_EQUAL(size_t(1), pDoc->GetFlyCount(FLYCNTTYPE_FRM));
pWrtShell->StartOfSection(false);
CPPUNIT_ASSERT_EQUAL(OUString("bar"),
-
pWrtShell->GetCursor()->GetNode().GetTextNode()->GetText());
+
pWrtShell->GetCursor()->GetPointNode().GetTextNode()->GetText());
pWrtShell->EndOfSection(true);
CPPUNIT_ASSERT_EQUAL(OUString("bar\nquux\n"),
pWrtShell->GetCursor()->GetText());
@@ -914,7 +914,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testTdf131912)
CPPUNIT_ASSERT_EQUAL(size_t(1), pDoc->GetFlyCount(FLYCNTTYPE_FRM));
pWrtShell->StartOfSection(false);
CPPUNIT_ASSERT_EQUAL(OUString("xyz"),
-
pWrtShell->GetCursor()->GetNode().GetTextNode()->GetText());
+
pWrtShell->GetCursor()->GetPointNode().GetTextNode()->GetText());
pWrtShell->EndOfSection(true);
CPPUNIT_ASSERT_EQUAL(OUString("xyz\n\nquux\n"),
pWrtShell->GetCursor()->GetText());
@@ -923,7 +923,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testTdf131912)
CPPUNIT_ASSERT_EQUAL(size_t(1), pDoc->GetFlyCount(FLYCNTTYPE_FRM));
pWrtShell->StartOfSection(false);
CPPUNIT_ASSERT_EQUAL(OUString("bar"),
-
pWrtShell->GetCursor()->GetNode().GetTextNode()->GetText());
+
pWrtShell->GetCursor()->GetPointNode().GetTextNode()->GetText());
pWrtShell->EndOfSection(true);
CPPUNIT_ASSERT_EQUAL(OUString("bar\nquux\n"),
pWrtShell->GetCursor()->GetText());
@@ -932,14 +932,14 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testTdf131912)
CPPUNIT_ASSERT_EQUAL(size_t(1), pDoc->GetFlyCount(FLYCNTTYPE_FRM));
pWrtShell->StartOfSection(false);
CPPUNIT_ASSERT_EQUAL(OUString("xyz"),
-
pWrtShell->GetCursor()->GetNode().GetTextNode()->GetText());
+
pWrtShell->GetCursor()->GetPointNode().GetTextNode()->GetText());
pWrtShell->EndOfSection(true);
CPPUNIT_ASSERT_EQUAL(OUString("xyz\n\nquux\n"),
pWrtShell->GetCursor()->GetText());
rUndoManager.Undo();
CPPUNIT_ASSERT_EQUAL(size_t(1), pDoc->GetFlyCount(FLYCNTTYPE_FRM));
- CPPUNIT_ASSERT_EQUAL(OUString("foo"),
pCursor->GetNode().GetTextNode()->GetText());
+ CPPUNIT_ASSERT_EQUAL(OUString("foo"),
pCursor->GetPointNode().GetTextNode()->GetText());
pWrtShell->StartOfSection(false);
pWrtShell->EndOfSection(true);
CPPUNIT_ASSERT_EQUAL(OUString("foo"), pWrtShell->GetCursor()->GetText());
@@ -1952,7 +1952,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest2,
testTdf108687_tabstop)
{
SwDoc* pDoc = createSwDoc(DATA_DIRECTORY, "tdf108687_tabstop.odt");
SwWrtShell* pWrtShell = pDoc->GetDocShell()->GetWrtShell();
- SwNodeOffset nStartIndex = pWrtShell->GetCursor()->GetNode().GetIndex();
+ SwNodeOffset nStartIndex =
pWrtShell->GetCursor()->GetPointNode().GetIndex();
CPPUNIT_ASSERT_EQUAL(SwNodeOffset(9), nStartIndex);
// Now pressing 'tab' should jump to the radio buttons.
diff --git a/sw/qa/extras/uiwriter/uiwriter3.cxx
b/sw/qa/extras/uiwriter/uiwriter3.cxx
index 79f8b9cf27ea..24d34f512388 100644
--- a/sw/qa/extras/uiwriter/uiwriter3.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter3.cxx
@@ -769,7 +769,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf61154)
const SwTOXBase* pTOXBase = pWrtShell->GetCurTOX();
pWrtShell->UpdateTableOf(*pTOXBase);
SwCursorShell* pShell(pDoc->GetEditShell());
- SwTextNode* pTitleNode = pShell->GetCursor()->GetNode().GetTextNode();
+ SwTextNode* pTitleNode = pShell->GetCursor()->GetPointNode().GetTextNode();
SwNodeIndex aIdx(*pTitleNode);
// table of contents node shouldn't contain tracked deletion
@@ -818,7 +818,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf100691)
const SwTOXBase* pTOXBase = pWrtShell->GetCurTOX();
pWrtShell->UpdateTableOf(*pTOXBase);
SwCursorShell* pShell(pDoc->GetEditShell());
- SwTextNode* pTitleNode = pShell->GetCursor()->GetNode().GetTextNode();
+ SwTextNode* pTitleNode = pShell->GetCursor()->GetPointNode().GetTextNode();
SwNodeIndex aIdx(*pTitleNode);
// table of contents node shouldn't contain invisible text
@@ -1394,7 +1394,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testToxmarkLinks)
CPPUNIT_ASSERT_EQUAL(OUString("#1%19the%20tocmark%19C%7Ctoxmark"),
url);
rView.JumpToSwMark(url.subView(1)); //
SfxApplication::OpenDocExec_Impl eats the "#"
CPPUNIT_ASSERT_EQUAL(OUString(OUStringChar(CH_TXTATR_INWORD) +
"tocmark"),
-
pWrtShell->GetCursor()->GetNode().GetTextNode()->GetText());
+
pWrtShell->GetCursor()->GetPointNode().GetTextNode()->GetText());
pWrtShell->Pop(SwCursorShell::PopMode::DeleteCurrent);
}
@@ -1409,7 +1409,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testToxmarkLinks)
CPPUNIT_ASSERT_EQUAL(OUString("#__RefHeading___Toc105_706348105"),
url);
rView.JumpToSwMark(url.subView(1));
CPPUNIT_ASSERT_EQUAL(OUString("foo"),
-
pWrtShell->GetCursor()->GetNode().GetTextNode()->GetText());
+
pWrtShell->GetCursor()->GetPointNode().GetTextNode()->GetText());
pWrtShell->Pop(SwCursorShell::PopMode::DeleteCurrent);
}
@@ -1429,7 +1429,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testToxmarkLinks)
CPPUNIT_ASSERT_EQUAL(OUString("#1%19the%20udmark%19UUser-Defined%7Ctoxmark"),
url);
rView.JumpToSwMark(url.subView(1));
CPPUNIT_ASSERT_EQUAL(OUString(OUStringChar(CH_TXTATR_INWORD) + "udmark
the first"),
-
pWrtShell->GetCursor()->GetNode().GetTextNode()->GetText());
+
pWrtShell->GetCursor()->GetPointNode().GetTextNode()->GetText());
pWrtShell->Pop(SwCursorShell::PopMode::DeleteCurrent);
}
@@ -1444,7 +1444,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testToxmarkLinks)
CPPUNIT_ASSERT_EQUAL(OUString("#2%19the%20udmark%19UUser-Defined%7Ctoxmark"),
url);
rView.JumpToSwMark(url.subView(1));
CPPUNIT_ASSERT_EQUAL(OUString(OUStringChar(CH_TXTATR_INWORD) + "udmark
the 2nd"),
-
pWrtShell->GetCursor()->GetNode().GetTextNode()->GetText());
+
pWrtShell->GetCursor()->GetPointNode().GetTextNode()->GetText());
pWrtShell->Pop(SwCursorShell::PopMode::DeleteCurrent);
}
@@ -1459,7 +1459,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testToxmarkLinks)
CPPUNIT_ASSERT_EQUAL(OUString("#__RefHeading___Toc105_706348105"),
url);
rView.JumpToSwMark(url.subView(1));
CPPUNIT_ASSERT_EQUAL(OUString("foo"),
-
pWrtShell->GetCursor()->GetNode().GetTextNode()->GetText());
+
pWrtShell->GetCursor()->GetPointNode().GetTextNode()->GetText());
pWrtShell->Pop(SwCursorShell::PopMode::DeleteCurrent);
}
@@ -1479,7 +1479,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testToxmarkLinks)
CPPUNIT_ASSERT_EQUAL(OUString("#1%19the%20udmark%19UNewUD!%7C%7Ctoxmark"), url);
rView.JumpToSwMark(url.subView(1));
CPPUNIT_ASSERT_EQUAL(OUString("the udmark"),
-
pWrtShell->GetCursor()->GetNode().GetTextNode()->GetText());
+
pWrtShell->GetCursor()->GetPointNode().GetTextNode()->GetText());
pWrtShell->Pop(SwCursorShell::PopMode::DeleteCurrent);
}
}
diff --git a/sw/qa/extras/uiwriter/uiwriter4.cxx
b/sw/qa/extras/uiwriter/uiwriter4.cxx
index 1ae2c41366b3..acfea225418f 100644
--- a/sw/qa/extras/uiwriter/uiwriter4.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter4.cxx
@@ -116,7 +116,7 @@ static OUString lcl_translitTest(SwDoc& rDoc, const SwPaM&
rPaM, Transliteration
utl::TransliterationWrapper
aTrans(::comphelper::getProcessComponentContext(), nType);
rDoc.getIDocumentContentOperations().TransliterateText(rPaM, aTrans);
//SwWrtShell* pWrtShell = pDoc->GetDocShell()->GetWrtShell();
- return rPaM.GetNode(false).GetTextNode()->GetText();
+ return rPaM.GetMarkNode().GetTextNode()->GetText();
}
CPPUNIT_TEST_FIXTURE(SwUiWriterTest4, testTdf146449)
@@ -1195,7 +1195,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest4,
testRedlineCopyPaste)
SwPaM aPaM(aIdx);
pDoc->getIDocumentContentOperations().InsertString(aPaM, "abzdezgh");
- SwTextNode* pTextNode = aPaM.GetNode().GetTextNode();
+ SwTextNode* pTextNode = aPaM.GetPointNode().GetTextNode();
// Turn on track changes, make changes, turn off track changes
uno::Reference<beans::XPropertySet> xPropertySet(mxComponent,
uno::UNO_QUERY);
diff --git a/sw/qa/extras/uiwriter/uiwriter5.cxx
b/sw/qa/extras/uiwriter/uiwriter5.cxx
index 4f12060a4cf8..4c0f776c7fc8 100644
--- a/sw/qa/extras/uiwriter/uiwriter5.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter5.cxx
@@ -2537,7 +2537,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest5, testTdf143904)
SwWrtShell* pWrtShell = pDoc->GetDocShell()->GetWrtShell();
CPPUNIT_ASSERT(pWrtShell);
- SwNodeOffset nIndex = pWrtShell->GetCursor()->GetNode().GetIndex();
+ SwNodeOffset nIndex = pWrtShell->GetCursor()->GetPointNode().GetIndex();
dispatchCommand(mxComponent, ".uno:InsertRowsAfter", {});
pWrtShell->Down(false);
@@ -2545,7 +2545,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest5, testTdf143904)
SwTextNode* pTextNodeA1 =
static_cast<SwTextNode*>(pDoc->GetNodes()[nIndex]);
CPPUNIT_ASSERT(pTextNodeA1->GetText().startsWith("Insert"));
- nIndex = pWrtShell->GetCursor()->GetNode().GetIndex();
+ nIndex = pWrtShell->GetCursor()->GetPointNode().GetIndex();
SwTextNode* pTextNodeA2 =
static_cast<SwTextNode*>(pDoc->GetNodes()[nIndex]);
CPPUNIT_ASSERT_EQUAL(OUString("foo"), pTextNodeA2->GetText());
CPPUNIT_ASSERT_EQUAL(false,
pTextNodeA2->GetSwAttrSet().HasItem(RES_CHRATR_FONT));
@@ -2560,7 +2560,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest5, testTdf90069)
SwWrtShell* pWrtShell = pDoc->GetDocShell()->GetWrtShell();
CPPUNIT_ASSERT(pWrtShell);
- SwNodeOffset nIndex = pWrtShell->GetCursor()->GetNode().GetIndex();
+ SwNodeOffset nIndex = pWrtShell->GetCursor()->GetPointNode().GetIndex();
dispatchCommand(mxComponent, ".uno:InsertRowsAfter", {});
pWrtShell->Down(false);
@@ -2568,7 +2568,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest5, testTdf90069)
SwTextNode* pTextNodeA1 =
static_cast<SwTextNode*>(pDoc->GetNodes()[nIndex]);
CPPUNIT_ASSERT(pTextNodeA1->GetText().startsWith("Insert"));
- nIndex = pWrtShell->GetCursor()->GetNode().GetIndex();
+ nIndex = pWrtShell->GetCursor()->GetPointNode().GetIndex();
SwTextNode* pTextNodeA2 =
static_cast<SwTextNode*>(pDoc->GetNodes()[nIndex]);
CPPUNIT_ASSERT_EQUAL(OUString("foo"), pTextNodeA2->GetText());
CPPUNIT_ASSERT_EQUAL(true,
pTextNodeA2->GetSwAttrSet().HasItem(RES_CHRATR_FONT));
@@ -2583,7 +2583,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest5, testTdf109266)
SwWrtShell* pWrtShell = pDoc->GetDocShell()->GetWrtShell();
CPPUNIT_ASSERT(pWrtShell);
- SwNodeOffset nIndex = pWrtShell->GetCursor()->GetNode().GetIndex();
+ SwNodeOffset nIndex = pWrtShell->GetCursor()->GetPointNode().GetIndex();
SwTextNode* pTextNode = static_cast<SwTextNode*>(pDoc->GetNodes()[nIndex]);
CPPUNIT_ASSERT_EQUAL(OUString("Lorem ipsum..."), pTextNode->GetText());
diff --git a/sw/qa/extras/uiwriter/uiwriter6.cxx
b/sw/qa/extras/uiwriter/uiwriter6.cxx
index 11129f9d1138..5c314179ca93 100644
--- a/sw/qa/extras/uiwriter/uiwriter6.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter6.cxx
@@ -162,7 +162,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest6,
testLinesMoveBackwardsInSectionInTable)
// Remove paragraph "4".
SwWrtShell* pWrtShell = pDoc->GetDocShell()->GetWrtShell();
- while (pWrtShell->GetCursor()->GetNode().GetIndex() < nPara4Node)
+ while (pWrtShell->GetCursor()->GetPointNode().GetIndex() < nPara4Node)
pWrtShell->Down(/*bSelect=*/false);
pWrtShell->EndPara();
pWrtShell->Up(/*bSelect=*/true);
@@ -469,7 +469,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest6, testTdf112160)
// Append a new paragraph to the end of the A2 cell.
SwWrtShell* pWrtShell = pDoc->GetDocShell()->GetWrtShell();
- while (pWrtShell->GetCursor()->GetNode().GetIndex() < nA2CellNode)
+ while (pWrtShell->GetCursor()->GetPointNode().GetIndex() < nA2CellNode)
pWrtShell->Down(/*bSelect=*/false);
pWrtShell->EndPara();
pWrtShell->SplitNode();
@@ -525,7 +525,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest6,
testTdf99689TableOfContents)
const SwTOXBase* pTOXBase = pWrtShell->GetCurTOX();
pWrtShell->UpdateTableOf(*pTOXBase);
SwCursorShell* pShell(pDoc->GetEditShell());
- SwTextNode* pTitleNode = pShell->GetCursor()->GetNode().GetTextNode();
+ SwTextNode* pTitleNode = pShell->GetCursor()->GetPointNode().GetTextNode();
SwNodeIndex aIdx(*pTitleNode);
// skip the title
pDoc->GetNodes().GoNext(&aIdx);
@@ -552,7 +552,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest6,
testTdf99689TableOfFigures)
const SwTOXBase* pTOXBase = pWrtShell->GetCurTOX();
pWrtShell->UpdateTableOf(*pTOXBase);
SwCursorShell* pShell(pDoc->GetEditShell());
- SwTextNode* pTitleNode = pShell->GetCursor()->GetNode().GetTextNode();
+ SwTextNode* pTitleNode = pShell->GetCursor()->GetPointNode().GetTextNode();
SwNodeIndex aIdx(*pTitleNode);
// skip the title
@@ -577,7 +577,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest6,
testTdf99689TableOfTables)
const SwTOXBase* pTOXBase = pWrtShell->GetCurTOX();
pWrtShell->UpdateTableOf(*pTOXBase);
SwCursorShell* pShell(pDoc->GetEditShell());
- SwTextNode* pTitleNode = pShell->GetCursor()->GetNode().GetTextNode();
+ SwTextNode* pTitleNode = pShell->GetCursor()->GetPointNode().GetTextNode();
SwNodeIndex aIdx(*pTitleNode);
// skip the title
@@ -943,11 +943,13 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest6, testTdf115132)
pWrtShell->GotoTable(rTableName);
do
{
- const SwStartNode* pNd =
pWrtShell->GetCursor()->GetNode().FindTableBoxStartNode();
+ const SwStartNode* pNd =
pWrtShell->GetCursor()->GetPointNode().FindTableBoxStartNode();
pWrtShell->DelRight();
- CPPUNIT_ASSERT_EQUAL(pNd,
pWrtShell->GetCursor()->GetNode().FindTableBoxStartNode());
+ CPPUNIT_ASSERT_EQUAL(pNd,
+
pWrtShell->GetCursor()->GetPointNode().FindTableBoxStartNode());
pWrtShell->DelLeft();
- CPPUNIT_ASSERT_EQUAL(pNd,
pWrtShell->GetCursor()->GetNode().FindTableBoxStartNode());
+ CPPUNIT_ASSERT_EQUAL(pNd,
+
pWrtShell->GetCursor()->GetPointNode().FindTableBoxStartNode());
} while (pWrtShell->GoNextCell(false));
}
}
@@ -1056,7 +1058,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest6, testTdf51223)
SwDoc* pDoc = createSwDoc();
SwWrtShell* pWrtShell = pDoc->GetDocShell()->GetWrtShell();
sw::UndoManager& rUndoManager = pDoc->GetUndoManager();
- SwNodeOffset nIndex = pWrtShell->GetCursor()->GetNode().GetIndex();
+ SwNodeOffset nIndex = pWrtShell->GetCursor()->GetPointNode().GetIndex();
pWrtShell->Insert("i");
pWrtShell->SplitNode(true);
CPPUNIT_ASSERT_EQUAL(OUString("I"),
diff --git a/sw/qa/extras/uiwriter/uiwriter7.cxx
b/sw/qa/extras/uiwriter/uiwriter7.cxx
index 37e0e276a566..a24201b78b2f 100644
--- a/sw/qa/extras/uiwriter/uiwriter7.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter7.cxx
@@ -338,7 +338,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest7, testTextSearch)
CPPUNIT_ASSERT_EQUAL(sal_Int32(4), ReplaceCount);
// check of the end result
CPPUNIT_ASSERT_EQUAL(OUString("xCelqy xWorqd xThzq xis xa xtasq"),
- pCursor->GetNode().GetTextNode()->GetText());
+ pCursor->GetPointNode().GetTextNode()->GetText());
// regex: use positive look-ahead assertion
xReplaceDes->setSearchString("Wor(?=qd xThzq xis xa xtasq)");
xReplaceDes->setReplaceString("&p"); // testing & reference
@@ -351,7 +351,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest7, testTextSearch)
CPPUNIT_ASSERT_EQUAL(sal_Int32(5), ReplaceCount); // one of the 6 "x" must
not be replaced
// check of the end result
CPPUNIT_ASSERT_EQUAL(OUString("mCelqy xWorpqd mThzq mis ma mtasq"),
- pCursor->GetNode().GetTextNode()->GetText());
+ pCursor->GetPointNode().GetTextNode()->GetText());
}
CPPUNIT_TEST_FIXTURE(SwUiWriterTest7, testTdf69282)
@@ -578,7 +578,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest7, testTdf72788)
rIDCO.InsertPoolItem(*pCursor, aWeightItem);
SfxItemSet aSet(pDoc->GetAttrPool(), svl::Items<RES_CHRATR_WEIGHT,
RES_CHRATR_WEIGHT>);
//Add selected text's attributes to aSet
- pCursor->GetNode().GetTextNode()->GetParaAttr(aSet, 5, 12);
+ pCursor->GetPointNode().GetTextNode()->GetParaAttr(aSet, 5, 12);
SfxPoolItem const* pPoolItem = aSet.GetItem(RES_CHRATR_WEIGHT);
//Check that bold is active on the selection and it's in aSet
CPPUNIT_ASSERT_EQUAL(true, (*pPoolItem == aWeightItem));
@@ -593,7 +593,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest7, testTdf72788)
pCursor->Move(fnMoveForward);
}
//Clear all the Direct Formatting ( Ctrl + M )
- SwTextNode* pTextNode = pCursor->GetNode().GetTextNode();
+ SwTextNode* pTextNode = pCursor->GetPointNode().GetTextNode();
SwContentIndex aSt(pTextNode, 0);
sal_Int32 nEnd = pTextNode->Len();
pTextNode->RstTextAttr(aSt, nEnd - aSt.GetIndex());
@@ -856,7 +856,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest7, testTdf77342)
CPPUNIT_ASSERT_EQUAL(uno::Any(sal_uInt16(2)), aAny);
//old footnote 1
pCursor->Move(fnMoveForward);
- SwTextNode* pTextNd1 = pCursor->GetNode().GetTextNode();
+ SwTextNode* pTextNd1 = pCursor->GetPointNode().GetTextNode();
SwTextAttr* const pFootnote1
=
pTextNd1->GetTextAttrForCharAt(pCursor->GetPoint()->GetContentIndex(),
RES_TXTATR_FTN);
const SwFormatFootnote& rFootnote1(pFootnote1->GetFootnote());
@@ -865,7 +865,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest7, testTdf77342)
CPPUNIT_ASSERT_EQUAL(sal_uInt16(2), pTFNote1->GetSeqRefNo());
//old footnote 2
pCursor->Move(fnMoveForward);
- SwTextNode* pTextNd2 = pCursor->GetNode().GetTextNode();
+ SwTextNode* pTextNd2 = pCursor->GetPointNode().GetTextNode();
SwTextAttr* const pFootnote2
=
pTextNd2->GetTextAttrForCharAt(pCursor->GetPoint()->GetContentIndex(),
RES_TXTATR_FTN);
const SwFormatFootnote& rFootnote2(pFootnote2->GetFootnote());
@@ -874,7 +874,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest7, testTdf77342)
CPPUNIT_ASSERT_EQUAL(sal_uInt16(1), pTFNote2->GetSeqRefNo());
//old footnote 3
pCursor->Move(fnMoveForward);
- SwTextNode* pTextNd3 = pCursor->GetNode().GetTextNode();
+ SwTextNode* pTextNd3 = pCursor->GetPointNode().GetTextNode();
SwTextAttr* const pFootnote3
=
pTextNd3->GetTextAttrForCharAt(pCursor->GetPoint()->GetContentIndex(),
RES_TXTATR_FTN);
const SwFormatFootnote& rFootnote3(pFootnote3->GetFootnote());
@@ -897,7 +897,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest7, testTdf77342)
CPPUNIT_ASSERT_EQUAL(uno::Any(sal_uInt16(3)), aAny);
//new footnote 1
pCursor->Move(fnMoveForward);
- SwTextNode* pTextNd4 = pCursor->GetNode().GetTextNode();
+ SwTextNode* pTextNd4 = pCursor->GetPointNode().GetTextNode();
SwTextAttr* const pFootnote4
=
pTextNd4->GetTextAttrForCharAt(pCursor->GetPoint()->GetContentIndex(),
RES_TXTATR_FTN);
const SwFormatFootnote& rFootnote4(pFootnote4->GetFootnote());
@@ -925,7 +925,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest7, testTdf77342)
CPPUNIT_ASSERT_EQUAL(uno::Any(sal_uInt16(4)), aAny);
//new footnote 1
pCursor->Move(fnMoveForward);
- SwTextNode* pTextNd11 = pCursor->GetNode().GetTextNode();
+ SwTextNode* pTextNd11 = pCursor->GetPointNode().GetTextNode();
SwTextAttr* const pFootnote11
=
pTextNd11->GetTextAttrForCharAt(pCursor->GetPoint()->GetContentIndex(),
RES_TXTATR_FTN);
const SwFormatFootnote& rFootnote11(pFootnote11->GetFootnote());
@@ -955,7 +955,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest7, testTdf77342)
CPPUNIT_ASSERT_EQUAL(uno::Any(sal_uInt16(2)), aAny);
//old footnote 1
pCursor->Move(fnMoveForward);
- SwTextNode* pTextNd12 = pCursor->GetNode().GetTextNode();
+ SwTextNode* pTextNd12 = pCursor->GetPointNode().GetTextNode();
SwTextAttr* const pFootnote12
=
pTextNd12->GetTextAttrForCharAt(pCursor->GetPoint()->GetContentIndex(),
RES_TXTATR_FTN);
const SwFormatFootnote& rFootnote12(pFootnote12->GetFootnote());
@@ -964,7 +964,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest7, testTdf77342)
CPPUNIT_ASSERT_EQUAL(sal_uInt16(2), pTFNote12->GetSeqRefNo());
//old footnote 2
pCursor->Move(fnMoveForward);
- SwTextNode* pTextNd13 = pCursor->GetNode().GetTextNode();
+ SwTextNode* pTextNd13 = pCursor->GetPointNode().GetTextNode();
SwTextAttr* const pFootnote13
=
pTextNd13->GetTextAttrForCharAt(pCursor->GetPoint()->GetContentIndex(),
RES_TXTATR_FTN);
const SwFormatFootnote& rFootnote13(pFootnote13->GetFootnote());
@@ -973,7 +973,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest7, testTdf77342)
CPPUNIT_ASSERT_EQUAL(sal_uInt16(1), pTFNote13->GetSeqRefNo());
//old footnote 3
pCursor->Move(fnMoveForward);
- SwTextNode* pTextNd14 = pCursor->GetNode().GetTextNode();
+ SwTextNode* pTextNd14 = pCursor->GetPointNode().GetTextNode();
SwTextAttr* const pFootnote14
=
pTextNd14->GetTextAttrForCharAt(pCursor->GetPoint()->GetContentIndex(),
RES_TXTATR_FTN);
const SwFormatFootnote& rFootnote14(pFootnote14->GetFootnote());
@@ -996,7 +996,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest7, testTdf77342)
CPPUNIT_ASSERT_EQUAL(uno::Any(sal_uInt16(3)), aAny);
//old footnote 4
pCursor->Move(fnMoveForward);
- SwTextNode* pTextNd15 = pCursor->GetNode().GetTextNode();
+ SwTextNode* pTextNd15 = pCursor->GetPointNode().GetTextNode();
SwTextAttr* const pFootnote15
=
pTextNd15->GetTextAttrForCharAt(pCursor->GetPoint()->GetContentIndex(),
RES_TXTATR_FTN);
const SwFormatFootnote& rFootnote15(pFootnote15->GetFootnote());
@@ -1570,13 +1570,13 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest7, testTdf75137)
SwWrtShell* pWrtShell = pDoc->GetDocShell()->GetWrtShell();
SwShellCursor* pShellCursor = pWrtShell->getShellCursor(true);
pWrtShell->InsertFootnote("This is first footnote");
- SwNodeOffset firstIndex = pShellCursor->GetNode().GetIndex();
+ SwNodeOffset firstIndex = pShellCursor->GetPointNode().GetIndex();
pShellCursor->GotoFootnoteAnchor();
pWrtShell->InsertFootnote("This is second footnote");
pWrtShell->Up(false);
- SwNodeOffset secondIndex = pShellCursor->GetNode().GetIndex();
+ SwNodeOffset secondIndex = pShellCursor->GetPointNode().GetIndex();
pWrtShell->Down(false);
- SwNodeOffset thirdIndex = pShellCursor->GetNode().GetIndex();
+ SwNodeOffset thirdIndex = pShellCursor->GetPointNode().GetIndex();
CPPUNIT_ASSERT_EQUAL(firstIndex, thirdIndex);
CPPUNIT_ASSERT(firstIndex != secondIndex);
}
@@ -1823,16 +1823,16 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest7,
testUndoDelAsCharTdf107512)
pShell->SelectTextModel(1, 4);
rIDCO.InsertPoolItem(*pShell->GetCursor(), hidden);
// now we have "\1foo\1" with the "foo" hidden
- CPPUNIT_ASSERT(
- pShell->GetCursor()->GetNode().GetTextNode()->GetTextAttrForCharAt(0,
RES_TXTATR_FLYCNT));
- CPPUNIT_ASSERT(
- pShell->GetCursor()->GetNode().GetTextNode()->GetTextAttrForCharAt(4,
RES_TXTATR_FLYCNT));
+
CPPUNIT_ASSERT(pShell->GetCursor()->GetPointNode().GetTextNode()->GetTextAttrForCharAt(
+ 0, RES_TXTATR_FLYCNT));
+
CPPUNIT_ASSERT(pShell->GetCursor()->GetPointNode().GetTextNode()->GetTextAttrForCharAt(
+ 4, RES_TXTATR_FLYCNT));
CPPUNIT_ASSERT_EQUAL(
OUString(OUStringChar(CH_TXTATR_BREAKWORD) + u"foo" +
OUStringChar(CH_TXTATR_BREAKWORD)),
- pShell->GetCursor()->GetNode().GetTextNode()->GetText());
+ pShell->GetCursor()->GetPointNode().GetTextNode()->GetText());
SfxPoolItem const* pItem;
SfxItemSet query(pDoc->GetAttrPool(), svl::Items<RES_CHRATR_HIDDEN,
RES_CHRATR_HIDDEN>);
- pShell->GetCursor()->GetNode().GetTextNode()->GetParaAttr(query, 1, 4);
+ pShell->GetCursor()->GetPointNode().GetTextNode()->GetParaAttr(query, 1,
4);
CPPUNIT_ASSERT_EQUAL(SfxItemState::SET,
query.GetItemState(RES_CHRATR_HIDDEN, false, &pItem));
CPPUNIT_ASSERT(static_cast<SvxCharHiddenItem const*>(pItem)->GetValue());
query.ClearItem(RES_CHRATR_HIDDEN);
@@ -1840,56 +1840,56 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest7,
testUndoDelAsCharTdf107512)
// delete from the start
pShell->SelectTextModel(0, 4);
rIDCO.DeleteAndJoin(*pShell->GetCursor());
- CPPUNIT_ASSERT(
- pShell->GetCursor()->GetNode().GetTextNode()->GetTextAttrForCharAt(0,
RES_TXTATR_FLYCNT));
+
CPPUNIT_ASSERT(pShell->GetCursor()->GetPointNode().GetTextNode()->GetTextAttrForCharAt(
+ 0, RES_TXTATR_FLYCNT));
CPPUNIT_ASSERT_EQUAL(size_t(1), pDoc->GetFlyCount(FLYCNTTYPE_GRF));
- CPPUNIT_ASSERT_EQUAL(sal_Int32(1),
pShell->GetCursor()->GetNode().GetTextNode()->Len());
- pShell->GetCursor()->GetNode().GetTextNode()->GetParaAttr(query, 0, 1);
+ CPPUNIT_ASSERT_EQUAL(sal_Int32(1),
pShell->GetCursor()->GetPointNode().GetTextNode()->Len());
+ pShell->GetCursor()->GetPointNode().GetTextNode()->GetParaAttr(query, 0,
1);
CPPUNIT_ASSERT_EQUAL(SfxItemState::DEFAULT,
query.GetItemState(RES_CHRATR_HIDDEN, false, &pItem));
query.ClearItem(RES_CHRATR_HIDDEN);
rUndoManager.Undo();
- CPPUNIT_ASSERT(
- pShell->GetCursor()->GetNode().GetTextNode()->GetTextAttrForCharAt(0,
RES_TXTATR_FLYCNT));
- CPPUNIT_ASSERT(
- pShell->GetCursor()->GetNode().GetTextNode()->GetTextAttrForCharAt(4,
RES_TXTATR_FLYCNT));
+
CPPUNIT_ASSERT(pShell->GetCursor()->GetPointNode().GetTextNode()->GetTextAttrForCharAt(
+ 0, RES_TXTATR_FLYCNT));
+
CPPUNIT_ASSERT(pShell->GetCursor()->GetPointNode().GetTextNode()->GetTextAttrForCharAt(
+ 4, RES_TXTATR_FLYCNT));
CPPUNIT_ASSERT_EQUAL(size_t(2), pDoc->GetFlyCount(FLYCNTTYPE_GRF));
- CPPUNIT_ASSERT_EQUAL(sal_Int32(5),
pShell->GetCursor()->GetNode().GetTextNode()->Len());
+ CPPUNIT_ASSERT_EQUAL(sal_Int32(5),
pShell->GetCursor()->GetPointNode().GetTextNode()->Len());
CPPUNIT_ASSERT_EQUAL(
OUString(OUStringChar(CH_TXTATR_BREAKWORD) + u"foo" +
OUStringChar(CH_TXTATR_BREAKWORD)),
- pShell->GetCursor()->GetNode().GetTextNode()->GetText());
- pShell->GetCursor()->GetNode().GetTextNode()->GetParaAttr(query, 0, 1);
+ pShell->GetCursor()->GetPointNode().GetTextNode()->GetText());
+ pShell->GetCursor()->GetPointNode().GetTextNode()->GetParaAttr(query, 0,
1);
CPPUNIT_ASSERT_EQUAL(SfxItemState::DEFAULT,
query.GetItemState(RES_CHRATR_HIDDEN, false, &pItem));
query.ClearItem(RES_CHRATR_HIDDEN);
- pShell->GetCursor()->GetNode().GetTextNode()->GetParaAttr(query, 1, 4);
+ pShell->GetCursor()->GetPointNode().GetTextNode()->GetParaAttr(query, 1,
4);
CPPUNIT_ASSERT_EQUAL(SfxItemState::SET,
query.GetItemState(RES_CHRATR_HIDDEN, false, &pItem));
CPPUNIT_ASSERT(static_cast<SvxCharHiddenItem const*>(pItem)->GetValue());
query.ClearItem(RES_CHRATR_HIDDEN);
rUndoManager.Redo();
- CPPUNIT_ASSERT(
- pShell->GetCursor()->GetNode().GetTextNode()->GetTextAttrForCharAt(0,
RES_TXTATR_FLYCNT));
+
CPPUNIT_ASSERT(pShell->GetCursor()->GetPointNode().GetTextNode()->GetTextAttrForCharAt(
+ 0, RES_TXTATR_FLYCNT));
CPPUNIT_ASSERT_EQUAL(size_t(1), pDoc->GetFlyCount(FLYCNTTYPE_GRF));
- CPPUNIT_ASSERT_EQUAL(sal_Int32(1),
pShell->GetCursor()->GetNode().GetTextNode()->Len());
- pShell->GetCursor()->GetNode().GetTextNode()->GetParaAttr(query, 0, 1);
+ CPPUNIT_ASSERT_EQUAL(sal_Int32(1),
pShell->GetCursor()->GetPointNode().GetTextNode()->Len());
+ pShell->GetCursor()->GetPointNode().GetTextNode()->GetParaAttr(query, 0,
1);
CPPUNIT_ASSERT_EQUAL(SfxItemState::DEFAULT,
query.GetItemState(RES_CHRATR_HIDDEN, false, &pItem));
query.ClearItem(RES_CHRATR_HIDDEN);
rUndoManager.Undo();
- CPPUNIT_ASSERT(
- pShell->GetCursor()->GetNode().GetTextNode()->GetTextAttrForCharAt(0,
RES_TXTATR_FLYCNT));
- CPPUNIT_ASSERT(
- pShell->GetCursor()->GetNode().GetTextNode()->GetTextAttrForCharAt(4,
RES_TXTATR_FLYCNT));
+
CPPUNIT_ASSERT(pShell->GetCursor()->GetPointNode().GetTextNode()->GetTextAttrForCharAt(
+ 0, RES_TXTATR_FLYCNT));
+
CPPUNIT_ASSERT(pShell->GetCursor()->GetPointNode().GetTextNode()->GetTextAttrForCharAt(
+ 4, RES_TXTATR_FLYCNT));
CPPUNIT_ASSERT_EQUAL(size_t(2), pDoc->GetFlyCount(FLYCNTTYPE_GRF));
- CPPUNIT_ASSERT_EQUAL(sal_Int32(5),
pShell->GetCursor()->GetNode().GetTextNode()->Len());
+ CPPUNIT_ASSERT_EQUAL(sal_Int32(5),
pShell->GetCursor()->GetPointNode().GetTextNode()->Len());
CPPUNIT_ASSERT_EQUAL(
OUString(OUStringChar(CH_TXTATR_BREAKWORD) + u"foo" +
OUStringChar(CH_TXTATR_BREAKWORD)),
- pShell->GetCursor()->GetNode().GetTextNode()->GetText());
- pShell->GetCursor()->GetNode().GetTextNode()->GetParaAttr(query, 0, 1);
+ pShell->GetCursor()->GetPointNode().GetTextNode()->GetText());
+ pShell->GetCursor()->GetPointNode().GetTextNode()->GetParaAttr(query, 0,
1);
CPPUNIT_ASSERT_EQUAL(SfxItemState::DEFAULT,
query.GetItemState(RES_CHRATR_HIDDEN, false, &pItem));
query.ClearItem(RES_CHRATR_HIDDEN);
- pShell->GetCursor()->GetNode().GetTextNode()->GetParaAttr(query, 1, 4);
+ pShell->GetCursor()->GetPointNode().GetTextNode()->GetParaAttr(query, 1,
4);
CPPUNIT_ASSERT_EQUAL(SfxItemState::SET,
query.GetItemState(RES_CHRATR_HIDDEN, false, &pItem));
CPPUNIT_ASSERT(static_cast<SvxCharHiddenItem const*>(pItem)->GetValue());
query.ClearItem(RES_CHRATR_HIDDEN);
@@ -1897,56 +1897,56 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest7,
testUndoDelAsCharTdf107512)
// delete from the end
pShell->SelectTextModel(1, 5);
rIDCO.DeleteAndJoin(*pShell->GetCursor());
- CPPUNIT_ASSERT(
- pShell->GetCursor()->GetNode().GetTextNode()->GetTextAttrForCharAt(0,
RES_TXTATR_FLYCNT));
+
CPPUNIT_ASSERT(pShell->GetCursor()->GetPointNode().GetTextNode()->GetTextAttrForCharAt(
+ 0, RES_TXTATR_FLYCNT));
CPPUNIT_ASSERT_EQUAL(size_t(1), pDoc->GetFlyCount(FLYCNTTYPE_GRF));
- CPPUNIT_ASSERT_EQUAL(sal_Int32(1),
pShell->GetCursor()->GetNode().GetTextNode()->Len());
- pShell->GetCursor()->GetNode().GetTextNode()->GetParaAttr(query, 4, 5);
+ CPPUNIT_ASSERT_EQUAL(sal_Int32(1),
pShell->GetCursor()->GetPointNode().GetTextNode()->Len());
+ pShell->GetCursor()->GetPointNode().GetTextNode()->GetParaAttr(query, 4,
5);
CPPUNIT_ASSERT_EQUAL(SfxItemState::DEFAULT,
query.GetItemState(RES_CHRATR_HIDDEN, false, &pItem));
query.ClearItem(RES_CHRATR_HIDDEN);
rUndoManager.Undo();
- CPPUNIT_ASSERT(
- pShell->GetCursor()->GetNode().GetTextNode()->GetTextAttrForCharAt(0,
RES_TXTATR_FLYCNT));
- CPPUNIT_ASSERT(
- pShell->GetCursor()->GetNode().GetTextNode()->GetTextAttrForCharAt(4,
RES_TXTATR_FLYCNT));
+
CPPUNIT_ASSERT(pShell->GetCursor()->GetPointNode().GetTextNode()->GetTextAttrForCharAt(
+ 0, RES_TXTATR_FLYCNT));
+
CPPUNIT_ASSERT(pShell->GetCursor()->GetPointNode().GetTextNode()->GetTextAttrForCharAt(
+ 4, RES_TXTATR_FLYCNT));
CPPUNIT_ASSERT_EQUAL(size_t(2), pDoc->GetFlyCount(FLYCNTTYPE_GRF));
- CPPUNIT_ASSERT_EQUAL(sal_Int32(5),
pShell->GetCursor()->GetNode().GetTextNode()->Len());
+ CPPUNIT_ASSERT_EQUAL(sal_Int32(5),
pShell->GetCursor()->GetPointNode().GetTextNode()->Len());
CPPUNIT_ASSERT_EQUAL(
OUString(OUStringChar(CH_TXTATR_BREAKWORD) + u"foo" +
OUStringChar(CH_TXTATR_BREAKWORD)),
- pShell->GetCursor()->GetNode().GetTextNode()->GetText());
- pShell->GetCursor()->GetNode().GetTextNode()->GetParaAttr(query, 4, 5);
+ pShell->GetCursor()->GetPointNode().GetTextNode()->GetText());
+ pShell->GetCursor()->GetPointNode().GetTextNode()->GetParaAttr(query, 4,
5);
CPPUNIT_ASSERT_EQUAL(SfxItemState::DEFAULT,
query.GetItemState(RES_CHRATR_HIDDEN, false, &pItem));
query.ClearItem(RES_CHRATR_HIDDEN);
- pShell->GetCursor()->GetNode().GetTextNode()->GetParaAttr(query, 1, 4);
+ pShell->GetCursor()->GetPointNode().GetTextNode()->GetParaAttr(query, 1,
4);
CPPUNIT_ASSERT_EQUAL(SfxItemState::SET,
query.GetItemState(RES_CHRATR_HIDDEN, false, &pItem));
CPPUNIT_ASSERT(static_cast<SvxCharHiddenItem const*>(pItem)->GetValue());
query.ClearItem(RES_CHRATR_HIDDEN);
rUndoManager.Redo();
- CPPUNIT_ASSERT(
- pShell->GetCursor()->GetNode().GetTextNode()->GetTextAttrForCharAt(0,
RES_TXTATR_FLYCNT));
+
CPPUNIT_ASSERT(pShell->GetCursor()->GetPointNode().GetTextNode()->GetTextAttrForCharAt(
+ 0, RES_TXTATR_FLYCNT));
CPPUNIT_ASSERT_EQUAL(size_t(1), pDoc->GetFlyCount(FLYCNTTYPE_GRF));
- CPPUNIT_ASSERT_EQUAL(sal_Int32(1),
pShell->GetCursor()->GetNode().GetTextNode()->Len());
- pShell->GetCursor()->GetNode().GetTextNode()->GetParaAttr(query, 4, 5);
+ CPPUNIT_ASSERT_EQUAL(sal_Int32(1),
pShell->GetCursor()->GetPointNode().GetTextNode()->Len());
+ pShell->GetCursor()->GetPointNode().GetTextNode()->GetParaAttr(query, 4,
5);
CPPUNIT_ASSERT_EQUAL(SfxItemState::DEFAULT,
query.GetItemState(RES_CHRATR_HIDDEN, false, &pItem));
query.ClearItem(RES_CHRATR_HIDDEN);
rUndoManager.Undo();
- CPPUNIT_ASSERT(
- pShell->GetCursor()->GetNode().GetTextNode()->GetTextAttrForCharAt(0,
RES_TXTATR_FLYCNT));
- CPPUNIT_ASSERT(
- pShell->GetCursor()->GetNode().GetTextNode()->GetTextAttrForCharAt(4,
RES_TXTATR_FLYCNT));
+
CPPUNIT_ASSERT(pShell->GetCursor()->GetPointNode().GetTextNode()->GetTextAttrForCharAt(
+ 0, RES_TXTATR_FLYCNT));
+
CPPUNIT_ASSERT(pShell->GetCursor()->GetPointNode().GetTextNode()->GetTextAttrForCharAt(
+ 4, RES_TXTATR_FLYCNT));
CPPUNIT_ASSERT_EQUAL(size_t(2), pDoc->GetFlyCount(FLYCNTTYPE_GRF));
- CPPUNIT_ASSERT_EQUAL(sal_Int32(5),
pShell->GetCursor()->GetNode().GetTextNode()->Len());
+ CPPUNIT_ASSERT_EQUAL(sal_Int32(5),
pShell->GetCursor()->GetPointNode().GetTextNode()->Len());
CPPUNIT_ASSERT_EQUAL(
OUString(OUStringChar(CH_TXTATR_BREAKWORD) + u"foo" +
OUStringChar(CH_TXTATR_BREAKWORD)),
- pShell->GetCursor()->GetNode().GetTextNode()->GetText());
- pShell->GetCursor()->GetNode().GetTextNode()->GetParaAttr(query, 4, 5);
+ pShell->GetCursor()->GetPointNode().GetTextNode()->GetText());
+ pShell->GetCursor()->GetPointNode().GetTextNode()->GetParaAttr(query, 4,
5);
CPPUNIT_ASSERT_EQUAL(SfxItemState::DEFAULT,
query.GetItemState(RES_CHRATR_HIDDEN, false, &pItem));
query.ClearItem(RES_CHRATR_HIDDEN);
- pShell->GetCursor()->GetNode().GetTextNode()->GetParaAttr(query, 1, 4);
+ pShell->GetCursor()->GetPointNode().GetTextNode()->GetParaAttr(query, 1,
4);
CPPUNIT_ASSERT_EQUAL(SfxItemState::SET,
query.GetItemState(RES_CHRATR_HIDDEN, false, &pItem));
CPPUNIT_ASSERT(static_cast<SvxCharHiddenItem const*>(pItem)->GetValue());
query.ClearItem(RES_CHRATR_HIDDEN);
@@ -1975,7 +1975,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest7,
testUndoCharAttribute)
rIDCO.InsertPoolItem(*pCursor, aWeightItem);
SfxItemSet aSet(pDoc->GetAttrPool(), svl::Items<RES_CHRATR_WEIGHT,
RES_CHRATR_WEIGHT>);
// Adds selected text's attributes to aSet
- pCursor->GetNode().GetTextNode()->GetParaAttr(aSet, 10, 19);
+ pCursor->GetPointNode().GetTextNode()->GetParaAttr(aSet, 10, 19);
SfxPoolItem const* pPoolItem = aSet.GetItem(RES_CHRATR_WEIGHT);
// Check that bold is active on the selection; checks if it's in aSet
CPPUNIT_ASSERT_EQUAL(true, (*pPoolItem == aWeightItem));
@@ -1983,7 +1983,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest7,
testUndoCharAttribute)
rUndoManager.Undo();
// Check that bold is no longer active
aSet.ClearItem(RES_CHRATR_WEIGHT);
- pCursor->GetNode().GetTextNode()->GetParaAttr(aSet, 10, 19);
+ pCursor->GetPointNode().GetTextNode()->GetParaAttr(aSet, 10, 19);
pPoolItem = aSet.GetItem(RES_CHRATR_WEIGHT);
CPPUNIT_ASSERT_EQUAL(false, (*pPoolItem == aWeightItem));
}
@@ -2005,20 +2005,20 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest7, testUndoDelAsChar)
pShell->Left(1, SwCursorSkipMode::Chars);
rIDCO.DeleteAndJoin(*pShell->GetCursor());
CPPUNIT_ASSERT_EQUAL(size_t(0), pDoc->GetFlyCount(FLYCNTTYPE_GRF));
- CPPUNIT_ASSERT(!pShell->GetCursor()->GetNode().GetTextNode()->HasHints());
- CPPUNIT_ASSERT_EQUAL(sal_Int32(0),
pShell->GetCursor()->GetNode().GetTextNode()->Len());
+
CPPUNIT_ASSERT(!pShell->GetCursor()->GetPointNode().GetTextNode()->HasHints());
+ CPPUNIT_ASSERT_EQUAL(sal_Int32(0),
pShell->GetCursor()->GetPointNode().GetTextNode()->Len());
rUndoManager.Undo();
CPPUNIT_ASSERT_EQUAL(size_t(1), pDoc->GetFlyCount(FLYCNTTYPE_GRF));
- CPPUNIT_ASSERT(pShell->GetCursor()->GetNode().GetTextNode()->HasHints());
- CPPUNIT_ASSERT_EQUAL(sal_Int32(1),
pShell->GetCursor()->GetNode().GetTextNode()->Len());
+
CPPUNIT_ASSERT(pShell->GetCursor()->GetPointNode().GetTextNode()->HasHints());
+ CPPUNIT_ASSERT_EQUAL(sal_Int32(1),
pShell->GetCursor()->GetPointNode().GetTextNode()->Len());
rUndoManager.Redo();
CPPUNIT_ASSERT_EQUAL(size_t(0), pDoc->GetFlyCount(FLYCNTTYPE_GRF));
- CPPUNIT_ASSERT(!pShell->GetCursor()->GetNode().GetTextNode()->HasHints());
- CPPUNIT_ASSERT_EQUAL(sal_Int32(0),
pShell->GetCursor()->GetNode().GetTextNode()->Len());
+
CPPUNIT_ASSERT(!pShell->GetCursor()->GetPointNode().GetTextNode()->HasHints());
+ CPPUNIT_ASSERT_EQUAL(sal_Int32(0),
pShell->GetCursor()->GetPointNode().GetTextNode()->Len());
rUndoManager.Undo();
CPPUNIT_ASSERT_EQUAL(size_t(1), pDoc->GetFlyCount(FLYCNTTYPE_GRF));
- CPPUNIT_ASSERT(pShell->GetCursor()->GetNode().GetTextNode()->HasHints());
- CPPUNIT_ASSERT_EQUAL(sal_Int32(1),
pShell->GetCursor()->GetNode().GetTextNode()->Len());
+
CPPUNIT_ASSERT(pShell->GetCursor()->GetPointNode().GetTextNode()->HasHints());
+ CPPUNIT_ASSERT_EQUAL(sal_Int32(1),
pShell->GetCursor()->GetPointNode().GetTextNode()->Len());
}
CPPUNIT_TEST_FIXTURE(SwUiWriterTest7, testTdf86639)
@@ -2325,16 +2325,16 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest7,
testUnicodeNotationToggle)
uno::Sequence<beans::PropertyValue> aPropertyValues;
pWrtShell->EndPara();
- sOriginalDocString =
pWrtShell->GetCursor()->GetNode().GetTextNode()->GetText();
+ sOriginalDocString =
pWrtShell->GetCursor()->GetPointNode().GetTextNode()->GetText();
CPPUNIT_ASSERT_EQUAL(OUString("uU+002b"), sOriginalDocString);
dispatchCommand(mxComponent, ".uno:UnicodeNotationToggle",
aPropertyValues);
sExpectedString = "u+";
- sDocString = pWrtShell->GetCursor()->GetNode().GetTextNode()->GetText();
+ sDocString =
pWrtShell->GetCursor()->GetPointNode().GetTextNode()->GetText();
CPPUNIT_ASSERT_EQUAL(sDocString, sExpectedString);
dispatchCommand(mxComponent, ".uno:UnicodeNotationToggle",
aPropertyValues);
- sDocString = pWrtShell->GetCursor()->GetNode().GetTextNode()->GetText();
+ sDocString =
pWrtShell->GetCursor()->GetPointNode().GetTextNode()->GetText();
CPPUNIT_ASSERT_EQUAL(sDocString, sOriginalDocString);
}
diff --git a/sw/qa/extras/unowriter/unowriter.cxx
b/sw/qa/extras/unowriter/unowriter.cxx
index 02b3002fd13c..2c2bd6f6f03d 100644
--- a/sw/qa/extras/unowriter/unowriter.cxx
+++ b/sw/qa/extras/unowriter/unowriter.cxx
@@ -739,7 +739,7 @@ CPPUNIT_TEST_FIXTURE(SwUnoWriter, testSelectionInTableEnum)
pWrtShell->Down(/*bSelect=*/false);
pWrtShell->EndPara(/*bSelect=*/true);
CPPUNIT_ASSERT_EQUAL(OUString("A1"),
-
pWrtShell->GetCursor()->GetNode().GetTextNode()->GetText());
+
pWrtShell->GetCursor()->GetPointNode().GetTextNode()->GetText());
// Access the selection.
uno::Reference<frame::XModel> xModel(mxComponent, uno::UNO_QUERY);
diff --git a/sw/qa/uibase/wrtsh/wrtsh.cxx b/sw/qa/uibase/wrtsh/wrtsh.cxx
index b5bf67899b0d..fb0d9d80d64a 100644
--- a/sw/qa/uibase/wrtsh/wrtsh.cxx
+++ b/sw/qa/uibase/wrtsh/wrtsh.cxx
@@ -76,7 +76,7 @@ CPPUNIT_TEST_FIXTURE(Test, testGotoContentControl)
// When going to that content control in placeholder mode:
SwWrtShell* pWrtShell = pDoc->GetDocShell()->GetWrtShell();
- SwNodeOffset nIndex = pWrtShell->GetCursor()->GetNode().GetIndex();
+ SwNodeOffset nIndex = pWrtShell->GetCursor()->GetPointNode().GetIndex();
SwTextNode* pTextNode = pDoc->GetNodes()[nIndex]->GetTextNode();
SwTextAttr* pAttr = pTextNode->GetTextAttrForCharAt(0,
RES_TXTATR_CONTENTCONTROL);
auto pTextContentControl =
static_txtattr_cast<SwTextContentControl*>(pAttr);
@@ -115,7 +115,7 @@ CPPUNIT_TEST_FIXTURE(Test, testTickCheckboxContentControl)
// When clicking on that content control:
SwWrtShell* pWrtShell = pDoc->GetDocShell()->GetWrtShell();
- SwTextNode* pTextNode = pWrtShell->GetCursor()->GetNode().GetTextNode();
+ SwTextNode* pTextNode =
pWrtShell->GetCursor()->GetPointNode().GetTextNode();
SwTextAttr* pAttr = pTextNode->GetTextAttrForCharAt(0,
RES_TXTATR_CONTENTCONTROL);
auto pTextContentControl =
static_txtattr_cast<SwTextContentControl*>(pAttr);
auto& rFormatContentControl
@@ -140,7 +140,7 @@ CPPUNIT_TEST_FIXTURE(Test, testInsertContentControl)
pWrtShell->InsertContentControl(SwContentControlType::RICH_TEXT);
// Then make sure that the matching text attribute is added to the
document model:
- SwTextNode* pTextNode = pWrtShell->GetCursor()->GetNode().GetTextNode();
+ SwTextNode* pTextNode =
pWrtShell->GetCursor()->GetPointNode().GetTextNode();
// Without the accompanying fix in place, this test would have failed,
nothing happened on
// InsertContentControl().
CPPUNIT_ASSERT(pTextNode->GetTextAttrForCharAt(0,
RES_TXTATR_CONTENTCONTROL));
@@ -156,7 +156,7 @@ CPPUNIT_TEST_FIXTURE(Test, testInsertCheckboxContentControl)
pWrtShell->InsertContentControl(SwContentControlType::CHECKBOX);
// Then make sure that the matching text attribute is added to the
document model:
- SwTextNode* pTextNode = pWrtShell->GetCursor()->GetNode().GetTextNode();
+ SwTextNode* pTextNode =
pWrtShell->GetCursor()->GetPointNode().GetTextNode();
SwTextAttr* pAttr = pTextNode->GetTextAttrForCharAt(0,
RES_TXTATR_CONTENTCONTROL);
auto pTextContentControl =
static_txtattr_cast<SwTextContentControl*>(pAttr);
auto& rFormatContentControl
@@ -202,7 +202,7 @@ CPPUNIT_TEST_FIXTURE(Test, testSelectDropdownContentControl)
// When clicking on that content control:
SwWrtShell* pWrtShell = pDoc->GetDocShell()->GetWrtShell();
- SwTextNode* pTextNode = pWrtShell->GetCursor()->GetNode().GetTextNode();
+ SwTextNode* pTextNode =
pWrtShell->GetCursor()->GetPointNode().GetTextNode();
SwTextAttr* pAttr = pTextNode->GetTextAttrForCharAt(0,
RES_TXTATR_CONTENTCONTROL);
auto pTextContentControl =
static_txtattr_cast<SwTextContentControl*>(pAttr);
auto& rFormatContentControl
@@ -228,7 +228,7 @@ CPPUNIT_TEST_FIXTURE(Test, testInsertDropdownContentControl)
pWrtShell->InsertContentControl(SwContentControlType::DROP_DOWN_LIST);
// Then make sure that the matching text attribute is added to the
document model:
- SwTextNode* pTextNode = pWrtShell->GetCursor()->GetNode().GetTextNode();
+ SwTextNode* pTextNode =
pWrtShell->GetCursor()->GetPointNode().GetTextNode();
SwTextAttr* pAttr = pTextNode->GetTextAttrForCharAt(0,
RES_TXTATR_CONTENTCONTROL);
auto pTextContentControl =
static_txtattr_cast<SwTextContentControl*>(pAttr);
auto& rFormatContentControl
@@ -296,7 +296,7 @@ CPPUNIT_TEST_FIXTURE(Test, testInsertPictureContentControl)
pWrtShell->InsertContentControl(SwContentControlType::PICTURE);
// Then make sure that the matching text attribute is added to the
document model:
- SwTextNode* pTextNode = pWrtShell->GetCursor()->GetNode().GetTextNode();
+ SwTextNode* pTextNode =
pWrtShell->GetCursor()->GetPointNode().GetTextNode();
SwTextAttr* pAttr = pTextNode->GetTextAttrForCharAt(0,
RES_TXTATR_CONTENTCONTROL);
auto pTextContentControl =
static_txtattr_cast<SwTextContentControl*>(pAttr);
auto& rFormatContentControl
@@ -329,7 +329,7 @@ CPPUNIT_TEST_FIXTURE(Test, testSelectDateContentControl)
// When clicking on that content control:
SwWrtShell* pWrtShell = pDoc->GetDocShell()->GetWrtShell();
- SwTextNode* pTextNode = pWrtShell->GetCursor()->GetNode().GetTextNode();
+ SwTextNode* pTextNode =
pWrtShell->GetCursor()->GetPointNode().GetTextNode();
SwTextAttr* pAttr = pTextNode->GetTextAttrForCharAt(0,
RES_TXTATR_CONTENTCONTROL);
auto pTextContentControl =
static_txtattr_cast<SwTextContentControl*>(pAttr);
auto& rFormatContentControl
@@ -357,7 +357,7 @@ CPPUNIT_TEST_FIXTURE(Test, testInsertDateContentControl)
pWrtShell->InsertContentControl(SwContentControlType::DATE);
// Then make sure that the matching text attribute is added to the
document model:
- SwTextNode* pTextNode = pWrtShell->GetCursor()->GetNode().GetTextNode();
+ SwTextNode* pTextNode =
pWrtShell->GetCursor()->GetPointNode().GetTextNode();
SwTextAttr* pAttr = pTextNode->GetTextAttrForCharAt(0,
RES_TXTATR_CONTENTCONTROL);
auto pTextContentControl =
static_txtattr_cast<SwTextContentControl*>(pAttr);
auto& rFormatContentControl
@@ -378,7 +378,7 @@ CPPUNIT_TEST_FIXTURE(Test,
testInsertPlainTextContentControl)
pWrtShell->InsertContentControl(SwContentControlType::PLAIN_TEXT);
// Then make sure that the matching text attribute is added to the
document model:
- SwTextNode* pTextNode = pWrtShell->GetCursor()->GetNode().GetTextNode();
+ SwTextNode* pTextNode =
pWrtShell->GetCursor()->GetPointNode().GetTextNode();
SwTextAttr* pAttr = pTextNode->GetTextAttrForCharAt(0,
RES_TXTATR_CONTENTCONTROL);
auto pTextContentControl =
static_txtattr_cast<SwTextContentControl*>(pAttr);
auto& rFormatContentControl
diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx
index afd523c55ae3..7bd31be3fcdb 100644
--- a/sw/source/core/crsr/crsrsh.cxx
+++ b/sw/source/core/crsr/crsrsh.cxx
@@ -546,7 +546,7 @@ bool SwCursorShell::LRMargin( bool bLeft, bool bAPI)
if ( bLeft && !bTableMode && bRet && bWasAtLM && !GetCursor_()->HasMark() )
{
- const SwTextNode * pTextNd = GetCursor_()->GetNode().GetTextNode();
+ const SwTextNode * pTextNd =
GetCursor_()->GetPointNode().GetTextNode();
assert(sw::GetParaPropsNode(*GetLayout(),
GetCursor_()->GetPoint()->GetNode()) == pTextNd);
if ( pTextNd && pTextNd->HasVisibleNumberingOrBullet() )
SetInFrontOfLabel( true );
@@ -1149,7 +1149,7 @@ bool SwCursorShell::IsEndOfTable() const
bool SwCursorShell::IsCursorInFootnote() const
{
- SwStartNodeType aStartNodeType =
m_pCurrentCursor->GetNode().StartOfSectionNode()->GetStartNodeType();
+ SwStartNodeType aStartNodeType =
m_pCurrentCursor->GetPointNode().StartOfSectionNode()->GetStartNodeType();
return aStartNodeType == SwStartNodeType::SwFootnoteStartNode;
}
@@ -1603,8 +1603,8 @@ void SwCursorShell::UpdateCursor( sal_uInt16 eFlags, bool
bIdleEnd )
if( pTstCursor->HasMark() && !m_pBlockCursor &&
SwDoc::IsIdxInTable( pTstCursor->GetPoint()->nNode ) &&
( m_pTableCursor ||
- pTstCursor->GetNode().StartOfSectionNode() !=
- pTstCursor->GetNode( false ).StartOfSectionNode() ) &&
!mbSelectAll)
+ pTstCursor->GetPointNode().StartOfSectionNode() !=
+ pTstCursor->GetMarkNode().StartOfSectionNode() ) && !mbSelectAll)
{
SwShellCursor* pITmpCursor = getShellCursor( true );
Point aTmpPt( pITmpCursor->GetPtPos() );
@@ -1777,7 +1777,7 @@ void SwCursorShell::UpdateCursor( sal_uInt16 eFlags, bool
bIdleEnd )
{
SwShellCursor* pShellCursor = getShellCursor( true );
bool bChgState = true;
- const SwSectionNode* pSectNd =
pShellCursor->GetNode().FindSectionNode();
+ const SwSectionNode* pSectNd =
pShellCursor->GetPointNode().FindSectionNode();
if( pSectNd && ( pSectNd->GetSection().IsHiddenFlag() ||
( !IsReadOnlyAvailable() &&
pSectNd->GetSection().IsProtectFlag() &&
@@ -2597,7 +2597,7 @@ OUString SwCursorShell::GetSelText() const
else if( m_pCurrentCursor->GetPoint()->GetNodeIndex() ==
m_pCurrentCursor->GetMark()->GetNodeIndex() )
{
- SwTextNode* pTextNd = m_pCurrentCursor->GetNode().GetTextNode();
+ SwTextNode* pTextNd = m_pCurrentCursor->GetPointNode().GetTextNode();
if( pTextNd )
{
const sal_Int32 nStt =
m_pCurrentCursor->Start()->GetContentIndex();
@@ -3190,22 +3190,22 @@ bool SwCursorShell::FindValidContentNode( bool
bOnlyText )
// move forward into non-protected area.
SwPaM aPam( rNdIdx.GetNode(), 0 );
- while( aPam.GetNode().IsProtect() &&
+ while( aPam.GetPointNode().IsProtect() &&
aPam.Move( fnMoveForward, GoInContent ) )
; // nothing to do in the loop; the aPam.Move does the moving!
// didn't work? then go backwards!
- if( aPam.GetNode().IsProtect() )
+ if( aPam.GetPointNode().IsProtect() )
{
SwPaM aTmpPaM( rNdIdx.GetNode(), 0 );
aPam = aTmpPaM;
- while( aPam.GetNode().IsProtect() &&
+ while( aPam.GetPointNode().IsProtect() &&
aPam.Move( fnMoveBackward, GoInContent ) )
; // nothing to do in the loop; the aPam.Move does the moving!
}
// if we're successful, set the new position
- if( ! aPam.GetNode().IsProtect() )
+ if( ! aPam.GetPointNode().IsProtect() )
{
*m_pCurrentCursor->GetPoint() = *aPam.GetPoint();
}
diff --git a/sw/source/core/crsr/crstrvl.cxx b/sw/source/core/crsr/crstrvl.cxx
index 01de0e18338e..ae45c38c46bb 100644
--- a/sw/source/core/crsr/crstrvl.cxx
+++ b/sw/source/core/crsr/crstrvl.cxx
@@ -1092,7 +1092,7 @@ bool SwCursorShell::GotoNextOutline()
}
SwCursor* pCursor = getShellCursor( true );
- SwNode* pNd = &(pCursor->GetNode());
+ SwNode* pNd = &(pCursor->GetPointNode());
SwOutlineNodes::size_type nPos;
bool bUseFirst = !rNds.GetOutLineNds().Seek_Entry( pNd, &nPos );
SwOutlineNodes::size_type const nStartPos(nPos);
@@ -1157,7 +1157,7 @@ bool SwCursorShell::GotoPrevOutline()
}
SwCursor* pCursor = getShellCursor( true );
- SwNode* pNd = &(pCursor->GetNode());
+ SwNode* pNd = &(pCursor->GetPointNode());
SwOutlineNodes::size_type nPos;
bool bRet = false;
(void)rNds.GetOutLineNds().Seek_Entry(pNd, &nPos);
@@ -1215,7 +1215,7 @@ SwOutlineNodes::size_type
SwCursorShell::GetOutlinePos(sal_uInt8 nLevel, SwPaM*
SwPaM* pCursor = pPaM ? pPaM : getShellCursor(true);
const SwNodes& rNds = GetDoc()->GetNodes();
- SwNode* pNd = &(pCursor->GetNode());
+ SwNode* pNd = &(pCursor->GetPointNode());
SwOutlineNodes::size_type nPos;
if( rNds.GetOutLineNds().Seek_Entry( pNd, &nPos ))
nPos++; // is at correct position; take next for while
@@ -1228,7 +1228,7 @@ SwOutlineNodes::size_type
SwCursorShell::GetOutlinePos(sal_uInt8 nLevel, SwPaM*
&& pNd->GetTextNode()->GetAttrOutlineLevel()-1 <= nLevel)
{
if (pNd->GetIndex() < rNds.GetEndOfExtras().GetIndex()
- && pCursor->GetNode().GetIndex() >
rNds.GetEndOfExtras().GetIndex())
+ && pCursor->GetPointNode().GetIndex() >
rNds.GetEndOfExtras().GetIndex())
{
// node found in extras but cursor position is not in extras
return SwOutlineNodes::npos;
diff --git a/sw/source/core/crsr/swcrsr.cxx b/sw/source/core/crsr/swcrsr.cxx
index 796ee5c53b49..02a721f4baa7 100644
--- a/sw/source/core/crsr/swcrsr.cxx
+++ b/sw/source/core/crsr/swcrsr.cxx
@@ -513,7 +513,7 @@ bool SwCursor::IsSelOvr( SwCursorSelOverFlags eFlags )
nSttEndTable = rNds[ nSEIdx ]->StartOfSectionIndex() - 1;
GetPoint()->nNode = nSttEndTable;
- const SwNode* pMyNd = &(GetNode());
+ const SwNode* pMyNd = &(GetPointNode());
if( pMyNd->IsSectionNode() || ( pMyNd->IsEndNode() &&
pMyNd->StartOfSectionNode()->IsSectionNode() ) )
@@ -617,7 +617,7 @@ bool SwCursor::IsInProtectTable( bool bMove, bool
bChgCursor )
// search next valid box
// if there is another StartNode after the EndNode of a cell then
// there is another cell
- SwNodeIndex aCellStt(
*GetNode().FindTableBoxStartNode()->EndOfSectionNode(), 1 );
+ SwNodeIndex aCellStt(
*GetPointNode().FindTableBoxStartNode()->EndOfSectionNode(), 1 );
bool bProt = true;
GoNextCell:
for (;;) {
@@ -667,7 +667,7 @@ SetNextCursor:
{
// if there is another EndNode in front of the StartNode than there
// exists a previous cell
- SwNodeIndex aCellStt( *GetNode().FindTableBoxStartNode(), -1 );
+ SwNodeIndex aCellStt( *GetPointNode().FindTableBoxStartNode(), -1 );
SwNode* pNd;
bool bProt = true;
GoPrevCell:
@@ -1212,7 +1212,7 @@ bool SwCursor::SelectWord( SwViewShell const *
pViewShell, const Point* pPt )
bool SwCursor::IsStartWordWT(sal_Int16 nWordType, SwRootFrame const*const
pLayout) const
{
bool bRet = false;
- SwTextNode* pTextNd = GetNode().GetTextNode();
+ SwTextNode* pTextNd = GetPointNode().GetTextNode();
if (pTextNd)
{
sal_Int32 nPtPos = GetPoint()->GetContentIndex();
@@ -1230,7 +1230,7 @@ bool SwCursor::IsStartWordWT(sal_Int16 nWordType,
SwRootFrame const*const pLayou
bool SwCursor::IsEndWordWT(sal_Int16 nWordType, SwRootFrame const*const
pLayout) const
{
bool bRet = false;
- SwTextNode* pTextNd = GetNode().GetTextNode();
+ SwTextNode* pTextNd = GetPointNode().GetTextNode();
if (pTextNd)
{
sal_Int32 nPtPos = GetPoint()->GetContentIndex();
@@ -1249,7 +1249,7 @@ bool SwCursor::IsEndWordWT(sal_Int16 nWordType,
SwRootFrame const*const pLayout)
bool SwCursor::IsInWordWT(sal_Int16 nWordType, SwRootFrame const*const
pLayout) const
{
bool bRet = false;
- SwTextNode* pTextNd = GetNode().GetTextNode();
+ SwTextNode* pTextNd = GetPointNode().GetTextNode();
if (pTextNd)
{
sal_Int32 nPtPos = GetPoint()->GetContentIndex();
@@ -1296,7 +1296,7 @@ bool SwCursor::IsStartEndSentence(bool bEnd, SwRootFrame
const*const pLayout) co
bool SwCursor::GoStartWordWT(sal_Int16 nWordType, SwRootFrame const*const
pLayout)
{
bool bRet = false;
- SwTextNode* pTextNd = GetNode().GetTextNode();
+ SwTextNode* pTextNd = GetPointNode().GetTextNode();
if (pTextNd)
{
SwCursorSaveState aSave( *this );
@@ -1325,7 +1325,7 @@ bool SwCursor::GoStartWordWT(sal_Int16 nWordType,
SwRootFrame const*const pLayou
bool SwCursor::GoEndWordWT(sal_Int16 nWordType, SwRootFrame const*const
pLayout)
{
bool bRet = false;
- SwTextNode* pTextNd = GetNode().GetTextNode();
+ SwTextNode* pTextNd = GetPointNode().GetTextNode();
if (pTextNd)
{
SwCursorSaveState aSave( *this );
@@ -1355,7 +1355,7 @@ bool SwCursor::GoEndWordWT(sal_Int16 nWordType,
SwRootFrame const*const pLayout)
bool SwCursor::GoNextWordWT(sal_Int16 nWordType, SwRootFrame const*const
pLayout)
{
bool bRet = false;
- SwTextNode* pTextNd = GetNode().GetTextNode();
+ SwTextNode* pTextNd = GetPointNode().GetTextNode();
if (pTextNd)
{
SwCursorSaveState aSave( *this );
@@ -1383,7 +1383,7 @@ bool SwCursor::GoNextWordWT(sal_Int16 nWordType,
SwRootFrame const*const pLayout
bool SwCursor::GoPrevWordWT(sal_Int16 nWordType, SwRootFrame const*const
pLayout)
{
bool bRet = false;
- SwTextNode* pTextNd = GetNode().GetTextNode();
+ SwTextNode* pTextNd = GetPointNode().GetTextNode();
if (pTextNd)
{
SwCursorSaveState aSave( *this );
@@ -1429,7 +1429,7 @@ bool SwCursor::SelectWordWT( SwViewShell const *
pViewShell, sal_Int16 nWordType
pLayout->GetModelPositionForViewPoint( GetPoint(), aPt );
}
- SwTextNode* pTextNd = GetNode().GetTextNode();
+ SwTextNode* pTextNd = GetPointNode().GetTextNode();
if (pTextNd)
{
// Should we select the whole fieldmark?
@@ -1557,7 +1557,7 @@ static OUString lcl_MaskDeletedRedlines( const
SwTextNode* pTextNd )
bool SwCursor::GoSentence(SentenceMoveType eMoveType, SwRootFrame const*const
pLayout)
{
bool bRet = false;
- SwTextNode* pTextNd = GetNode().GetTextNode();
+ SwTextNode* pTextNd = GetPointNode().GetTextNode();
if (pTextNd)
{
OUString const sNodeText(lcl_MaskDeletedRedlines(pTextNd));
@@ -2002,8 +2002,8 @@ bool SwCursor::UpDown( bool bUp, sal_uInt16 nCnt,
// If the point/mark of the table cursor in the same box then set cursor to
// beginning of the box
- if( pTableCursor && GetNode().StartOfSectionNode() ==
- GetNode( false ).StartOfSectionNode() )
+ if( pTableCursor && GetPointNode().StartOfSectionNode() ==
+ GetMarkNode().StartOfSectionNode() )
{
if ( End() != GetPoint() )
Exchange();
@@ -2043,7 +2043,7 @@ bool SwCursor::UpDown( bool bUp, sal_uInt16 nCnt,
// than one paragraph. If we want to go down, we have to set the
// point to the last frame in the table box. This is only necessary
// if we do not already have a table selection
- const SwStartNode* pTableNd = GetNode().FindTableBoxStartNode();
+ const SwStartNode* pTableNd =
GetPointNode().FindTableBoxStartNode();
OSL_ENSURE( pTableNd, "pTableCursor without SwTableNode?" );
if ( pTableNd ) // safety first
@@ -2528,8 +2528,8 @@ void SwTableCursor::DeleteBox(size_t const nPos)
bool SwTableCursor::NewTableSelection()
{
bool bRet = false;
- const SwNode *pStart = GetNode().FindTableBoxStartNode();
- const SwNode *pEnd = GetNode(false).FindTableBoxStartNode();
+ const SwNode *pStart = GetPointNode().FindTableBoxStartNode();
+ const SwNode *pEnd = GetMarkNode().FindTableBoxStartNode();
if( pStart && pEnd )
{
const SwTableNode *pTableNode = pStart->FindTableNode();
diff --git a/sw/source/core/crsr/trvlfnfl.cxx b/sw/source/core/crsr/trvlfnfl.cxx
index 11ede589747c..752ecfa0462c 100644
--- a/sw/source/core/crsr/trvlfnfl.cxx
+++ b/sw/source/core/crsr/trvlfnfl.cxx
@@ -140,7 +140,7 @@ bool SwCursorShell::GotoFootnoteText()
bool SwCursor::GotoFootnoteAnchor()
{
// jump from footnote to anchor
- const SwNode* pSttNd = GetNode().FindFootnoteStartNode();
+ const SwNode* pSttNd = GetPointNode().FindFootnoteStartNode();
if( pSttNd )
{
// search in all footnotes in document for this StartIndex
diff --git a/sw/source/core/crsr/trvlreg.cxx b/sw/source/core/crsr/trvlreg.cxx
index c66692005d71..db4b5e3f44cd 100644
--- a/sw/source/core/crsr/trvlreg.cxx
+++ b/sw/source/core/crsr/trvlreg.cxx
@@ -181,7 +181,7 @@ bool GotoNextRegion( SwPaM& rCurrentCursor,
SwMoveFnCollection const & fnPosRegi
bool GotoCurrRegionAndSkip( SwPaM& rCurrentCursor, SwMoveFnCollection const &
fnPosRegion,
bool bInReadOnly )
{
- SwNode& rCurrNd = rCurrentCursor.GetNode();
+ SwNode& rCurrNd = rCurrentCursor.GetPointNode();
SwSectionNode* pNd = rCurrNd.FindSectionNode();
if( !pNd )
return false;
diff --git a/sw/source/core/crsr/trvltbl.cxx b/sw/source/core/crsr/trvltbl.cxx
index b431d9f48e13..7b8364959b9a 100644
--- a/sw/source/core/crsr/trvltbl.cxx
+++ b/sw/source/core/crsr/trvltbl.cxx
@@ -49,7 +49,7 @@ bool SwCursorShell::GoNextCell( bool bAppendLine )
// Check if we have to move the cursor to a covered cell before
// proceeding:
- const SwNode* pTableBoxStartNode =
pCursor->GetNode().FindTableBoxStartNode();
+ const SwNode* pTableBoxStartNode =
pCursor->GetPointNode().FindTableBoxStartNode();
const SwTableBox* pTableBox = nullptr;
if ( pCursor->GetCursorRowSpanOffset() )
diff --git a/sw/source/core/doc/DocumentContentOperationsManager.cxx
b/sw/source/core/doc/DocumentContentOperationsManager.cxx
index 759cb5024848..bd8b154b1323 100644
--- a/sw/source/core/doc/DocumentContentOperationsManager.cxx
+++ b/sw/source/core/doc/DocumentContentOperationsManager.cxx
@@ -793,7 +793,7 @@ namespace
void lcl_SaveRedlines(const SwPaM& aPam, SaveRedlines_t& rArr)
{
- SwDoc& rDoc = aPam.GetNode().GetDoc();
+ SwDoc& rDoc = aPam.GetPointNode().GetDoc();
auto [pStart, pEnd] = aPam.StartEnd(); // SwPosition*
@@ -2496,7 +2496,7 @@ bool DocumentContentOperationsManager::MoveRange( SwPaM&
rPaM, SwPosition& rPos,
*aSavePam.GetMark() = rPos;
rPaM.SetMark(); // create a Sel. around the new range
- pTNd = aSavePam.GetNode().GetTextNode();
+ pTNd = aSavePam.GetPointNode().GetTextNode();
assert(!m_rDoc.GetIDocumentUndoRedo().DoesUndo());
bool bRemove = true;
// Do two Nodes have to be joined at the SavePam?
@@ -3205,7 +3205,7 @@ SwDrawFrameFormat*
DocumentContentOperationsManager::InsertDrawObj(
eAnchorId = aAnch.GetAnchorId();
if ( eAnchorId == RndStdIds::FLY_AT_FLY )
{
- const SwStartNode* pStartNode = rRg.GetNode().FindFlyStartNode();
+ const SwStartNode* pStartNode =
rRg.GetPointNode().FindFlyStartNode();
assert(pStartNode);
SwPosition aPos(*pStartNode);
aAnch.SetAnchor( &aPos );
diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx
index 6132efb16d97..0909e632ba74 100644
--- a/sw/source/core/doc/doc.cxx
+++ b/sw/source/core/doc/doc.cxx
@@ -1737,9 +1737,9 @@ void SwDoc::ChangeTOX(SwTOXBase & rTOX, const SwTOXBase &
rNew)
OUString SwDoc::GetPaMDescr(const SwPaM & rPam)
{
- if (&rPam.GetNode() == &rPam.GetNode(false))
+ if (&rPam.GetPointNode() == &rPam.GetMarkNode())
{
- SwTextNode * pTextNode = rPam.GetNode().GetTextNode();
+ SwTextNode * pTextNode = rPam.GetPointNode().GetTextNode();
if (nullptr != pTextNode)
{
diff --git a/sw/source/core/doc/docnew.cxx b/sw/source/core/doc/docnew.cxx
index 45a8e40eb354..ff1659ee1d9d 100644
--- a/sw/source/core/doc/docnew.cxx
+++ b/sw/source/core/doc/docnew.cxx
@@ -1154,11 +1154,11 @@ SwNodeIndex SwDoc::AppendDoc(const SwDoc& rSource,
sal_uInt16 const nStartPageNu
SwPaM aInsertPam( GetNodes().GetEndOfContent() );
#ifdef DBG_UTIL
- SAL_INFO( "sw.docappend", "Pam-Nd: " << aCpyPam.GetNode().GetIndex() -
aCpyPam.GetNode( false ).GetIndex() + 1
- << " (0x" << std::hex <<
static_cast<int>(aCpyPam.GetNode( false ).GetNodeType()) << std::dec
- << " " << aCpyPam.GetNode( false ).GetIndex()
- << " - 0x" << std::hex <<
static_cast<int>(aCpyPam.GetNode().GetNodeType()) << std::dec
- << " " << aCpyPam.GetNode().GetIndex() << ")" );
+ SAL_INFO( "sw.docappend", "Pam-Nd: " << aCpyPam.GetPointNode().GetIndex()
- aCpyPam.GetMarkNode().GetIndex() + 1
+ << " (0x" << std::hex <<
static_cast<int>(aCpyPam.GetMarkNode().GetNodeType()) << std::dec
+ << " " << aCpyPam.GetMarkNode().GetIndex()
+ << " - 0x" << std::hex <<
static_cast<int>(aCpyPam.GetPointNode().GetNodeType()) << std::dec
+ << " " << aCpyPam.GetPointNode().GetIndex() <<
")" );
#endif
GetIDocumentUndoRedo().StartUndo( SwUndoId::INSGLOSSARY, nullptr );
diff --git a/sw/source/core/doc/docredln.cxx b/sw/source/core/doc/docredln.cxx
index 586ef850f40e..9a09204a6b6b 100644
--- a/sw/source/core/doc/docredln.cxx
+++ b/sw/source/core/doc/docredln.cxx
@@ -1989,7 +1989,7 @@ OUString SwRangeRedline::GetDescr(bool bSimplified)
}
OUString sDescr = DenoteSpecialCharacters(pPaM->GetText().replace('\n', '
'), /*bQuoted=*/!bSimplified);
- if (const SwTextNode *pTextNode = pPaM->GetNode().GetTextNode())
+ if (const SwTextNode *pTextNode = pPaM->GetPointNode().GetTextNode())
{
if (const SwTextAttr* pTextAttr =
pTextNode->GetFieldTextAttrAt(pPaM->GetPoint()->GetContentIndex() - 1, true ))
{
diff --git a/sw/source/core/doc/number.cxx b/sw/source/core/doc/number.cxx
... etc. - the rest is truncated
