summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2012-12-10 20:52:55 +0100
committerPetr Mladek <pmladek@suse.cz>2012-12-21 16:30:04 +0100
commit0c43e577591a32a374d6fc64995a324f3fc4e5d9 (patch)
treed72c62d5007559160a3d45fd11654ca23f8261d9
parent6509c47ebfba5f516bdd3b29f5115d9286c044c5 (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) Reviewed-on: https://gerrit.libreoffice.org/1290 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com>
-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 a008a13bb120..39dad68165ab 100644
--- a/sw/source/core/layout/tabfrm.cxx
+++ b/sw/source/core/layout/tabfrm.cxx
@@ -4832,8 +4832,8 @@ sal_Bool lcl_ArrangeLowers( SwLayoutFrm *pLay, long lYStart, sal_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();