diff options
author | Michael Stahl <mstahl@redhat.com> | 2012-12-13 01:28:59 +0100 |
---|---|---|
committer | Andras Timar <atimar@suse.com> | 2013-01-13 22:00:58 +0100 |
commit | be3fc27ff3e52cf041f0c8f72035b83044704d8e (patch) | |
tree | 426fcc562695bc1d5f6f6a18ffc76eed214d66ef | |
parent | 5dd06e066e202dd68676cd63612f37a717621512 (diff) |
fdo#58142: fix frame selection in SwPageFrm::GetCrsrOfst:
The function does not handle the case where a paragraph was hit but no
background frame was hit properly, which may or may not (depending on
the platform) cause it to return a position of a frame when that is
undesirable, such as when called from SwWrtShell::UnSelectFrm().
When UnselectFrm() leaves a frame selected pasting multiple pictures
leads to a crash.
(regression from e8fbe97900f13305b17015d9044993bde4adab36)
Change-Id: I3604825f654c523a37f47a9fc660647d8b3e7077
(cherry picked from commit 2fc4af311656e7d019ca802d23444e5161f820ee)
Reviewed-on: https://gerrit.libreoffice.org/1314
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r-- | sw/source/core/layout/trvlfrm.cxx | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/sw/source/core/layout/trvlfrm.cxx b/sw/source/core/layout/trvlfrm.cxx index 2ffc033f6b7f..ee907cd17468 100644 --- a/sw/source/core/layout/trvlfrm.cxx +++ b/sw/source/core/layout/trvlfrm.cxx @@ -275,8 +275,12 @@ sal_Bool SwPageFrm::GetCrsrOfst( SwPosition *pPos, Point &rPoint, if ( ( bTestBackground && bBackRet ) || !bTextRet ) { bRet = bBackRet; - pPos->nNode = aBackPos.nNode; - pPos->nContent = aBackPos.nContent; + (*pPos) = aBackPos; + } + else if (bTextRet && !bBackRet) + { + bRet = bTextRet; + (*pPos) = aTextPos; } else { @@ -314,14 +318,12 @@ sal_Bool SwPageFrm::GetCrsrOfst( SwPosition *pPos, Point &rPoint, if ( bValidTextDistance && bValidBackDistance && basegfx::fTools::more( nTextDistance, nBackDistance ) ) { bRet = bBackRet; - pPos->nNode = aBackPos.nNode; - pPos->nContent = aBackPos.nContent; + (*pPos) = aBackPos; } else { bRet = bTextRet; - pPos->nNode = aTextPos.nNode; - pPos->nContent = aTextPos.nContent; + (*pPos) = aTextPos; } } } |