[Libreoffice-commits] .: Branch 'libreoffice-3-6' - sw/source

[Libreoffice Gerrit user]

 sw/source/core/layout/tabfrm.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 1ca23f2674d1c46ad8629f657a0c9a67a5551679
Author: Michael Stahl <mstahl at redhat.com>
Date:   Mon Dec 10 20:52:55 2012 +0100

    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 at redhat.com>
    Tested-by: Eike Rathke <erack at redhat.com>

diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx
index a008a13..39dad68 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();