summaryrefslogtreecommitdiff
path: root/sw/source/core/crsr/viscrs.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'sw/source/core/crsr/viscrs.cxx')
-rw-r--r--sw/source/core/crsr/viscrs.cxx13
1 files changed, 9 insertions, 4 deletions
diff --git a/sw/source/core/crsr/viscrs.cxx b/sw/source/core/crsr/viscrs.cxx
index 4a2b73d5a194..1b437fe76e33 100644
--- a/sw/source/core/crsr/viscrs.cxx
+++ b/sw/source/core/crsr/viscrs.cxx
@@ -142,7 +142,7 @@ void SwVisibleCursor::SetPosAndShow(SfxViewShell const * pViewShell)
if( rNode.IsTextNode() )
{
const SwTextNode& rTNd = *rNode.GetTextNode();
- const SwFrame* pFrame = rTNd.getLayoutFrame( m_pCursorShell->GetLayout(), nullptr, nullptr, false );
+ const SwFrame* pFrame = rTNd.getLayoutFrame(m_pCursorShell->GetLayout(), nullptr, nullptr);
if ( pFrame )
{
const SwScriptInfo* pSI = static_cast<const SwTextFrame*>(pFrame)->GetScriptInfo();
@@ -290,7 +290,10 @@ void SwSelPaintRects::Hide()
static SwRect lcl_getLayoutRect(const Point& rPoint, const SwPosition& rPosition)
{
const SwContentNode* pNode = rPosition.nNode.GetNode().GetContentNode();
- const SwContentFrame* pFrame = pNode->getLayoutFrame(pNode->GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout(), &rPoint, &rPosition);
+ std::pair<Point, bool> const tmp(rPoint, true);
+ const SwContentFrame* pFrame = pNode->getLayoutFrame(
+ pNode->GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout(),
+ &rPosition, &tmp);
SwRect aRect;
pFrame->GetCharRect(aRect, rPosition);
return aRect;
@@ -784,7 +787,8 @@ void SwShellTableCursor::FillRects()
if( !pCNd )
continue;
- SwFrame* pFrame = pCNd->getLayoutFrame( GetShell()->GetLayout(), &GetSttPos() );
+ std::pair<Point, bool> const tmp(GetSttPos(), true);
+ SwFrame* pFrame = pCNd->getLayoutFrame(GetShell()->GetLayout(), nullptr, &tmp);
while( pFrame && !pFrame->IsCellFrame() )
pFrame = pFrame->GetUpper();
@@ -833,7 +837,8 @@ bool SwShellTableCursor::IsInside( const Point& rPt ) const
if( !pCNd )
continue;
- SwFrame* pFrame = pCNd->getLayoutFrame( GetShell()->GetLayout(), &GetPtPos() );
+ std::pair<Point, bool> const tmp(GetPtPos(), true);
+ SwFrame* pFrame = pCNd->getLayoutFrame(GetShell()->GetLayout(), nullptr, &tmp);
while( pFrame && !pFrame->IsCellFrame() )
pFrame = pFrame->GetUpper();
OSL_ENSURE( pFrame, "Node not in a table" );