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

n#676858: Fix selection of background pictures vs text

Browse Source
This commit is contained in:
Cédric Bosdonnat
2011-12-13 17:25:51 +01:00
parent 3c1bc2311c
commit 8e17c11e25
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sw/source/core/layout/trvlfrm.cxx
View File

@@ -31,6 +31,7 @@
#include <hintids.hxx> #include <hintids.hxx>
#include <hints.hxx> #include <hints.hxx>
#include <tools/bigint.hxx> #include <tools/bigint.hxx>
#include <editeng/opaqitem.hxx>
#include <editeng/protitem.hxx> #include <editeng/protitem.hxx>
#include <vcl/settings.hxx> #include <vcl/settings.hxx>
#include <vcl/outdev.hxx> #include <vcl/outdev.hxx>
@@ -78,7 +79,8 @@ namespace {
static_cast<const SwVirtFlyDrawObj*>(aIter()); static_cast<const SwVirtFlyDrawObj*>(aIter());
const SwAnchoredObject* pAnchoredObj = GetUserCall( aIter() )->GetAnchoredObj( aIter() ); const SwAnchoredObject* pAnchoredObj = GetUserCall( aIter() )->GetAnchoredObj( aIter() );
const SwFmtSurround& rSurround = pAnchoredObj->GetFrmFmt().GetSurround(); const SwFmtSurround& rSurround = pAnchoredObj->GetFrmFmt().GetSurround();
bool bInBackground = ( rSurround.GetSurround() == SURROUND_THROUGHT ); const SvxOpaqueItem& rOpaque = pAnchoredObj->GetFrmFmt().GetOpaque();
bool bInBackground = ( rSurround.GetSurround() == SURROUND_THROUGHT ) && !rOpaque.GetValue();
bool bBackgroundMatches = ( bInBackground && bSearchBackground ) || bool bBackgroundMatches = ( bInBackground && bSearchBackground ) ||
( !bInBackground && !bSearchBackground ); ( !bInBackground && !bSearchBackground );
@@ -274,7 +276,7 @@ sal_Bool SwPageFrm::GetCrsrOfst( SwPosition *pPos, Point &rPoint,
} }
// TODO Pick up the best approaching selection // TODO Pick up the best approaching selection
if ( bTextRet && bBackRet && ( nTextSurface < nBackSurface ) ) if ( bTextRet && bBackRet && ( nTextSurface > nBackSurface ) )
{ {
bRet = bBackRet; bRet = bBackRet;
pPos->nNode = aBackPos.nNode; pPos->nNode = aBackPos.nNode;