summaryrefslogtreecommitdiff
path: root/sw/source/core/frmedt/fecopy.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'sw/source/core/frmedt/fecopy.cxx')
-rw-r--r--sw/source/core/frmedt/fecopy.cxx188
1 files changed, 94 insertions, 94 deletions
diff --git a/sw/source/core/frmedt/fecopy.cxx b/sw/source/core/frmedt/fecopy.cxx
index f82afebe55b8..55ece42fad2f 100644
--- a/sw/source/core/frmedt/fecopy.cxx
+++ b/sw/source/core/frmedt/fecopy.cxx
@@ -123,10 +123,10 @@ bool SwFEShell::Copy( SwDoc* pClpDoc, const OUString* pNewClpText )
bool bRet;
// do we want to copy a FlyFrame?
- if( IsFrmSelected() )
+ if( IsFrameSelected() )
{
// get the FlyFormat
- SwFlyFrm* pFly = GetSelectedFlyFrm();
+ SwFlyFrame* pFly = GetSelectedFlyFrame();
SwFrameFormat* pFlyFormat = pFly->GetFormat();
SwFormatAnchor aAnchor( pFlyFormat->GetAnchor() );
@@ -226,30 +226,30 @@ bool SwFEShell::Copy( SwDoc* pClpDoc, const OUString* pNewClpText )
return bRet;
}
-static const Point &lcl_FindBasePos( const SwFrm *pFrm, const Point &rPt )
+static const Point &lcl_FindBasePos( const SwFrame *pFrame, const Point &rPt )
{
- const SwFrm *pF = pFrm;
- while ( pF && !pF->Frm().IsInside( rPt ) )
+ const SwFrame *pF = pFrame;
+ while ( pF && !pF->Frame().IsInside( rPt ) )
{
- if ( pF->IsContentFrm() )
- pF = static_cast<const SwContentFrm*>(pF)->GetFollow();
+ if ( pF->IsContentFrame() )
+ pF = static_cast<const SwContentFrame*>(pF)->GetFollow();
else
pF = nullptr;
}
if ( pF )
- return pF->Frm().Pos();
+ return pF->Frame().Pos();
else
- return pFrm->Frm().Pos();
+ return pFrame->Frame().Pos();
}
-static bool lcl_SetAnchor( const SwPosition& rPos, const SwNode& rNd, SwFlyFrm* pFly,
+static bool lcl_SetAnchor( const SwPosition& rPos, const SwNode& rNd, SwFlyFrame* pFly,
const Point& rInsPt, SwFEShell& rDestShell, SwFormatAnchor& rAnchor,
Point& rNewPos, bool bCheckFlyRecur )
{
bool bRet = true;
rAnchor.SetAnchor( &rPos );
- SwContentFrm* pTmpFrm = rNd.GetContentNode()->getLayoutFrm( rDestShell.GetLayout(), &rInsPt, nullptr, false );
- SwFlyFrm *pTmpFly = pTmpFrm->FindFlyFrm();
+ SwContentFrame* pTmpFrame = rNd.GetContentNode()->getLayoutFrame( rDestShell.GetLayout(), &rInsPt, nullptr, false );
+ SwFlyFrame *pTmpFly = pTmpFrame->FindFlyFrame();
if( pTmpFly && bCheckFlyRecur && pFly->IsUpperOf( *pTmpFly ) )
{
bRet = false;
@@ -261,18 +261,18 @@ static bool lcl_SetAnchor( const SwPosition& rPos, const SwNode& rNd, SwFlyFrm*
const SwNodeIndex& rIdx = *pTmpFly->GetFormat()->GetContent().GetContentIdx();
SwPosition aPos( rIdx );
rAnchor.SetAnchor( &aPos );
- rNewPos = pTmpFly->Frm().Pos();
+ rNewPos = pTmpFly->Frame().Pos();
}
else
{
rAnchor.SetType( FLY_AT_PAGE );
rAnchor.SetPageNum( rDestShell.GetPageNumber( rInsPt ) );
- const SwFrm *pPg = pTmpFrm->FindPageFrm();
- rNewPos = pPg->Frm().Pos();
+ const SwFrame *pPg = pTmpFrame->FindPageFrame();
+ rNewPos = pPg->Frame().Pos();
}
}
else
- rNewPos = ::lcl_FindBasePos( pTmpFrm, rInsPt );
+ rNewPos = ::lcl_FindBasePos( pTmpFrame, rInsPt );
return bRet;
}
@@ -337,11 +337,11 @@ bool SwFEShell::CopyDrawSel( SwFEShell* pDestShell, const Point& rSttPt,
{
// same shell? Then request the position
// from the passed DocumentPosition
- SwPosition aPos( *GetCrsr()->GetPoint() );
+ SwPosition aPos( *GetCursor()->GetPoint() );
Point aPt( rInsPt );
aPt -= rSttPt - pObj->GetSnapRect().TopLeft();
- SwCrsrMoveState aState( MV_SETONLYTEXT );
- GetLayout()->GetCrsrOfst( &aPos, aPt, &aState );
+ SwCursorMoveState aState( MV_SETONLYTEXT );
+ GetLayout()->GetCursorOfst( &aPos, aPt, &aState );
const SwNode *pNd;
if( (pNd = &aPos.nNode.GetNode())->IsNoTextNode() )
bRet = false;
@@ -351,12 +351,12 @@ bool SwFEShell::CopyDrawSel( SwFEShell* pDestShell, const Point& rSttPt,
}
else
{
- SwPaM *pCrsr = pDestShell->GetCrsr();
- if( pCrsr->GetNode().IsNoTextNode() )
+ SwPaM *pCursor = pDestShell->GetCursor();
+ if( pCursor->GetNode().IsNoTextNode() )
bRet = false;
else
- bRet = ::lcl_SetAnchor( *pCrsr->GetPoint(),
- pCrsr->GetNode(), nullptr, rInsPt,
+ bRet = ::lcl_SetAnchor( *pCursor->GetPoint(),
+ pCursor->GetNode(), nullptr, rInsPt,
*pDestShell, aAnchor,
aNewAnch, false );
}
@@ -364,10 +364,10 @@ bool SwFEShell::CopyDrawSel( SwFEShell* pDestShell, const Point& rSttPt,
else if ( FLY_AT_PAGE == aAnchor.GetAnchorId() )
{
aAnchor.SetPageNum( pDestShell->GetPageNumber( rInsPt ) );
- const SwRootFrm* pTmpRoot = pDestShell->GetLayout();
- const SwFrm* pPg = pTmpRoot->GetPageAtPos( rInsPt, nullptr, true );
+ const SwRootFrame* pTmpRoot = pDestShell->GetLayout();
+ const SwFrame* pPg = pTmpRoot->GetPageAtPos( rInsPt, nullptr, true );
if ( pPg )
- aNewAnch = pPg->Frm().Pos();
+ aNewAnch = pPg->Frame().Pos();
}
if( bRet )
@@ -379,7 +379,7 @@ bool SwFEShell::CopyDrawSel( SwFEShell* pDestShell, const Point& rSttPt,
aSet.Put( aAnchor );
SdrObject* pNew = pDestDoc->CloneSdrObj( *pObj, bIsMove &&
GetDoc() == pDestDoc );
- pFormat = pDestDoc->getIDocumentContentOperations().InsertDrawObj( *pDestShell->GetCrsr(), *pNew, aSet );
+ pFormat = pDestDoc->getIDocumentContentOperations().InsertDrawObj( *pDestShell->GetCursor(), *pNew, aSet );
}
else
pFormat = pDestDoc->getIDocumentLayoutAccess().CopyLayoutFormat( *pFormat, aAnchor, true, true );
@@ -465,9 +465,9 @@ bool SwFEShell::Copy( SwFEShell* pDestShell, const Point& rSttPt,
// (individual boxes in the area are retrieved via the layout)
SwFieldType* pTableFieldTyp = pDestShell->GetDoc()->getIDocumentFieldsAccess().GetSysFieldType( RES_TABLEFLD );
- if( IsFrmSelected() )
+ if( IsFrameSelected() )
{
- SwFlyFrm* pFly = GetSelectedFlyFrm();
+ SwFlyFrame* pFly = GetSelectedFlyFrame();
SwFrameFormat* pFlyFormat = pFly->GetFormat();
SwFormatAnchor aAnchor( pFlyFormat->GetAnchor() );
bRet = true;
@@ -482,11 +482,11 @@ bool SwFEShell::Copy( SwFEShell* pDestShell, const Point& rSttPt,
{
// same shell? Then request the position
// from the passed DocumentPosition
- SwPosition aPos( *GetCrsr()->GetPoint() );
+ SwPosition aPos( *GetCursor()->GetPoint() );
Point aPt( rInsPt );
- aPt -= rSttPt - pFly->Frm().Pos();
- SwCrsrMoveState aState( MV_SETONLYTEXT );
- GetLayout()->GetCrsrOfst( &aPos, aPt, &aState );
+ aPt -= rSttPt - pFly->Frame().Pos();
+ SwCursorMoveState aState( MV_SETONLYTEXT );
+ GetLayout()->GetCursorOfst( &aPos, aPt, &aState );
const SwNode *pNd;
if( (pNd = &aPos.nNode.GetNode())->IsNoTextNode() )
bRet = false;
@@ -506,11 +506,11 @@ bool SwFEShell::Copy( SwFEShell* pDestShell, const Point& rSttPt,
}
else
{
- const SwPaM *pCrsr = pDestShell->GetCrsr();
- if( pCrsr->GetNode().IsNoTextNode() )
+ const SwPaM *pCursor = pDestShell->GetCursor();
+ if( pCursor->GetNode().IsNoTextNode() )
bRet = false;
else
- bRet = ::lcl_SetAnchor( *pCrsr->GetPoint(), pCrsr->GetNode(),
+ bRet = ::lcl_SetAnchor( *pCursor->GetPoint(), pCursor->GetNode(),
pFly, rInsPt, *pDestShell, aAnchor,
aNewAnch, GetDoc() == pDestShell->GetDoc());
}
@@ -518,10 +518,10 @@ bool SwFEShell::Copy( SwFEShell* pDestShell, const Point& rSttPt,
else if ( FLY_AT_PAGE == aAnchor.GetAnchorId() )
{
aAnchor.SetPageNum( pDestShell->GetPageNumber( rInsPt ) );
- const SwRootFrm* pTmpRoot = pDestShell->GetLayout();
- const SwFrm* pPg = pTmpRoot->GetPageAtPos( rInsPt, nullptr, true );
+ const SwRootFrame* pTmpRoot = pDestShell->GetLayout();
+ const SwFrame* pPg = pTmpRoot->GetPageAtPos( rInsPt, nullptr, true );
if ( pPg )
- aNewAnch = pPg->Frm().Pos();
+ aNewAnch = pPg->Frame().Pos();
}
else {
OSL_ENSURE( false, "what anchor is it?" );
@@ -536,12 +536,12 @@ bool SwFEShell::Copy( SwFEShell* pDestShell, const Point& rSttPt,
{
Point aPos( rInsPt );
aPos -= aNewAnch;
- aPos -= rSttPt - pFly->Frm().Pos();
+ aPos -= rSttPt - pFly->Frame().Pos();
pFlyFormat->SetFormatAttr( SwFormatHoriOrient( aPos.getX(),text::HoriOrientation::NONE, text::RelOrientation::FRAME ) );
pFlyFormat->SetFormatAttr( SwFormatVertOrient( aPos.getY(),text::VertOrientation::NONE, text::RelOrientation::FRAME ) );
}
- const Point aPt( pDestShell->GetCrsrDocPos() );
+ const Point aPt( pDestShell->GetCursorDocPos() );
if( bIsMove )
GetDoc()->getIDocumentLayoutAccess().DelLayoutFormat( pOldFormat );
@@ -549,12 +549,12 @@ bool SwFEShell::Copy( SwFEShell* pDestShell, const Point& rSttPt,
// only select if it can be shifted/copied in the same shell
if( bSelectInsert )
{
- SwFlyFrm* pFlyFrm = static_cast<SwFlyFrameFormat*>(pFlyFormat)->GetFrm( &aPt );
- if( pFlyFrm )
+ SwFlyFrame* pFlyFrame = static_cast<SwFlyFrameFormat*>(pFlyFormat)->GetFrame( &aPt );
+ if( pFlyFrame )
{
- //JP 12.05.98: should this be in SelectFlyFrm???
+ //JP 12.05.98: should this be in SelectFlyFrame???
pDestShell->Imp()->GetDrawView()->UnmarkAll();
- pDestShell->SelectFlyFrm( *pFlyFrm, true );
+ pDestShell->SelectFlyFrame( *pFlyFrame, true );
}
}
@@ -580,24 +580,24 @@ bool SwFEShell::Copy( SwFEShell* pDestShell, const Point& rSttPt,
SwPosition* pDstPos = nullptr;
if( this == pDestShell )
{
- // same shell? Then create new Crsr at the
+ // same shell? Then create new Cursor at the
// DocumentPosition passed
- pDstPos = new SwPosition( *GetCrsr()->GetPoint() );
+ pDstPos = new SwPosition( *GetCursor()->GetPoint() );
Point aPt( rInsPt );
- GetLayout()->GetCrsrOfst( pDstPos, aPt );
+ GetLayout()->GetCursorOfst( pDstPos, aPt );
if( !pDstPos->nNode.GetNode().IsNoTextNode() )
bRet = true;
}
- else if( !pDestShell->GetCrsr()->GetNode().IsNoTextNode() )
+ else if( !pDestShell->GetCursor()->GetNode().IsNoTextNode() )
{
- pDstPos = new SwPosition( *pDestShell->GetCrsr()->GetPoint() );
+ pDstPos = new SwPosition( *pDestShell->GetCursor()->GetPoint() );
bRet = true;
}
if( bRet )
{
if( GetDoc() == pDestShell->GetDoc() )
- ParkTableCrsr();
+ ParkTableCursor();
bRet = pDestShell->GetDoc()->InsCopyOfTable( *pDstPos, aBoxes,nullptr,
bIsMove && this == pDestShell &&
@@ -606,16 +606,16 @@ bool SwFEShell::Copy( SwFEShell* pDestShell, const Point& rSttPt,
this != pDestShell );
if( this != pDestShell )
- *pDestShell->GetCrsr()->GetPoint() = *pDstPos;
+ *pDestShell->GetCursor()->GetPoint() = *pDstPos;
- // create all parked Crsr?
+ // create all parked Cursor?
if( GetDoc() == pDestShell->GetDoc() )
- GetCrsr();
+ GetCursor();
// JP 16.04.99: Bug 64908 - Set InsPos, to assure the parked
// Cursor is positioned at the insert position
if( this == pDestShell )
- GetCrsrDocPos() = rInsPt;
+ GetCursorDocPos() = rInsPt;
}
delete pDstPos;
}
@@ -627,12 +627,12 @@ bool SwFEShell::Copy( SwFEShell* pDestShell, const Point& rSttPt,
{
// same shell? then request the position
// at the passed document position
- SwPosition aPos( *GetCrsr()->GetPoint() );
+ SwPosition aPos( *GetCursor()->GetPoint() );
Point aPt( rInsPt );
- GetLayout()->GetCrsrOfst( &aPos, aPt );
+ GetLayout()->GetCursorOfst( &aPos, aPt );
bRet = !aPos.nNode.GetNode().IsNoTextNode();
}
- else if( pDestShell->GetCrsr()->GetNode().IsNoTextNode() )
+ else if( pDestShell->GetCursor()->GetNode().IsNoTextNode() )
bRet = false;
if( bRet )
@@ -722,18 +722,18 @@ bool SwFEShell::Paste( SwDoc* pClpDoc, bool bIncludingPageFrames )
- aCpyPam.GetMark()->nNode.GetIndex();
sal_uInt32 nCount = nSelCount;
SwNodeIndex aClpIdx( aIdx );
- SwPaM* pStartCursor = GetCrsr();
- SwPaM* pCurrCrsr = pStartCursor;
+ SwPaM* pStartCursor = GetCursor();
+ SwPaM* pCurrCursor = pStartCursor;
sal_uInt32 nCursorCount = pStartCursor->GetRingContainer().size();
// If the target selection is a multi-selection, often the last and first
// cursor of the ring points to identical document positions. Then
// we should avoid double insertion of text portions...
- while( nCursorCount > 1 && *pCurrCrsr->GetPoint() ==
- *(pCurrCrsr->GetPrev()->GetPoint()) )
+ while( nCursorCount > 1 && *pCurrCursor->GetPoint() ==
+ *(pCurrCursor->GetPrev()->GetPoint()) )
{
--nCursorCount;
- pCurrCrsr = pCurrCrsr->GetNext();
- pStartCursor = pCurrCrsr;
+ pCurrCursor = pCurrCursor->GetNext();
+ pStartCursor = pCurrCursor;
}
SwPosition aStartPos( *pStartCursor->GetPoint() );
SwPosition aInsertPos( aStartPos ); // first insertion position
@@ -749,23 +749,23 @@ bool SwFEShell::Paste( SwDoc* pClpDoc, bool bIncludingPageFrames )
PositionPtr( new SwPosition( aInsertPos ) ) );
++aIdx;
aInsertion.first->SetMark();
- if( pStartCursor == pCurrCrsr->GetNext() )
+ if( pStartCursor == pCurrCursor->GetNext() )
{ // Now we have to look for insertion positions...
if( !nMove ) // Annotate the last given insert position
aStartPos = aInsertPos;
- SwCursor aCrsr( aStartPos, nullptr, false);
+ SwCursor aCursor( aStartPos, nullptr, false);
// Check if we find another insert position by moving
// down the last given position
- if( aCrsr.UpDown( false, ++nMove, nullptr, 0 ) )
- aInsertPos = *aCrsr.GetPoint();
+ if( aCursor.UpDown( false, ++nMove, nullptr, 0 ) )
+ aInsertPos = *aCursor.GetPoint();
else // if there is no paragraph we have to create it
bCompletePara = nCount > 0;
nCursorCount = 0;
}
else // as long as we find more insert positions in the cursor ring
{ // we'll take them
- pCurrCrsr = pCurrCrsr->GetNext();
- aInsertPos = *pCurrCrsr->GetPoint();
+ pCurrCursor = pCurrCursor->GetNext();
+ aInsertPos = *pCurrCursor->GetPoint();
--nCursorCount;
}
// If there are no more paragraphs e.g. at the end of a document,
@@ -819,7 +819,7 @@ bool SwFEShell::Paste( SwDoc* pClpDoc, bool bIncludingPageFrames )
{
bool bDelTable = true;
- for(SwPaM& rPaM : GetCrsr()->GetRingContainer())
+ for(SwPaM& rPaM : GetCursor()->GetRingContainer())
{
if( pSrcNd &&
@@ -832,7 +832,7 @@ bool SwFEShell::Paste( SwDoc* pClpDoc, bool bIncludingPageFrames )
{
SwPosition aDestPos( *rPaM.GetPoint() );
- bool bParkTableCrsr = false;
+ bool bParkTableCursor = false;
const SwStartNode* pSttNd = rPaM.GetNode().FindTableBoxStartNode();
// TABLE IN TABLE: copy table in table
@@ -841,8 +841,8 @@ bool SwFEShell::Paste( SwDoc* pClpDoc, bool bIncludingPageFrames )
if( IsTableMode() ) // table selection?
{
GetTableSel( *this, aBoxes );
- ParkTableCrsr();
- bParkTableCrsr = true;
+ ParkTableCursor();
+ bParkTableCursor = true;
}
else if( !PamHasSelection(rPaM) && rPaM.GetNext() == &rPaM &&
( !pSrcNd->GetTable().IsTableComplex() ||
@@ -856,7 +856,7 @@ bool SwFEShell::Paste( SwDoc* pClpDoc, bool bIncludingPageFrames )
}
SwNodeIndex aNdIdx( *pDestNd->EndOfSectionNode());
- if( !bParkTableCrsr )
+ if( !bParkTableCursor )
{
// exit first the complete table
// ???? what about only table in a frame ?????
@@ -869,8 +869,8 @@ bool SwFEShell::Paste( SwDoc* pClpDoc, bool bIncludingPageFrames )
bRet = GetDoc()->InsCopyOfTable( aDestPos, aBoxes, &pSrcNd->GetTable() );
- if( bParkTableCrsr )
- GetCrsr();
+ if( bParkTableCursor )
+ GetCursor();
else
{
// return to the box
@@ -986,11 +986,11 @@ bool SwFEShell::Paste( SwDoc* pClpDoc, bool bIncludingPageFrames )
{
if( RES_FLYFRMFMT == pNew->Which() )
{
- const Point aPt( GetCrsrDocPos() );
- SwFlyFrm* pFlyFrm = static_cast<SwFlyFrameFormat*>(pNew)->
- GetFrm( &aPt );
- if( pFlyFrm )
- SelectFlyFrm( *pFlyFrm, true );
+ const Point aPt( GetCursorDocPos() );
+ SwFlyFrame* pFlyFrame = static_cast<SwFlyFrameFormat*>(pNew)->
+ GetFrame( &aPt );
+ if( pFlyFrame )
+ SelectFlyFrame( *pFlyFrame, true );
// always pick the first FlyFrame only; the others
// were copied to the clipboard via Fly in Fly
break;
@@ -1133,7 +1133,7 @@ bool SwFEShell::PastePages( SwFEShell& rToFill, sal_uInt16 nStartPage, sal_uInt1
return false;
}
MovePage( fnPageCurr, fnPageStart );
- SwPaM aCpyPam( *GetCrsr()->GetPoint() );
+ SwPaM aCpyPam( *GetCursor()->GetPoint() );
OUString sStartingPageDesc = GetPageDesc( GetCurPageDesc()).GetName();
SwPageDesc* pDesc = rToFill.FindPageDescByName( sStartingPageDesc, true );
if( pDesc )
@@ -1162,7 +1162,7 @@ bool SwFEShell::PastePages( SwFEShell& rToFill, sal_uInt16 nStartPage, sal_uInt1
MovePage( fnPageCurr, fnPageEnd );
aCpyPam.SetMark();
- *aCpyPam.GetMark() = *GetCrsr()->GetPoint();
+ *aCpyPam.GetMark() = *GetCursor()->GetPoint();
SET_CURR_SHELL( this );
@@ -1266,7 +1266,7 @@ bool SwFEShell::GetDrawObjGraphic( SotClipboardFormatId nFormat, Graphic& rGrf )
// Not the original size, but the current one.
// Otherwise it could happen that for vector graphics
// many MB's of memory are allocated.
- const Size aSz( GetSelectedFlyFrm()->Prt().SSize() );
+ const Size aSz( GetSelectedFlyFrame()->Prt().SSize() );
ScopedVclPtrInstance< VirtualDevice > pVirtDev(*GetWin());
MapMode aTmp( MAP_TWIP );
@@ -1373,14 +1373,14 @@ void SwFEShell::Paste( SvStream& rStrm, SwPasteSdr nAction, const Point* pPt )
case SwPasteSdr::Replace:
{
const SwFrameFormat* pFormat(nullptr);
- const SwFrm* pAnchor(nullptr);
+ const SwFrame* pAnchor(nullptr);
if( dynamic_cast<const SwVirtFlyDrawObj*>( pOldObj) != nullptr )
{
pFormat = FindFrameFormat( pOldObj );
Point aNullPt;
- SwFlyFrm* pFlyFrm = static_cast<const SwFlyFrameFormat*>(pFormat)->GetFrm( &aNullPt );
- pAnchor = pFlyFrm ? pFlyFrm->GetAnchorFrm() : nullptr;
+ SwFlyFrame* pFlyFrame = static_cast<const SwFlyFrameFormat*>(pFormat)->GetFrame( &aNullPt );
+ pAnchor = pFlyFrame ? pFlyFrame->GetAnchorFrame() : nullptr;
if (!pAnchor || pAnchor->FindFooterOrHeader())
{
@@ -1414,14 +1414,14 @@ void SwFEShell::Paste( SvStream& rStrm, SwPasteSdr nAction, const Point* pPt )
if( dynamic_cast<const SwVirtFlyDrawObj*>( pOldObj) != nullptr )
{
// store attributes, then set SdrObject
- SfxItemSet aFrmSet( mpDoc->GetAttrPool(),
+ SfxItemSet aFrameSet( mpDoc->GetAttrPool(),
RES_SURROUND, RES_ANCHOR );
- aFrmSet.Set( pFormat->GetAttrSet() );
+ aFrameSet.Set( pFormat->GetAttrSet() );
Point aNullPt;
- if( pAnchor->IsTextFrm() && static_cast<const SwTextFrm*>(pAnchor)->IsFollow() )
+ if( pAnchor->IsTextFrame() && static_cast<const SwTextFrame*>(pAnchor)->IsFollow() )
{
- const SwTextFrm* pTmp = static_cast<const SwTextFrm*>(pAnchor);
+ const SwTextFrame* pTmp = static_cast<const SwTextFrame*>(pAnchor);
do {
pTmp = pTmp->FindMaster();
OSL_ENSURE( pTmp, "Where's my Master?" );
@@ -1433,7 +1433,7 @@ void SwFEShell::Paste( SvStream& rStrm, SwPasteSdr nAction, const Point* pPt )
else
aNullPt = aOldObjRect.TopLeft();
- Point aNewAnchor = pAnchor->GetFrmAnchorPos( ::HasWrap( pOldObj ) );
+ Point aNewAnchor = pAnchor->GetFrameAnchorPos( ::HasWrap( pOldObj ) );
// OD 2004-04-05 #i26791# - direct positioning of Writer
// fly frame object for <SwDoc::Insert(..)>
pNewObj->NbcSetRelativePos( aNullPt - aNewAnchor );
@@ -1443,7 +1443,7 @@ void SwFEShell::Paste( SvStream& rStrm, SwPasteSdr nAction, const Point* pPt )
DelSelectedObj();
- GetDoc()->getIDocumentContentOperations().InsertDrawObj( *GetCrsr(), *pNewObj, aFrmSet );
+ GetDoc()->getIDocumentContentOperations().InsertDrawObj( *GetCursor(), *pNewObj, aFrameSet );
}
else
{
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-25 11:11:06 +0000