summaryrefslogtreecommitdiff
path: root/sw/source/core/undo
diff options
context:
space:
mode:
Diffstat (limited to 'sw/source/core/undo')
-rw-r--r--sw/source/core/undo/rolbck.cxx6
-rw-r--r--sw/source/core/undo/unattr.cxx16
-rw-r--r--sw/source/core/undo/undel.cxx14
-rw-r--r--sw/source/core/undo/undobj.cxx2
-rw-r--r--sw/source/core/undo/undobj1.cxx26
-rw-r--r--sw/source/core/undo/unfmco.cxx2
-rw-r--r--sw/source/core/undo/unins.cxx6
-rw-r--r--sw/source/core/undo/unsort.cxx16
-rw-r--r--sw/source/core/undo/untbl.cxx70
9 files changed, 79 insertions, 79 deletions
diff --git a/sw/source/core/undo/rolbck.cxx b/sw/source/core/undo/rolbck.cxx
index 90b04c018225..fd439e76356d 100644
--- a/sw/source/core/undo/rolbck.cxx
+++ b/sw/source/core/undo/rolbck.cxx
@@ -428,7 +428,7 @@ SwHistorySetFootnote::SwHistorySetFootnote( SwTextFootnote* pTextFootnote, sal_u
SwNode* pSaveNd = pDoc->GetNodes()[ m_nNodeIndex ];
// keep pointer to StartNode of FootnoteSection and reset its attribute for now
- // (as a result, its/all Frms will be deleted automatically)
+ // (as a result, its/all Frames will be deleted automatically)
SwNodeIndex aSttIdx( *pTextFootnote->GetStartNode() );
pTextFootnote->SetStartNode( nullptr, false );
@@ -889,9 +889,9 @@ void SwHistoryChangeFlyAnchor::SetInDoc( SwDoc* pDoc, bool )
aTmp.SetAnchor( &aPos );
// so the Layout does not get confused
- if ( !pCNd || !pCNd->getLayoutFrm( pDoc->getIDocumentLayoutAccess().GetCurrentLayout(), nullptr, nullptr, false ) )
+ if ( !pCNd || !pCNd->getLayoutFrame( pDoc->getIDocumentLayoutAccess().GetCurrentLayout(), nullptr, nullptr, false ) )
{
- m_rFormat.DelFrms();
+ m_rFormat.DelFrames();
}
m_rFormat.SetFormatAttr( aTmp );
diff --git a/sw/source/core/undo/unattr.cxx b/sw/source/core/undo/unattr.cxx
index dfee272a8387..adb31b0ea3a2 100644
--- a/sw/source/core/undo/unattr.cxx
+++ b/sw/source/core/undo/unattr.cxx
@@ -315,7 +315,7 @@ void SwUndoFormatAttr::RepeatImpl(::sw::RepeatContext & rContext)
case RES_FLYFRMFMT: {
// Check if the cursor is in a flying frame
- // Steps: search in all FlyFrmFormats for the FlyContent attribute
+ // Steps: search in all FlyFrameFormats for the FlyContent attribute
// and validate if the cursor is in the respective section
SwFrameFormat *const pFly =
rContext.GetRepeatPaM().GetNode().GetFlyFormat();
@@ -364,7 +364,7 @@ void SwUndoFormatAttr::SaveFlyAnchor( bool bSvDrwPt )
Point aPt( static_cast<SwFrameFormat*>(m_pFormat)->FindSdrObject()
->GetRelativePos() );
// store old value as attribute, to keep SwUndoFormatAttr small
- m_pOldSet->Put( SwFormatFrmSize( ATT_VAR_SIZE, aPt.X(), aPt.Y() ) );
+ m_pOldSet->Put( SwFormatFrameSize( ATT_VAR_SIZE, aPt.X(), aPt.Y() ) );
}
}
@@ -433,7 +433,7 @@ bool SwUndoFormatAttr::RestoreFlyAnchor(::sw::UndoRedoContext & rContext)
if( pDoc->getIDocumentLayoutAccess().GetCurrentViewShell() ) {
if( RES_DRAWFRMFMT == pFrameFormat->Which() ) {
// get the old cached value
- const SwFormatFrmSize& rOldSize = static_cast<const SwFormatFrmSize&>(
+ const SwFormatFrameSize& rOldSize = static_cast<const SwFormatFrameSize&>(
m_pOldSet->Get( RES_FRM_SIZE ) );
aDrawSavePt.X() = rOldSize.GetWidth();
aDrawSavePt.Y() = rOldSize.GetHeight();
@@ -442,7 +442,7 @@ bool SwUndoFormatAttr::RestoreFlyAnchor(::sw::UndoRedoContext & rContext)
// write the current value into cache
aDrawOldPt = pFrameFormat->FindSdrObject()->GetRelativePos();
} else {
- pFrameFormat->DelFrms(); // delete Frms
+ pFrameFormat->DelFrames(); // delete Frames
}
}
@@ -451,7 +451,7 @@ bool SwUndoFormatAttr::RestoreFlyAnchor(::sw::UndoRedoContext & rContext)
// Consider case, that as-character anchored object has moved its anchor position.
if (FLY_AS_CHAR == rOldAnch.GetAnchorId()) {
// With InContents it's tricky: the text attribute needs to be deleted.
- // Unfortunately, this not only destroys the Frms but also the format.
+ // Unfortunately, this not only destroys the Frames but also the format.
// To prevent that, first detach the connection between attribute and
// format.
const SwPosition *pPos = rOldAnch.GetContentAnchor();
@@ -491,7 +491,7 @@ bool SwUndoFormatAttr::RestoreFlyAnchor(::sw::UndoRedoContext & rContext)
// change of the Contact object by setting the anchor.
SdrObject* pObj = pCont->GetMaster();
- if( pCont->GetAnchorFrm() && !pObj->IsInserted() ) {
+ if( pCont->GetAnchorFrame() && !pObj->IsInserted() ) {
OSL_ENSURE( pDoc->getIDocumentDrawModelAccess().GetDrawModel(),
"RestoreFlyAnchor without DrawModel" );
pDoc->getIDocumentDrawModelAccess().GetDrawModel()->GetPage( 0 )->InsertObject( pObj );
@@ -500,7 +500,7 @@ bool SwUndoFormatAttr::RestoreFlyAnchor(::sw::UndoRedoContext & rContext)
// cache the old value again
m_pOldSet->Put(
- SwFormatFrmSize( ATT_VAR_SIZE, aDrawOldPt.X(), aDrawOldPt.Y() ) );
+ SwFormatFrameSize( ATT_VAR_SIZE, aDrawOldPt.X(), aDrawOldPt.Y() ) );
}
if (FLY_AS_CHAR == aNewAnchor.GetAnchorId()) {
@@ -512,7 +512,7 @@ bool SwUndoFormatAttr::RestoreFlyAnchor(::sw::UndoRedoContext & rContext)
}
if (RES_DRAWFRMFMT != pFrameFormat->Which())
- pFrameFormat->MakeFrms();
+ pFrameFormat->MakeFrames();
else
{
SdrObject* pSdrObj = pFrameFormat->FindSdrObject();
diff --git a/sw/source/core/undo/undel.cxx b/sw/source/core/undo/undel.cxx
index e68ce6dfda8f..a9c7dca25ba5 100644
--- a/sw/source/core/undo/undel.cxx
+++ b/sw/source/core/undo/undel.cxx
@@ -46,11 +46,11 @@
#include <vector>
// DELETE
-/* lcl_MakeAutoFrms has to call MakeFrms for objects bounded "AtChar"
+/* lcl_MakeAutoFrames has to call MakeFrames for objects bounded "AtChar"
( == AUTO ), if the anchor frame has be moved via _MoveNodes(..) and
- DelFrms(..)
+ DelFrames(..)
*/
-static void lcl_MakeAutoFrms( const SwFrameFormats& rSpzArr, sal_uLong nMovedIndex )
+static void lcl_MakeAutoFrames( const SwFrameFormats& rSpzArr, sal_uLong nMovedIndex )
{
if( !rSpzArr.empty() )
{
@@ -62,7 +62,7 @@ static void lcl_MakeAutoFrms( const SwFrameFormats& rSpzArr, sal_uLong nMovedInd
{
const SwPosition* pAPos = pAnchor->GetContentAnchor();
if( pAPos && nMovedIndex == pAPos->nNode.GetIndex() )
- pFormat->MakeFrms();
+ pFormat->MakeFrames();
}
}
}
@@ -329,7 +329,7 @@ SwUndoDelete::SwUndoDelete(
}
}
if( m_nSectDiff || m_nReplaceDummy )
- lcl_MakeAutoFrms( *pDoc->GetSpzFrameFormats(),
+ lcl_MakeAutoFrames( *pDoc->GetSpzFrameFormats(),
m_bJoinNext ? pEndTextNd->GetIndex() : pSttTextNd->GetIndex() );
}
else
@@ -881,7 +881,7 @@ void SwUndoDelete::UndoImpl(::sw::UndoRedoContext & rContext)
}
if( pMovedNode )
- lcl_MakeAutoFrms(*rDoc.GetSpzFrameFormats(), pMovedNode->GetIndex());
+ lcl_MakeAutoFrames(*rDoc.GetSpzFrameFormats(), pMovedNode->GetIndex());
if( m_pSttStr )
{
@@ -1044,7 +1044,7 @@ void SwUndoDelete::RedoImpl(::sw::UndoRedoContext & rContext)
false, &pItem ) )
pNextNd->SetAttr( *pItem );
}
- pTableNd->DelFrms();
+ pTableNd->DelFrames();
}
// avoid asserts from ~SwIndexReg for deleted nodes
diff --git a/sw/source/core/undo/undobj.cxx b/sw/source/core/undo/undobj.cxx
index a603a69c9c3a..928b831d66ca 100644
--- a/sw/source/core/undo/undobj.cxx
+++ b/sw/source/core/undo/undobj.cxx
@@ -147,7 +147,7 @@ void SwUndo::RemoveIdxFromRange( SwPaM& rPam, bool bMoveNext )
void SwUndo::RemoveIdxRel( sal_uLong nIdx, const SwPosition& rPos )
{
- // Move only the Crsr. Bookmarks/TOXMarks/etc. are done by the corresponding
+ // Move only the Cursor. Bookmarks/TOXMarks/etc. are done by the corresponding
// JoinNext/JoinPrev
SwNodeIndex aIdx( rPos.nNode.GetNode().GetNodes(), nIdx );
::PaMCorrRel( aIdx, rPos );
diff --git a/sw/source/core/undo/undobj1.cxx b/sw/source/core/undo/undobj1.cxx
index 17b11837a263..7696d1a7971b 100644
--- a/sw/source/core/undo/undobj1.cxx
+++ b/sw/source/core/undo/undobj1.cxx
@@ -55,7 +55,7 @@ SwUndoFlyBase::~SwUndoFlyBase()
delete pFrameFormat;
}
-void SwUndoFlyBase::InsFly(::sw::UndoRedoContext & rContext, bool bShowSelFrm)
+void SwUndoFlyBase::InsFly(::sw::UndoRedoContext & rContext, bool bShowSelFrame)
{
SwDoc *const pDoc = & rContext.GetDoc();
@@ -117,9 +117,9 @@ void SwUndoFlyBase::InsFly(::sw::UndoRedoContext & rContext, bool bShowSelFrm)
pCNd->GetTextNode()->InsertItem( aFormat, nCntPos, nCntPos );
}
- pFrameFormat->MakeFrms();
+ pFrameFormat->MakeFrames();
- if( bShowSelFrm )
+ if( bShowSelFrame )
{
rContext.SetSelections(pFrameFormat, nullptr);
}
@@ -153,7 +153,7 @@ void SwUndoFlyBase::InsFly(::sw::UndoRedoContext & rContext, bool bShowSelFrm)
void SwUndoFlyBase::DelFly( SwDoc* pDoc )
{
bDelFormat = true; // delete Format in DTOR
- pFrameFormat->DelFrms(); // destroy Frms
+ pFrameFormat->DelFrames(); // destroy Frames
// all Uno objects should now log themselves off
{
@@ -226,7 +226,7 @@ void SwUndoFlyBase::DelFly( SwDoc* pDoc )
SwUndoInsLayFormat::SwUndoInsLayFormat( SwFrameFormat* pFormat, sal_uLong nNodeIdx, sal_Int32 nCntIdx )
: SwUndoFlyBase( pFormat, RES_DRAWFRMFMT == pFormat->Which() ?
UNDO_INSDRAWFMT : UNDO_INSLAYFMT ),
- mnCrsrSaveIndexPara( nNodeIdx ), mnCrsrSaveIndexPos( nCntIdx )
+ mnCursorSaveIndexPara( nNodeIdx ), mnCursorSaveIndexPos( nCntIdx )
{
const SwFormatAnchor& rAnchor = pFrameFormat->GetAnchor();
nRndId = static_cast<sal_uInt16>(rAnchor.GetAnchorId());
@@ -264,17 +264,17 @@ void SwUndoInsLayFormat::UndoImpl(::sw::UndoRedoContext & rContext)
if( rContent.GetContentIdx() ) // no content
{
bool bRemoveIdx = true;
- if( mnCrsrSaveIndexPara > 0 )
+ if( mnCursorSaveIndexPara > 0 )
{
SwTextNode *const pNode =
- rDoc.GetNodes()[mnCrsrSaveIndexPara]->GetTextNode();
+ rDoc.GetNodes()[mnCursorSaveIndexPara]->GetTextNode();
if( pNode )
{
SwNodeIndex aIdx( rDoc.GetNodes(),
rContent.GetContentIdx()->GetIndex() );
SwNodeIndex aEndIdx( rDoc.GetNodes(),
aIdx.GetNode().EndOfSectionIndex() );
- SwIndex aIndex( pNode, mnCrsrSaveIndexPos );
+ SwIndex aIndex( pNode, mnCursorSaveIndexPos );
SwPosition aPos( *pNode, aIndex );
SwDoc::CorrAbs( aIdx, aEndIdx, aPos, true );
bRemoveIdx = false;
@@ -395,7 +395,7 @@ lcl_GetSwUndoId(SwFrameFormat *const pFrameFormat)
SwUndoDelLayFormat::SwUndoDelLayFormat( SwFrameFormat* pFormat )
: SwUndoFlyBase( pFormat, lcl_GetSwUndoId(pFormat) )
- , bShowSelFrm( true )
+ , bShowSelFrame( true )
{
SwDoc* pDoc = pFormat->GetDoc();
DelFly( pDoc );
@@ -428,7 +428,7 @@ SwRewriter SwUndoDelLayFormat::GetRewriter() const
void SwUndoDelLayFormat::UndoImpl(::sw::UndoRedoContext & rContext)
{
- InsFly( rContext, bShowSelFrm );
+ InsFly( rContext, bShowSelFrame );
}
void SwUndoDelLayFormat::RedoImpl(::sw::UndoRedoContext & rContext)
@@ -539,7 +539,7 @@ void SwUndoSetFlyFormat::UndoImpl(::sw::UndoRedoContext & rContext)
if( rDoc.GetFrameFormats()->Contains( pOldFormat ) )
{
if( bAnchorChgd )
- pFrameFormat->DelFrms();
+ pFrameFormat->DelFrames();
if( pFrameFormat->DerivedFrom() != pOldFormat )
pFrameFormat->SetDerivedFrom( pOldFormat );
@@ -565,7 +565,7 @@ void SwUndoSetFlyFormat::UndoImpl(::sw::UndoRedoContext & rContext)
if (FLY_AS_CHAR == rOldAnch.GetAnchorId())
{
// With InContents it's tricky: the text attribute needs to be
- // deleted. Unfortunately, this not only destroys the Frms but
+ // deleted. Unfortunately, this not only destroys the Frames but
// also the format. To prevent that, first detach the
// connection between attribute and format.
const SwPosition *pPos = rOldAnch.GetContentAnchor();
@@ -598,7 +598,7 @@ void SwUndoSetFlyFormat::UndoImpl(::sw::UndoRedoContext & rContext)
nOldContent, 0 );
}
- pFrameFormat->MakeFrms();
+ pFrameFormat->MakeFrames();
}
rContext.SetSelections(pFrameFormat, nullptr);
}
diff --git a/sw/source/core/undo/unfmco.cxx b/sw/source/core/undo/unfmco.cxx
index 7759230e559a..c69f50bbf1f8 100644
--- a/sw/source/core/undo/unfmco.cxx
+++ b/sw/source/core/undo/unfmco.cxx
@@ -70,7 +70,7 @@ void SwUndoFormatColl::RepeatImpl(::sw::RepeatContext & rContext)
void SwUndoFormatColl::DoSetFormatColl(SwDoc & rDoc, SwPaM & rPaM)
{
- // Only one TextFrmColl can be applied to a section, thus request only in
+ // Only one TextFrameColl can be applied to a section, thus request only in
// this array.
// does the format still exist?
diff --git a/sw/source/core/undo/unins.cxx b/sw/source/core/undo/unins.cxx
index aa8de2c3e397..38c532c26d7b 100644
--- a/sw/source/core/undo/unins.cxx
+++ b/sw/source/core/undo/unins.cxx
@@ -991,9 +991,9 @@ void SwUndoInsertLabel::RepeatImpl(::sw::RepeatContext & rContext)
case LTYPE_FLY:
case LTYPE_OBJECT:
{
- SwFlyFrm* pFly;
- SwContentFrm *pCnt = pCNd->getLayoutFrm( rDoc.getIDocumentLayoutAccess().GetCurrentLayout() );
- if( pCnt && nullptr != ( pFly = pCnt->FindFlyFrm() ) )
+ SwFlyFrame* pFly;
+ SwContentFrame *pCnt = pCNd->getLayoutFrame( rDoc.getIDocumentLayoutAccess().GetCurrentLayout() );
+ if( pCnt && nullptr != ( pFly = pCnt->FindFlyFrame() ) )
nIdx = pFly->GetFormat()->GetContent().GetContentIdx()->GetIndex();
}
break;
diff --git a/sw/source/core/undo/unsort.cxx b/sw/source/core/undo/unsort.cxx
index f393cfe9de2d..4399cdd1fcf7 100644
--- a/sw/source/core/undo/unsort.cxx
+++ b/sw/source/core/undo/unsort.cxx
@@ -86,11 +86,11 @@ void SwUndoSort::UndoImpl(::sw::UndoRedoContext & rContext)
SwTableNode* pTableNd = rDoc.GetNodes()[ nTableNd ]->GetTableNode();
- // #i37739# A simple 'MakeFrms' after the node sorting
+ // #i37739# A simple 'MakeFrames' after the node sorting
// does not work if the table is inside a frame and has no prev/next.
SwNode2Layout aNode2Layout( *pTableNd );
- pTableNd->DelFrms();
+ pTableNd->DelFrames();
const SwTable& rTable = pTableNd->GetTable();
SwMovedBoxes aMovedList;
@@ -110,10 +110,10 @@ void SwUndoSort::UndoImpl(::sw::UndoRedoContext & rContext)
}
// Restore table frames:
- // #i37739# A simple 'MakeFrms' after the node sorting
+ // #i37739# A simple 'MakeFrames' after the node sorting
// does not work if the table is inside a frame and has no prev/next.
const sal_uLong nIdx = pTableNd->GetIndex();
- aNode2Layout.RestoreUpperFrms( rDoc.GetNodes(), nIdx, nIdx + 1 );
+ aNode2Layout.RestoreUpperFrames( rDoc.GetNodes(), nIdx, nIdx + 1 );
}
else
{
@@ -165,11 +165,11 @@ void SwUndoSort::RedoImpl(::sw::UndoRedoContext & rContext)
SwTableNode* pTableNd = rDoc.GetNodes()[ nTableNd ]->GetTableNode();
- // #i37739# A simple 'MakeFrms' after the node sorting
+ // #i37739# A simple 'MakeFrames' after the node sorting
// does not work if the table is inside a frame and has no prev/next.
SwNode2Layout aNode2Layout( *pTableNd );
- pTableNd->DelFrms();
+ pTableNd->DelFrames();
const SwTable& rTable = pTableNd->GetTable();
SwMovedBoxes aMovedList;
@@ -193,10 +193,10 @@ void SwUndoSort::RedoImpl(::sw::UndoRedoContext & rContext)
}
// Restore table frames:
- // #i37739# A simple 'MakeFrms' after the node sorting
+ // #i37739# A simple 'MakeFrames' after the node sorting
// does not work if the table is inside a frame and has no prev/next.
const sal_uLong nIdx = pTableNd->GetIndex();
- aNode2Layout.RestoreUpperFrms( rDoc.GetNodes(), nIdx, nIdx + 1 );
+ aNode2Layout.RestoreUpperFrames( rDoc.GetNodes(), nIdx, nIdx + 1 );
}
else
{
diff --git a/sw/source/core/undo/untbl.cxx b/sw/source/core/undo/untbl.cxx
index 8acb14a9cfed..116c68696907 100644
--- a/sw/source/core/undo/untbl.cxx
+++ b/sw/source/core/undo/untbl.cxx
@@ -130,7 +130,7 @@ public:
void RestoreAttr( SwTable& rTable, bool bModifyBox = false );
void SaveContentAttrs( SwDoc* pDoc );
- void CreateNew( SwTable& rTable, bool bCreateFrms = true,
+ void CreateNew( SwTable& rTable, bool bCreateFrames = true,
bool bRestoreChart = true );
bool IsNewModel() const { return m_bNewModel; }
};
@@ -256,7 +256,7 @@ void SwUndoInsTable::UndoImpl(::sw::UndoRedoContext & rContext)
SwTableNode* pTableNd = aIdx.GetNode().GetTableNode();
OSL_ENSURE( pTableNd, "no TableNode" );
- pTableNd->DelFrms();
+ pTableNd->DelFrames();
if( IDocumentRedlineAccess::IsRedlineOn( GetRedlineMode() ))
rDoc.getIDocumentRedlineAccess().DeleteRedline( *pTableNd, true, USHRT_MAX );
@@ -443,17 +443,17 @@ void SwUndoTableToText::UndoImpl(::sw::UndoRedoContext & rContext)
SwDoc & rDoc = rContext.GetDoc();
SwPaM *const pPam(& rContext.GetCursorSupplier().CreateNewShellCursor());
- SwNodeIndex aFrmIdx( rDoc.GetNodes(), nSttNd );
+ SwNodeIndex aFrameIdx( rDoc.GetNodes(), nSttNd );
SwNodeIndex aEndIdx( rDoc.GetNodes(), nEndNd );
- pPam->GetPoint()->nNode = aFrmIdx;
+ pPam->GetPoint()->nNode = aFrameIdx;
pPam->SetMark();
pPam->GetPoint()->nNode = aEndIdx;
rDoc.DelNumRules( *pPam );
pPam->DeleteMark();
// now collect all Uppers
- SwNode2Layout aNode2Layout( aFrmIdx.GetNode() );
+ SwNode2Layout aNode2Layout( aFrameIdx.GetNode() );
// create TableNode structure
SwTableNode* pTableNd = rDoc.GetNodes().UndoTableToText( nSttNd, nEndNd, *m_pBoxSaves );
@@ -490,7 +490,7 @@ void SwUndoTableToText::UndoImpl(::sw::UndoRedoContext & rContext)
pHistory->SetTmpEnd( nTmpEnd );
}
- aNode2Layout.RestoreUpperFrms( rDoc.GetNodes(),
+ aNode2Layout.RestoreUpperFrames( rDoc.GetNodes(),
pTableNd->GetIndex(), pTableNd->GetIndex()+1 );
// Is a table selection requested?
@@ -525,7 +525,7 @@ SwTableNode* SwNodes::UndoTableToText( sal_uLong nSttNd, sal_uLong nEndNd,
for( n = pTableNd->GetIndex() + 1; n < nTmpEnd; ++n )
{
if( ( pNd = (*this)[ n ] )->IsContentNode() )
- static_cast<SwContentNode*>(pNd)->DelFrms();
+ static_cast<SwContentNode*>(pNd)->DelFrames();
pNd->m_pStartOfSection = pTableNd;
}
}
@@ -726,7 +726,7 @@ void SwUndoTextToTable::UndoImpl(::sw::UndoRedoContext & rContext)
if( pDelBoxes )
{
- pTNd->DelFrms();
+ pTNd->DelFrames();
SwTable& rTable = pTNd->GetTable();
for( size_t n = pDelBoxes->size(); n; )
{
@@ -753,7 +753,7 @@ void SwUndoTextToTable::UndoImpl(::sw::UndoRedoContext & rContext)
{
SwNodeIndex & rIdx = aPam.GetPoint()->nNode;
- // than move, relatively, the Crsr/etc. again
+ // than move, relatively, the Cursor/etc. again
RemoveIdxRel( rIdx.GetIndex()+1, *pPos );
rIdx.GetNode().GetContentNode()->JoinNext();
@@ -771,7 +771,7 @@ void SwUndoTextToTable::UndoImpl(::sw::UndoRedoContext & rContext)
aPam.GetMark()->nContent.Assign( nullptr, 0 );
aPam.GetPoint()->nContent.Assign( nullptr, 0 );
- // than move, relatively, the Crsr/etc. again
+ // than move, relatively, the Cursor/etc. again
pPos->nContent.Assign(pTextNd, pTextNd->GetText().getLength());
RemoveIdxRel( nEndNode + 1, *pPos );
@@ -921,7 +921,7 @@ void _SaveTable::RestoreAttr( SwTable& rTable, bool bMdfyBox )
{
m_bModifyBox = bMdfyBox;
- // first, get back attributes of TableFrmFormat
+ // first, get back attributes of TableFrameFormat
SwFrameFormat* pFormat = rTable.GetFrameFormat();
SfxItemSet& rFormatSet = (SfxItemSet&)pFormat->GetAttrSet();
rFormatSet.ClearItem();
@@ -929,13 +929,13 @@ void _SaveTable::RestoreAttr( SwTable& rTable, bool bMdfyBox )
if( pFormat->IsInCache() )
{
- SwFrm::GetCache().Delete( pFormat );
+ SwFrame::GetCache().Delete( pFormat );
pFormat->SetInCache( false );
}
// for safety, invalidate all TableFrames
- SwIterator<SwTabFrm,SwFormat> aIter( *pFormat );
- for( SwTabFrm* pLast = aIter.First(); pLast; pLast = aIter.Next() )
+ SwIterator<SwTabFrame,SwFormat> aIter( *pFormat );
+ for( SwTabFrame* pLast = aIter.First(); pLast; pLast = aIter.Next() )
if( pLast->GetTable() == &rTable )
{
pLast->InvalidateAll();
@@ -972,13 +972,13 @@ void _SaveTable::SaveContentAttrs( SwDoc* pDoc )
m_pLine->SaveContentAttrs(pDoc);
}
-void _SaveTable::CreateNew( SwTable& rTable, bool bCreateFrms,
+void _SaveTable::CreateNew( SwTable& rTable, bool bCreateFrames,
bool bRestoreChart )
{
_FndBox aTmpBox( nullptr, nullptr );
- aTmpBox.DelFrms( rTable );
+ aTmpBox.DelFrames( rTable );
- // first, get back attributes of TableFrmFormat
+ // first, get back attributes of TableFrameFormat
SwFrameFormat* pFormat = rTable.GetFrameFormat();
SfxItemSet& rFormatSet = (SfxItemSet&)pFormat->GetAttrSet();
rFormatSet.ClearItem();
@@ -986,7 +986,7 @@ void _SaveTable::CreateNew( SwTable& rTable, bool bCreateFrms,
if( pFormat->IsInCache() )
{
- SwFrm::GetCache().Delete( pFormat );
+ SwFrame::GetCache().Delete( pFormat );
pFormat->SetInCache( false );
}
@@ -1068,8 +1068,8 @@ void _SaveTable::CreateNew( SwTable& rTable, bool bCreateFrms,
aParent.GetTabLines().erase( aParent.GetTabLines().begin(), aParent.GetTabLines().begin() + n );
assert(aParent.GetTabLines().empty());
- if( bCreateFrms )
- aTmpBox.MakeFrms( rTable );
+ if( bCreateFrames )
+ aTmpBox.MakeFrames( rTable );
if( bRestoreChart )
{
// TL_CHART2: need to inform chart of probably changed cell names
@@ -1093,20 +1093,20 @@ void _SaveTable::NewFrameFormat( const SwTableLine* pTableLn, const SwTableBox*
m_aFrameFormats[nFormatPos] = pFormat;
}
- // first re-assign Frms
- SwIterator<SwTabFrm,SwFormat> aIter( *pOldFormat );
- for( SwFrm* pLast = aIter.First(); pLast; pLast = aIter.Next() )
+ // first re-assign Frames
+ SwIterator<SwTabFrame,SwFormat> aIter( *pOldFormat );
+ for( SwFrame* pLast = aIter.First(); pLast; pLast = aIter.Next() )
{
- if( pTableLn ? static_cast<SwRowFrm*>(pLast)->GetTabLine() == pTableLn
- : static_cast<SwCellFrm*>(pLast)->GetTabBox() == pTableBx )
+ if( pTableLn ? static_cast<SwRowFrame*>(pLast)->GetTabLine() == pTableLn
+ : static_cast<SwCellFrame*>(pLast)->GetTabBox() == pTableBx )
{
pLast->RegisterToFormat(*pFormat);
pLast->InvalidateAll();
- pLast->ReinitializeFrmSizeAttrFlags();
+ pLast->ReinitializeFrameSizeAttrFlags();
if ( !pTableLn )
{
- static_cast<SwCellFrm*>(pLast)->SetDerivedVert( false );
- static_cast<SwCellFrm*>(pLast)->CheckDirChange();
+ static_cast<SwCellFrame*>(pLast)->SetDerivedVert( false );
+ static_cast<SwCellFrame*>(pLast)->CheckDirChange();
}
}
}
@@ -1774,11 +1774,11 @@ void SwUndoTableNdsChg::UndoImpl(::sw::UndoRedoContext & rContext)
}
}
- // fdo#57197: before deleting the SwTableBoxes, delete the SwTabFrms
+ // fdo#57197: before deleting the SwTableBoxes, delete the SwTabFrames
aTmpBox.SetTableLines(aDelBoxes, pTableNd->GetTable());
- aTmpBox.DelFrms(pTableNd->GetTable());
+ aTmpBox.DelFrames(pTableNd->GetTable());
- // do this _after_ deleting Frms because disposing SwAccessible requires
+ // do this _after_ deleting Frames because disposing SwAccessible requires
// connection to the nodes, see SwAccessibleChild::IsAccessible()
for (size_t i = 0; i < aDelNodes.size(); ++i)
{
@@ -2932,7 +2932,7 @@ void SwUndoSplitTable::UndoImpl(::sw::UndoRedoContext & rContext)
SwTable::SelLineFromBox( pBox, aSelBoxes );
_FndBox aTmpBox( nullptr, nullptr );
aTmpBox.SetTableLines( aSelBoxes, rTable );
- aTmpBox.DelFrms( rTable );
+ aTmpBox.DelFrames( rTable );
rTable.DeleteSel( pDoc, aSelBoxes, nullptr, nullptr, false, false );
}
break;
@@ -3028,13 +3028,13 @@ void SwUndoMergeTable::UndoImpl(::sw::UndoRedoContext & rContext)
// get lines for layout update
_FndBox aFndBox( nullptr, nullptr );
aFndBox.SetTableLines( *pTable );
- aFndBox.DelFrms( *pTable );
+ aFndBox.DelFrames( *pTable );
// ? TL_CHART2: notification or locking of controller required ?
SwTableNode* pNew = pDoc->GetNodes().SplitTable( rIdx );
// update layout
- aFndBox.MakeFrms( *pTable );
+ aFndBox.MakeFrames( *pTable );
// ? TL_CHART2: notification or locking of controller required ?
if( bWithPrev )
@@ -3057,7 +3057,7 @@ void SwUndoMergeTable::UndoImpl(::sw::UndoRedoContext & rContext)
// create frames for the new table
SwNodeIndex aTmpIdx( *pNew );
- pNew->MakeFrms( &aTmpIdx );
+ pNew->MakeFrames( &aTmpIdx );
// position cursor somewhere in content
SwContentNode* pCNd = pDoc->GetNodes().GoNext( &rIdx );
generated by cgit (git 2.34.1) at 2024-05-29 00:56:29 +0000