summaryrefslogtreecommitdiff
path: root/sw/source/core/doc/docedt.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'sw/source/core/doc/docedt.cxx')
-rw-r--r--sw/source/core/doc/docedt.cxx44
1 files changed, 22 insertions, 22 deletions
diff --git a/sw/source/core/doc/docedt.cxx b/sw/source/core/doc/docedt.cxx
index b5628f10af60..c0b5d3656fee 100644
--- a/sw/source/core/doc/docedt.cxx
+++ b/sw/source/core/doc/docedt.cxx
@@ -80,8 +80,8 @@ void _RestFlyInRange( _SaveFlyArr & rArr, const SwNodeIndex& rSttIdx,
// SetFormatAttr should call Modify() and add it to the node
pFormat->SetFormatAttr( aAnchor );
SwContentNode* pCNd = aPos.nNode.GetNode().GetContentNode();
- if( pCNd && pCNd->getLayoutFrm( pFormat->GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout(), nullptr, nullptr, false ) )
- pFormat->MakeFrms();
+ if( pCNd && pCNd->getLayoutFrame( pFormat->GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout(), nullptr, nullptr, false ) )
+ pFormat->MakeFrames();
}
sw::CheckAnchoredFlyConsistency(*rSttIdx.GetNode().GetDoc());
}
@@ -102,7 +102,7 @@ void _SaveFlyInRange( const SwNodeRange& rRg, _SaveFlyArr& rArr )
_SaveFly aSave( pAPos->nNode.GetIndex() - rRg.aStart.GetIndex(),
pFormat, false );
rArr.push_back( aSave );
- pFormat->DelFrms();
+ pFormat->DelFrames();
// set a dummy anchor position to maintain anchoring invariants
SwFormatAnchor aAnchor( pFormat->GetAnchor() );
aAnchor.SetAnchor(nullptr);
@@ -168,7 +168,7 @@ void _SaveFlyInRange( const SwPaM& rPam, const SwNodeIndex& rInsPos,
_SaveFly aSave( pAPos->nNode.GetIndex() - rSttNdIdx.GetIndex(),
pFormat, bInsPos );
rArr.push_back( aSave );
- pFormat->DelFrms();
+ pFormat->DelFrames();
// set a dummy anchor position to maintain anchoring invariants
SwFormatAnchor aAnchor( pFormat->GetAnchor() );
aAnchor.SetAnchor(nullptr);
@@ -403,7 +403,7 @@ bool sw_JoinText( SwPaM& rPam, bool bJoinPrev )
if( !pContentStore->Empty() )
pContentStore->Restore( pDoc, aIdx.GetIndex() );
- // If the passed PaM is not in the Crsr ring,
+ // If the passed PaM is not in the Cursor ring,
// treat it separately (e.g. when it's being called from AutoFormat)
if( pOldTextNd == rPam.GetBound().nContent.GetIdxReg() )
rPam.GetBound() = aAlphaPos;
@@ -513,7 +513,7 @@ uno::Any SwDoc::Spell( SwPaM& rPaM,
uno::Any aRet;
if( nCurrNd <= nEndNd )
{
- SwContentFrm* pCntFrm;
+ SwContentFrame* pContentFrame;
bool bGoOn = true;
while( bGoOn )
{
@@ -521,18 +521,18 @@ uno::Any SwDoc::Spell( SwPaM& rPaM,
switch( pNd->GetNodeType() )
{
case ND_TEXTNODE:
- if( nullptr != ( pCntFrm = pNd->GetTextNode()->getLayoutFrm( getIDocumentLayoutAccess().GetCurrentLayout() )) )
+ if( nullptr != ( pContentFrame = pNd->GetTextNode()->getLayoutFrame( getIDocumentLayoutAccess().GetCurrentLayout() )) )
{
// skip protected and hidden Cells and Flys
- if( pCntFrm->IsProtected() )
+ if( pContentFrame->IsProtected() )
{
nCurrNd = pNd->EndOfSectionIndex();
}
- else if( !static_cast<SwTextFrm*>(pCntFrm)->IsHiddenNow() )
+ else if( !static_cast<SwTextFrame*>(pContentFrame)->IsHiddenNow() )
{
if( pPageCnt && *pPageCnt && pPageSt )
{
- sal_uInt16 nPageNr = pCntFrm->GetPhyPageNum();
+ sal_uInt16 nPageNr = pContentFrame->GetPhyPageNum();
if( !*pPageSt )
{
*pPageSt = nPageNr;
@@ -557,12 +557,12 @@ uno::Any SwDoc::Spell( SwPaM& rPaM,
{
SwIndex aStartIndex( dynamic_cast< SwTextNode* >( pNd ), nBeginGrammarCheck );
SwPosition aStart( *pNd, aStartIndex );
- SwCursor aCrsr(aStart, nullptr, false);
- SwPosition aOrigPos = *aCrsr.GetPoint();
- aCrsr.GoSentence( SwCursor::START_SENT );
- if( aOrigPos != *aCrsr.GetPoint() )
+ SwCursor aCursor(aStart, nullptr, false);
+ SwPosition aOrigPos = *aCursor.GetPoint();
+ aCursor.GoSentence( SwCursor::START_SENT );
+ if( aOrigPos != *aCursor.GetPoint() )
{
- nBeginGrammarCheck = aCrsr.GetPoint()->nContent.GetIndex();
+ nBeginGrammarCheck = aCursor.GetPoint()->nContent.GetIndex();
}
}
nEndGrammarCheck = (pSpellArgs->pEndNode == pNd)
@@ -689,9 +689,9 @@ public:
inline sal_uInt16 *GetPageSt() { return pPageSt; }
};
-SwHyphArgs::SwHyphArgs( const SwPaM *pPam, const Point &rCrsrPos,
+SwHyphArgs::SwHyphArgs( const SwPaM *pPam, const Point &rCursorPos,
sal_uInt16* pPageCount, sal_uInt16* pPageStart )
- : SwInterHyphInfo( rCrsrPos ), pNode(nullptr),
+ : SwInterHyphInfo( rCursorPos ), pNode(nullptr),
pPageCnt( pPageCount ), pPageSt( pPageStart )
{
// The following constraints have to be met:
@@ -746,14 +746,14 @@ static bool lcl_HyphenateNode( const SwNodePtr& rpNd, void* pArgs )
SwHyphArgs *pHyphArgs = static_cast<SwHyphArgs*>(pArgs);
if( pNode )
{
- SwContentFrm* pCntFrm = pNode->getLayoutFrm( pNode->GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout() );
- if( pCntFrm && !static_cast<SwTextFrm*>(pCntFrm)->IsHiddenNow() )
+ SwContentFrame* pContentFrame = pNode->getLayoutFrame( pNode->GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout() );
+ if( pContentFrame && !static_cast<SwTextFrame*>(pContentFrame)->IsHiddenNow() )
{
sal_uInt16 *pPageSt = pHyphArgs->GetPageSt();
sal_uInt16 *pPageCnt = pHyphArgs->GetPageCnt();
if( pPageCnt && *pPageCnt && pPageSt )
{
- sal_uInt16 nPageNr = pCntFrm->GetPhyPageNum();
+ sal_uInt16 nPageNr = pContentFrame->GetPhyPageNum();
if( !*pPageSt )
{
*pPageSt = nPageNr;
@@ -777,7 +777,7 @@ static bool lcl_HyphenateNode( const SwNodePtr& rpNd, void* pArgs )
}
uno::Reference< XHyphenatedWord > SwDoc::Hyphenate(
- SwPaM *pPam, const Point &rCrsrPos,
+ SwPaM *pPam, const Point &rCursorPos,
sal_uInt16* pPageCnt, sal_uInt16* pPageSt )
{
OSL_ENSURE(this == pPam->GetDoc(), "SwDoc::Hyphenate: strangers in the night");
@@ -785,7 +785,7 @@ uno::Reference< XHyphenatedWord > SwDoc::Hyphenate(
if( *pPam->GetPoint() > *pPam->GetMark() )
pPam->Exchange();
- SwHyphArgs aHyphArg( pPam, rCrsrPos, pPageCnt, pPageSt );
+ SwHyphArgs aHyphArg( pPam, rCursorPos, pPageCnt, pPageSt );
SwNodeIndex aTmpIdx( pPam->GetMark()->nNode, 1 );
GetNodes().ForEach( pPam->GetPoint()->nNode, aTmpIdx,
lcl_HyphenateNode, &aHyphArg );
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-24 07:41:57 +0000