[Libreoffice-commits] core.git: sw/inc sw/qa sw/source
Noel Grandin (via logerrit)
logerrit at kemper.freedesktop.org
Tue Feb 4 14:02:57 UTC 2020
sw/inc/crsrsh.hxx | 2 -
sw/inc/crstate.hxx | 6 ++--
sw/qa/extras/layout/layout.cxx | 6 ++--
sw/source/core/access/accpara.cxx | 4 +-
sw/source/core/crsr/crsrsh.cxx | 30 ++++++++++-----------
sw/source/core/crsr/crstrvl.cxx | 14 +++++-----
sw/source/core/crsr/swcrsr.cxx | 4 +-
sw/source/core/crsr/trvlcol.cxx | 2 -
sw/source/core/crsr/trvlfnfl.cxx | 2 -
sw/source/core/crsr/viscrs.cxx | 2 -
sw/source/core/doc/docfly.cxx | 4 +-
sw/source/core/doc/notxtfrm.cxx | 2 -
sw/source/core/edit/edlingu.cxx | 4 +-
sw/source/core/edit/edsect.cxx | 2 -
sw/source/core/fields/expfld.cxx | 2 -
sw/source/core/frmedt/fecopy.cxx | 8 ++---
sw/source/core/frmedt/fefly1.cxx | 14 +++++-----
sw/source/core/frmedt/feshview.cxx | 4 +-
sw/source/core/frmedt/fetab.cxx | 2 -
sw/source/core/frmedt/fews.cxx | 4 +-
sw/source/core/inc/cellfrm.hxx | 2 -
sw/source/core/inc/drawfont.hxx | 2 -
sw/source/core/inc/flyfrm.hxx | 2 -
sw/source/core/inc/fntcache.hxx | 2 -
sw/source/core/inc/frame.hxx | 2 -
sw/source/core/inc/layfrm.hxx | 4 +-
sw/source/core/inc/notxtfrm.hxx | 2 -
sw/source/core/inc/pagefrm.hxx | 2 -
sw/source/core/inc/rootfrm.hxx | 2 -
sw/source/core/inc/swfont.hxx | 6 ++--
sw/source/core/inc/txtfrm.hxx | 6 ++--
sw/source/core/layout/flycnt.cxx | 2 -
sw/source/core/layout/trvlfrm.cxx | 50 ++++++++++++++++++------------------
sw/source/core/layout/unusedf.cxx | 4 +-
sw/source/core/text/frmcrsr.cxx | 24 ++++++++---------
sw/source/core/text/frminf.cxx | 2 -
sw/source/core/text/itrcrsr.cxx | 18 ++++++------
sw/source/core/text/itrtxt.hxx | 2 -
sw/source/core/text/pordrop.hxx | 2 -
sw/source/core/text/porexp.cxx | 4 +-
sw/source/core/text/porexp.hxx | 2 -
sw/source/core/text/porfld.cxx | 2 -
sw/source/core/text/porfld.hxx | 2 -
sw/source/core/text/porfly.hxx | 2 -
sw/source/core/text/porftn.hxx | 2 -
sw/source/core/text/porglue.cxx | 4 +-
sw/source/core/text/porglue.hxx | 2 -
sw/source/core/text/porlin.cxx | 2 -
sw/source/core/text/porlin.hxx | 2 -
sw/source/core/text/pormulti.cxx | 2 -
sw/source/core/text/porrst.cxx | 2 -
sw/source/core/text/porrst.hxx | 2 -
sw/source/core/text/portxt.cxx | 6 ++--
sw/source/core/text/portxt.hxx | 2 -
sw/source/core/text/txtdrop.cxx | 2 -
sw/source/core/text/txtftn.cxx | 2 -
sw/source/core/txtnode/fntcache.cxx | 2 -
sw/source/core/txtnode/fntcap.cxx | 4 +-
sw/source/core/txtnode/swfont.cxx | 6 ++--
sw/source/core/unocore/unodraw.cxx | 6 ++--
sw/source/uibase/docvw/edtwin.cxx | 2 -
61 files changed, 158 insertions(+), 158 deletions(-)
New commits:
commit 1e22bc412920d468b5fde2824d116812e450a7a9
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Tue Feb 4 14:10:16 2020 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Tue Feb 4 15:02:17 2020 +0100
rename GetCursorOfst -> GetModelPositionForViewPoint
Change-Id: Ia7202e009f635032178e5467a1ac0ab43f82ccf2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87953
Reviewed-by: Michael Stahl <michael.stahl at cib.de>
Tested-by: Jenkins
diff --git a/sw/inc/crsrsh.hxx b/sw/inc/crsrsh.hxx
index 5c5b71b8b8b8..3c49316b74f3 100644
--- a/sw/inc/crsrsh.hxx
+++ b/sw/inc/crsrsh.hxx
@@ -202,7 +202,7 @@ private:
* (via Find()) can be realised.
*/
sal_uInt16 m_nCursorMove;
- CursorMoveState m_eMvState; ///< Status for Cursor-Travelling - GetCursorOfst
+ CursorMoveState m_eMvState; ///< Status for Cursor-Travelling - GetModelPositionForViewPoint
SwTable::SearchType m_eEnhancedTableSel; /// table rows or columns selected by not cell by cell
OUString m_sMarkedListId;
diff --git a/sw/inc/crstate.hxx b/sw/inc/crstate.hxx
index 8697b1388100..7d7dcd705559 100644
--- a/sw/inc/crstate.hxx
+++ b/sw/inc/crstate.hxx
@@ -117,7 +117,7 @@ struct SwSpecialPos
{}
};
-// CursorTravelling-States (for GetCursorOfst)
+// CursorTravelling-States (for GetModelPositionForViewPoint)
enum CursorMoveState
{
MV_NONE, ///< default
@@ -142,14 +142,14 @@ struct SwCursorMoveState
bool m_bFieldInfo; ///< should be fields recognized?
bool m_bPosCorr; ///< Point had to be corrected
bool m_bFootnoteNoInfo; ///< recognized footnote numbering
- bool m_bExactOnly; /**< let GetCursorOfst look for exact matches only,
+ bool m_bExactOnly; /**< let GetModelPositionForViewPoint look for exact matches only,
i.e. never let it run into GetContentPos */
bool m_bFillRet; ///< only used temporary in FillMode
bool m_bSetInReadOnly; ///< ReadOnly areas may be entered
bool m_bRealWidth; ///< Calculation of the width required
bool m_b2Lines; ///< Check 2line portions and fill p2Lines
bool m_bNoScroll; ///< No scrolling of undersized textframes
- bool m_bPosMatchesBounds; /**< GetCursorOfst should not return the next
+ bool m_bPosMatchesBounds; /**< GetModelPositionForViewPoint should not return the next
position if screen position is inside second
have of bound rect */
diff --git a/sw/qa/extras/layout/layout.cxx b/sw/qa/extras/layout/layout.cxx
index c1c43399c9f4..bd1e609fdce1 100644
--- a/sw/qa/extras/layout/layout.cxx
+++ b/sw/qa/extras/layout/layout.cxx
@@ -3082,7 +3082,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testBtlrCell)
aPoint.setX(nSecondParaLeft + nSecondParaWidth / 2);
aPoint.setY(nSecondParaTop + nSecondParaHeight - 100);
SwCursorMoveState aState(MV_NONE);
- pLayout->GetCursorOfst(&aPosition, aPoint, &aState);
+ pLayout->GetModelPositionForViewPoint(&aPosition, aPoint, &aState);
CPPUNIT_ASSERT_EQUAL(aCellStart.nNode.GetIndex() + 1, aPosition.nNode.GetIndex());
// Without the accompanying fix in place, this test would have failed: character position was 5,
// i.e. cursor was at the end of the paragraph.
@@ -3229,7 +3229,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testImageComment)
// Ask for the doc model pos of this layout point.
SwPosition aPosition(*pTextFrame->GetTextNodeForFirstText());
- pTextFrame->GetCursorOfst(&aPosition, aPoint);
+ pTextFrame->GetModelPositionForViewPoint(&aPosition, aPoint);
// Without the accompanying fix in place, this test would have failed with:
// - Expected: 5
@@ -3554,7 +3554,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf128399)
SwPosition aPosition = *pWrtShell->GetCursor()->Start();
SwPosition aFirstRow(aPosition);
SwCursorMoveState aState(MV_NONE);
- pLayout->GetCursorOfst(&aPosition, aPoint, &aState);
+ pLayout->GetModelPositionForViewPoint(&aPosition, aPoint, &aState);
// Second row is +3: end node, start node and the first text node in the 2nd row.
sal_uLong nExpected = aFirstRow.nNode.GetIndex() + 3;
diff --git a/sw/source/core/access/accpara.cxx b/sw/source/core/access/accpara.cxx
index 65fa30f36d9e..4eee91528d88 100644
--- a/sw/source/core/access/accpara.cxx
+++ b/sw/source/core/access/accpara.cxx
@@ -2145,12 +2145,12 @@ sal_Int32 SwAccessibleParagraph::getIndexAtPoint( const awt::Point& rPoint )
OSL_ENSURE( GetFrame() != nullptr, "The text frame has vanished!" );
OSL_ENSURE( GetFrame()->IsTextFrame(), "The text frame has mutated!" );
const SwTextFrame* pFrame = static_cast<const SwTextFrame*>( GetFrame() );
- // construct SwPosition (where GetCursorOfst() will put the result into)
+ // construct SwPosition (where GetModelPositionForViewPoint() will put the result into)
SwTextNode* pNode = const_cast<SwTextNode*>(pFrame->GetTextNodeFirst());
SwPosition aPos(*pNode, 0);
SwCursorMoveState aMoveState;
aMoveState.m_bPosMatchesBounds = true;
- const bool bSuccess = pFrame->GetCursorOfst( &aPos, aCorePoint, &aMoveState );
+ const bool bSuccess = pFrame->GetModelPositionForViewPoint( &aPos, aCorePoint, &aMoveState );
TextFrameIndex nIndex = pFrame->MapModelToViewPos(aPos);
if (TextFrameIndex(0) < nIndex)
diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx
index 1e8f8fe7a90a..7a33146ac52f 100644
--- a/sw/source/core/crsr/crsrsh.cxx
+++ b/sw/source/core/crsr/crsrsh.cxx
@@ -509,7 +509,7 @@ bool SwCursorShell::UpDown( bool bUp, sal_uInt16 nCnt )
if( bRet )
{
- m_eMvState = MV_UPDOWN; // status for Cursor travelling - GetCursorOfst
+ m_eMvState = MV_UPDOWN; // status for Cursor travelling - GetModelPositionForViewPoint
if( !ActionPend() )
{
CursorFlag eUpdateMode = SwCursorShell::SCROLLWIN;
@@ -526,7 +526,7 @@ bool SwCursorShell::LRMargin( bool bLeft, bool bAPI)
{
SwCallLink aLk( *this ); // watch Cursor-Moves; call Link if needed
SET_CURR_SHELL( this );
- m_eMvState = MV_LEFTMARGIN; // status for Cursor travelling - GetCursorOfst
+ m_eMvState = MV_LEFTMARGIN; // status for Cursor travelling - GetModelPositionForViewPoint
const bool bTableMode = IsTableMode();
SwShellCursor* pTmpCursor = getShellCursor( true );
@@ -776,7 +776,7 @@ int SwCursorShell::SetCursor( const Point &rLPt, bool bOnlyText, bool bBlock )
}
int bRet = CRSR_POSOLD |
- ( GetLayout()->GetCursorOfst( &aPos, aPt, &aTmpState )
+ ( GetLayout()->GetModelPositionForViewPoint( &aPos, aPt, &aTmpState )
? 0 : CRSR_POSCHG );
const bool bOldInFrontOfLabel = IsInFrontOfLabel();
@@ -996,7 +996,7 @@ bool SwCursorShell::TestCurrPam(
SwCursorMoveState aTmpState( MV_NONE );
aTmpState.m_bSetInReadOnly = IsReadOnlyAvailable();
- if ( !GetLayout()->GetCursorOfst( &aPtPos, aPt, &aTmpState ) && bTstHit )
+ if ( !GetLayout()->GetModelPositionForViewPoint( &aPtPos, aPt, &aTmpState ) && bTstHit )
return false;
// search in all selections for this position
@@ -1487,7 +1487,7 @@ void SwCursorShell::UpdateCursorPos()
{
SwCursorMoveState aTmpState( MV_NONE );
aTmpState.m_bSetInReadOnly = IsReadOnlyAvailable();
- GetLayout()->GetCursorOfst( pShellCursor->GetPoint(), pShellCursor->GetPtPos(),
+ GetLayout()->GetModelPositionForViewPoint( pShellCursor->GetPoint(), pShellCursor->GetPtPos(),
&aTmpState );
pShellCursor->DeleteMark();
}
@@ -1696,7 +1696,7 @@ void SwCursorShell::UpdateCursor( sal_uInt16 eFlags, bool bIdleEnd )
{
Point aCentrPt( m_aCharRect.Center() );
aTmpState.m_bSetInReadOnly = IsReadOnlyAvailable();
- pTableFrame->GetCursorOfst(m_pTableCursor->GetPoint(), aCentrPt, &aTmpState);
+ pTableFrame->GetModelPositionForViewPoint(m_pTableCursor->GetPoint(), aCentrPt, &aTmpState);
bool const bResult =
pTableFrame->GetCharRect(m_aCharRect, *m_pTableCursor->GetPoint());
OSL_ENSURE( bResult, "GetCharRect failed." );
@@ -1735,7 +1735,7 @@ void SwCursorShell::UpdateCursor( sal_uInt16 eFlags, bool bIdleEnd )
-m_aCharRect.Width() : m_aCharRect.Height());
m_pVisibleCursor->Show(); // show again
}
- m_eMvState = MV_NONE; // state for cursor travelling - GetCursorOfst
+ m_eMvState = MV_NONE; // state for cursor travelling - GetModelPositionForViewPoint
if (Imp()->IsAccessible())
Imp()->InvalidateAccessibleCursorPosition( pTableFrame );
return;
@@ -1923,7 +1923,7 @@ void SwCursorShell::UpdateCursor( sal_uInt16 eFlags, bool bIdleEnd )
{
Point& rPt = pShellCursor->GetPtPos();
rPt = m_aCharRect.Center();
- pFrame->GetCursorOfst( pShellCursor->GetPoint(), rPt, &aTmpState );
+ pFrame->GetModelPositionForViewPoint( pShellCursor->GetPoint(), rPt, &aTmpState );
}
}
UISizeNotify(); // tdf#96256 update view size
@@ -2006,7 +2006,7 @@ void SwCursorShell::UpdateCursor( sal_uInt16 eFlags, bool bIdleEnd )
}
}
- m_eMvState = MV_NONE; // state for cursor travelling - GetCursorOfst
+ m_eMvState = MV_NONE; // state for cursor travelling - GetModelPositionForViewPoint
if (Imp()->IsAccessible())
Imp()->InvalidateAccessibleCursorPosition( pFrame );
@@ -2638,7 +2638,7 @@ bool SwCursorShell::SetVisibleCursor( const Point &rPt )
aTmpState.m_bSetInReadOnly = IsReadOnlyAvailable();
aTmpState.m_bRealHeight = true;
- const bool bRet = GetLayout()->GetCursorOfst( &aPos, aPt /*, &aTmpState*/ );
+ const bool bRet = GetLayout()->GetModelPositionForViewPoint( &aPos, aPt /*, &aTmpState*/ );
SetInFrontOfLabel( false ); // #i27615#
@@ -2696,7 +2696,7 @@ bool SwCursorShell::IsOverReadOnlyPos( const Point& rPt ) const
{
Point aPt( rPt );
SwPaM aPam( *m_pCurrentCursor->GetPoint() );
- GetLayout()->GetCursorOfst( aPam.GetPoint(), aPt );
+ GetLayout()->GetModelPositionForViewPoint( aPam.GetPoint(), aPt );
// form view
return aPam.HasReadonlySel( GetViewOptions()->IsFormView() );
}
@@ -2951,7 +2951,7 @@ SwCursorShell::SwCursorShell( SwDoc& rDoc, vcl::Window *pInitWin,
, m_nCurrentContent(0)
, m_nCurrentNdTyp(SwNodeType::NONE)
, m_nCursorMove( 0 )
- , m_eMvState( MV_NONE ) // state for crsr-travelling - GetCursorOfst
+ , m_eMvState( MV_NONE ) // state for crsr-travelling - GetModelPositionForViewPoint
, m_eEnhancedTableSel(SwTable::SEARCH_NONE)
, m_sMarkedListId()
, m_nMarkedListLevel( 0 )
@@ -3257,7 +3257,7 @@ bool SwCursorShell::FindValidContentNode( bool bOnlyText )
{
SwCursorMoveState aTmpState( MV_NONE );
aTmpState.m_bSetInReadOnly = IsReadOnlyAvailable();
- GetLayout()->GetCursorOfst( m_pCurrentCursor->GetPoint(), m_pCurrentCursor->GetPtPos(),
+ GetLayout()->GetModelPositionForViewPoint( m_pCurrentCursor->GetPoint(), m_pCurrentCursor->GetPtPos(),
&aTmpState );
}
}
@@ -3375,7 +3375,7 @@ SvxFrameDirection SwCursorShell::GetTextDirection( const Point* pPt ) const
SwCursorMoveState aTmpState( MV_NONE );
aTmpState.m_bSetInReadOnly = IsReadOnlyAvailable();
- GetLayout()->GetCursorOfst( &aPos, aPt, &aTmpState );
+ GetLayout()->GetModelPositionForViewPoint( &aPos, aPt, &aTmpState );
}
return mxDoc->GetTextDirection( aPos, &aPt );
@@ -3728,7 +3728,7 @@ void SwCursorShell::GetSmartTagRect( const Point& rPt, SwRect& rSelectRect )
SwTextNode *pNode;
const SwWrongList *pSmartTagList;
- if( GetLayout()->GetCursorOfst( &aPos, aPt, &eTmpState ) &&
+ if( GetLayout()->GetModelPositionForViewPoint( &aPos, aPt, &eTmpState ) &&
nullptr != (pNode = aPos.nNode.GetNode().GetTextNode()) &&
nullptr != (pSmartTagList = pNode->GetSmartTags()) &&
!pNode->IsInProtectSect() )
diff --git a/sw/source/core/crsr/crstrvl.cxx b/sw/source/core/crsr/crstrvl.cxx
index ea8a4608aaef..c7b00dea2cbb 100644
--- a/sw/source/core/crsr/crstrvl.cxx
+++ b/sw/source/core/crsr/crstrvl.cxx
@@ -98,7 +98,7 @@ void SwCursorShell::MoveCursorToNum()
aPt.setY(m_aCharRect.Center().getY());
aPt.setX(pFrame->getFrameArea().Left() + GetUpDownX());
}
- pFrame->GetCursorOfst( m_pCurrentCursor->GetPoint(), aPt );
+ pFrame->GetModelPositionForViewPoint( m_pCurrentCursor->GetPoint(), aPt );
if ( !m_pCurrentCursor->IsSelOvr( SwCursorSelOverFlags::Toggle |
SwCursorSelOverFlags::ChangePos ))
{
@@ -142,7 +142,7 @@ bool SwCursorShell::GotoHeaderText()
SwCursorSaveState aSaveState( *pTmpCursor );
pFrame->Calc(GetOut());
Point aPt( pFrame->getFrameArea().Pos() + pFrame->getFramePrintArea().Pos() );
- pFrame->GetCursorOfst( pTmpCursor->GetPoint(), aPt );
+ pFrame->GetModelPositionForViewPoint( pTmpCursor->GetPoint(), aPt );
if( !pTmpCursor->IsSelOvr() )
UpdateCursor();
else
@@ -174,7 +174,7 @@ bool SwCursorShell::GotoFooterText()
SwCursorSaveState aSaveState( *pTmpCursor );
pLower->Calc(GetOut());
Point aPt( pLower->getFrameArea().Pos() + pLower->getFramePrintArea().Pos() );
- pLower->GetCursorOfst( pTmpCursor->GetPoint(), aPt );
+ pLower->GetModelPositionForViewPoint( pTmpCursor->GetPoint(), aPt );
if( !pTmpCursor->IsSelOvr() )
UpdateCursor();
else
@@ -964,7 +964,7 @@ bool SwCursorShell::DocPtInsideInputField( const Point& rDocPt ) const
{
SwPosition aPos( *(GetCursor()->Start()) );
Point aDocPt( rDocPt );
- if ( GetLayout()->GetCursorOfst( &aPos, aDocPt ) )
+ if ( GetLayout()->GetModelPositionForViewPoint( &aPos, aDocPt ) )
{
return PosInsideInputField( aPos );
}
@@ -1292,7 +1292,7 @@ bool SwCursorShell::GetContentAtPos( const Point& rPt,
aTmpState.m_pSpecialPos = ( IsAttrAtPos::SmartTag & rContentAtPos.eContentAtPos ) ?
&aSpecialPos : nullptr;
- const bool bCursorFoundExact = GetLayout()->GetCursorOfst( &aPos, aPt, &aTmpState );
+ const bool bCursorFoundExact = GetLayout()->GetModelPositionForViewPoint( &aPos, aPt, &aTmpState );
pTextNd = aPos.nNode.GetNode().GetTextNode();
const SwNodes& rNds = GetDoc()->GetNodes();
@@ -2026,7 +2026,7 @@ bool SwCursorShell::GetShadowCursorPos( const Point& rPt, SwFillMode eFillMode,
SwFillCursorPos aFPos( eFillMode );
SwCursorMoveState aTmpState( &aFPos );
- if( GetLayout()->GetCursorOfst( &aPos, aPt, &aTmpState ) &&
+ if( GetLayout()->GetModelPositionForViewPoint( &aPos, aPt, &aTmpState ) &&
!aPos.nNode.GetNode().IsProtect())
{
// start position in protected section?
@@ -2052,7 +2052,7 @@ bool SwCursorShell::SetShadowCursorPos( const Point& rPt, SwFillMode eFillMode )
SwFillCursorPos aFPos( eFillMode );
SwCursorMoveState aTmpState( &aFPos );
- if( GetLayout()->GetCursorOfst( &aPos, aPt, &aTmpState ) )
+ if( GetLayout()->GetModelPositionForViewPoint( &aPos, aPt, &aTmpState ) )
{
SwCallLink aLk( *this ); // watch Cursor-Moves
StartAction();
diff --git a/sw/source/core/crsr/swcrsr.cxx b/sw/source/core/crsr/swcrsr.cxx
index 12b71b08d530..96b77d8a8e71 100644
--- a/sw/source/core/crsr/swcrsr.cxx
+++ b/sw/source/core/crsr/swcrsr.cxx
@@ -1398,7 +1398,7 @@ bool SwCursor::SelectWordWT( SwViewShell const * pViewShell, sal_Int16 nWordType
{
// set the cursor to the layout position
Point aPt( *pPt );
- pLayout->GetCursorOfst( GetPoint(), aPt );
+ pLayout->GetModelPositionForViewPoint( GetPoint(), aPt );
}
SwTextNode* pTextNd = GetNode().GetTextNode();
@@ -2022,7 +2022,7 @@ bool SwCursor::UpDown( bool bUp, sal_uInt16 nCnt,
pFrame->Calc(rLayout.GetCurrShell()->GetOut());
aPt.setX(pFrame->getFrameArea().Left() + nUpDownX);
}
- pFrame->GetCursorOfst( GetPoint(), aPt, &eTmpState );
+ pFrame->GetModelPositionForViewPoint( GetPoint(), aPt, &eTmpState );
}
bRet = !IsSelOvr( SwCursorSelOverFlags::Toggle | SwCursorSelOverFlags::ChangePos );
}
diff --git a/sw/source/core/crsr/trvlcol.cxx b/sw/source/core/crsr/trvlcol.cxx
index e557131d5255..b05bf7c503cb 100644
--- a/sw/source/core/crsr/trvlcol.cxx
+++ b/sw/source/core/crsr/trvlcol.cxx
@@ -86,7 +86,7 @@ void SwCursorShell::MoveColumn( SwWhichColumn fnWhichCol, SwPosColumn fnPosCol )
aPt.setY(aPt.getY() + pCnt->getFramePrintArea().Height());
}
- pCnt->GetCursorOfst( m_pCurrentCursor->GetPoint(), aPt );
+ pCnt->GetModelPositionForViewPoint( m_pCurrentCursor->GetPoint(), aPt );
if( !m_pCurrentCursor->IsInProtectTable( true ) &&
!m_pCurrentCursor->IsSelOvr() )
diff --git a/sw/source/core/crsr/trvlfnfl.cxx b/sw/source/core/crsr/trvlfnfl.cxx
index 86ef09fbdd04..155e37187f81 100644
--- a/sw/source/core/crsr/trvlfnfl.cxx
+++ b/sw/source/core/crsr/trvlfnfl.cxx
@@ -361,7 +361,7 @@ void SwCursorShell::GotoFlyAnchor()
const SwPageFrame* pPageFrame = pFrame->FindPageFrame();
const SwContentFrame* pFndFrame = pPageFrame->GetContentPos( aPt, false, true );
- pFndFrame->GetCursorOfst( m_pCurrentCursor->GetPoint(), aPt );
+ pFndFrame->GetModelPositionForViewPoint( m_pCurrentCursor->GetPoint(), aPt );
bool bRet = !m_pCurrentCursor->IsInProtectTable() && !m_pCurrentCursor->IsSelOvr();
if( bRet )
diff --git a/sw/source/core/crsr/viscrs.cxx b/sw/source/core/crsr/viscrs.cxx
index 9f803876cf6f..4c61a86bfbd5 100644
--- a/sw/source/core/crsr/viscrs.cxx
+++ b/sw/source/core/crsr/viscrs.cxx
@@ -221,7 +221,7 @@ void SwVisibleCursor::SetPosAndShow(SfxViewShell const * pViewShell)
Point aPt = aRect.Pos();
SwCursorMoveState eTmpState(MV_SETONLYTEXT);
SwTextNode *pNode = nullptr;
- if (m_pCursorShell->GetLayout()->GetCursorOfst(&aPos, aPt, &eTmpState))
+ if (m_pCursorShell->GetLayout()->GetModelPositionForViewPoint(&aPos, aPt, &eTmpState))
pNode = aPos.nNode.GetNode().GetTextNode();
if (pNode && !pNode->IsInProtectSect())
{
diff --git a/sw/source/core/doc/docfly.cxx b/sw/source/core/doc/docfly.cxx
index 0735144328d0..6077fc7fcf0b 100644
--- a/sw/source/core/doc/docfly.cxx
+++ b/sw/source/core/doc/docfly.cxx
@@ -810,7 +810,7 @@ bool SwDoc::ChgAnchor( const SdrMarkList& _rMrkList,
SwPosition aPos( GetNodes() );
Point aPoint( aPt );
aPoint.setX(aPoint.getX() - 1);
- getIDocumentLayoutAccess().GetCurrentLayout()->GetCursorOfst( &aPos, aPoint, &aState );
+ getIDocumentLayoutAccess().GetCurrentLayout()->GetModelPositionForViewPoint( &aPos, aPoint, &aState );
// consider that drawing objects can be in
// header/footer. Thus, <GetFrame()> by left-top-corner
std::pair<Point, bool> const tmp(aPt, false);
@@ -877,7 +877,7 @@ bool SwDoc::ChgAnchor( const SdrMarkList& _rMrkList,
// We need to find a TextNode, because only there we can anchor a
// content-bound DrawObject.
SwCursorMoveState aState( MV_SETONLYTEXT );
- getIDocumentLayoutAccess().GetCurrentLayout()->GetCursorOfst( &aPos, aPoint, &aState );
+ getIDocumentLayoutAccess().GetCurrentLayout()->GetModelPositionForViewPoint( &aPos, aPoint, &aState );
}
else
{
diff --git a/sw/source/core/doc/notxtfrm.cxx b/sw/source/core/doc/notxtfrm.cxx
index c5823e3e3809..9858cc3eebfa 100644
--- a/sw/source/core/doc/notxtfrm.cxx
+++ b/sw/source/core/doc/notxtfrm.cxx
@@ -691,7 +691,7 @@ bool SwNoTextFrame::GetCharRect( SwRect &rRect, const SwPosition& rPos,
return true;
}
-bool SwNoTextFrame::GetCursorOfst(SwPosition* pPos, Point& ,
+bool SwNoTextFrame::GetModelPositionForViewPoint(SwPosition* pPos, Point& ,
SwCursorMoveState*, bool ) const
{
SwContentNode* pCNd = const_cast<SwContentNode*>(GetNode());
diff --git a/sw/source/core/edit/edlingu.cxx b/sw/source/core/edit/edlingu.cxx
index e6866e842400..62d1b94679a9 100644
--- a/sw/source/core/edit/edlingu.cxx
+++ b/sw/source/core/edit/edlingu.cxx
@@ -900,7 +900,7 @@ uno::Reference< XSpellAlternatives >
SwCursorMoveState eTmpState( MV_SETONLYTEXT );
SwTextNode *pNode = nullptr;
SwWrongList *pWrong = nullptr;
- if (pPt && GetLayout()->GetCursorOfst( &aPos, *const_cast<Point*>(pPt), &eTmpState ))
+ if (pPt && GetLayout()->GetModelPositionForViewPoint( &aPos, *const_cast<Point*>(pPt), &eTmpState ))
pNode = aPos.nNode.GetNode().GetTextNode();
if (nullptr == pNode)
pNode = pCursor->GetNode().GetTextNode();
@@ -967,7 +967,7 @@ bool SwEditShell::GetGrammarCorrection(
SwCursorMoveState eTmpState( MV_SETONLYTEXT );
SwTextNode *pNode = nullptr;
SwGrammarMarkUp *pWrong = nullptr;
- if (pPt && GetLayout()->GetCursorOfst( &aPos, *const_cast<Point*>(pPt), &eTmpState ))
+ if (pPt && GetLayout()->GetModelPositionForViewPoint( &aPos, *const_cast<Point*>(pPt), &eTmpState ))
pNode = aPos.nNode.GetNode().GetTextNode();
if (nullptr == pNode)
pNode = pCursor->GetNode().GetTextNode();
diff --git a/sw/source/core/edit/edsect.cxx b/sw/source/core/edit/edsect.cxx
index 662737d2fe2a..ba765eee408e 100644
--- a/sw/source/core/edit/edsect.cxx
+++ b/sw/source/core/edit/edsect.cxx
@@ -86,7 +86,7 @@ SwSection* SwEditShell::GetAnySection( bool bOutOfTab, const Point* pPt )
{
SwPosition aPos( *GetCursor()->GetPoint() );
Point aPt( *pPt );
- GetLayout()->GetCursorOfst( &aPos, aPt );
+ GetLayout()->GetModelPositionForViewPoint( &aPos, aPt );
SwContentNode *pNd = aPos.nNode.GetNode().GetContentNode();
std::pair<Point, bool> const tmp(*pPt, true);
pFrame = pNd->getLayoutFrame(GetLayout(), nullptr, &tmp);
diff --git a/sw/source/core/fields/expfld.cxx b/sw/source/core/fields/expfld.cxx
index 304f8a796fed..efeca5aff94b 100644
--- a/sw/source/core/fields/expfld.cxx
+++ b/sw/source/core/fields/expfld.cxx
@@ -154,7 +154,7 @@ static SwTextNode* GetFirstTextNode( const SwDoc& rDoc, SwPosition& rPos,
}
else
{
- pCFrame->GetCursorOfst( &rPos, rPt );
+ pCFrame->GetModelPositionForViewPoint( &rPos, rPt );
pTextNode = rPos.nNode.GetNode().GetTextNode();
}
return pTextNode;
diff --git a/sw/source/core/frmedt/fecopy.cxx b/sw/source/core/frmedt/fecopy.cxx
index 51e344890885..d0777144c039 100644
--- a/sw/source/core/frmedt/fecopy.cxx
+++ b/sw/source/core/frmedt/fecopy.cxx
@@ -338,7 +338,7 @@ bool SwFEShell::CopyDrawSel( SwFEShell* pDestShell, const Point& rSttPt,
Point aPt( rInsPt );
aPt -= rSttPt - pObj->GetSnapRect().TopLeft();
SwCursorMoveState aState( MV_SETONLYTEXT );
- GetLayout()->GetCursorOfst( &aPos, aPt, &aState );
+ GetLayout()->GetModelPositionForViewPoint( &aPos, aPt, &aState );
const SwNode *pNd;
if( (pNd = &aPos.nNode.GetNode())->IsNoTextNode() )
bRet = false;
@@ -485,7 +485,7 @@ bool SwFEShell::Copy( SwFEShell* pDestShell, const Point& rSttPt,
Point aPt( rInsPt );
aPt -= rSttPt - pFly->getFrameArea().Pos();
SwCursorMoveState aState( MV_SETONLYTEXT );
- GetLayout()->GetCursorOfst( &aPos, aPt, &aState );
+ GetLayout()->GetModelPositionForViewPoint( &aPos, aPt, &aState );
const SwNode *pNd;
if( (pNd = &aPos.nNode.GetNode())->IsNoTextNode() )
bRet = false;
@@ -583,7 +583,7 @@ bool SwFEShell::Copy( SwFEShell* pDestShell, const Point& rSttPt,
// DocumentPosition passed
pDstPos.reset(new SwPosition( *GetCursor()->GetPoint() ));
Point aPt( rInsPt );
- GetLayout()->GetCursorOfst( pDstPos.get(), aPt );
+ GetLayout()->GetModelPositionForViewPoint( pDstPos.get(), aPt );
if( !pDstPos->nNode.GetNode().IsNoTextNode() )
bRet = true;
}
@@ -627,7 +627,7 @@ bool SwFEShell::Copy( SwFEShell* pDestShell, const Point& rSttPt,
// at the passed document position
SwPosition aPos( *GetCursor()->GetPoint() );
Point aPt( rInsPt );
- GetLayout()->GetCursorOfst( &aPos, aPt );
+ GetLayout()->GetModelPositionForViewPoint( &aPos, aPt );
bRet = !aPos.nNode.GetNode().IsNoTextNode();
}
else if( pDestShell->GetCursor()->GetNode().IsNoTextNode() )
diff --git a/sw/source/core/frmedt/fefly1.cxx b/sw/source/core/frmedt/fefly1.cxx
index da9be791b33b..203aaa1eeaee 100644
--- a/sw/source/core/frmedt/fefly1.cxx
+++ b/sw/source/core/frmedt/fefly1.cxx
@@ -139,7 +139,7 @@ static bool lcl_FindAnchorPos(
// a content bound frame can be anchored
SwCursorMoveState aState( MV_SETONLYTEXT );
aTmpPnt.setX(aTmpPnt.getX() - 1); // do not land in the fly!
- if( !pNewAnch->GetCursorOfst( &aPos, aTmpPnt, &aState ) )
+ if( !pNewAnch->GetModelPositionForViewPoint( &aPos, aTmpPnt, &aState ) )
{
assert(pNewAnch->IsTextFrame()); // because AT_CHAR/AS_CHAR
SwTextFrame const*const pTextFrame(
@@ -173,7 +173,7 @@ static bool lcl_FindAnchorPos(
SwCursorMoveState aState( MV_SETONLYTEXT );
SwPosition aPos( rDoc.GetNodes() );
aTmpPnt.setX(aTmpPnt.getX() - 1); // do not land in the fly!
- rDoc.getIDocumentLayoutAccess().GetCurrentLayout()->GetCursorOfst( &aPos, aTmpPnt, &aState );
+ rDoc.getIDocumentLayoutAccess().GetCurrentLayout()->GetModelPositionForViewPoint( &aPos, aTmpPnt, &aState );
pNewAnch = ::FindAnchor(
aPos.nNode.GetNode().GetContentNode()->getLayoutFrame(rFrame.getRootFrame(), nullptr, nullptr),
aTmpPnt )->FindFlyFrame();
@@ -353,7 +353,7 @@ const SwFrameFormat* SwFEShell::IsFlyInFly()
SwPosition aPos( aSwNodeIndex );
Point aPoint( aTmpPos );
aPoint.setX(aPoint.getX() - 1); //do not land in the fly!!
- GetLayout()->GetCursorOfst( &aPos, aPoint, &aState );
+ GetLayout()->GetModelPositionForViewPoint( &aPos, aPoint, &aState );
// determine text frame by left-top-corner of object
SwContentNode *pNd = aPos.nNode.GetNode().GetContentNode();
std::pair<Point, bool> const tmp(aTmpPos, false);
@@ -477,7 +477,7 @@ Point SwFEShell::FindAnchorPos( const Point& rAbsPos, bool bMoveIt )
SwCursorMoveState aState( MV_SETONLYTEXT );
SwPosition aPos( GetDoc()->GetNodes().GetEndOfExtras() );
Point aTmpPnt( rAbsPos );
- GetLayout()->GetCursorOfst( &aPos, aTmpPnt, &aState );
+ GetLayout()->GetModelPositionForViewPoint( &aPos, aTmpPnt, &aState );
if (aPos.nNode != GetDoc()->GetNodes().GetEndOfExtras().GetIndex()
&& (nAnchorId != RndStdIds::FLY_AT_CHAR || !PosInsideInputField(aPos)))
{
@@ -558,7 +558,7 @@ Point SwFEShell::FindAnchorPos( const Point& rAbsPos, bool bMoveIt )
{
SwPosition pos = *aAnch.GetContentAnchor();
Point aTmpPnt( rAbsPos );
- if( pTextFrame->GetCursorOfst( &pos, aTmpPnt ) )
+ if( pTextFrame->GetModelPositionForViewPoint( &pos, aTmpPnt ) )
{
SwRect aTmpRect;
pTextFrame->GetCharRect( aTmpRect, pos );
@@ -926,7 +926,7 @@ void SwFEShell::InsertDrawObj( SdrObject& rDrawObj,
{
SwCursorMoveState aState( MV_SETONLYTEXT );
Point aTmpPt( rInsertPosition );
- GetLayout()->GetCursorOfst( aPam.GetPoint(), aTmpPt, &aState );
+ GetLayout()->GetModelPositionForViewPoint( aPam.GetPoint(), aTmpPt, &aState );
const SwFrame* pFrame = aPam.GetContentNode()->getLayoutFrame(GetLayout(), nullptr, nullptr);
const Point aRelPos( rInsertPosition.X() - pFrame->getFrameArea().Left(),
rInsertPosition.Y() - pFrame->getFrameArea().Top() );
@@ -1612,7 +1612,7 @@ const SwFrameFormat* SwFEShell::GetFormatFromAnyObj( const Point& rPt ) const
{
SwPosition aPos( *GetCursor()->GetPoint() );
Point aPt( rPt );
- GetLayout()->GetCursorOfst( &aPos, aPt );
+ GetLayout()->GetModelPositionForViewPoint( &aPos, aPt );
SwContentNode *pNd = aPos.nNode.GetNode().GetContentNode();
std::pair<Point, bool> const tmp(rPt, false);
SwFrame* pFrame = pNd->getLayoutFrame(GetLayout(), nullptr, &tmp)->FindFlyFrame();
diff --git a/sw/source/core/frmedt/feshview.cxx b/sw/source/core/frmedt/feshview.cxx
index d56a4a0a72d4..99ee92524af7 100644
--- a/sw/source/core/frmedt/feshview.cxx
+++ b/sw/source/core/frmedt/feshview.cxx
@@ -1814,7 +1814,7 @@ bool SwFEShell::ImpEndCreate()
SwPosition aPos( GetDoc()->GetNodes() );
SwCursorMoveState aState( MV_SETONLYTEXT );
Point aPoint( aPt.getX(), aPt.getY() + rBound.GetHeight()/2 );
- GetLayout()->GetCursorOfst( &aPos, aPoint, &aState );
+ GetLayout()->GetModelPositionForViewPoint( &aPos, aPoint, &aState );
// characterbinding not allowed in readonly-content
if( !aPos.nNode.GetNode().IsProtect() )
@@ -1860,7 +1860,7 @@ bool SwFEShell::ImpEndCreate()
SwCursorMoveState aState( MV_SETONLYTEXT );
Point aPoint( aPt );
SwPosition aPos( GetDoc()->GetNodes() );
- GetLayout()->GetCursorOfst( &aPos, aPoint, &aState );
+ GetLayout()->GetModelPositionForViewPoint( &aPos, aPoint, &aState );
// do not set in ReadnOnly-content
if (aPos.nNode.GetNode().IsProtect())
diff --git a/sw/source/core/frmedt/fetab.cxx b/sw/source/core/frmedt/fetab.cxx
index 41c0b9184207..fcadbac2717a 100644
--- a/sw/source/core/frmedt/fetab.cxx
+++ b/sw/source/core/frmedt/fetab.cxx
@@ -1618,7 +1618,7 @@ const SwFrame* SwFEShell::GetBox( const Point &rPt, bool* pbRow, bool* pbCol ) c
const SwCellFrame *pFrame = nullptr;
if ( pPage )
{
- // We cannot search the box by GetCursorOfst or GetContentPos.
+ // We cannot search the box by GetModelPositionForViewPoint or GetContentPos.
// This would lead to a performance collapse for documents
// with a lot of paragraphs/tables on one page
//(BrowseMode!)
diff --git a/sw/source/core/frmedt/fews.cxx b/sw/source/core/frmedt/fews.cxx
index fc0f211f06c4..e5edce6ba7f0 100644
--- a/sw/source/core/frmedt/fews.cxx
+++ b/sw/source/core/frmedt/fews.cxx
@@ -101,7 +101,7 @@ const SwRect& SwFEShell::GetAnyCurRect( CurRectType eType, const Point* pPt,
{
SwPosition aPos( *GetCursor()->GetPoint() );
Point aPt( *pPt );
- GetLayout()->GetCursorOfst( &aPos, aPt );
+ GetLayout()->GetModelPositionForViewPoint( &aPos, aPt );
SwContentNode *pNd = aPos.nNode.GetNode().GetContentNode();
std::pair<Point, bool> const tmp(*pPt, true);
pFrame = pNd->getLayoutFrame(GetLayout(), nullptr, &tmp);
@@ -241,7 +241,7 @@ FrameTypeFlags SwFEShell::GetFrameType( const Point *pPt, bool bStopAtFly ) cons
{
SwPosition aPos( *GetCursor()->GetPoint() );
Point aPt( *pPt );
- GetLayout()->GetCursorOfst( &aPos, aPt );
+ GetLayout()->GetModelPositionForViewPoint( &aPos, aPt );
SwContentNode *pNd = aPos.nNode.GetNode().GetContentNode();
std::pair<Point, bool> const tmp(*pPt, true);
pFrame = pNd->getLayoutFrame(GetLayout(), nullptr, &tmp);
diff --git a/sw/source/core/inc/cellfrm.hxx b/sw/source/core/inc/cellfrm.hxx
index 43de64d2adf6..e98654ae4765 100644
--- a/sw/source/core/inc/cellfrm.hxx
+++ b/sw/source/core/inc/cellfrm.hxx
@@ -41,7 +41,7 @@ protected:
public:
SwCellFrame( const SwTableBox &, SwFrame*, bool bInsertContent );
- virtual bool GetCursorOfst( SwPosition *, Point&, SwCursorMoveState* = nullptr, bool bTestBackground = false ) const override;
+ virtual bool GetModelPositionForViewPoint( SwPosition *, Point&, SwCursorMoveState* = nullptr, bool bTestBackground = false ) const override;
virtual void PaintSwFrame( vcl::RenderContext& rRenderContext, SwRect const&,
SwPrintData const*const pPrintData = nullptr ) const override;
virtual void CheckDirection( bool bVert ) override;
diff --git a/sw/source/core/inc/drawfont.hxx b/sw/source/core/inc/drawfont.hxx
index 2672b82d4b56..44a536454fb1 100644
--- a/sw/source/core/inc/drawfont.hxx
+++ b/sw/source/core/inc/drawfont.hxx
@@ -78,7 +78,7 @@ class SW_DLLPUBLIC SwDrawTextInfo
bool m_bSnapToGrid : 1; // Does paragraph snap to grid?
// Paint text as if text has LTR direction, used for line numbering
bool m_bIgnoreFrameRTL : 1;
- // GetCursorOfst should not return the next position if screen position is
+ // GetModelPositionForViewPoint should not return the next position if screen position is
// inside second half of bound rect, used for Accessibility
bool m_bPosMatchesBounds :1;
diff --git a/sw/source/core/inc/flyfrm.hxx b/sw/source/core/inc/flyfrm.hxx
index 18f263cfc1db..464eadd7ec02 100644
--- a/sw/source/core/inc/flyfrm.hxx
+++ b/sw/source/core/inc/flyfrm.hxx
@@ -154,7 +154,7 @@ public:
virtual void PaintSwFrame( vcl::RenderContext& rRenderContext, SwRect const&,
SwPrintData const*const pPrintData = nullptr ) const override;
virtual Size ChgSize( const Size& aNewSize ) override;
- virtual bool GetCursorOfst( SwPosition *, Point&,
+ virtual bool GetModelPositionForViewPoint( SwPosition *, Point&,
SwCursorMoveState* = nullptr, bool bTestBackground = false ) const override;
virtual void CheckDirection( bool bVert ) override;
diff --git a/sw/source/core/inc/fntcache.hxx b/sw/source/core/inc/fntcache.hxx
index 456c235d5ff7..b394682307b5 100644
--- a/sw/source/core/inc/fntcache.hxx
+++ b/sw/source/core/inc/fntcache.hxx
@@ -130,7 +130,7 @@ public:
void DrawText( SwDrawTextInfo &rInf );
/// determine the TextSize (of the printer)
Size GetTextSize( SwDrawTextInfo &rInf );
- TextFrameIndex GetCursorOfst(SwDrawTextInfo &rInf);
+ TextFrameIndex GetModelPositionForViewPoint(SwDrawTextInfo &rInf);
void CreateScrFont( const SwViewShell& rSh, const OutputDevice& rOut );
void CreatePrtFont( const OutputDevice& rOut );
diff --git a/sw/source/core/inc/frame.hxx b/sw/source/core/inc/frame.hxx
index b997fd29712b..a97c719aaa78 100644
--- a/sw/source/core/inc/frame.hxx
+++ b/sw/source/core/inc/frame.hxx
@@ -811,7 +811,7 @@ public:
virtual bool FillSelection( SwSelectionList& rList, const SwRect& rRect ) const;
- virtual bool GetCursorOfst( SwPosition *, Point&,
+ virtual bool GetModelPositionForViewPoint( SwPosition *, Point&,
SwCursorMoveState* = nullptr, bool bTestBackground = false ) const;
virtual bool GetCharRect( SwRect &, const SwPosition&,
SwCursorMoveState* = nullptr, bool bAllowFarAway = true ) const;
diff --git a/sw/source/core/inc/layfrm.hxx b/sw/source/core/inc/layfrm.hxx
index f7d90f00d8f6..1a725dc3477e 100644
--- a/sw/source/core/inc/layfrm.hxx
+++ b/sw/source/core/inc/layfrm.hxx
@@ -79,7 +79,7 @@ public:
virtual bool FillSelection( SwSelectionList& rList, const SwRect& rRect ) const override;
- virtual bool GetCursorOfst( SwPosition *, Point&,
+ virtual bool GetModelPositionForViewPoint( SwPosition *, Point&,
SwCursorMoveState* = nullptr, bool bTestBackground = false ) const override;
virtual void Cut() override;
@@ -87,7 +87,7 @@ public:
/**
* Finds the closest Content for the SPoint
- * Is used for Pages, Flys and Cells if GetCursorOfst failed
+ * Is used for Pages, Flys and Cells if GetModelPositionForViewPoint failed
*/
const SwContentFrame* GetContentPos( Point &rPoint, const bool bDontLeave,
const bool bBodyOnly = false,
diff --git a/sw/source/core/inc/notxtfrm.hxx b/sw/source/core/inc/notxtfrm.hxx
index 225c0906066c..e726ec6402ed 100644
--- a/sw/source/core/inc/notxtfrm.hxx
+++ b/sw/source/core/inc/notxtfrm.hxx
@@ -69,7 +69,7 @@ public:
SwPrintData const*const pPrintData = nullptr ) const override;
virtual bool GetCharRect( SwRect &, const SwPosition&,
SwCursorMoveState* = nullptr, bool bAllowFarAway = true ) const override;
- virtual bool GetCursorOfst(SwPosition* pPos, Point& aPoint,
+ virtual bool GetModelPositionForViewPoint(SwPosition* pPos, Point& aPoint,
SwCursorMoveState* = nullptr, bool bTestBackground = false) const override;
void GetGrfArea( SwRect &rRect, SwRect * ) const;
diff --git a/sw/source/core/inc/pagefrm.hxx b/sw/source/core/inc/pagefrm.hxx
index 95d69bd699ee..81949f58e1b4 100644
--- a/sw/source/core/inc/pagefrm.hxx
+++ b/sw/source/core/inc/pagefrm.hxx
@@ -159,7 +159,7 @@ public:
// this assertion. Thus, delete it.
void PlaceFly( SwFlyFrame* pFly, SwFlyFrameFormat* pFormat );
- virtual bool GetCursorOfst( SwPosition *, Point&,
+ virtual bool GetModelPositionForViewPoint( SwPosition *, Point&,
SwCursorMoveState* = nullptr, bool bTestBackground = false ) const override;
/// Get info from Client
virtual bool GetInfo( SfxPoolItem& ) const override;
diff --git a/sw/source/core/inc/rootfrm.hxx b/sw/source/core/inc/rootfrm.hxx
index 40179efd79ab..05d081019e67 100644
--- a/sw/source/core/inc/rootfrm.hxx
+++ b/sw/source/core/inc/rootfrm.hxx
@@ -225,7 +225,7 @@ public:
SdrPage* GetDrawPage() { return mpDrawPage; }
void SetDrawPage( SdrPage* pNew ){ mpDrawPage = pNew; }
- virtual bool GetCursorOfst( SwPosition *, Point&,
+ virtual bool GetModelPositionForViewPoint( SwPosition *, Point&,
SwCursorMoveState* = nullptr, bool bTestBackground = false ) const override;
virtual void PaintSwFrame( vcl::RenderContext& rRenderContext, SwRect const&,
diff --git a/sw/source/core/inc/swfont.hxx b/sw/source/core/inc/swfont.hxx
index 62cd74b81171..53e1027f488d 100644
--- a/sw/source/core/inc/swfont.hxx
+++ b/sw/source/core/inc/swfont.hxx
@@ -79,7 +79,7 @@ class SwSubFont : public SvxFont
void DrawStretchCapital( SwDrawTextInfo &rInf );
void DoOnCapitals( SwDoCapitals &rDo );
void DrawStretchText_( SwDrawTextInfo &rInf );
- TextFrameIndex GetCursorOfst_( SwDrawTextInfo& rInf );
+ TextFrameIndex GetModelPositionForViewPoint_( SwDrawTextInfo& rInf );
TextFrameIndex GetCapitalCursorOfst( SwDrawTextInfo& rInf );
inline void SetColor( const Color& rColor );
@@ -311,8 +311,8 @@ public:
TextFrameIndex GetTextBreak( SwDrawTextInfo const & rInf, long nTextWidth );
- TextFrameIndex GetCursorOfst_( SwDrawTextInfo& rInf )
- { return m_aSub[m_nActual].GetCursorOfst_( rInf ); }
+ TextFrameIndex GetModelPositionForViewPoint_( SwDrawTextInfo& rInf )
+ { return m_aSub[m_nActual].GetModelPositionForViewPoint_( rInf ); }
void DrawText_( SwDrawTextInfo &rInf )
{ m_aSub[m_nActual].DrawText_( rInf, IsGreyWave() ); }
diff --git a/sw/source/core/inc/txtfrm.hxx b/sw/source/core/inc/txtfrm.hxx
index 944929a5965f..4076f6a4b814 100644
--- a/sw/source/core/inc/txtfrm.hxx
+++ b/sw/source/core/inc/txtfrm.hxx
@@ -242,7 +242,7 @@ class SW_DLLPUBLIC SwTextFrame: public SwContentFrame
bool IsIdxInside(TextFrameIndex nPos, TextFrameIndex nLen) const;
// Changes the Frame or not (cf. FlyCnt)
- bool GetCursorOfst_(SwPosition *pPos, const Point &rPoint,
+ bool GetModelPositionForViewPoint_(SwPosition *pPos, const Point &rPoint,
const bool bChgFrame, SwCursorMoveState* = nullptr ) const;
void FillCursorPos( SwFillData &rFill ) const;
@@ -382,7 +382,7 @@ public:
* @returns false if the SPoint is outside of the SSize else
* returns true
*/
- virtual bool GetCursorOfst( SwPosition *, Point&,
+ virtual bool GetModelPositionForViewPoint( SwPosition *, Point&,
SwCursorMoveState* = nullptr, bool bTestBackground = false ) const override;
/**
@@ -390,7 +390,7 @@ public:
* character-bound Frame)
*/
bool GetKeyCursorOfst(SwPosition *pPos, const Point &rPoint ) const
- { return GetCursorOfst_( pPos, rPoint, false ); }
+ { return GetModelPositionForViewPoint_( pPos, rPoint, false ); }
void PaintExtraData( const SwRect & rRect ) const; /// Page number etc.
SwRect GetPaintSwRect();
diff --git a/sw/source/core/layout/flycnt.cxx b/sw/source/core/layout/flycnt.cxx
index bb5db884e4fd..3ffd236a6559 100644
--- a/sw/source/core/layout/flycnt.cxx
+++ b/sw/source/core/layout/flycnt.cxx
@@ -1336,7 +1336,7 @@ void SwFlyAtContentFrame::SetAbsPos( const Point &rNew )
SwTextFrame const*const pTextFrame(static_cast<SwTextFrame const*>(pCnt));
SwCursorMoveState eTmpState( MV_SETONLYTEXT );
Point aPt( rNew );
- if( pCnt->GetCursorOfst( &pos, aPt, &eTmpState )
+ if( pCnt->GetModelPositionForViewPoint( &pos, aPt, &eTmpState )
&& FrameContainsNode(*pTextFrame, pos.nNode.GetIndex()))
{
const SwTextAttr *const pTextInputField =
diff --git a/sw/source/core/layout/trvlfrm.cxx b/sw/source/core/layout/trvlfrm.cxx
index 4000db4d2511..3834898f5ea9 100644
--- a/sw/source/core/layout/trvlfrm.cxx
+++ b/sw/source/core/layout/trvlfrm.cxx
@@ -54,7 +54,7 @@
#include <comphelper/lok.hxx>
namespace {
- bool lcl_GetCursorOfst_Objects( const SwPageFrame* pPageFrame, bool bSearchBackground,
+ bool lcl_GetModelPositionForViewPoint_Objects( const SwPageFrame* pPageFrame, bool bSearchBackground,
SwPosition *pPos, Point const & rPoint, SwCursorMoveState* pCMS )
{
bool bRet = false;
@@ -76,7 +76,7 @@ namespace {
if ( pFly && bBackgroundMatches &&
( ( pCMS && pCMS->m_bSetInReadOnly ) ||
!pFly->IsProtected() ) &&
- pFly->GetCursorOfst( pPos, aPoint, pCMS ) )
+ pFly->GetModelPositionForViewPoint( pPos, aPoint, pCMS ) )
{
bRet = true;
break;
@@ -107,7 +107,7 @@ namespace {
namespace {
-//For SwFlyFrame::GetCursorOfst
+//For SwFlyFrame::GetModelPositionForViewPoint
class SwCursorOszControl
{
public:
@@ -147,7 +147,7 @@ public:
static SwCursorOszControl g_OszCtrl = { nullptr, nullptr, nullptr };
/** Searches the ContentFrame owning the PrtArea containing the point. */
-bool SwLayoutFrame::GetCursorOfst( SwPosition *pPos, Point &rPoint,
+bool SwLayoutFrame::GetModelPositionForViewPoint( SwPosition *pPos, Point &rPoint,
SwCursorMoveState* pCMS, bool ) const
{
vcl::RenderContext* pRenderContext = getRootFrame()->GetCurrShell()->GetOut();
@@ -164,7 +164,7 @@ bool SwLayoutFrame::GetCursorOfst( SwPosition *pPos, Point &rPoint,
pFrame->GetPaintArea() );
if ( aPaintRect.IsInside( rPoint ) &&
- ( bContentCheck || pFrame->GetCursorOfst( pPos, rPoint, pCMS ) ) )
+ ( bContentCheck || pFrame->GetModelPositionForViewPoint( pPos, rPoint, pCMS ) ) )
bRet = true;
else
pFrame = pFrame->GetNext();
@@ -176,7 +176,7 @@ bool SwLayoutFrame::GetCursorOfst( SwPosition *pPos, Point &rPoint,
/** Searches the page containing the searched point. */
-bool SwPageFrame::GetCursorOfst( SwPosition *pPos, Point &rPoint,
+bool SwPageFrame::GetModelPositionForViewPoint( SwPosition *pPos, Point &rPoint,
SwCursorMoveState* pCMS, bool bTestBackground ) const
{
Point aPoint( rPoint );
@@ -196,7 +196,7 @@ bool SwPageFrame::GetCursorOfst( SwPosition *pPos, Point &rPoint,
//all changes should be impossible.
if ( GetSortedObjs() )
{
- bRet = lcl_GetCursorOfst_Objects( this, false, pPos, rPoint, pCMS );
+ bRet = lcl_GetModelPositionForViewPoint_Objects( this, false, pPos, rPoint, pCMS );
}
if ( !bRet )
@@ -207,7 +207,7 @@ bool SwPageFrame::GetCursorOfst( SwPosition *pPos, Point &rPoint,
//We fix the StartPoint if no Content below the page 'answers' and then
//start all over again one page before the current one.
//However we can't use Flys in such a case.
- if (!SwLayoutFrame::GetCursorOfst(&aTextPos, aPoint, pCMS))
+ if (!SwLayoutFrame::GetModelPositionForViewPoint(&aTextPos, aPoint, pCMS))
{
if ( pCMS && (pCMS->m_bStop || pCMS->m_bExactOnly) )
{
@@ -224,9 +224,9 @@ bool SwPageFrame::GetCursorOfst( SwPosition *pPos, Point &rPoint,
OSL_ENSURE( pCnt, "Cursor is gone to a Black hole" );
if( pCMS && pCMS->m_pFill && pCnt->IsTextFrame() )
- bTextRet = pCnt->GetCursorOfst( &aTextPos, rPoint, pCMS );
+ bTextRet = pCnt->GetModelPositionForViewPoint( &aTextPos, rPoint, pCMS );
else
- bTextRet = pCnt->GetCursorOfst( &aTextPos, aPoint, pCMS );
+ bTextRet = pCnt->GetModelPositionForViewPoint( &aTextPos, aPoint, pCMS );
if ( !bTextRet )
{
@@ -263,7 +263,7 @@ bool SwPageFrame::GetCursorOfst( SwPosition *pPos, Point &rPoint,
// Check objects in the background if nothing else matched
if ( GetSortedObjs() )
{
- bBackRet = lcl_GetCursorOfst_Objects( this, true, &aBackPos, rPoint, pCMS );
+ bBackRet = lcl_GetModelPositionForViewPoint_Objects( this, true, &aBackPos, rPoint, pCMS );
}
if (bConsiderBackground && bTestBackground && bBackRet)
@@ -292,7 +292,7 @@ bool SwPageFrame::GetCursorOfst( SwPosition *pPos, Point &rPoint,
comphelper::FlagRestorationGuard g(
pState->m_bPosMatchesBounds, true);
SwPosition prevTextPos(*pPos);
- SwLayoutFrame::GetCursorOfst(&prevTextPos, aPoint, pState);
+ SwLayoutFrame::GetModelPositionForViewPoint(&prevTextPos, aPoint, pState);
SwRect aTextRect;
pTextFrame->GetCharRect(aTextRect, prevTextPos);
@@ -420,7 +420,7 @@ bool SwRootFrame::FillSelection( SwSelectionList& aSelList, const SwRect& rRect)
*
* @return false, if the passed Point gets changed
*/
-bool SwRootFrame::GetCursorOfst( SwPosition *pPos, Point &rPoint,
+bool SwRootFrame::GetModelPositionForViewPoint( SwPosition *pPos, Point &rPoint,
SwCursorMoveState* pCMS, bool bTestBackground ) const
{
const bool bOldAction = IsCallbackActionEnabled();
@@ -447,7 +447,7 @@ bool SwRootFrame::GetCursorOfst( SwPosition *pPos, Point &rPoint,
}
if ( pPage )
{
- pPage->SwPageFrame::GetCursorOfst( pPos, rPoint, pCMS, bTestBackground );
+ pPage->SwPageFrame::GetModelPositionForViewPoint( pPos, rPoint, pCMS, bTestBackground );
}
const_cast<SwRootFrame*>(this)->SetCallbackActionEnabled( bOldAction );
@@ -467,7 +467,7 @@ bool SwRootFrame::GetCursorOfst( SwPosition *pPos, Point &rPoint,
*
* There is no entry for protected cells.
*/
-bool SwCellFrame::GetCursorOfst( SwPosition *pPos, Point &rPoint,
+bool SwCellFrame::GetModelPositionForViewPoint( SwPosition *pPos, Point &rPoint,
SwCursorMoveState* pCMS, bool ) const
{
vcl::RenderContext* pRenderContext = getRootFrame()->GetCurrShell()->GetOut();
@@ -492,7 +492,7 @@ bool SwCellFrame::GetCursorOfst( SwPosition *pPos, Point &rPoint,
if ( Lower() )
{
if ( Lower()->IsLayoutFrame() )
- return SwLayoutFrame::GetCursorOfst( pPos, rPoint, pCMS );
+ return SwLayoutFrame::GetModelPositionForViewPoint( pPos, rPoint, pCMS );
else
{
Calc(pRenderContext);
@@ -504,7 +504,7 @@ bool SwCellFrame::GetCursorOfst( SwPosition *pPos, Point &rPoint,
pFrame->Calc(pRenderContext);
if ( pFrame->getFrameArea().IsInside( rPoint ) )
{
- bRet = pFrame->GetCursorOfst( pPos, rPoint, pCMS );
+ bRet = pFrame->GetModelPositionForViewPoint( pPos, rPoint, pCMS );
if ( pCMS && pCMS->m_bStop )
return false;
}
@@ -519,7 +519,7 @@ bool SwCellFrame::GetCursorOfst( SwPosition *pPos, Point &rPoint,
{
rPoint = aPoint;
}
- pCnt->GetCursorOfst( pPos, rPoint, pCMS );
+ pCnt->GetModelPositionForViewPoint( pPos, rPoint, pCMS );
}
return true;
}
@@ -534,8 +534,8 @@ bool SwCellFrame::GetCursorOfst( SwPosition *pPos, Point &rPoint,
//fly which lies completely inside the current Fly we could trigger an endless
//loop with the mentioned situation above.
//Using the helper class SwCursorOszControl we prevent the recursion. During
-//a recursion GetCursorOfst picks the one which lies on top.
-bool SwFlyFrame::GetCursorOfst( SwPosition *pPos, Point &rPoint,
+//a recursion GetModelPositionForViewPoint picks the one which lies on top.
+bool SwFlyFrame::GetModelPositionForViewPoint( SwPosition *pPos, Point &rPoint,
SwCursorMoveState* pCMS, bool ) const
{
vcl::RenderContext* pRenderContext = getRootFrame()->GetCurrShell()->GetOut();
@@ -543,7 +543,7 @@ bool SwFlyFrame::GetCursorOfst( SwPosition *pPos, Point &rPoint,
//If the Points lies inside the Fly, we try hard to set the Cursor inside it.
//However if the Point sits inside a Fly which is completely located inside
- //the current one, we call GetCursorOfst for it.
+ //the current one, we call GetModelPositionForViewPoint for it.
Calc(pRenderContext);
bool bInside = getFrameArea().IsInside( rPoint ) && Lower();
bool bRet = false;
@@ -568,7 +568,7 @@ bool SwFlyFrame::GetCursorOfst( SwPosition *pPos, Point &rPoint,
{
if (g_OszCtrl.ChkOsz(pFly))
break;
- bRet = pFly->GetCursorOfst( pPos, rPoint, pCMS );
+ bRet = pFly->GetModelPositionForViewPoint( pPos, rPoint, pCMS );
if ( bRet )
break;
if ( pCMS && pCMS->m_bStop )
@@ -586,7 +586,7 @@ bool SwFlyFrame::GetCursorOfst( SwPosition *pPos, Point &rPoint,
pFrame->Calc(pRenderContext);
if ( pFrame->getFrameArea().IsInside( rPoint ) )
{
- bRet = pFrame->GetCursorOfst( pPos, rPoint, pCMS );
+ bRet = pFrame->GetModelPositionForViewPoint( pPos, rPoint, pCMS );
if ( pCMS && pCMS->m_bStop )
return false;
}
@@ -603,7 +603,7 @@ bool SwFlyFrame::GetCursorOfst( SwPosition *pPos, Point &rPoint,
{
rPoint = aPoint;
}
- pCnt->GetCursorOfst( pPos, rPoint, pCMS );
+ pCnt->GetModelPositionForViewPoint( pPos, rPoint, pCMS );
bRet = true;
}
}
@@ -1459,7 +1459,7 @@ void SwPageFrame::GetContentPosition( const Point &rPt, SwPosition &rPos ) const
else
{
SwCursorMoveState aTmpState( MV_SETONLYTEXT );
- pAct->GetCursorOfst( &rPos, aAct, &aTmpState );
+ pAct->GetModelPositionForViewPoint( &rPos, aAct, &aTmpState );
}
}
diff --git a/sw/source/core/layout/unusedf.cxx b/sw/source/core/layout/unusedf.cxx
index 64df237862bd..fea1c055167b 100644
--- a/sw/source/core/layout/unusedf.cxx
+++ b/sw/source/core/layout/unusedf.cxx
@@ -43,9 +43,9 @@ bool SwFrame::FillSelection( SwSelectionList& , const SwRect& ) const
return false;
}
-bool SwFrame::GetCursorOfst( SwPosition *, Point&, SwCursorMoveState*, bool ) const
+bool SwFrame::GetModelPositionForViewPoint( SwPosition *, Point&, SwCursorMoveState*, bool ) const
{
- OSL_FAIL( "GetCursorOfst of the base class, hi!" );
+ OSL_FAIL( "GetModelPositionForViewPoint of the base class, hi!" );
return false;
}
diff --git a/sw/source/core/text/frmcrsr.cxx b/sw/source/core/text/frmcrsr.cxx
index ae7ca3d7d0ba..f146433df074 100644
--- a/sw/source/core/text/frmcrsr.cxx
+++ b/sw/source/core/text/frmcrsr.cxx
@@ -170,7 +170,7 @@ SwTextFrame *SwTextFrame::GetFrameAtPos( const SwPosition &rPos )
/*
* GetCharRect() returns the char's char line described by aPos.
- * GetCursorOfst() does the reverse: It goes from a document coordinate to
+ * GetModelPositionForViewPoint() does the reverse: It goes from a document coordinate to
* a Pam.
* Both are virtual in the frame base class and thus are redefined here.
*/
@@ -546,10 +546,10 @@ struct SwFillData
void SetOrient( const sal_Int16 eNew ){ pCMS->m_pFill->eOrient = eNew; }
};
-bool SwTextFrame::GetCursorOfst_(SwPosition* pPos, const Point& rPoint,
+bool SwTextFrame::GetModelPositionForViewPoint_(SwPosition* pPos, const Point& rPoint,
const bool bChgFrame, SwCursorMoveState* pCMS ) const
{
- // GetCursorOfst_ is called by GetCursorOfst and GetKeyCursorOfst.
+ // GetModelPositionForViewPoint_ is called by GetModelPositionForViewPoint and GetKeyCursorOfst.
// Never just a return false.
if( IsLocked() || IsHiddenNow() )
@@ -601,14 +601,14 @@ bool SwTextFrame::GetCursorOfst_(SwPosition* pPos, const Point& rPoint,
while( aLine.GetLineNr() > 1 )
aLine.Prev();
- TextFrameIndex nOffset = aLine.GetCursorOfst(pPos, rPoint, bChgFrame, pCMS);
+ TextFrameIndex nOffset = aLine.GetModelPositionForViewPoint(pPos, rPoint, bChgFrame, pCMS);
if( pCMS && pCMS->m_eState == MV_NONE && aLine.GetEnd() == nOffset )
pCMS->m_eState = MV_RIGHTMARGIN;
// pPos is a pure IN parameter and must not be evaluated.
- // pIter->GetCursorOfst returns from a nesting with COMPLETE_STRING.
- // If SwTextIter::GetCursorOfst calls GetCursorOfst further by itself
+ // pIter->GetModelPositionForViewPoint returns from a nesting with COMPLETE_STRING.
+ // If SwTextIter::GetModelPositionForViewPoint calls GetModelPositionForViewPoint further by itself
// nNode changes the position.
// In such cases, pPos must not be calculated.
if (TextFrameIndex(COMPLETE_STRING) != nOffset)
@@ -658,11 +658,11 @@ bool SwTextFrame::GetCursorOfst_(SwPosition* pPos, const Point& rPoint,
return true;
}
-bool SwTextFrame::GetCursorOfst(SwPosition* pPos, Point& rPoint,
+bool SwTextFrame::GetModelPositionForViewPoint(SwPosition* pPos, Point& rPoint,
SwCursorMoveState* pCMS, bool ) const
{
const bool bChgFrame = !(pCMS && MV_UPDOWN == pCMS->m_eState);
- return GetCursorOfst_( pPos, rPoint, bChgFrame, pCMS );
+ return GetModelPositionForViewPoint_( pPos, rPoint, bChgFrame, pCMS );
}
/*
@@ -825,12 +825,12 @@ bool SwTextFrame::UnitUp_( SwPaM *pPam, const SwTwips nOffset,
aCharBox.SSize().setWidth( aCharBox.SSize().Width() / 2 );
aCharBox.Pos().setX( aCharBox.Pos().X() - 150 );
- // See comment in SwTextFrame::GetCursorOfst()
+ // See comment in SwTextFrame::GetModelPositionForViewPoint()
#if OSL_DEBUG_LEVEL > 0
const sal_uLong nOldNode = pPam->GetPoint()->nNode.GetIndex();
#endif
// The node should not be changed
- TextFrameIndex nTmpOfst = aLine.GetCursorOfst(pPam->GetPoint(),
+ TextFrameIndex nTmpOfst = aLine.GetModelPositionForViewPoint(pPam->GetPoint(),
aCharBox.Pos(), false );
#if OSL_DEBUG_LEVEL > 0
OSL_ENSURE( nOldNode == pPam->GetPoint()->nNode.GetIndex(),
@@ -1187,13 +1187,13 @@ bool SwTextFrame::UnitDown_(SwPaM *pPam, const SwTwips nOffset,
{
aCharBox.SSize().setWidth( aCharBox.SSize().Width() / 2 );
#if OSL_DEBUG_LEVEL > 0
- // See comment in SwTextFrame::GetCursorOfst()
+ // See comment in SwTextFrame::GetModelPositionForViewPoint()
const sal_uLong nOldNode = pPam->GetPoint()->nNode.GetIndex();
#endif
if ( pNextLine && ! bFirstOfDouble )
aLine.NextLine();
- TextFrameIndex nTmpOfst = aLine.GetCursorOfst( pPam->GetPoint(),
+ TextFrameIndex nTmpOfst = aLine.GetModelPositionForViewPoint( pPam->GetPoint(),
aCharBox.Pos(), false );
#if OSL_DEBUG_LEVEL > 0
OSL_ENSURE( nOldNode == pPam->GetPoint()->nNode.GetIndex(),
diff --git a/sw/source/core/text/frminf.cxx b/sw/source/core/text/frminf.cxx
index ac25d9d1c1b4..f42fef6954b0 100644
--- a/sw/source/core/text/frminf.cxx
+++ b/sw/source/core/text/frminf.cxx
@@ -264,7 +264,7 @@ sal_Int32 SwTextFrameInfo::GetBigIndent(TextFrameIndex& rFndPos,
return 0;
const Point aPoint( nNextIndent, aLine.Y() );
- rFndPos = aLine.GetCursorOfst( nullptr, aPoint, false );
+ rFndPos = aLine.GetModelPositionForViewPoint( nullptr, aPoint, false );
if (TextFrameIndex(1) >= rFndPos)
return 0;
diff --git a/sw/source/core/text/itrcrsr.cxx b/sw/source/core/text/itrcrsr.cxx
index 6d653e7e04b3..44d7485185df 100644
--- a/sw/source/core/text/itrcrsr.cxx
+++ b/sw/source/core/text/itrcrsr.cxx
@@ -1251,7 +1251,7 @@ void SwTextCursor::GetCharRect( SwRect* pOrig, TextFrameIndex const nOfst,
}
/**
- * Determines if SwTextCursor::GetCursorOfst() should consider the next portion when calculating the
+ * Determines if SwTextCursor::GetModelPositionForViewPoint() should consider the next portion when calculating the
* doc model position from a Point.
*/
static bool ConsiderNextPortionForCursorOffset(const SwLinePortion* pPor, sal_uInt16 nWidth30, sal_uInt16 nX)
@@ -1272,7 +1272,7 @@ static bool ConsiderNextPortionForCursorOffset(const SwLinePortion* pPor, sal_uI
}
// Return: Offset in String
-TextFrameIndex SwTextCursor::GetCursorOfst( SwPosition *pPos, const Point &rPoint,
+TextFrameIndex SwTextCursor::GetModelPositionForViewPoint( SwPosition *pPos, const Point &rPoint,
bool bChgNode, SwCursorMoveState* pCMS ) const
{
// If necessary, as catch up, do the adjustment
@@ -1556,7 +1556,7 @@ TextFrameIndex SwTextCursor::GetCursorOfst( SwPosition *pPos, const Point &rPoin
{
if( pPor->IsMultiPortion() )
{
- // In a multi-portion we use GetCursorOfst()-function recursively
+ // In a multi-portion we use GetModelPositionForViewPoint()-function recursively
SwTwips nTmpY = rPoint.Y() - m_pCurr->GetAscent() + pPor->GetAscent();
// if we are in the first line of a double line portion, we have
// to add a value to nTmpY for not staying in this line
@@ -1603,7 +1603,7 @@ TextFrameIndex SwTextCursor::GetCursorOfst( SwPosition *pPos, const Point &rPoin
nX = 0;
}
- return GetCursorOfst( pPos, Point( GetLineStart() + nX, rPoint.Y() ),
+ return GetModelPositionForViewPoint( pPos, Point( GetLineStart() + nX, rPoint.Y() ),
bChgNode, pCMS );
}
if( pPor->InTextGrp() )
@@ -1689,7 +1689,7 @@ TextFrameIndex SwTextCursor::GetCursorOfst( SwPosition *pPos, const Point &rPoin
! pPor->InFieldGrp() )
aDrawInf.SetKanaComp( nKanaComp );
- nLength = aSizeInf.GetFont()->GetCursorOfst_( aDrawInf );
+ nLength = aSizeInf.GetFont()->GetModelPositionForViewPoint_( aDrawInf );
// get position inside field portion?
if ( pPor->InFieldGrp() && pCMS && pCMS->m_pSpecialPos )
@@ -1740,13 +1740,13 @@ TextFrameIndex SwTextCursor::GetCursorOfst( SwPosition *pPos, const Point &rPoin
// For comparison: Paint and new SwFlyCntPortion !
static_cast<SwTextSizeInfo*>(m_pInf)->SelectFont();
- // 6776: The pIter->GetCursorOfst is returning here
+ // 6776: The pIter->GetModelPositionForViewPoint is returning here
// from a nesting with COMPLETE_STRING.
return TextFrameIndex(COMPLETE_STRING);
}
}
else
- nLength = pPor->GetCursorOfst( nX );
+ nLength = pPor->GetModelPositionForViewPoint( nX );
}
}
nOffset = nCurrStart + nLength;
@@ -1844,7 +1844,7 @@ bool SwTextFrame::FillSelection( SwSelectionList& rSelList, const SwRect& rRect
// Looking for the position of the left border of the rectangle
// in this text line
SwCursorMoveState aState( MV_UPDOWN );
- if( GetCursorOfst( &aPosL, aPoint, &aState ) )
+ if( GetModelPositionForViewPoint( &aPosL, aPoint, &aState ) )
{
if( aRectFnSet.IsVert() )
{
@@ -1860,7 +1860,7 @@ bool SwTextFrame::FillSelection( SwSelectionList& rSelList, const SwRect& rRect
// is not the same like the left position of the line before
// which could happen e.g. for field portions or fly frames
// a SwPaM will be inserted with these positions
- if( GetCursorOfst( &aPosR, aPoint, &aState ) &&
+ if( GetModelPositionForViewPoint( &aPosR, aPoint, &aState ) &&
aOld != aPosL)
{
SwPaM *pPam = new SwPaM( aPosL, aPosR );
diff --git a/sw/source/core/text/itrtxt.hxx b/sw/source/core/text/itrtxt.hxx
index 9c4e5eacb015..064f62c9f153 100644
--- a/sw/source/core/text/itrtxt.hxx
+++ b/sw/source/core/text/itrtxt.hxx
@@ -280,7 +280,7 @@ public:
const long nMax = 0 );
void GetEndCharRect(SwRect *, TextFrameIndex, SwCursorMoveState* = nullptr,
const long nMax = 0 );
- TextFrameIndex GetCursorOfst( SwPosition *pPos, const Point &rPoint,
+ TextFrameIndex GetModelPositionForViewPoint( SwPosition *pPos, const Point &rPoint,
bool bChgNode, SwCursorMoveState* = nullptr ) const;
// Respects ambiguities: For the implementation see below
const SwLineLayout *CharCursorToLine(TextFrameIndex const nPos);
diff --git a/sw/source/core/text/pordrop.hxx b/sw/source/core/text/pordrop.hxx
index 2001260768dd..96ba5aed876d 100644
--- a/sw/source/core/text/pordrop.hxx
+++ b/sw/source/core/text/pordrop.hxx
@@ -83,7 +83,7 @@ public:
void PaintDrop( const SwTextPaintInfo &rInf ) const;
virtual bool Format( SwTextFormatInfo &rInf ) override;
virtual SwPosSize GetTextSize( const SwTextSizeInfo &rInfo ) const override;
- virtual TextFrameIndex GetCursorOfst(sal_uInt16 nOfst) const override;
+ virtual TextFrameIndex GetModelPositionForViewPoint(sal_uInt16 nOfst) const override;
sal_uInt16 GetLines() const { return nLines; }
sal_uInt16 GetDistance() const { return nDistance; }
diff --git a/sw/source/core/text/porexp.cxx b/sw/source/core/text/porexp.cxx
index 0eff0701a6d1..659b5532d3b9 100644
--- a/sw/source/core/text/porexp.cxx
+++ b/sw/source/core/text/porexp.cxx
@@ -22,8 +22,8 @@
#include "inftxt.hxx"
#include "porexp.hxx"
-TextFrameIndex SwExpandPortion::GetCursorOfst(const sal_uInt16 nOfst) const
-{ return SwLinePortion::GetCursorOfst( nOfst ); }
+TextFrameIndex SwExpandPortion::GetModelPositionForViewPoint(const sal_uInt16 nOfst) const
+{ return SwLinePortion::GetModelPositionForViewPoint( nOfst ); }
bool SwExpandPortion::GetExpText( const SwTextSizeInfo&, OUString &rText ) const
{
diff --git a/sw/source/core/text/porexp.hxx b/sw/source/core/text/porexp.hxx
index 6ab851ad3b2b..22a8aef317ba 100644
--- a/sw/source/core/text/porexp.hxx
+++ b/sw/source/core/text/porexp.hxx
@@ -27,7 +27,7 @@ class SwExpandPortion : public SwTextPortion
public:
SwExpandPortion() { SetWhichPor( PortionType::Expand ); }
virtual bool Format( SwTextFormatInfo &rInf ) override;
- virtual TextFrameIndex GetCursorOfst(sal_uInt16 nOfst) const override;
+ virtual TextFrameIndex GetModelPositionForViewPoint(sal_uInt16 nOfst) const override;
virtual bool GetExpText( const SwTextSizeInfo &rInf, OUString &rText ) const override;
virtual SwPosSize GetTextSize( const SwTextSizeInfo &rInfo ) const override;
virtual void Paint( const SwTextPaintInfo &rInf ) const override;
diff --git a/sw/source/core/text/porfld.cxx b/sw/source/core/text/porfld.cxx
index 8a2b2f0a100a..41700584368c 100644
--- a/sw/source/core/text/porfld.cxx
+++ b/sw/source/core/text/porfld.cxx
@@ -512,7 +512,7 @@ SwNumberPortion::SwNumberPortion( const OUString &rExpand,
SetCenter( bCntr );
}
-TextFrameIndex SwNumberPortion::GetCursorOfst(const sal_uInt16) const
+TextFrameIndex SwNumberPortion::GetModelPositionForViewPoint(const sal_uInt16) const
{
return TextFrameIndex(0);
}
diff --git a/sw/source/core/text/porfld.hxx b/sw/source/core/text/porfld.hxx
index c8d7b7942ac5..2c87ed1ef25c 100644
--- a/sw/source/core/text/porfld.hxx
+++ b/sw/source/core/text/porfld.hxx
@@ -132,7 +132,7 @@ public:
const sal_uInt16 nMinDst,
const bool bLabelAlignmentPosAndSpaceModeActive );
virtual void Paint( const SwTextPaintInfo &rInf ) const override;
- virtual TextFrameIndex GetCursorOfst(sal_uInt16 nOfst) const override;
+ virtual TextFrameIndex GetModelPositionForViewPoint(sal_uInt16 nOfst) const override;
virtual bool Format( SwTextFormatInfo &rInf ) override;
// Field cloner for SplitGlue
diff --git a/sw/source/core/text/porfly.hxx b/sw/source/core/text/porfly.hxx
index 7d859ad1d7bf..c01abd4994fa 100644
--- a/sw/source/core/text/porfly.hxx
+++ b/sw/source/core/text/porfly.hxx
@@ -70,7 +70,7 @@ namespace sw
FlyContentPortion(SwFlyInContentFrame* pFly);
static FlyContentPortion* Create(const SwTextFrame& rFrame, SwFlyInContentFrame* pFly, const Point& rBase, long nAscent, long nDescent, long nFlyAsc, long nFlyDesc, AsCharFlags nFlags);
SwFlyInContentFrame* GetFlyFrame() { return m_pFly; }
- void GetFlyCursorOfst(Point& rPoint, SwPosition& rPos, SwCursorMoveState* pCMS) const { m_pFly->GetCursorOfst(&rPos, rPoint, pCMS); };
+ void GetFlyCursorOfst(Point& rPoint, SwPosition& rPos, SwCursorMoveState* pCMS) const { m_pFly->GetModelPositionForViewPoint(&rPos, rPoint, pCMS); };
virtual void Paint(const SwTextPaintInfo& rInf) const override;
virtual ~FlyContentPortion() override;
};
diff --git a/sw/source/core/text/porftn.hxx b/sw/source/core/text/porftn.hxx
index 49a3d5df2faa..5c6ea9a68616 100644
--- a/sw/source/core/text/porftn.hxx
+++ b/sw/source/core/text/porftn.hxx
@@ -90,7 +90,7 @@ class SwErgoSumPortion : public SwFieldPortion
{
public:
SwErgoSumPortion( const OUString &rExp, const OUString& rStr );
- virtual TextFrameIndex GetCursorOfst(sal_uInt16 nOfst) const override;
+ virtual TextFrameIndex GetModelPositionForViewPoint(sal_uInt16 nOfst) const override;
virtual bool Format( SwTextFormatInfo &rInf ) override;
// Field cloner for SplitGlue
diff --git a/sw/source/core/text/porglue.cxx b/sw/source/core/text/porglue.cxx
index 55de11a6d723..0d34ea304919 100644
--- a/sw/source/core/text/porglue.cxx
+++ b/sw/source/core/text/porglue.cxx
@@ -32,11 +32,11 @@ SwGluePortion::SwGluePortion( const sal_uInt16 nInitFixWidth )
SetWhichPor( PortionType::Glue );
}
-TextFrameIndex SwGluePortion::GetCursorOfst(const sal_uInt16 nOfst) const
+TextFrameIndex SwGluePortion::GetModelPositionForViewPoint(const sal_uInt16 nOfst) const
{
// FIXME why nOfst > GetLen() ? is that supposed to be > Width() ?
if( !GetLen() || nOfst > sal_Int32(GetLen()) || !Width() )
- return SwLinePortion::GetCursorOfst( nOfst );
+ return SwLinePortion::GetModelPositionForViewPoint( nOfst );
else
return TextFrameIndex(nOfst / (Width() / sal_Int32(GetLen())));
}
diff --git a/sw/source/core/text/porglue.hxx b/sw/source/core/text/porglue.hxx
index 0a4ac95b1dc3..27e9b0dabb52 100644
--- a/sw/source/core/text/porglue.hxx
+++ b/sw/source/core/text/porglue.hxx
@@ -41,7 +41,7 @@ public:
inline void MoveHalfGlue( SwGluePortion *pTarget );
inline void AdjFixWidth();
virtual void Paint( const SwTextPaintInfo &rInf ) const override;
- virtual TextFrameIndex GetCursorOfst(sal_uInt16 nOfst) const override;
+ virtual TextFrameIndex GetModelPositionForViewPoint(sal_uInt16 nOfst) const override;
virtual SwPosSize GetTextSize( const SwTextSizeInfo &rInfo ) const override;
virtual bool GetExpText( const SwTextSizeInfo &rInf, OUString &rText ) const override;
};
diff --git a/sw/source/core/text/porlin.cxx b/sw/source/core/text/porlin.cxx
index 3d5cb26aa4be..8b51ebb2e07f 100644
--- a/sw/source/core/text/porlin.cxx
+++ b/sw/source/core/text/porlin.cxx
@@ -222,7 +222,7 @@ SwLinePortion *SwLinePortion::FindPrevPortion( const SwLinePortion *pRoot )
return pPos;
}
-TextFrameIndex SwLinePortion::GetCursorOfst(const sal_uInt16 nOfst) const
+TextFrameIndex SwLinePortion::GetModelPositionForViewPoint(const sal_uInt16 nOfst) const
{
if( nOfst > ( PrtWidth() / 2 ) )
return GetLen();
diff --git a/sw/source/core/text/porlin.hxx b/sw/source/core/text/porlin.hxx
index ca7bc1a34fe1..615c90022d23 100644
--- a/sw/source/core/text/porlin.hxx
+++ b/sw/source/core/text/porlin.hxx
@@ -140,7 +140,7 @@ public:
SwLinePortion *FindLastPortion();
/// the parameter is actually SwTwips apparently?
- virtual TextFrameIndex GetCursorOfst(sal_uInt16 nOfst) const;
+ virtual TextFrameIndex GetModelPositionForViewPoint(sal_uInt16 nOfst) const;
virtual SwPosSize GetTextSize( const SwTextSizeInfo &rInfo ) const;
void CalcTextSize( const SwTextSizeInfo &rInfo );
diff --git a/sw/source/core/text/pormulti.cxx b/sw/source/core/text/pormulti.cxx
index 5e991cc4bed3..c7ac050d1bc7 100644
--- a/sw/source/core/text/pormulti.cxx
+++ b/sw/source/core/text/pormulti.cxx
@@ -2499,7 +2499,7 @@ SwLinePortion* SwTextFormatter::MakeRestPortion( const SwLineLayout* pLine,
}
// SwTextCursorSave notes the start and current line of a SwTextCursor,
-// sets them to the values for GetCursorOfst inside a multiportion
+// sets them to the values for GetModelPositionForViewPoint inside a multiportion
// and restores them in the destructor.
SwTextCursorSave::SwTextCursorSave( SwTextCursor* pCursor,
SwMultiPortion* pMulti,
diff --git a/sw/source/core/text/porrst.cxx b/sw/source/core/text/porrst.cxx
index 92c471d61e01..98ad3b82a69f 100644
--- a/sw/source/core/text/porrst.cxx
+++ b/sw/source/core/text/porrst.cxx
@@ -77,7 +77,7 @@ SwBreakPortion::SwBreakPortion( const SwLinePortion &rPortion )
SetWhichPor( PortionType::Break );
}
-TextFrameIndex SwBreakPortion::GetCursorOfst(const sal_uInt16) const
+TextFrameIndex SwBreakPortion::GetModelPositionForViewPoint(const sal_uInt16) const
{
return TextFrameIndex(0);
}
diff --git a/sw/source/core/text/porrst.hxx b/sw/source/core/text/porrst.hxx
index dcb2cfcae7e9..623849c15453 100644
--- a/sw/source/core/text/porrst.hxx
+++ b/sw/source/core/text/porrst.hxx
@@ -54,7 +54,7 @@ public:
virtual void Paint( const SwTextPaintInfo &rInf ) const override;
virtual bool Format( SwTextFormatInfo &rInf ) override;
virtual sal_uInt16 GetViewWidth( const SwTextSizeInfo &rInf ) const override;
- virtual TextFrameIndex GetCursorOfst(sal_uInt16 nOfst) const override;
+ virtual TextFrameIndex GetModelPositionForViewPoint(sal_uInt16 nOfst) const override;
// Accessibility: pass information about this portion to the PortionHandler
virtual void HandlePortion( SwPortionHandler& rPH ) const override;
diff --git a/sw/source/core/text/portxt.cxx b/sw/source/core/text/portxt.cxx
index d40b4d12226c..ea16142b9f33 100644
--- a/sw/source/core/text/portxt.cxx
+++ b/sw/source/core/text/portxt.cxx
@@ -498,10 +498,10 @@ void SwTextPortion::FormatEOL( SwTextFormatInfo &rInf )
}
-TextFrameIndex SwTextPortion::GetCursorOfst(const sal_uInt16 nOfst) const
+TextFrameIndex SwTextPortion::GetModelPositionForViewPoint(const sal_uInt16 nOfst) const
{
- OSL_ENSURE( false, "SwTextPortion::GetCursorOfst: don't use this method!" );
- return SwLinePortion::GetCursorOfst( nOfst );
+ OSL_ENSURE( false, "SwTextPortion::GetModelPositionForViewPoint: don't use this method!" );
+ return SwLinePortion::GetModelPositionForViewPoint( nOfst );
}
// The GetTextSize() assumes that the own length is correct
diff --git a/sw/source/core/text/portxt.hxx b/sw/source/core/text/portxt.hxx
index 7ae5cef12f0f..88e81a358e67 100644
--- a/sw/source/core/text/portxt.hxx
+++ b/sw/source/core/text/portxt.hxx
@@ -36,7 +36,7 @@ public:
virtual void Paint( const SwTextPaintInfo &rInf ) const override;
virtual bool Format( SwTextFormatInfo &rInf ) override;
virtual void FormatEOL( SwTextFormatInfo &rInf ) override;
- virtual TextFrameIndex GetCursorOfst(sal_uInt16 nOfst) const override;
+ virtual TextFrameIndex GetModelPositionForViewPoint(sal_uInt16 nOfst) const override;
virtual SwPosSize GetTextSize( const SwTextSizeInfo &rInfo ) const override;
virtual bool GetExpText( const SwTextSizeInfo &rInf, OUString &rText ) const override;
virtual long CalcSpacing( long nSpaceAdd, const SwTextSizeInfo &rInf ) const override;
diff --git a/sw/source/core/text/txtdrop.cxx b/sw/source/core/text/txtdrop.cxx
index db4f09a19e45..34662b3d4237 100644
--- a/sw/source/core/text/txtdrop.cxx
+++ b/sw/source/core/text/txtdrop.cxx
@@ -478,7 +478,7 @@ SwPosSize SwDropPortion::GetTextSize( const SwTextSizeInfo &rInf ) const
return aPosSize;
}
-TextFrameIndex SwDropPortion::GetCursorOfst(const sal_uInt16) const
+TextFrameIndex SwDropPortion::GetModelPositionForViewPoint(const sal_uInt16) const
{
return TextFrameIndex(0);
}
diff --git a/sw/source/core/text/txtftn.cxx b/sw/source/core/text/txtftn.cxx
index 97557d7ad98e..fde611eabbb1 100644
--- a/sw/source/core/text/txtftn.cxx
+++ b/sw/source/core/text/txtftn.cxx
@@ -1482,7 +1482,7 @@ SwErgoSumPortion::SwErgoSumPortion(const OUString &rExp, const OUString& rStr)
SetWhichPor( PortionType::ErgoSum );
}
-TextFrameIndex SwErgoSumPortion::GetCursorOfst(const sal_uInt16) const
+TextFrameIndex SwErgoSumPortion::GetModelPositionForViewPoint(const sal_uInt16) const
{
return TextFrameIndex(0);
}
diff --git a/sw/source/core/txtnode/fntcache.cxx b/sw/source/core/txtnode/fntcache.cxx
index 0ed8984d4ec6..55968e13fdd9 100644
--- a/sw/source/core/txtnode/fntcache.cxx
+++ b/sw/source/core/txtnode/fntcache.cxx
@@ -2081,7 +2081,7 @@ Size SwFntObj::GetTextSize( SwDrawTextInfo& rInf )
return aTextSize;
}
-TextFrameIndex SwFntObj::GetCursorOfst(SwDrawTextInfo &rInf)
+TextFrameIndex SwFntObj::GetModelPositionForViewPoint(SwDrawTextInfo &rInf)
{
long nSpaceAdd = rInf.GetSpace() / SPACING_PRECISION_FACTOR;
const long nSperren = -rInf.GetSperren() / SPACING_PRECISION_FACTOR;
diff --git a/sw/source/core/txtnode/fntcap.cxx b/sw/source/core/txtnode/fntcap.cxx
index da9382f78f88..98fca76d705f 100644
--- a/sw/source/core/txtnode/fntcap.cxx
+++ b/sw/source/core/txtnode/fntcap.cxx
@@ -379,12 +379,12 @@ void SwDoCapitalCursorOfst::Do()
if ( rInf.GetUpper() )
{
aDrawInf.SetSpace( 0 );
- nCursor = nCursor + pUpperFnt->GetCursorOfst( aDrawInf );
+ nCursor = nCursor + pUpperFnt->GetModelPositionForViewPoint( aDrawInf );
}
else
{
aDrawInf.SetSpace( rInf.GetSpace() );
- nCursor = nCursor + pLowerFnt->GetCursorOfst( aDrawInf );
+ nCursor = nCursor + pLowerFnt->GetModelPositionForViewPoint( aDrawInf );
}
nOfst = 0;
}
diff --git a/sw/source/core/txtnode/swfont.cxx b/sw/source/core/txtnode/swfont.cxx
index b398fa8f8d81..8d7a4f42468e 100644
--- a/sw/source/core/txtnode/swfont.cxx
+++ b/sw/source/core/txtnode/swfont.cxx
@@ -1359,7 +1359,7 @@ void SwSubFont::DrawStretchText_( SwDrawTextInfo &rInf )
rInf.SetPos(aOldPos);
}
-TextFrameIndex SwSubFont::GetCursorOfst_( SwDrawTextInfo& rInf )
+TextFrameIndex SwSubFont::GetModelPositionForViewPoint_( SwDrawTextInfo& rInf )
{
if ( !pLastFont || pLastFont->GetOwner() != reinterpret_cast<const void*>(m_nFontCacheId) )
ChgFnt( rInf.GetShell(), rInf.GetOut() );
@@ -1380,11 +1380,11 @@ TextFrameIndex SwSubFont::GetCursorOfst_( SwDrawTextInfo& rInf )
rInf.SetKern( CheckKerning() );
SV_STAT( nGetTextSize );
if ( !IsCaseMap() )
- nCursor = pLastFont->GetCursorOfst( rInf );
+ nCursor = pLastFont->GetModelPositionForViewPoint( rInf );
else
{
rInf.SetText( CalcCaseMap( rInf.GetText() ) );
- nCursor = pLastFont->GetCursorOfst( rInf );
+ nCursor = pLastFont->GetModelPositionForViewPoint( rInf );
}
rInf.SetKern( nOldKern );
rInf.SetText(oldText);
diff --git a/sw/source/core/unocore/unodraw.cxx b/sw/source/core/unocore/unodraw.cxx
index 3b911846e66c..f26ac1dde4aa 100644
--- a/sw/source/core/unocore/unodraw.cxx
+++ b/sw/source/core/unocore/unodraw.cxx
@@ -688,7 +688,7 @@ void SwXDrawPage::add(const uno::Reference< drawing::XShape > & xShape)
{
SwCursorMoveState aState( MV_SETONLYTEXT );
Point aTmp(convertMm100ToTwip(aMM100Pos.X), convertMm100ToTwip(aMM100Pos.Y));
- pDoc->getIDocumentLayoutAccess().GetCurrentLayout()->GetCursorOfst( pPam->GetPoint(), aTmp, &aState );
+ pDoc->getIDocumentLayoutAccess().GetCurrentLayout()->GetModelPositionForViewPoint( pPam->GetPoint(), aTmp, &aState );
aAnchor.SetAnchor( pPam->GetPoint() );
// #i32349# - adjustment of vertical positioning
@@ -1267,7 +1267,7 @@ void SwXShape::setPropertyValue(const OUString& rPropertyName, const uno::Any& a
{
SwCursorMoveState aState( MV_SETONLYTEXT );
Point aTmp( pObj->GetSnapRect().TopLeft() );
- pDoc->getIDocumentLayoutAccess().GetCurrentLayout()->GetCursorOfst( aPam.GetPoint(), aTmp, &aState );
+ pDoc->getIDocumentLayoutAccess().GetCurrentLayout()->GetModelPositionForViewPoint( aPam.GetPoint(), aTmp, &aState );
}
else
{
@@ -1288,7 +1288,7 @@ void SwXShape::setPropertyValue(const OUString& rPropertyName, const uno::Any& a
{
SwCursorMoveState aState( MV_SETONLYTEXT );
Point aTmp( pObj->GetSnapRect().TopLeft() );
- pDoc->getIDocumentLayoutAccess().GetCurrentLayout()->GetCursorOfst( aPam.GetPoint(), aTmp, &aState );
+ pDoc->getIDocumentLayoutAccess().GetCurrentLayout()->GetModelPositionForViewPoint( aPam.GetPoint(), aTmp, &aState );
}
else
{
diff --git a/sw/source/uibase/docvw/edtwin.cxx b/sw/source/uibase/docvw/edtwin.cxx
index e190e0f1b391..45995e6c9e7f 100644
--- a/sw/source/uibase/docvw/edtwin.cxx
+++ b/sw/source/uibase/docvw/edtwin.cxx
@@ -6200,7 +6200,7 @@ bool SwEditWin::IsOverHeaderFooterFly( const Point& rDocPos, FrameControlType& r
Point aPt( rDocPos );
SwWrtShell &rSh = m_rView.GetWrtShell();
SwPaM aPam( *rSh.GetCurrentShellCursor().GetPoint() );
- rSh.GetLayout()->GetCursorOfst( aPam.GetPoint(), aPt, nullptr, true );
+ rSh.GetLayout()->GetModelPositionForViewPoint( aPam.GetPoint(), aPt, nullptr, true );
const SwStartNode* pStartFly = aPam.GetPoint()->nNode.GetNode().FindFlyStartNode();
if ( pStartFly )
More information about the Libreoffice-commits
mailing list