[Libreoffice-commits] core.git: Changes to 'private/jmux/old-layouting'

[Jan-Marek Glogowski]

New branch 'private/jmux/old-layouting' available with the following commits:
commit 9b92db424f9ec161e1c26cc84de271a61606dd3e
Author: Jan-Marek Glogowski <glogow at fbihome.de>
Date:   Sat Jul 12 23:17:31 2014 +0200

    fdo#70346 MM: hide sections based on field values
    
    This recalculates the section conditions based on the mail merge
    fields before converting the fields to text.
    
    It also removes the condition from the sections, as the fields
    won't be available in the merged document.
    
    Change-Id: I82a5f9f6962628a76c836e8e2a7c9e264fdc16e0

commit f2c1e437fc251aaa052f0f7f27fb36a56d82edf9
Author: Jan-Marek Glogowski <glogow at fbihome.de>
Date:   Sat Jul 12 19:32:15 2014 +0200

    Revert i#23187 fix; introduces layout problems
    
    commit 09f50c017fe106b7bf94f60933667b55130ea1b5
    
      Reintroduce unlockPositionOfObjects().
    
      This unlocking code was accidentally removed in commit
      120922361a5928ea4437ffe253ce209abd7060b0.  Not sure if it is
      still necessary, but I am at the moment unable to prove it is
      not, so better to be safe :-)
    
    and
    
    commit 120922361a5928ea4437ffe253ce209abd7060b0
    
      i#23187: Fix crash of the document.
    
      The mbLayoutInProgress bool was effectively unused - only set and
      reset, but  the only place that was checking for that was in
      lcl_RecalcRow(), again, only to set and reset it.
    
      Worse - with the document from i#23187, the mbLayoutInProgress was
      set / reset on a page already disposed in SwFrm::InsertPage() which
      was causing the crash here.
    
      So let's get rid of all this mbLayoutInProgress, its getter and
      setter, and  NotifyLayoutOfPageInProgress class.
    
      Valgrind, thank you that you exist, would have never found it
      without you! :-)
    
    This is no real fix for fdo#80926 - it just restores the "working"
    state, if a document is loaded in a shell, where just a single page
    can be displayed.
    
    Change-Id: I8493a7f802f255fc8b5f911086f4944c5cc8b161

commit fe0f93fa0cd410f3795675d363137ccbc803879d
Author: Jan-Marek Glogowski <glogow at fbihome.de>
Date:   Sat Jul 12 19:27:11 2014 +0200

    Invalidate rect cache before moving object
    
    Otherwise I get sw/source/core/layout/anchoredobject.cxx:582:
    
      <SwAnchoredObject::GetObjRectWithSpaces> - cache for object
      rectangle inclusive spaces marked as valid, but it couldn't be.
      Missing invalidation of cache. Please inform OD.
    
    Change-Id: I3f315b15fca6e2480c11183269be5583e6aea123

commit aff4e0288f2be49a00f95a9913b487f9675bfb2b
Author: Jan-Marek Glogowski <glogow at fbihome.de>
Date:   Sat Jul 12 13:35:54 2014 +0200

    Fix moving out-of-bounds draw / fly objects
    
    Actually move the object in the right direction, if it's outside
    of the document boundaries.
    
    Fixes the mysterious effect, that negative y-offset in fdo#80926
    changed the objects x-offset values.
    
    Change-Id: If88cf2a07fb44537b2e047e77c5e009664db94af

commit 33b5685979f37c28873ded0701e8e9a79898687a
Author: Jan-Marek Glogowski <glogow at fbihome.de>
Date:   Sat Jul 12 13:34:01 2014 +0200

    Better variable naming in SwViewImp::NotifySizeChg
    
    Make it obvious, which variable contains the document boundaries and
    which the draw / fly object boundaries.
    
    Change-Id: I0bc2bcb5515e317c7a204b3458b92c61482e1a5c