summaryrefslogtreecommitdiff
path: root/sw/source/core/fields
diff options
context:
space:
mode:
Diffstat (limited to 'sw/source/core/fields')
-rw-r--r--sw/source/core/fields/authfld.cxx8
-rw-r--r--sw/source/core/fields/cellfml.cxx34
-rw-r--r--sw/source/core/fields/chpfld.cxx8
-rw-r--r--sw/source/core/fields/docufld.cxx52
-rw-r--r--sw/source/core/fields/expfld.cxx70
-rw-r--r--sw/source/core/fields/fldlst.cxx6
-rw-r--r--sw/source/core/fields/postithelper.cxx28
-rw-r--r--sw/source/core/fields/reffld.cxx134
8 files changed, 170 insertions, 170 deletions
diff --git a/sw/source/core/fields/authfld.cxx b/sw/source/core/fields/authfld.cxx
index 6ce9a3fa4ac5..e92383cfc5cf 100644
--- a/sw/source/core/fields/authfld.cxx
+++ b/sw/source/core/fields/authfld.cxx
@@ -260,16 +260,16 @@ sal_uInt16 SwAuthorityFieldType::GetSequencePos(sal_IntPtr nHandle)
const SwTextNode& rFieldTextNode = pTextField->GetTextNode();
SwPosition aFieldPos(rFieldTextNode);
SwDoc& rDoc = *const_cast<SwDoc*>(rFieldTextNode.GetDoc());
- SwContentFrm *pFrm = rFieldTextNode.getLayoutFrm( rDoc.getIDocumentLayoutAccess().GetCurrentLayout() );
+ SwContentFrame *pFrame = rFieldTextNode.getLayoutFrame( rDoc.getIDocumentLayoutAccess().GetCurrentLayout() );
const SwTextNode* pTextNode = nullptr;
- if(pFrm && !pFrm->IsInDocBody())
- pTextNode = GetBodyTextNode( rDoc, aFieldPos, *pFrm );
+ if(pFrame && !pFrame->IsInDocBody())
+ pTextNode = GetBodyTextNode( rDoc, aFieldPos, *pFrame );
//if no text node could be found or the field is in the document
//body the directly available text node will be used
if(!pTextNode)
pTextNode = &rFieldTextNode;
if (!pTextNode->GetText().isEmpty() &&
- pTextNode->getLayoutFrm( rDoc.getIDocumentLayoutAccess().GetCurrentLayout() ) &&
+ pTextNode->getLayoutFrame( rDoc.getIDocumentLayoutAccess().GetCurrentLayout() ) &&
pTextNode->GetNodes().IsDocNodes() )
{
SwTOXAuthority* pNew = new SwTOXAuthority( *pTextNode,
diff --git a/sw/source/core/fields/cellfml.cxx b/sw/source/core/fields/cellfml.cxx
index 5ef6d3ff8bb3..7b5ff1a1232b 100644
--- a/sw/source/core/fields/cellfml.cxx
+++ b/sw/source/core/fields/cellfml.cxx
@@ -54,7 +54,7 @@ enum
}
-static const SwFrm* lcl_GetBoxFrm( const SwTableBox& rBox );
+static const SwFrame* lcl_GetBoxFrame( const SwTableBox& rBox );
static sal_Int32 lcl_GetLongBoxNum( OUString& rStr );
static const SwTableBox* lcl_RelToBox( const SwTable& rTable,
const SwTableBox* pRefBox,
@@ -91,13 +91,13 @@ double SwTableBox::GetValue( SwTableCalcPara& rCalcPara ) const
// Does it create a recursion?
SwTableBox* pBox = const_cast<SwTableBox*>(this);
- if( rCalcPara.pBoxStk->find( pBox ) != rCalcPara.pBoxStk->end() )
+ if( rCalcPara.pBoxStack->find( pBox ) != rCalcPara.pBoxStack->end() )
return nRet; // already on the stack: error
// re-start with this box
rCalcPara.SetLastTableBox( this );
- rCalcPara.pBoxStk->insert( pBox ); // add
+ rCalcPara.pBoxStack->insert( pBox ); // add
do { // Middle-Check-Loop, so that we can jump from here. Used so that the box pointer
// will be removed from stack at the end.
SwDoc* pDoc = GetFrameFormat()->GetDoc();
@@ -237,7 +237,7 @@ double SwTableBox::GetValue( SwTableCalcPara& rCalcPara ) const
if( !rCalcPara.IsStackOverflow() )
{
- rCalcPara.pBoxStk->erase( pBox ); // remove from stack
+ rCalcPara.pBoxStack->erase( pBox ); // remove from stack
rCalcPara.DecStackCnt();
}
@@ -254,12 +254,12 @@ SwTableCalcPara::SwTableCalcPara( SwCalc& rCalculator, const SwTable& rTable )
: pLastTableBox( nullptr ), nStackCnt( 0 ), nMaxSize( cMAXSTACKSIZE ),
rCalc( rCalculator ), pTable( &rTable )
{
- pBoxStk = new SwTableSortBoxes;
+ pBoxStack = new SwTableSortBoxes;
}
SwTableCalcPara::~SwTableCalcPara()
{
- delete pBoxStk;
+ delete pBoxStack;
}
bool SwTableCalcPara::CalcWithStackOverflow()
@@ -276,7 +276,7 @@ bool SwTableCalcPara::CalcWithStackOverflow()
rCalc.SetCalcError( CALC_NOERR );
aStackOverflows.insert( aStackOverflows.begin() + nCnt++, pBox );
- pBoxStk->erase( pBox );
+ pBoxStack->erase( pBox );
pBox->GetValue( *this );
} while( IsStackOverflow() );
@@ -285,7 +285,7 @@ bool SwTableCalcPara::CalcWithStackOverflow()
// if recursion was detected
nStackCnt = 0;
rCalc.SetCalcError( CALC_NOERR );
- pBoxStk->clear();
+ pBoxStack->clear();
while( !rCalc.IsCalcError() && nCnt )
{
@@ -722,13 +722,13 @@ const SwTable* SwTableFormula::FindTable( SwDoc& rDoc, const OUString& rNm )
return pRet;
}
-static const SwFrm* lcl_GetBoxFrm( const SwTableBox& rBox )
+static const SwFrame* lcl_GetBoxFrame( const SwTableBox& rBox )
{
SwNodeIndex aIdx( *rBox.GetSttNd() );
SwContentNode* pCNd = aIdx.GetNodes().GoNext( &aIdx );
OSL_ENSURE( pCNd, "Box has no TextNode" );
Point aPt; // get the first frame of the layout - table headline
- return pCNd->getLayoutFrm( pCNd->GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout(), &aPt, nullptr, false );
+ return pCNd->getLayoutFrame( pCNd->GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout(), &aPt, nullptr, false );
}
static sal_Int32 lcl_GetLongBoxNum( OUString& rStr )
@@ -921,16 +921,16 @@ void SwTableFormula::GetBoxes( const SwTableBox& rSttBox,
SwSelBoxes& rBoxes )
{
// get all selected boxes via layout
- const SwLayoutFrm *pStt, *pEnd;
- const SwFrm* pFrm = lcl_GetBoxFrm( rSttBox );
- pStt = pFrm ? pFrm->GetUpper() : nullptr;
- pEnd = ( nullptr != (pFrm = lcl_GetBoxFrm( rEndBox ))) ? pFrm->GetUpper() : nullptr;
+ const SwLayoutFrame *pStt, *pEnd;
+ const SwFrame* pFrame = lcl_GetBoxFrame( rSttBox );
+ pStt = pFrame ? pFrame->GetUpper() : nullptr;
+ pEnd = ( nullptr != (pFrame = lcl_GetBoxFrame( rEndBox ))) ? pFrame->GetUpper() : nullptr;
if( !pStt || !pEnd )
return ; // no valid selection
GetTableSel( pStt, pEnd, rBoxes, nullptr );
- const SwTable* pTable = pStt->FindTabFrm()->GetTable();
+ const SwTable* pTable = pStt->FindTabFrame()->GetTable();
// filter headline boxes
if( pTable->GetRowsToRepeat() > 0 )
@@ -951,8 +951,8 @@ void SwTableFormula::GetBoxes( const SwTableBox& rSttBox,
if( pTable->IsHeadline( *pLine ) )
break; // headline in this area!
- const SwTabFrm *pStartTable = pStt->FindTabFrm();
- const SwTabFrm *pEndTable = pEnd->FindTabFrm();
+ const SwTabFrame *pStartTable = pStt->FindTabFrame();
+ const SwTabFrame *pEndTable = pEnd->FindTabFrame();
if (pStartTable == pEndTable) // no split table
break;
diff --git a/sw/source/core/fields/chpfld.cxx b/sw/source/core/fields/chpfld.cxx
index cfbf5d45dfd2..090509db2313 100644
--- a/sw/source/core/fields/chpfld.cxx
+++ b/sw/source/core/fields/chpfld.cxx
@@ -98,18 +98,18 @@ SwField* SwChapterField::Copy() const
}
// #i53420#
-void SwChapterField::ChangeExpansion(const SwFrm* pFrm,
+void SwChapterField::ChangeExpansion(const SwFrame* pFrame,
const SwContentNode* pContentNode,
bool bSrchNum )
{
- OSL_ENSURE( pFrm, "In which frame am I?" );
+ OSL_ENSURE( pFrame, "In which frame am I?" );
SwDoc* pDoc = const_cast<SwDoc*>(pContentNode->GetDoc());
const SwTextNode* pTextNode = dynamic_cast<const SwTextNode*>(pContentNode);
- if ( !pTextNode || !pFrm->IsInDocBody() )
+ if ( !pTextNode || !pFrame->IsInDocBody() )
{
SwPosition aDummyPos( pDoc->GetNodes().GetEndOfContent() );
- pTextNode = GetBodyTextNode( *pDoc, aDummyPos, *pFrm );
+ pTextNode = GetBodyTextNode( *pDoc, aDummyPos, *pFrame );
}
if ( pTextNode )
diff --git a/sw/source/core/fields/docufld.cxx b/sw/source/core/fields/docufld.cxx
index 45c0caa71c9d..cd54815d2ea0 100644
--- a/sw/source/core/fields/docufld.cxx
+++ b/sw/source/core/fields/docufld.cxx
@@ -159,7 +159,7 @@ void SwPageNumberFieldType::ChangeExpansion( SwDoc* pDoc,
const SwContentNode* pNd = dynamic_cast<const SwContentNode*>( pDesc->GetDefinedIn() );
if( pNd )
{
- if ( SwIterator<SwFrm,SwContentNode>(*pNd).First() )
+ if ( SwIterator<SwFrame,SwContentNode>(*pNd).First() )
bVirtuell = true;
}
else if( dynamic_cast< const SwFormat* >(pDesc->GetDefinedIn()) != nullptr)
@@ -792,11 +792,11 @@ void SwDocStatField::SetSubType(sal_uInt16 nSub)
nSubType = nSub;
}
-void SwDocStatField::ChangeExpansion( const SwFrm* pFrm )
+void SwDocStatField::ChangeExpansion( const SwFrame* pFrame )
{
if( DS_PAGE == nSubType && SVX_NUM_PAGEDESC == GetFormat() )
static_cast<SwDocStatFieldType*>(GetTyp())->SetNumFormat(
- pFrm->FindPageFrm()->GetPageDesc()->GetNumType().GetNumberingType() );
+ pFrame->FindPageFrame()->GetPageDesc()->GetNumType().GetNumberingType() );
}
bool SwDocStatField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const
@@ -2104,15 +2104,15 @@ bool SwRefPageGetFieldType::MakeSetList( _SetGetExpFields& rTmpLst )
// Always the first! (in Tab-Headline, header/footer )
Point aPt;
- const SwContentFrm* pFrm = rTextNd.getLayoutFrm( rTextNd.GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout(), &aPt, nullptr, false );
+ const SwContentFrame* pFrame = rTextNd.getLayoutFrame( rTextNd.GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout(), &aPt, nullptr, false );
_SetGetExpField* pNew;
- if( !pFrm ||
- pFrm->IsInDocBody() ||
+ if( !pFrame ||
+ pFrame->IsInDocBody() ||
// #i31868#
- // Check if pFrm is not yet connected to the layout.
- !pFrm->FindPageFrm() )
+ // Check if pFrame is not yet connected to the layout.
+ !pFrame->FindPageFrame() )
{
// create index for determination of the TextNode
SwNodeIndex aIdx( rTextNd );
@@ -2122,7 +2122,7 @@ bool SwRefPageGetFieldType::MakeSetList( _SetGetExpFields& rTmpLst )
{
// create index for determination of the TextNode
SwPosition aPos( pDoc->GetNodes().GetEndOfPostIts() );
- bool const bResult = GetBodyTextNode( *pDoc, aPos, *pFrm );
+ bool const bResult = GetBodyTextNode( *pDoc, aPos, *pFrame );
OSL_ENSURE(bResult, "where is the Field?");
(void) bResult; // unused in non-debug
pNew = new _SetGetExpField( aPos.nNode, pTField,
@@ -2163,18 +2163,18 @@ void SwRefPageGetFieldType::UpdateField( SwTextField* pTextField,
{
// determine the correct offset
Point aPt;
- const SwContentFrm* pFrm = pTextNode->getLayoutFrm( pTextNode->GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout(), &aPt, nullptr, false );
- const SwContentFrm* pRefFrm = pRefTextField->GetTextNode().getLayoutFrm( pRefTextField->GetTextNode().GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout(), &aPt, nullptr, false );
- const SwPageFrm* pPgFrm = nullptr;
- const short nDiff = ( pFrm && pRefFrm )
- ? (pPgFrm = pFrm->FindPageFrm())->GetPhyPageNum() -
- pRefFrm->FindPageFrm()->GetPhyPageNum() + 1
+ const SwContentFrame* pFrame = pTextNode->getLayoutFrame( pTextNode->GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout(), &aPt, nullptr, false );
+ const SwContentFrame* pRefFrame = pRefTextField->GetTextNode().getLayoutFrame( pRefTextField->GetTextNode().GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout(), &aPt, nullptr, false );
+ const SwPageFrame* pPgFrame = nullptr;
+ const short nDiff = ( pFrame && pRefFrame )
+ ? (pPgFrame = pFrame->FindPageFrame())->GetPhyPageNum() -
+ pRefFrame->FindPageFrame()->GetPhyPageNum() + 1
: 1;
sal_uInt32 nTmpFormat = SVX_NUM_PAGEDESC == pGetField->GetFormat()
- ? ( !pPgFrm
+ ? ( !pPgFrame
? (sal_uInt32)SVX_NUM_ARABIC
- : pPgFrm->GetPageDesc()->GetNumType().GetNumberingType() )
+ : pPgFrame->GetPageDesc()->GetNumType().GetNumberingType() )
: pGetField->GetFormat();
const short nPageNum = std::max<short>(0, pSetField->GetOffset() + nDiff);
pGetField->SetText( FormatNumber( nPageNum, nTmpFormat ) );
@@ -2206,7 +2206,7 @@ SwField* SwRefPageGetField::Copy() const
return pCpy;
}
-void SwRefPageGetField::ChangeExpansion( const SwFrm* pFrm,
+void SwRefPageGetField::ChangeExpansion( const SwFrame* pFrame,
const SwTextField* pField )
{
// only fields in Footer, Header, FootNote, Flys
@@ -2218,7 +2218,7 @@ void SwRefPageGetField::ChangeExpansion( const SwFrm* pFrm,
sText.clear();
- OSL_ENSURE( !pFrm->IsInDocBody(), "Flag incorrect, frame is in DocBody" );
+ OSL_ENSURE( !pFrame->IsInDocBody(), "Flag incorrect, frame is in DocBody" );
// collect all SetPageRefFields
_SetGetExpFields aTmpLst;
@@ -2227,7 +2227,7 @@ void SwRefPageGetField::ChangeExpansion( const SwFrm* pFrm,
// create index for determination of the TextNode
SwPosition aPos( SwNodeIndex( pDoc->GetNodes() ) );
- SwTextNode* pTextNode = const_cast<SwTextNode*>(GetBodyTextNode( *pDoc, aPos, *pFrm ));
+ SwTextNode* pTextNode = const_cast<SwTextNode*>(GetBodyTextNode( *pDoc, aPos, *pFrame ));
// If no layout exists, ChangeExpansion is called for header and
// footer lines via layout formatting without existing TextNode.
@@ -2246,17 +2246,17 @@ void SwRefPageGetField::ChangeExpansion( const SwFrm* pFrm,
const SwRefPageSetField* pSetField =
static_cast<const SwRefPageSetField*>(pRefTextField->GetFormatField().GetField());
Point aPt;
- const SwContentFrm* pRefFrm = pRefTextField->GetTextNode().getLayoutFrm( pFrm->getRootFrm(), &aPt, nullptr, false );
- if( pSetField->IsOn() && pRefFrm )
+ const SwContentFrame* pRefFrame = pRefTextField->GetTextNode().getLayoutFrame( pFrame->getRootFrame(), &aPt, nullptr, false );
+ if( pSetField->IsOn() && pRefFrame )
{
// determine the correct offset
- const SwPageFrm* pPgFrm = pFrm->FindPageFrm();
- const short nDiff = pPgFrm->GetPhyPageNum() -
- pRefFrm->FindPageFrm()->GetPhyPageNum() + 1;
+ const SwPageFrame* pPgFrame = pFrame->FindPageFrame();
+ const short nDiff = pPgFrame->GetPhyPageNum() -
+ pRefFrame->FindPageFrame()->GetPhyPageNum() + 1;
SwRefPageGetField* pGetField = const_cast<SwRefPageGetField*>(static_cast<const SwRefPageGetField*>(pField->GetFormatField().GetField()));
sal_uInt32 nTmpFormat = SVX_NUM_PAGEDESC == pGetField->GetFormat()
- ? pPgFrm->GetPageDesc()->GetNumType().GetNumberingType()
+ ? pPgFrame->GetPageDesc()->GetNumType().GetNumberingType()
: pGetField->GetFormat();
const short nPageNum = std::max<short>(0, pSetField->GetOffset() + nDiff);
pGetField->SetText( FormatNumber( nPageNum, nTmpFormat ) );
diff --git a/sw/source/core/fields/expfld.cxx b/sw/source/core/fields/expfld.cxx
index 042106994284..973ad932586b 100644
--- a/sw/source/core/fields/expfld.cxx
+++ b/sw/source/core/fields/expfld.cxx
@@ -132,10 +132,10 @@ OUString ReplacePoint( const OUString& rTmpName, bool bWithCommandType )
}
SwTextNode* GetFirstTextNode( const SwDoc& rDoc, SwPosition& rPos,
- const SwContentFrm *pCFrm, Point &rPt )
+ const SwContentFrame *pCFrame, Point &rPt )
{
SwTextNode* pTextNode = nullptr;
- if ( !pCFrm )
+ if ( !pCFrame )
{
const SwNodes& rNodes = rDoc.GetNodes();
rPos.nNode = *rNodes.GetEndOfContent().StartOfSectionNode();
@@ -146,32 +146,32 @@ SwTextNode* GetFirstTextNode( const SwDoc& rDoc, SwPosition& rPos,
OSL_ENSURE( pTextNode, "Where is the 1. TextNode?" );
rPos.nContent.Assign( pTextNode, 0 );
}
- else if ( !pCFrm->IsValid() )
+ else if ( !pCFrame->IsValid() )
{
- pTextNode = const_cast<SwTextNode*>(static_cast<const SwTextNode*>(pCFrm->GetNode()));
+ pTextNode = const_cast<SwTextNode*>(static_cast<const SwTextNode*>(pCFrame->GetNode()));
rPos.nNode = *pTextNode;
rPos.nContent.Assign( pTextNode, 0 );
}
else
{
- pCFrm->GetCrsrOfst( &rPos, rPt );
+ pCFrame->GetCursorOfst( &rPos, rPt );
pTextNode = rPos.nNode.GetNode().GetTextNode();
}
return pTextNode;
}
const SwTextNode* GetBodyTextNode( const SwDoc& rDoc, SwPosition& rPos,
- const SwFrm& rFrm )
+ const SwFrame& rFrame )
{
- const SwLayoutFrm* pLayout = rFrm.GetUpper();
+ const SwLayoutFrame* pLayout = rFrame.GetUpper();
const SwTextNode* pTextNode = nullptr;
while( pLayout )
{
- if( pLayout->IsFlyFrm() )
+ if( pLayout->IsFlyFrame() )
{
// get the FlyFormat
- const SwFrameFormat* pFlyFormat = static_cast<const SwFlyFrm*>(pLayout)->GetFormat();
+ const SwFrameFormat* pFlyFormat = static_cast<const SwFlyFrame*>(pLayout)->GetFormat();
OSL_ENSURE( pFlyFormat, "Could not find FlyFormat, where is the field?" );
const SwFormatAnchor &rAnchor = pFlyFormat->GetAnchor();
@@ -179,7 +179,7 @@ const SwTextNode* GetBodyTextNode( const SwDoc& rDoc, SwPosition& rPos,
if( FLY_AT_FLY == rAnchor.GetAnchorId() )
{
// the fly needs to be attached somewhere, so ask it
- pLayout = static_cast<const SwLayoutFrm*>(static_cast<const SwFlyFrm*>(pLayout)->GetAnchorFrm());
+ pLayout = static_cast<const SwLayoutFrame*>(static_cast<const SwFlyFrame*>(pLayout)->GetAnchorFrame());
continue;
}
else if ((FLY_AT_PARA == rAnchor.GetAnchorId()) ||
@@ -196,57 +196,57 @@ const SwTextNode* GetBodyTextNode( const SwDoc& rDoc, SwPosition& rPos,
}
// do not break yet, might be as well in Header/Footer/Footnote/Fly
- pLayout = static_cast<const SwFlyFrm*>(pLayout)->GetAnchorFrm()
- ? static_cast<const SwFlyFrm*>(pLayout)->GetAnchorFrm()->GetUpper() : nullptr;
+ pLayout = static_cast<const SwFlyFrame*>(pLayout)->GetAnchorFrame()
+ ? static_cast<const SwFlyFrame*>(pLayout)->GetAnchorFrame()->GetUpper() : nullptr;
continue;
}
else
{
- pLayout->FindPageFrm()->GetContentPosition(
- pLayout->Frm().Pos(), rPos );
+ pLayout->FindPageFrame()->GetContentPosition(
+ pLayout->Frame().Pos(), rPos );
pTextNode = rPos.nNode.GetNode().GetTextNode();
}
}
- else if( pLayout->IsFootnoteFrm() )
+ else if( pLayout->IsFootnoteFrame() )
{
// get the anchor's node
- const SwTextFootnote* pFootnote = static_cast<const SwFootnoteFrm*>(pLayout)->GetAttr();
+ const SwTextFootnote* pFootnote = static_cast<const SwFootnoteFrame*>(pLayout)->GetAttr();
pTextNode = &pFootnote->GetTextNode();
rPos.nNode = *pTextNode;
rPos.nContent = pFootnote->GetStart();
}
- else if( pLayout->IsHeaderFrm() || pLayout->IsFooterFrm() )
+ else if( pLayout->IsHeaderFrame() || pLayout->IsFooterFrame() )
{
- const SwContentFrm* pCntFrm;
- const SwPageFrm* pPgFrm = pLayout->FindPageFrm();
- if( pLayout->IsHeaderFrm() )
+ const SwContentFrame* pContentFrame;
+ const SwPageFrame* pPgFrame = pLayout->FindPageFrame();
+ if( pLayout->IsHeaderFrame() )
{
- const SwTabFrm *pTab;
- if( nullptr != ( pCntFrm = pPgFrm->FindFirstBodyContent()) &&
- nullptr != (pTab = pCntFrm->FindTabFrm()) && pTab->IsFollow() &&
+ const SwTabFrame *pTab;
+ if( nullptr != ( pContentFrame = pPgFrame->FindFirstBodyContent()) &&
+ nullptr != (pTab = pContentFrame->FindTabFrame()) && pTab->IsFollow() &&
pTab->GetTable()->GetRowsToRepeat() > 0 &&
- pTab->IsInHeadline( *pCntFrm ) )
+ pTab->IsInHeadline( *pContentFrame ) )
{
// take the next line
- const SwLayoutFrm* pRow = pTab->GetFirstNonHeadlineRow();
- pCntFrm = pRow->ContainsContent();
+ const SwLayoutFrame* pRow = pTab->GetFirstNonHeadlineRow();
+ pContentFrame = pRow->ContainsContent();
}
}
else
- pCntFrm = pPgFrm->FindLastBodyContent();
+ pContentFrame = pPgFrame->FindLastBodyContent();
- if( pCntFrm )
+ if( pContentFrame )
{
- pTextNode = pCntFrm->GetNode()->GetTextNode();
+ pTextNode = pContentFrame->GetNode()->GetTextNode();
rPos.nNode = *pTextNode;
const_cast<SwTextNode*>(pTextNode)->MakeEndIndex( &rPos.nContent );
}
else
{
- Point aPt( pLayout->Frm().Pos() );
+ Point aPt( pLayout->Frame().Pos() );
aPt.Y()++; // get out of the header
- pCntFrm = pPgFrm->GetContentPos( aPt, false, true );
- pTextNode = GetFirstTextNode( rDoc, rPos, pCntFrm, aPt );
+ pContentFrame = pPgFrame->GetContentPos( aPt, false, true );
+ pTextNode = GetFirstTextNode( rDoc, rPos, pContentFrame, aPt );
}
}
else
@@ -319,12 +319,12 @@ SwField* SwGetExpField::Copy() const
return pTmp;
}
-void SwGetExpField::ChangeExpansion( const SwFrm& rFrm, const SwTextField& rField )
+void SwGetExpField::ChangeExpansion( const SwFrame& rFrame, const SwTextField& rField )
{
if( bIsInBodyText ) // only fields in Footer, Header, FootNote, Flys
return;
- OSL_ENSURE( !rFrm.IsInDocBody(), "Flag incorrect, frame is in DocBody" );
+ OSL_ENSURE( !rFrame.IsInDocBody(), "Flag incorrect, frame is in DocBody" );
// determine document (or is there an easier way?)
const SwTextNode* pTextNode = &rField.GetTextNode();
@@ -332,7 +332,7 @@ void SwGetExpField::ChangeExpansion( const SwFrm& rFrm, const SwTextField& rFiel
// create index for determination of the TextNode
SwPosition aPos( SwNodeIndex( rDoc.GetNodes() ) );
- pTextNode = GetBodyTextNode( rDoc, aPos, rFrm );
+ pTextNode = GetBodyTextNode( rDoc, aPos, rFrame );
// If no layout exists, ChangeExpansion is called for header and
// footer lines via layout formatting without existing TextNode.
diff --git a/sw/source/core/fields/fldlst.cxx b/sw/source/core/fields/fldlst.cxx
index 449c7c63e5b7..e20d7453b05d 100644
--- a/sw/source/core/fields/fldlst.cxx
+++ b/sw/source/core/fields/fldlst.cxx
@@ -97,14 +97,14 @@ SwField* SwInputFieldList::GetField(size_t nId)
}
/// save cursor
-void SwInputFieldList::PushCrsr()
+void SwInputFieldList::PushCursor()
{
pSh->Push();
pSh->ClearMark();
}
/// get cursor
-void SwInputFieldList::PopCrsr()
+void SwInputFieldList::PopCursor()
{
pSh->Pop(false);
}
@@ -113,7 +113,7 @@ void SwInputFieldList::PopCrsr()
void SwInputFieldList::GotoFieldPos(size_t nId)
{
pSh->StartAllAction();
- (*pSrtLst)[ nId ]->GetPosOfContent( *pSh->GetCrsr()->GetPoint() );
+ (*pSrtLst)[ nId ]->GetPosOfContent( *pSh->GetCursor()->GetPoint() );
pSh->EndAllAction();
}
diff --git a/sw/source/core/fields/postithelper.cxx b/sw/source/core/fields/postithelper.cxx
index f08447899223..ed4aa4c50893 100644
--- a/sw/source/core/fields/postithelper.cxx
+++ b/sw/source/core/fields/postithelper.cxx
@@ -48,19 +48,19 @@ SwPostItHelper::SwLayoutStatus SwPostItHelper::getLayoutInfos(
if ( pTextNode == nullptr )
return aRet;
- SwIterator<SwTextFrm,SwContentNode> aIter( *pTextNode );
- for( SwTextFrm* pTextFrm = aIter.First(); pTextFrm != nullptr; pTextFrm = aIter.Next() )
+ SwIterator<SwTextFrame,SwContentNode> aIter( *pTextNode );
+ for( SwTextFrame* pTextFrame = aIter.First(); pTextFrame != nullptr; pTextFrame = aIter.Next() )
{
- if( !pTextFrm->IsFollow() )
+ if( !pTextFrame->IsFollow() )
{
- pTextFrm = pTextFrm->GetFrmAtPos( rAnchorPos );
- SwPageFrm *pPage = pTextFrm ? pTextFrm->FindPageFrm() : nullptr;
+ pTextFrame = pTextFrame->GetFrameAtPos( rAnchorPos );
+ SwPageFrame *pPage = pTextFrame ? pTextFrame->FindPageFrame() : nullptr;
if ( pPage != nullptr && !pPage->IsInvalid() && !pPage->IsInvalidFly() )
{
aRet = VISIBLE;
- o_rInfo.mpAnchorFrm = pTextFrm;
- pTextFrm->GetCharRect( o_rInfo.mPosition, rAnchorPos );
+ o_rInfo.mpAnchorFrame = pTextFrame;
+ pTextFrame->GetCharRect( o_rInfo.mPosition, rAnchorPos );
if ( pAnnotationStartPos != nullptr )
{
o_rInfo.mnStartNodeIdx = pAnnotationStartPos->nNode.GetIndex();
@@ -71,7 +71,7 @@ SwPostItHelper::SwLayoutStatus SwPostItHelper::getLayoutInfos(
o_rInfo.mnStartNodeIdx = 0;
o_rInfo.mnStartContent = -1;
}
- o_rInfo.mPageFrame = pPage->Frm();
+ o_rInfo.mPageFrame = pPage->Frame();
o_rInfo.mPagePrtArea = pPage->Prt();
o_rInfo.mPagePrtArea.Pos() += o_rInfo.mPageFrame.Pos();
o_rInfo.mnPageNumber = pPage->GetPhyPageNum();
@@ -100,13 +100,13 @@ SwPostItHelper::SwLayoutStatus SwPostItHelper::getLayoutInfos(
: aRet;
}
-long SwPostItHelper::getLayoutHeight( const SwRootFrm* pRoot )
+long SwPostItHelper::getLayoutHeight( const SwRootFrame* pRoot )
{
- long nRet = pRoot ? pRoot->Frm().Height() : 0;
+ long nRet = pRoot ? pRoot->Frame().Height() : 0;
return nRet;
}
-void SwPostItHelper::setSidebarChanged( SwRootFrm* pRoot, bool bBrowseMode )
+void SwPostItHelper::setSidebarChanged( SwRootFrame* pRoot, bool bBrowseMode )
{
if( pRoot )
{
@@ -116,14 +116,14 @@ void SwPostItHelper::setSidebarChanged( SwRootFrm* pRoot, bool bBrowseMode )
}
}
-unsigned long SwPostItHelper::getPageInfo( SwRect& rPageFrm, const SwRootFrm* pRoot, const Point& rPoint )
+unsigned long SwPostItHelper::getPageInfo( SwRect& rPageFrame, const SwRootFrame* pRoot, const Point& rPoint )
{
unsigned long nRet = 0;
- const SwFrm* pPage = pRoot->GetPageAtPos( rPoint, nullptr, true );
+ const SwFrame* pPage = pRoot->GetPageAtPos( rPoint, nullptr, true );
if( pPage )
{
nRet = pPage->GetPhyPageNum();
- rPageFrm = pPage->Frm();
+ rPageFrame = pPage->Frame();
}
return nRet;
}
diff --git a/sw/source/core/fields/reffld.cxx b/sw/source/core/fields/reffld.cxx
index 60268b75b437..a36e3aac1206 100644
--- a/sw/source/core/fields/reffld.cxx
+++ b/sw/source/core/fields/reffld.cxx
@@ -70,24 +70,24 @@ using namespace ::com::sun::star;
using namespace ::com::sun::star::text;
using namespace ::com::sun::star::lang;
-static void lcl_GetLayTree( const SwFrm* pFrm, std::vector<const SwFrm*>& rArr )
+static void lcl_GetLayTree( const SwFrame* pFrame, std::vector<const SwFrame*>& rArr )
{
- while( pFrm )
+ while( pFrame )
{
- if( pFrm->IsBodyFrm() ) // unspectacular
- pFrm = pFrm->GetUpper();
+ if( pFrame->IsBodyFrame() ) // unspectacular
+ pFrame = pFrame->GetUpper();
else
{
- rArr.push_back( pFrm );
+ rArr.push_back( pFrame );
// this is the last page
- if( pFrm->IsPageFrm() )
+ if( pFrame->IsPageFrame() )
break;
- if( pFrm->IsFlyFrm() )
- pFrm = static_cast<const SwFlyFrm*>(pFrm)->GetAnchorFrm();
+ if( pFrame->IsFlyFrame() )
+ pFrame = static_cast<const SwFlyFrame*>(pFrame)->GetAnchorFrame();
else
- pFrm = pFrm->GetUpper();
+ pFrame = pFrame->GetUpper();
}
}
}
@@ -95,20 +95,20 @@ static void lcl_GetLayTree( const SwFrm* pFrm, std::vector<const SwFrm*>& rArr )
bool IsFrameBehind( const SwTextNode& rMyNd, sal_Int32 nMySttPos,
const SwTextNode& rBehindNd, sal_Int32 nSttPos )
{
- const SwTextFrm *pMyFrm = static_cast<SwTextFrm*>(rMyNd.getLayoutFrm( rMyNd.GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout(), nullptr, nullptr, false) ),
- *pFrm = static_cast<SwTextFrm*>(rBehindNd.getLayoutFrm( rBehindNd.GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout(), nullptr, nullptr, false) );
+ const SwTextFrame *pMyFrame = static_cast<SwTextFrame*>(rMyNd.getLayoutFrame( rMyNd.GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout(), nullptr, nullptr, false) ),
+ *pFrame = static_cast<SwTextFrame*>(rBehindNd.getLayoutFrame( rBehindNd.GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout(), nullptr, nullptr, false) );
- while( pFrm && !pFrm->IsInside( nSttPos ) )
- pFrm = pFrm->GetFollow();
- while( pMyFrm && !pMyFrm->IsInside( nMySttPos ) )
- pMyFrm = pMyFrm->GetFollow();
+ while( pFrame && !pFrame->IsInside( nSttPos ) )
+ pFrame = pFrame->GetFollow();
+ while( pMyFrame && !pMyFrame->IsInside( nMySttPos ) )
+ pMyFrame = pMyFrame->GetFollow();
- if( !pFrm || !pMyFrm || pFrm == pMyFrm )
+ if( !pFrame || !pMyFrame || pFrame == pMyFrame )
return false;
- std::vector<const SwFrm*> aRefArr, aArr;
- ::lcl_GetLayTree( pFrm, aRefArr );
- ::lcl_GetLayTree( pMyFrm, aArr );
+ std::vector<const SwFrame*> aRefArr, aArr;
+ ::lcl_GetLayTree( pFrame, aRefArr );
+ ::lcl_GetLayTree( pMyFrame, aArr );
size_t nRefCnt = aRefArr.size() - 1, nCnt = aArr.size() - 1;
bool bVert = false;
@@ -117,9 +117,9 @@ bool IsFrameBehind( const SwTextNode& rMyNd, sal_Int32 nMySttPos,
// Loop as long as a frame does not equal?
while( nRefCnt && nCnt && aRefArr[ nRefCnt ] == aArr[ nCnt ] )
{
- const SwFrm* pTmpFrm = aArr[ nCnt ];
- bVert = pTmpFrm->IsVertical();
- bR2L = pTmpFrm->IsRightToLeft();
+ const SwFrame* pTmpFrame = aArr[ nCnt ];
+ bVert = pTmpFrame->IsVertical();
+ bR2L = pTmpFrame->IsRightToLeft();
--nCnt, --nRefCnt;
}
@@ -132,65 +132,65 @@ bool IsFrameBehind( const SwTextNode& rMyNd, sal_Int32 nMySttPos,
--nRefCnt;
}
- const SwFrm* pRefFrm = aRefArr[ nRefCnt ];
- const SwFrm* pFieldFrm = aArr[ nCnt ];
+ const SwFrame* pRefFrame = aRefArr[ nRefCnt ];
+ const SwFrame* pFieldFrame = aArr[ nCnt ];
// different frames, check their Y-/X-position
bool bRefIsLower = false;
- if( ( FRM_COLUMN | FRM_CELL ) & pFieldFrm->GetType() ||
- ( FRM_COLUMN | FRM_CELL ) & pRefFrm->GetType() )
+ if( ( FRM_COLUMN | FRM_CELL ) & pFieldFrame->GetType() ||
+ ( FRM_COLUMN | FRM_CELL ) & pRefFrame->GetType() )
{
- if( pFieldFrm->GetType() == pRefFrm->GetType() )
+ if( pFieldFrame->GetType() == pRefFrame->GetType() )
{
// here, the X-pos is more important
if( bVert )
{
if( bR2L )
- bRefIsLower = pRefFrm->Frm().Top() < pFieldFrm->Frm().Top() ||
- ( pRefFrm->Frm().Top() == pFieldFrm->Frm().Top() &&
- pRefFrm->Frm().Left() < pFieldFrm->Frm().Left() );
+ bRefIsLower = pRefFrame->Frame().Top() < pFieldFrame->Frame().Top() ||
+ ( pRefFrame->Frame().Top() == pFieldFrame->Frame().Top() &&
+ pRefFrame->Frame().Left() < pFieldFrame->Frame().Left() );
else
- bRefIsLower = pRefFrm->Frm().Top() < pFieldFrm->Frm().Top() ||
- ( pRefFrm->Frm().Top() == pFieldFrm->Frm().Top() &&
- pRefFrm->Frm().Left() > pFieldFrm->Frm().Left() );
+ bRefIsLower = pRefFrame->Frame().Top() < pFieldFrame->Frame().Top() ||
+ ( pRefFrame->Frame().Top() == pFieldFrame->Frame().Top() &&
+ pRefFrame->Frame().Left() > pFieldFrame->Frame().Left() );
}
else if( bR2L )
- bRefIsLower = pRefFrm->Frm().Left() > pFieldFrm->Frm().Left() ||
- ( pRefFrm->Frm().Left() == pFieldFrm->Frm().Left() &&
- pRefFrm->Frm().Top() < pFieldFrm->Frm().Top() );
+ bRefIsLower = pRefFrame->Frame().Left() > pFieldFrame->Frame().Left() ||
+ ( pRefFrame->Frame().Left() == pFieldFrame->Frame().Left() &&
+ pRefFrame->Frame().Top() < pFieldFrame->Frame().Top() );
else
- bRefIsLower = pRefFrm->Frm().Left() < pFieldFrm->Frm().Left() ||
- ( pRefFrm->Frm().Left() == pFieldFrm->Frm().Left() &&
- pRefFrm->Frm().Top() < pFieldFrm->Frm().Top() );
- pRefFrm = nullptr;
+ bRefIsLower = pRefFrame->Frame().Left() < pFieldFrame->Frame().Left() ||
+ ( pRefFrame->Frame().Left() == pFieldFrame->Frame().Left() &&
+ pRefFrame->Frame().Top() < pFieldFrame->Frame().Top() );
+ pRefFrame = nullptr;
}
- else if( ( FRM_COLUMN | FRM_CELL ) & pFieldFrm->GetType() )
- pFieldFrm = aArr[ nCnt - 1 ];
+ else if( ( FRM_COLUMN | FRM_CELL ) & pFieldFrame->GetType() )
+ pFieldFrame = aArr[ nCnt - 1 ];
else
- pRefFrm = aRefArr[ nRefCnt - 1 ];
+ pRefFrame = aRefArr[ nRefCnt - 1 ];
}
- if( pRefFrm ) // misuse as flag
+ if( pRefFrame ) // misuse as flag
{
if( bVert )
{
if( bR2L )
- bRefIsLower = pRefFrm->Frm().Left() < pFieldFrm->Frm().Left() ||
- ( pRefFrm->Frm().Left() == pFieldFrm->Frm().Left() &&
- pRefFrm->Frm().Top() < pFieldFrm->Frm().Top() );
+ bRefIsLower = pRefFrame->Frame().Left() < pFieldFrame->Frame().Left() ||
+ ( pRefFrame->Frame().Left() == pFieldFrame->Frame().Left() &&
+ pRefFrame->Frame().Top() < pFieldFrame->Frame().Top() );
else
- bRefIsLower = pRefFrm->Frm().Left() > pFieldFrm->Frm().Left() ||
- ( pRefFrm->Frm().Left() == pFieldFrm->Frm().Left() &&
- pRefFrm->Frm().Top() < pFieldFrm->Frm().Top() );
+ bRefIsLower = pRefFrame->Frame().Left() > pFieldFrame->Frame().Left() ||
+ ( pRefFrame->Frame().Left() == pFieldFrame->Frame().Left() &&
+ pRefFrame->Frame().Top() < pFieldFrame->Frame().Top() );
}
else if( bR2L )
- bRefIsLower = pRefFrm->Frm().Top() < pFieldFrm->Frm().Top() ||
- ( pRefFrm->Frm().Top() == pFieldFrm->Frm().Top() &&
- pRefFrm->Frm().Left() > pFieldFrm->Frm().Left() );
+ bRefIsLower = pRefFrame->Frame().Top() < pFieldFrame->Frame().Top() ||
+ ( pRefFrame->Frame().Top() == pFieldFrame->Frame().Top() &&
+ pRefFrame->Frame().Left() > pFieldFrame->Frame().Left() );
else
- bRefIsLower = pRefFrm->Frm().Top() < pFieldFrm->Frm().Top() ||
- ( pRefFrm->Frm().Top() == pFieldFrm->Frm().Top() &&
- pRefFrm->Frm().Left() < pFieldFrm->Frm().Left() );
+ bRefIsLower = pRefFrame->Frame().Top() < pFieldFrame->Frame().Top() ||
+ ( pRefFrame->Frame().Top() == pFieldFrame->Frame().Top() &&
+ pRefFrame->Frame().Left() < pFieldFrame->Frame().Left() );
}
return bRefIsLower;
}
@@ -420,17 +420,17 @@ void SwGetRefField::UpdateField( const SwTextField* pFieldTextAttr )
case REF_PAGE:
case REF_PAGE_PGDESC:
{
- const SwTextFrm* pFrm = static_cast<SwTextFrm*>(pTextNd->getLayoutFrm( pDoc->getIDocumentLayoutAccess().GetCurrentLayout(), nullptr, nullptr, false)),
- *pSave = pFrm;
- while( pFrm && !pFrm->IsInside( nNumStart ) )
- pFrm = pFrm->GetFollow();
+ const SwTextFrame* pFrame = static_cast<SwTextFrame*>(pTextNd->getLayoutFrame( pDoc->getIDocumentLayoutAccess().GetCurrentLayout(), nullptr, nullptr, false)),
+ *pSave = pFrame;
+ while( pFrame && !pFrame->IsInside( nNumStart ) )
+ pFrame = pFrame->GetFollow();
- if( pFrm || nullptr != ( pFrm = pSave ))
+ if( pFrame || nullptr != ( pFrame = pSave ))
{
- sal_uInt16 nPageNo = pFrm->GetVirtPageNum();
- const SwPageFrm *pPage;
+ sal_uInt16 nPageNo = pFrame->GetVirtPageNum();
+ const SwPageFrame *pPage;
if( REF_PAGE_PGDESC == GetFormat() &&
- nullptr != ( pPage = pFrm->FindPageFrm() ) &&
+ nullptr != ( pPage = pFrame->FindPageFrame() ) &&
pPage->GetPageDesc() )
sText = pPage->GetPageDesc()->GetNumType().GetNumStr( nPageNo );
else
@@ -442,13 +442,13 @@ void SwGetRefField::UpdateField( const SwTextField* pFieldTextAttr )
case REF_CHAPTER:
{
// a bit tricky: search any frame
- const SwFrm* pFrm = pTextNd->getLayoutFrm( pDoc->getIDocumentLayoutAccess().GetCurrentLayout() );
- if( pFrm )
+ const SwFrame* pFrame = pTextNd->getLayoutFrame( pDoc->getIDocumentLayoutAccess().GetCurrentLayout() );
+ if( pFrame )
{
SwChapterFieldType aFieldTyp;
SwChapterField aField( &aFieldTyp, 0 );
aField.SetLevel( MAXLEVEL - 1 );
- aField.ChangeExpansion( pFrm, pTextNd, true );
+ aField.ChangeExpansion( pFrame, pTextNd, true );
sText = aField.GetNumber();
}
}
generated by cgit (git 2.34.1) at 2024-05-29 22:00:09 +0000