Kaydet (Commit) 06c8b802 authored tarafından Michael Stahl's avatar Michael Stahl

sw_redlinehide: trivial conversions callnk.cxx,swcrsr.cxx,trvlfnfl.cxx

Change-Id: Ice8d5b3356ac8fa84439eaf0b785ae56c2de9274
üst 845a6570
...@@ -227,9 +227,12 @@ long SwCallLink::getLayoutFrame( const SwRootFrame* pRoot, SwTextNode const & rN ...@@ -227,9 +227,12 @@ long SwCallLink::getLayoutFrame( const SwRootFrame* pRoot, SwTextNode const & rN
if ( pFrame && !pFrame->IsHiddenNow() ) if ( pFrame && !pFrame->IsHiddenNow() )
{ {
if( pFrame->HasFollow() ) if( pFrame->HasFollow() )
{
TextFrameIndex const nPos(pFrame->MapModelToView(&rNd, nCntPos));
while( nullptr != ( pNext = pFrame->GetFollow() ) && while( nullptr != ( pNext = pFrame->GetFollow() ) &&
nCntPos >= pNext->GetOfst() ) nPos >= pNext->GetOfst())
pFrame = pNext; pFrame = pNext;
}
return pFrame->getFrameArea().Left(); return pFrame->getFrameArea().Left();
} }
......
...@@ -1581,9 +1581,12 @@ SwCursor::DoSetBidiLevelLeftRight( ...@@ -1581,9 +1581,12 @@ SwCursor::DoSetBidiLevelLeftRight(
{ {
sal_uInt8 nCursorLevel = GetCursorBidiLevel(); sal_uInt8 nCursorLevel = GetCursorBidiLevel();
bool bForward = ! io_rbLeft; bool bForward = ! io_rbLeft;
const_cast<SwTextFrame*>(static_cast<const SwTextFrame*>(pSttFrame))->PrepareVisualMove( nPos, nCursorLevel, SwTextFrame *const pTF(const_cast<SwTextFrame*>(
static_cast<const SwTextFrame*>(pSttFrame)));
TextFrameIndex nTFIndex(pTF->MapModelToViewPos(*GetPoint()));
pTF->PrepareVisualMove( nTFIndex, nCursorLevel,
bForward, bInsertCursor ); bForward, bInsertCursor );
rIdx = nPos; *GetPoint() = pTF->MapViewToModelPos(nTFIndex);
SetCursorBidiLevel( nCursorLevel ); SetCursorBidiLevel( nCursorLevel );
io_rbLeft = ! bForward; io_rbLeft = ! bForward;
} }
......
...@@ -100,11 +100,10 @@ bool SwCursorShell::GotoFootnoteText() ...@@ -100,11 +100,10 @@ bool SwCursorShell::GotoFootnoteText()
(pFrame)->ContainsContent(); (pFrame)->ContainsContent();
if( pCnt ) if( pCnt )
{ {
const SwContentNode* pNode = pCnt->GetNode(); SwTextFrame const*const pTF(
GetCursor_()->GetPoint()->nNode = *pNode; static_cast<const SwTextFrame*>(pCnt));
GetCursor_()->GetPoint()->nContent.Assign( *GetCursor_()->GetPoint() =
const_cast<SwContentNode*>(pNode), pTF->MapViewToModelPos(pTF->GetOfst());
static_cast<const SwTextFrame*>(pCnt)->GetOfst() );
UpdateCursor( SwCursorShell::SCROLLWIN | UpdateCursor( SwCursorShell::SCROLLWIN |
SwCursorShell::CHKRANGE | SwCursorShell::READONLY ); SwCursorShell::CHKRANGE | SwCursorShell::READONLY );
bRet = true; bRet = true;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment