chart2/inc/strings.hrc | 3 -
chart2/source/controller/dialogs/ObjectNameProvider.cxx | 2
chart2/source/controller/dialogs/dlg_ObjectProperties.cxx | 2
chart2/source/controller/main/ChartController_Insert.cxx | 6 +-
sw/source/core/crsr/crstrvl.cxx | 2
sw/source/core/crsr/pam.cxx | 4 -
sw/source/core/doc/DocumentContentOperationsManager.cxx | 16 ++---
sw/source/core/doc/docbm.cxx | 4 -
sw/source/core/doc/docedt.cxx | 2
sw/source/core/doc/docglbl.cxx | 4 -
sw/source/core/doc/docsort.cxx | 2
sw/source/core/doc/tblcpy.cxx | 2
sw/source/core/docnode/nodes.cxx | 2
sw/source/core/edit/edfmt.cxx | 2
sw/source/core/frmedt/fecopy.cxx | 2
sw/source/core/layout/sortedobjs.cxx | 2
sw/source/core/table/swtable.cxx | 2
sw/source/core/txtnode/modeltoviewhelper.cxx | 6 +-
sw/source/core/undo/undobj.cxx | 38 +++++++-------
sw/source/core/unocore/unoobj2.cxx | 4 -
sw/source/core/unocore/unotext.cxx | 2
sw/source/filter/html/htmltab.cxx | 2
sw/source/filter/ww8/wrtww8.cxx | 2
sw/source/filter/ww8/ww8par2.cxx | 4 -
24 files changed, 58 insertions(+), 59 deletions(-)
New commits:
commit 66faff4d3c9756e4a83933a07e2f9329ede9e043
Author: Tomaž Vajngerl <tomaz.vajng...@collabora.co.uk>
AuthorDate: Tue Aug 16 16:44:55 2022 +0200
Commit: Tomaž Vajngerl <qui...@gmail.com>
CommitDate: Thu Aug 18 08:47:53 2022 +0200
chart2: use only one "Data Table" string to simplify translation
Change-Id: Idff337523a66195277b364be474baffcebca26aa
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138369
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <qui...@gmail.com>
diff --git a/chart2/inc/strings.hrc b/chart2/inc/strings.hrc
index 9a9943df1f3c..a60da15e0004 100644
--- a/chart2/inc/strings.hrc
+++ b/chart2/inc/strings.hrc
@@ -48,7 +48,6 @@
#define STR_PAGE_APPEARANCE NC_("STR_PAGE_APPEARANCE",
"Appearance")
#define STR_PAGE_ILLUMINATION
NC_("STR_PAGE_ILLUMINATION", "Illumination")
#define STR_PAGE_ASIAN NC_("STR_PAGE_ASIAN",
"Asian Typography")
-#define STR_PAGE_DATA_TABLE NC_("STR_PAGE_DATA_TABLE",
"Data Table")
#define STR_OBJECT_AVERAGE_LINE_WITH_PARAMETERS
NC_("STR_OBJECT_AVERAGE_LINE_WITH_PARAMETERS", "Mean value line with value
%AVERAGE_VALUE and standard deviation %STD_DEVIATION")
#define STR_OBJECT_AXIS NC_("STR_OBJECT_AXIS",
"Axis")
#define STR_OBJECT_AXIS_X NC_("STR_OBJECT_AXIS_X",
"X Axis")
@@ -98,7 +97,6 @@
#define STR_OBJECT_DIAGRAM_WALL
NC_("STR_OBJECT_DIAGRAM_WALL", "Chart Wall")
#define STR_OBJECT_DIAGRAM_FLOOR
NC_("STR_OBJECT_DIAGRAM_FLOOR", "Chart Floor")
#define STR_OBJECT_SHAPE NC_("STR_OBJECT_SHAPE",
"Drawing Object")
-#define STR_OBJECT_DATA_TABLE
NC_("STR_OBJECT_DATA_TABLE", "Data Table")
#define STR_TIP_DATASERIES NC_("STR_TIP_DATASERIES",
"Data Series '%SERIESNAME'")
#define STR_TIP_DATAPOINT_INDEX
NC_("STR_TIP_DATAPOINT_INDEX", "Data Point %POINTNUMBER")
#define STR_TIP_DATAPOINT_VALUES
NC_("STR_TIP_DATAPOINT_VALUES", "Values: %POINTVALUES")
@@ -147,6 +145,7 @@
#define STR_TEXT_DIRECTION_SUPER
NC_("STR_TEXT_DIRECTION_SUPER", "Use superordinate object settings")
#define STR_PROPERTY_ROLE_FILLCOLOR
NC_("STR_PROPERTY_ROLE_FILLCOLOR", "Fill Color")
#define STR_PROPERTY_ROLE_BORDERCOLOR
NC_("STR_PROPERTY_ROLE_BORDERCOLOR", "Border Color")
+#define STR_DATA_TABLE NC_("STR_DATA_TABLE",
"Data Table")
#define STR_CONTROLTEXT_ERROR_BARS_FROM_DATA
NC_("STR_CONTROLTEXT_ERROR_BARS_FROM_DATA", "From Data Table")
#define STR_REGRESSION_LINEAR
NC_("STR_REGRESSION_LINEAR", "Linear")
diff --git a/chart2/source/controller/dialogs/ObjectNameProvider.cxx
b/chart2/source/controller/dialogs/ObjectNameProvider.cxx
index b105ecc61211..84230ff14da7 100644
--- a/chart2/source/controller/dialogs/ObjectNameProvider.cxx
+++ b/chart2/source/controller/dialogs/ObjectNameProvider.cxx
@@ -315,7 +315,7 @@ OUString ObjectNameProvider::getName( ObjectType
eObjectType, bool bPlural )
aRet=SchResId(STR_OBJECT_CURVE_EQUATION);
break;
case OBJECTTYPE_DATA_TABLE:
- aRet=SchResId(STR_OBJECT_DATA_TABLE);
+ aRet=SchResId(STR_DATA_TABLE);
break;
default: //OBJECTTYPE_UNKNOWN
;
diff --git a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
index 230862e2cedb..70787a22bc32 100644
--- a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
+++ b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
@@ -460,7 +460,7 @@ SchAttribTabDlg::SchAttribTabDlg(weld::Window* pParent,
// nothing
break;
case OBJECTTYPE_DATA_TABLE:
- AddTabPage("datatable", SchResId(STR_PAGE_DATA_TABLE),
DataTableTabPage::Create);
+ AddTabPage("datatable", SchResId(STR_DATA_TABLE),
DataTableTabPage::Create);
AddTabPage("border", SchResId(STR_PAGE_LINE), RID_SVXPAGE_LINE);
AddTabPage("area", SchResId(STR_PAGE_AREA), RID_SVXPAGE_AREA);
AddTabPage("fontname", SchResId(STR_PAGE_FONT),
RID_SVXPAGE_CHAR_NAME);
diff --git a/chart2/source/controller/main/ChartController_Insert.cxx
b/chart2/source/controller/main/ChartController_Insert.cxx
index 6fd0dd19025d..5a3612a732db 100644
--- a/chart2/source/controller/main/ChartController_Insert.cxx
+++ b/chart2/source/controller/main/ChartController_Insert.cxx
@@ -162,7 +162,7 @@ void
ChartController::executeDispatch_OpenInsertDataTableDialog()
{
SolarMutexGuard aGuard;
- auto aUndoDescription =
ActionDescriptionProvider::createDescription(ActionDescriptionProvider::ActionType::Insert,
SchResId(STR_OBJECT_DATA_TABLE));
+ auto aUndoDescription =
ActionDescriptionProvider::createDescription(ActionDescriptionProvider::ActionType::Insert,
SchResId(STR_DATA_TABLE));
UndoGuard aUndoGuard(aUndoDescription, m_xUndoManager);
rtl::Reference<Diagram> xDiagram = getFirstDiagram();
@@ -237,7 +237,7 @@ void
ChartController::executeDispatch_OpenInsertDataTableDialog()
void ChartController::executeDispatch_InsertDataTable()
{
- auto aUndoDescription =
ActionDescriptionProvider::createDescription(ActionDescriptionProvider::ActionType::Insert,
SchResId(STR_OBJECT_DATA_TABLE));
+ auto aUndoDescription =
ActionDescriptionProvider::createDescription(ActionDescriptionProvider::ActionType::Insert,
SchResId(STR_DATA_TABLE));
UndoGuard aUndoGuard(aUndoDescription, m_xUndoManager);
@@ -256,7 +256,7 @@ void ChartController::executeDispatch_InsertDataTable()
void ChartController::executeDispatch_DeleteDataTable()
{
- auto aUndoDescription =
ActionDescriptionProvider::createDescription(ActionDescriptionProvider::ActionType::Delete,
SchResId(STR_OBJECT_DATA_TABLE));
+ auto aUndoDescription =
ActionDescriptionProvider::createDescription(ActionDescriptionProvider::ActionType::Delete,
SchResId(STR_DATA_TABLE));
UndoGuard aUndoGuard(aUndoDescription, m_xUndoManager);
commit 1085810635c1a666e31ca4614f5f32b30af5fb1d
Author: Noel Grandin <noelgran...@gmail.com>
AuthorDate: Wed Aug 17 18:53:35 2022 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Thu Aug 18 08:47:39 2022 +0200
convert more nNode to SwPosition::GetNode
in places where we are using the result with operator<
Change-Id: I3440d1204e69e30f21eaf833c2d0c42cde59e55c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138454
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/sw/source/core/crsr/crstrvl.cxx b/sw/source/core/crsr/crstrvl.cxx
index 759b8bc9b847..6993d5810c65 100644
--- a/sw/source/core/crsr/crstrvl.cxx
+++ b/sw/source/core/crsr/crstrvl.cxx
@@ -412,7 +412,7 @@ bool SwCursorShell::GotoNxtPrvTableFormula( bool bNext,
bool bOnlyErrors )
}
}
- if( rPos.nNode < GetDoc()->GetNodes().GetEndOfExtras() )
+ if( rPos.GetNode() < GetDoc()->GetNodes().GetEndOfExtras() )
{
// also at collection use only the first frame
std::pair<Point, bool> const tmp(aPt, false);
diff --git a/sw/source/core/crsr/pam.cxx b/sw/source/core/crsr/pam.cxx
index d9076608774d..dd2da8a80897 100644
--- a/sw/source/core/crsr/pam.cxx
+++ b/sw/source/core/crsr/pam.cxx
@@ -1059,7 +1059,7 @@ void GoStartSection( SwPosition * pPos )
// jump to section's beginning
SwNodes& rNodes = pPos->GetNodes();
sal_uInt16 nLevel = SwNodes::GetSectionLevel( pPos->GetNode() );
- if( pPos->nNode < rNodes.GetEndOfContent().StartOfSectionIndex() )
+ if( pPos->GetNode() < *rNodes.GetEndOfContent().StartOfSectionNode() )
nLevel--;
do { SwNodes::GoStartOfSection( &pPos->nNode ); } while( nLevel-- );
@@ -1080,7 +1080,7 @@ void GoEndSection( SwPosition * pPos )
// jump to section's beginning/end
SwNodes& rNodes = pPos->GetNodes();
sal_uInt16 nLevel = SwNodes::GetSectionLevel( pPos->GetNode() );
- if( pPos->nNode < rNodes.GetEndOfContent().StartOfSectionIndex() )
+ if( pPos->GetNode() < *rNodes.GetEndOfContent().StartOfSectionNode() )
nLevel--;
do { SwNodes::GoEndOfSection( &pPos->nNode ); } while( nLevel-- );
diff --git a/sw/source/core/doc/DocumentContentOperationsManager.cxx
b/sw/source/core/doc/DocumentContentOperationsManager.cxx
index 866558d5bff1..5f027b12e204 100644
--- a/sw/source/core/doc/DocumentContentOperationsManager.cxx
+++ b/sw/source/core/doc/DocumentContentOperationsManager.cxx
@@ -911,10 +911,10 @@ namespace
pTmpPos->Assign(rRg.aEnd);
}
}
- else if( pRStt->nNode < rRg.aEnd )
+ else if( pRStt->GetNode() < rRg.aEnd.GetNode() )
{
rRedlTable.Remove( nRedlPos-- );
- if( pREnd->nNode < rRg.aEnd ||
+ if( pREnd->GetNode() < rRg.aEnd.GetNode() ||
( pREnd->GetNode() == rRg.aEnd.GetNode() &&
!pREnd->GetContentIndex()) )
{
// move everything
@@ -1854,7 +1854,7 @@ namespace //local functions originally from docfmt.cxx
/*
* The selection spans more than one Node.
*/
- if( pStt->nNode < pEnd->nNode )
+ if( pStt->GetNode() < pEnd->GetNode() )
{
pNode = pEnd->GetNode().GetContentNode();
if(pNode)
@@ -2300,7 +2300,7 @@ bool DocumentContentOperationsManager::DelFullPara(
SwPaM& rPam )
// note: here use <= not < like in
// IsDestroyFrameAnchoredAtChar() because of the increment
// of rPam in the bDoesUndo path above!
- aRg.aStart <= pAPos->nNode && pAPos->nNode <= aRg.aEnd )
+ aRg.aStart <= pAPos->GetNode() && pAPos->GetNode() <=
aRg.aEnd.GetNode() )
{
m_rDoc.getIDocumentLayoutAccess().DelLayoutFormat( pFly );
--n;
@@ -2596,11 +2596,11 @@ bool DocumentContentOperationsManager::MoveNodeRange(
SwNodeRange& rRange, SwNod
SwRangeRedline* pTmp =
m_rDoc.getIDocumentRedlineAccess().GetRedlineTable()[ nRedlPos ];
pRStt = pTmp->Start();
pREnd = pTmp->End();
- if( pREnd->GetNode() == rPos.GetNode() && pRStt->nNode < rPos )
+ if( pREnd->GetNode() == rPos.GetNode() && pRStt->GetNode() <
rPos.GetNode() )
{
aSavRedlInsPosArr.push_back( pTmp );
}
- } while( pRStt->nNode < rPos && ++nRedlPos <
m_rDoc.getIDocumentRedlineAccess().GetRedlineTable().size());
+ } while( pRStt->GetNode() < rPos.GetNode() && ++nRedlPos <
m_rDoc.getIDocumentRedlineAccess().GetRedlineTable().size());
}
}
@@ -3629,7 +3629,7 @@ void DocumentContentOperationsManager::CopyWithFlyInFly(
SwCopyFlags const flags) const
{
assert(!pCopiedPaM || pCopiedPaM->first.End()->GetNode() ==
rRg.aEnd.GetNode());
- assert(!pCopiedPaM || pCopiedPaM->second.nNode <= rInsPos);
+ assert(!pCopiedPaM || pCopiedPaM->second.GetNode() <= rInsPos.GetNode());
SwDoc& rDest = rInsPos.GetNode().GetDoc();
SwNodeIndex aSavePos( rInsPos );
@@ -3850,7 +3850,7 @@ void DocumentContentOperationsManager::CopyFlyInFlyImpl(
// or a text frame then they have to be copied
//- if the content index in this node is > 0 then paragraph and
frame bound objects are copied
//- to-character bound objects are copied if their index is <=
nEndContentIndex
- if (pAPos->nNode < rRg.aEnd)
+ if (pAPos->GetNode() < rRg.aEnd.GetNode())
bAdd = true;
if (!bAdd && !m_rDoc.getIDocumentRedlineAccess().IsRedlineMove())
// fdo#40599: not for redline move
{
diff --git a/sw/source/core/doc/docbm.cxx b/sw/source/core/doc/docbm.cxx
index f7d87e0daa86..2da73745fb2f 100644
--- a/sw/source/core/doc/docbm.cxx
+++ b/sw/source/core/doc/docbm.cxx
@@ -196,7 +196,7 @@ namespace
bool lcl_Lower( const SwPosition& rPos, const SwNode& rNdIdx,
std::optional<sal_Int32> oContentIdx )
{
- return rPos.nNode < rNdIdx
+ return rPos.GetNode() < rNdIdx
|| ( oContentIdx.has_value()
&& rPos.GetNode() == rNdIdx
&& rPos.nContent < *oContentIdx );
@@ -209,7 +209,7 @@ namespace
auto const& rSecondStart(pSecond->GetMarkStart());
if (rFirstStart.nNode != rSecondStart.nNode)
{
- return rFirstStart.nNode < rSecondStart.nNode;
+ return rFirstStart.GetNode() < rSecondStart.GetNode();
}
const sal_Int32 nFirstContent = rFirstStart.GetContentIndex();
const sal_Int32 nSecondContent = rSecondStart.GetContentIndex();
diff --git a/sw/source/core/doc/docedt.cxx b/sw/source/core/doc/docedt.cxx
index 3d3812014f5e..e89f30e9f0f4 100644
--- a/sw/source/core/doc/docedt.cxx
+++ b/sw/source/core/doc/docedt.cxx
@@ -114,7 +114,7 @@ void SaveFlyInRange( const SwNodeRange& rRg, SaveFlyArr&
rArr )
if (pAPos &&
((RndStdIds::FLY_AT_PARA == pAnchor->GetAnchorId()) ||
(RndStdIds::FLY_AT_CHAR == pAnchor->GetAnchorId())) &&
- rRg.aStart <= pAPos->nNode && pAPos->nNode < rRg.aEnd )
+ rRg.aStart <= pAPos->GetNode() && pAPos->GetNode() <
rRg.aEnd.GetNode() )
{
SaveFly aSave( pAPos->GetNodeIndex() - rRg.aStart.GetIndex(),
(RndStdIds::FLY_AT_CHAR == pAnchor->GetAnchorId())
diff --git a/sw/source/core/doc/docglbl.cxx b/sw/source/core/doc/docglbl.cxx
index 79dc2c885f82..2e9be7c67717 100644
--- a/sw/source/core/doc/docglbl.cxx
+++ b/sw/source/core/doc/docglbl.cxx
@@ -379,8 +379,8 @@ bool SwDoc::SplitDoc( sal_uInt16 eDocType, const OUString&
rPath, bool bOutline,
if (pAPos &&
((RndStdIds::FLY_AT_PARA ==
pAnchor->GetAnchorId()) ||
(RndStdIds::FLY_AT_CHAR ==
pAnchor->GetAnchorId())) &&
- aSIdx <= pAPos->nNode &&
- pAPos->nNode < aEIdx )
+ aSIdx <= pAPos->GetNode() &&
+ pAPos->GetNode() < aEIdx.GetNode() )
{
getIDocumentLayoutAccess().DelLayoutFormat( pFly );
--n;
diff --git a/sw/source/core/doc/docsort.cxx b/sw/source/core/doc/docsort.cxx
index 2708e1cbc13d..9623a62d6e75 100644
--- a/sw/source/core/doc/docsort.cxx
+++ b/sw/source/core/doc/docsort.cxx
@@ -292,7 +292,7 @@ bool SwDoc::SortText(const SwPaM& rPaM, const
SwSortOptions& rOpt)
SwPosition const*const pAPos = pAnchor->GetContentAnchor();
if (pAPos && (RndStdIds::FLY_AT_PARA == pAnchor->GetAnchorId()) &&
- pStart->nNode <= pAPos->nNode && pAPos->nNode <= pEnd->nNode )
+ pStart->GetNode() <= pAPos->GetNode() && pAPos->GetNode() <=
pEnd->GetNode() )
return false;
}
diff --git a/sw/source/core/doc/tblcpy.cxx b/sw/source/core/doc/tblcpy.cxx
index b0fa499f0b3c..aaab4e837bee 100644
--- a/sw/source/core/doc/tblcpy.cxx
+++ b/sw/source/core/doc/tblcpy.cxx
@@ -546,7 +546,7 @@ static void lcl_CpyBox( const SwTable& rCpyTable, const
SwTableBox* pCpyBox,
if (pAPos &&
((RndStdIds::FLY_AT_PARA == pAnchor->GetAnchorId()) ||
(RndStdIds::FLY_AT_CHAR == pAnchor->GetAnchorId())) &&
- aInsIdx <= pAPos->nNode && pAPos->nNode <= aEndNdIdx )
+ aInsIdx <= pAPos->GetNode() && pAPos->GetNode() <=
aEndNdIdx.GetNode() )
{
pDoc->getIDocumentLayoutAccess().DelLayoutFormat( pFly );
}
diff --git a/sw/source/core/docnode/nodes.cxx b/sw/source/core/docnode/nodes.cxx
index e12df9c0687e..221166f37e12 100644
--- a/sw/source/core/docnode/nodes.cxx
+++ b/sw/source/core/docnode/nodes.cxx
@@ -1615,7 +1615,7 @@ void SwNodes::MoveRange( SwPaM & rPam, SwPosition & rPos,
SwNodes& rNodes )
// at the end of this range a new TextNode will be created
if( !bSplitDestNd )
{
- if( rPos.nNode < rNodes.GetEndOfContent().GetIndex() )
+ if( rPos.GetNode() < rNodes.GetEndOfContent() )
{
++rPos.nNode;
}
diff --git a/sw/source/core/edit/edfmt.cxx b/sw/source/core/edit/edfmt.cxx
index f624b00de292..ee291e82e8dd 100644
--- a/sw/source/core/edit/edfmt.cxx
+++ b/sw/source/core/edit/edfmt.cxx
@@ -75,7 +75,7 @@ void SwEditShell::FillByEx(SwCharFormat* pCharFormat)
else
{
nStt = pMkPos->GetContentIndex();
- if( pPtPos->nNode < pMkPos->nNode )
+ if( pPtPos->GetNode() < pMkPos->GetNode() )
{
nEnd = nStt;
nStt = 0;
diff --git a/sw/source/core/frmedt/fecopy.cxx b/sw/source/core/frmedt/fecopy.cxx
index 7004c7e5b698..e641e6b67fba 100644
--- a/sw/source/core/frmedt/fecopy.cxx
+++ b/sw/source/core/frmedt/fecopy.cxx
@@ -100,7 +100,7 @@ void SwFEShell::Copy( SwDoc& rClpDoc, const OUString*
pNewClpText )
if (pAPos &&
((RndStdIds::FLY_AT_PARA == pAnchor->GetAnchorId()) ||
(RndStdIds::FLY_AT_CHAR == pAnchor->GetAnchorId())) &&
- aSttIdx <= pAPos->nNode && pAPos->nNode <= aEndNdIdx )
+ aSttIdx <= pAPos->GetNode() && pAPos->GetNode() <=
aEndNdIdx.GetNode() )
{
rClpDoc.getIDocumentLayoutAccess().DelLayoutFormat( pFly );
}
diff --git a/sw/source/core/layout/sortedobjs.cxx
b/sw/source/core/layout/sortedobjs.cxx
index 8be7d5e6dc75..d4add08ec8e6 100644
--- a/sw/source/core/layout/sortedobjs.cxx
+++ b/sw/source/core/layout/sortedobjs.cxx
@@ -127,7 +127,7 @@ struct ObjAnchorOrder
if ( pContentAnchorListed && pContentAnchorNew &&
pContentAnchorListed->nNode != pContentAnchorNew->nNode )
{
- return pContentAnchorListed->nNode < pContentAnchorNew->nNode;
+ return pContentAnchorListed->GetNode() <
pContentAnchorNew->GetNode();
}
// objects anchored at the same content.
diff --git a/sw/source/core/table/swtable.cxx b/sw/source/core/table/swtable.cxx
index bf5ee443661f..3e250e72a7bf 100644
--- a/sw/source/core/table/swtable.cxx
+++ b/sw/source/core/table/swtable.cxx
@@ -1703,7 +1703,7 @@ SwRedlineTable::size_type
SwTableLine::UpdateTextChangesOnly(
// there is text content outside of redlines: not a deletion
if ( !bInsertion && ( !bHasRedlineInBox || (
pPreviousDeleteRedline &&
- ( pPreviousDeleteRedline->End()->nNode < aCellEnd.nNode ||
+ ( pPreviousDeleteRedline->End()->GetNode() <
aCellEnd.GetNode() ||
pPreviousDeleteRedline->End()->GetContentIndex() <
aCellEnd.GetNode().GetContentNode()->Len() ) ) ) )
{
diff --git a/sw/source/core/txtnode/modeltoviewhelper.cxx
b/sw/source/core/txtnode/modeltoviewhelper.cxx
index 757e6b89d9cd..d7ebeaf57775 100644
--- a/sw/source/core/txtnode/modeltoviewhelper.cxx
+++ b/sw/source/core/txtnode/modeltoviewhelper.cxx
@@ -138,17 +138,17 @@ ModelToViewHelper::ModelToViewHelper(const SwTextNode
&rNode,
assert(pFieldMark->GetMarkStart().GetNode().GetTextNode()->GetText()[pFieldMark->GetMarkStart().GetContentIndex()]
!= CH_TXT_ATR_FORMELEMENT);
// getFieldmarkFor may also return one that starts at rNode,0 -
// skip it, must be handled in loop below
- if (pFieldMark->GetMarkStart().nNode < rNode)
+ if (pFieldMark->GetMarkStart().GetNode() < rNode)
{
// this can be a nested field's end - skip over those!
- if (pFieldMark->GetMarkEnd().nNode < rNode)
+ if (pFieldMark->GetMarkEnd().GetNode() < rNode)
{
assert(cursor.GetPoint()->GetNode().GetTextNode()->GetText()[cursor.GetPoint()->GetContentIndex()]
== CH_TXT_ATR_FIELDEND);
}
else
{
SwPosition const
sepPos(::sw::mark::FindFieldSep(*pFieldMark));
- startedFields.emplace_front(pFieldMark, sepPos.nNode <
rNode);
+ startedFields.emplace_front(pFieldMark, sepPos.GetNode() <
rNode);
}
*cursor.GetPoint() = pFieldMark->GetMarkStart();
}
diff --git a/sw/source/core/undo/undobj.cxx b/sw/source/core/undo/undobj.cxx
index cc5699b0c006..34d5de35d581 100644
--- a/sw/source/core/undo/undobj.cxx
+++ b/sw/source/core/undo/undobj.cxx
@@ -964,8 +964,8 @@ void SwUndoSaveContent::DelContentIndex( const SwPosition&
rMark,
case RndStdIds::FLY_AS_CHAR:
if( nullptr != (pAPos = pAnchor->GetContentAnchor() ) &&
(( DelContentType::CheckNoCntnt & nDelContentType )
- ? ( pStt->nNode <= pAPos->nNode &&
- pAPos->nNode < pEnd->nNode )
+ ? ( pStt->GetNode() <= pAPos->GetNode() &&
+ pAPos->GetNode() < pEnd->GetNode() )
: ( *pStt <= *pAPos && *pAPos < *pEnd )) )
{
if( !m_pHistory )
@@ -984,7 +984,7 @@ void SwUndoSaveContent::DelContentIndex( const SwPosition&
rMark,
{
pAPos = pAnchor->GetContentAnchor();
if (pAPos &&
- pStt->nNode <= pAPos->nNode && pAPos->nNode <=
pEnd->nNode)
+ pStt->GetNode() <= pAPos->GetNode() &&
pAPos->GetNode() <= pEnd->GetNode())
{
if (!m_pHistory)
m_pHistory.reset( new SwHistory );
@@ -1021,7 +1021,7 @@ void SwUndoSaveContent::DelContentIndex( const
SwPosition& rMark,
break;
case RndStdIds::FLY_AT_CHAR:
if( nullptr != (pAPos = pAnchor->GetContentAnchor() ) &&
- ( pStt->nNode <= pAPos->nNode && pAPos->nNode <=
pEnd->nNode ) )
+ ( pStt->GetNode() <= pAPos->GetNode() &&
pAPos->GetNode() <= pEnd->GetNode() ) )
{
if( !m_pHistory )
m_pHistory.reset( new SwHistory );
@@ -1090,14 +1090,14 @@ void SwUndoSaveContent::DelContentIndex( const
SwPosition& rMark,
if( DelContentType::CheckNoCntnt & nDelContentType )
{
- if ( pStt->nNode <= pBkmk->GetMarkPos().nNode
- && pBkmk->GetMarkPos().nNode < pEnd->nNode )
+ if ( pStt->GetNode() <= pBkmk->GetMarkPos().GetNode()
+ && pBkmk->GetMarkPos().GetNode() < pEnd->GetNode() )
{
bSavePos = true;
}
if ( pBkmk->IsExpanded()
- && pStt->nNode <= pBkmk->GetOtherMarkPos().nNode
- && pBkmk->GetOtherMarkPos().nNode < pEnd->nNode )
+ && pStt->GetNode() <= pBkmk->GetOtherMarkPos().GetNode()
+ && pBkmk->GetOtherMarkPos().GetNode() < pEnd->GetNode() )
{
bSaveOtherPos = true;
}
@@ -1559,7 +1559,7 @@ static bool IsAtEndOfSection(SwPosition const& rAnchorPos)
SwNodeIndex node(*rAnchorPos.GetNode().EndOfSectionNode());
SwContentNode *const pNode(SwNodes::GoPrevious(&node));
assert(pNode);
- assert(rAnchorPos.nNode <= node); // last valid anchor pos is last content
+ assert(rAnchorPos.GetNode() <= node.GetNode()); // last valid anchor pos
is last content
return node == rAnchorPos.nNode
// at-para fly has no SwContentIndex!
&& (rAnchorPos.GetContentIndex() == pNode->Len() ||
rAnchorPos.GetContentNode() == nullptr);
@@ -1572,7 +1572,7 @@ static bool IsAtStartOfSection(SwPosition const&
rAnchorPos)
SwContentNode *const pNode(rNodes.GoNext(&node));
assert(pNode);
(void) pNode;
- assert(node <= rAnchorPos.nNode);
+ assert(node <= rAnchorPos.GetNode());
return node == rAnchorPos.nNode && rAnchorPos.GetContentIndex() == 0;
}
@@ -1612,8 +1612,8 @@ bool IsDestroyFrameAnchoredAtChar(SwPosition const &
rAnchorPos,
// CheckNoCntnt means DelFullPara which is obvious to handle
if (DelContentType::CheckNoCntnt & nDelContentType)
{ // exclude selection end node because it won't be deleted
- return (rAnchorPos.nNode < rEnd.nNode)
- && (rStart.nNode <= rAnchorPos.nNode);
+ return (rAnchorPos.GetNode() < rEnd.GetNode())
+ && (rStart.GetNode() <= rAnchorPos.GetNode());
}
if ((nDelContentType & DelContentType::WriterfilterHack)
@@ -1624,8 +1624,8 @@ bool IsDestroyFrameAnchoredAtChar(SwPosition const &
rAnchorPos,
if (nDelContentType & DelContentType::ExcludeFlyAtStartEnd)
{ // exclude selection start and end node
- return (rAnchorPos.nNode < rEnd.nNode)
- && (rStart.nNode < rAnchorPos.nNode);
+ return (rAnchorPos.GetNode() < rEnd.GetNode())
+ && (rStart.GetNode() < rAnchorPos.GetNode());
}
// in general, exclude the start and end position
@@ -1653,8 +1653,8 @@ bool IsSelectFrameAnchoredAtPara(SwPosition const &
rAnchorPos,
// CheckNoCntnt means DelFullPara which is obvious to handle
if (DelContentType::CheckNoCntnt & nDelContentType)
{ // exclude selection end node because it won't be deleted
- return (rAnchorPos.nNode < rEnd.nNode)
- && (rStart.nNode <= rAnchorPos.nNode);
+ return (rAnchorPos.GetNode() < rEnd.GetNode())
+ && (rStart.GetNode() <= rAnchorPos.GetNode());
}
if ((nDelContentType & DelContentType::WriterfilterHack)
@@ -1665,11 +1665,11 @@ bool IsSelectFrameAnchoredAtPara(SwPosition const &
rAnchorPos,
// stupid code temp. overrides it - instead rely on setting the ALLFLYS
// flag in MoveFromSection() and converting that to CheckNoCntnt with
// adjusted cursor!
- return (rStart.nNode < rAnchorPos.nNode) && (rAnchorPos.nNode <
rEnd.nNode);
+ return (rStart.GetNode() < rAnchorPos.GetNode()) && (rAnchorPos.nNode
< rEnd.GetNode());
}
// in general, exclude the start and end position
- return ((rStart.nNode < rAnchorPos.nNode)
+ return ((rStart.GetNode() < rAnchorPos.GetNode())
|| (rStart.GetNode() == rAnchorPos.GetNode()
&& !(nDelContentType & DelContentType::ExcludeFlyAtStartEnd)
// special case: fully deleted node
@@ -1677,7 +1677,7 @@ bool IsSelectFrameAnchoredAtPara(SwPosition const &
rAnchorPos,
// but not if the selection is backspace/delete!
&& IsNotBackspaceHeuristic(rStart, rEnd))
|| (IsAtStartOfSection2(rStart) &&
IsAtEndOfSection2(rEnd)))))
- && ((rAnchorPos.nNode < rEnd.nNode)
+ && ((rAnchorPos.GetNode() < rEnd.GetNode())
|| (rAnchorPos.GetNode() == rEnd.GetNode()
&& !(nDelContentType & DelContentType::ExcludeFlyAtStartEnd)
// special case: fully deleted node
diff --git a/sw/source/core/unocore/unoobj2.cxx
b/sw/source/core/unocore/unoobj2.cxx
index 2d754a249897..beab3975a53b 100644
--- a/sw/source/core/unocore/unoobj2.cxx
+++ b/sw/source/core/unocore/unoobj2.cxx
@@ -872,7 +872,7 @@ void SwXTextRange::DeleteAndInsert(
// now there should be a text node at the start and end of it!
*aCursor.GetPoint() = SwPosition(start);
aCursor.Move( fnMoveForward, GoInContent );
- assert(aCursor.GetPoint()->nNode <= end);
+ assert(aCursor.GetPoint()->GetNode() <= end.GetNode());
aCursor.SetMark();
*aCursor.GetPoint() = SwPosition(end);
aCursor.Move( fnMoveBackward, GoInContent );
@@ -995,7 +995,7 @@ SwXTextRange::getStart()
auto const pSectFormat(static_cast<SwSectionFormat
const*>(m_pImpl->m_pTableOrSectionFormat));
SwPaM aPaM(*pSectFormat->GetContent().GetContentIdx());
aPaM.Move( fnMoveForward, GoInContent );
- assert(aPaM.GetPoint()->nNode <
*pSectFormat->GetContent().GetContentIdx()->GetNode().EndOfSectionNode());
+ assert(aPaM.GetPoint()->GetNode() <
*pSectFormat->GetContent().GetContentIdx()->GetNode().EndOfSectionNode());
xRet = new SwXTextRange(aPaM, m_pImpl->m_xParentText);
}
else
diff --git a/sw/source/core/unocore/unotext.cxx
b/sw/source/core/unocore/unotext.cxx
index 91ad6b3525cb..13f2a30e7729 100644
--- a/sw/source/core/unocore/unotext.cxx
+++ b/sw/source/core/unocore/unotext.cxx
@@ -1947,7 +1947,7 @@ void SwXText::Impl::ConvertCell(
/** check the nodes between start and end
it is allowed to have pairs of StartNode/EndNodes
*/
- if (aStartCellPam.Start()->nNode < aEndCellPam.End()->nNode)
+ if (aStartCellPam.Start()->GetNode() < aEndCellPam.End()->GetNode())
{
// increment on each StartNode and decrement on each EndNode
// we must reach zero at the end and must not go below zero
diff --git a/sw/source/filter/html/htmltab.cxx
b/sw/source/filter/html/htmltab.cxx
index 88b8c9e0663d..68b1c80f6f97 100644
--- a/sw/source/filter/html/htmltab.cxx
+++ b/sw/source/filter/html/htmltab.cxx
@@ -4924,7 +4924,7 @@ void SwHTMLParser::ClearFootnotesMarksInRange(const
SwNodeIndex& rMkNdIdx, const
if (pAPos &&
((rAnch.GetAnchorId() == RndStdIds::FLY_AT_PARA) ||
(rAnch.GetAnchorId() == RndStdIds::FLY_AT_CHAR)) &&
- ( rMkNdIdx < pAPos->nNode && pAPos->nNode <= rPtNdIdx ))
+ ( rMkNdIdx < pAPos->GetNode() && pAPos->GetNode() <=
rPtNdIdx.GetNode() ))
{
if( rPtNdIdx != pAPos->nNode )
{
diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index 967debe85dc4..50db68474cf1 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -2753,7 +2753,7 @@ public:
bool contentRemainsToExport(ww8::WW8TableInfo *pTableInfo)
{
- bool bSimpleContentRemains = m_pCurPam->GetPoint()->nNode <
m_pCurPam->GetMark()->nNode ||
+ bool bSimpleContentRemains = m_pCurPam->GetPoint()->GetNode() <
m_pCurPam->GetMark()->GetNode() ||
(m_pCurPam->GetPoint()->GetNode() ==
m_pCurPam->GetMark()->GetNode() &&
m_pCurPam->GetPoint()->GetContentIndex() <=
m_pCurPam->GetMark()->GetContentIndex());
if (bSimpleContentRemains)
diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index 8d07a23ba23e..c05447b4b1c8 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -174,7 +174,7 @@ sal_uInt16 SwWW8ImplReader::End_Footnote()
into field results and field commands.
*/
if (m_bIgnoreText ||
- m_pPaM->GetPoint()->nNode <
m_rDoc.GetNodes().GetEndOfExtras().GetIndex())
+ m_pPaM->GetPoint()->GetNode() < m_rDoc.GetNodes().GetEndOfExtras())
{
return 0;
}
@@ -302,7 +302,7 @@ tools::Long
SwWW8ImplReader::Read_Footnote(WW8PLCFManResult* pRes)
into field results and field commands.
*/
if (m_bIgnoreText ||
- m_pPaM->GetPoint()->nNode <
m_rDoc.GetNodes().GetEndOfExtras().GetIndex())
+ m_pPaM->GetPoint()->GetNode() < m_rDoc.GetNodes().GetEndOfExtras())
{
return 0;
}
