mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Resolves: fdo#87760 if we can't anchor at hidden text then...

Browse Source 
anchor to the page instead

Change-Id: Ib7931fdd1c70e809ec442aeac125879980e20ec9
This commit is contained in:
Caolán McNamara
2015-01-22 17:03:22 +00:00
parent ef3b6fa0cf
commit 15faeb4f9f
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
sw/source/core/frmedt/feshview.cxx
View File

@@ -1585,12 +1585,20 @@ bool SwFEShell::ImpEndCreate()
GetLayout()->GetCrsrOfst( &aPos, aPoint, &aState ); GetLayout()->GetCrsrOfst( &aPos, aPoint, &aState );
// do not set in ReadnOnly-content // do not set in ReadnOnly-content
if( aPos.nNode.GetNode().IsProtect() ) if (aPos.nNode.GetNode().IsProtect())
{
// then only page bound. Or should we // then only page bound. Or should we
// search the next not-readonly position? // search the next not-readonly position?
bAtPage = true; bAtPage = true;
}
pAnch = aPos.nNode.GetNode().GetCntntNode()->getLayoutFrm( GetLayout(), &aPoint, 0, false ); SwCntntNode* pCNode = aPos.nNode.GetNode().GetCntntNode();
pAnch = pCNode ? pCNode->getLayoutFrm( GetLayout(), &aPoint, 0, false ) : NULL;
if (!pAnch)
{
// Hidden content. Anchor to the page instead
bAtPage = true;
}
if( !bAtPage ) if( !bAtPage )
{ {
@@ -1636,7 +1644,7 @@ bool SwFEShell::ImpEndCreate()
if( bAtPage ) if( bAtPage )
{ {
pPage = pAnch->FindPageFrm(); pPage = pAnch ? pAnch->FindPageFrm() : GetLayout()->GetPageAtPos(aPoint);
aAnch.SetType( FLY_AT_PAGE ); aAnch.SetType( FLY_AT_PAGE );
aAnch.SetPageNum( pPage->GetPhyPageNum() ); aAnch.SetPageNum( pPage->GetPhyPageNum() );