summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2012-12-10 20:52:55 +0100
committerMichael Stahl <mstahl@redhat.com>2012-12-10 21:11:18 +0100
commit37fdcc35941283d01e44ec2d04742ab2652e9d5f (patch)
tree740f59744fceb74323c8891d85b3695a952ba1d8
parent491f8c5b2422a3ca7ff23e80ac4fb70a37cb8adb (diff)
fdo#57780: sw: lcl_ArrangeLowers: register drawing ...
... objects at the right page. This was effectively disabled for all anchor types except FLY_AT_PARA by a misplaced ! in the conditional, and C++ not being a type safe language. Change-Id: I64af2141e577ac896292eecd9f8c46c62a0548db (cherry picked from commit c479ccc438edeb7197a2d05bdb99067365d7bac0)
-rw-r--r--sw/source/core/layout/tabfrm.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx
index 932cb2a74aa0..394538384079 100644
--- a/sw/source/core/layout/tabfrm.cxx
+++ b/sw/source/core/layout/tabfrm.cxx
@@ -4820,8 +4820,8 @@ static bool lcl_ArrangeLowers( SwLayoutFrm *pLay, long lYStart, bool bInva )
if ( pTabFrm &&
!( pTabFrm->IsFollow() &&
pTabFrm->FindMaster()->IsRebuildLastLine() ) &&
- !pAnchoredObj->GetFrmFmt().GetAnchor().GetAnchorId()
- == FLY_AS_CHAR )
+ (pAnchoredObj->GetFrmFmt().GetAnchor().GetAnchorId()
+ != FLY_AS_CHAR))
{
SwPageFrm* pPageFrm = pAnchoredObj->GetPageFrm();
SwPageFrm* pPageOfAnchor = pFrm->FindPageFrm();