[Libreoffice-commits] core.git: Changes to 'private/mst/sw_redlinehide_2'
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Fri Jul 27 16:53:12 UTC 2018
New branch 'private/mst/sw_redlinehide_2' available with the following commits:
commit 4bdc98547c33b74f6451baf854d88a7d32f06ce3
Author: Michael Stahl <Michael.Stahl at cib.de>
Date: Fri Jul 27 18:25:59 2018 +0200
sw_redlinehide_2: improve SwRootFrame::SetHideRedlines()
Change-Id: If54585d20bbe0fbf5c071e3a96737015d7d62c05
commit 03077e560d4cec9f074563a907081c522faad948
Author: Michael Stahl <Michael.Stahl at cib.de>
Date: Fri Jul 27 18:43:37 2018 +0200
sw_redlinehide_2: fix CanSkipOverRedline crash
Change-Id: Ia7efc0639650af570acc98f62f9f36f683beb1fa
commit 1410f7227a56f16bf79823252863ffd1d11bb4a5
Author: Michael Stahl <Michael.Stahl at cib.de>
Date: Fri Jul 27 17:38:43 2018 +0200
sw_redlinehide_2: SwContentNode::DelFrames(): ignore merged...
... frames unless the node is the owner / first node of the frame.
Not sure what should happen if the node *is* the first node of a merged
frame; let's not create a frame for the 2nd... node for now.
Change-Id: I5b105d0745d67012bbbdf778811e417efaae8490
commit cef927195031891359bf87f4042bc7ad58a3555a
Author: Michael Stahl <Michael.Stahl at cib.de>
Date: Fri Jul 27 17:35:21 2018 +0200
sw_redlinehide_2: InsertCnt_(): skip merged nodes
Change-Id: I3363c787779364e771e0406b0f9e90b0337bf03d
commit 46548ff3cb0012fd81103d13bee848b70859d586
Author: Michael Stahl <Michael.Stahl at cib.de>
Date: Fri Jul 27 17:33:47 2018 +0200
sw_redlinehide_2: assert that SwContentFrame is created only when allowed
Change-Id: I1b42b386eb7323dcbf40d4086276bd0a74d581b9
commit 47430b92c958a057670c5ef8f13117b47c0c5c58
Author: Michael Stahl <Michael.Stahl at cib.de>
Date: Fri Jul 27 16:07:15 2018 +0200
sw_redlinehide_2: SetMergedPara must ensure that frame is...
... registered as listener on a node somehow.
Change-Id: I1100726d3dd9cf46e1cc48e992cc5a1a0187b7c5
commit 0dd629ce3e3c35be0a0e1504223da03cc18015eb
Author: Michael Stahl <Michael.Stahl at cib.de>
Date: Fri Jul 27 16:04:48 2018 +0200
sw_redlinehide_2: SwView::GetState must be in sync with Execute
Because FN_REDLINE_SHOW is TOGGLE so it reads the existing state to
invert it.
Change-Id: I43053c28085722c869f1e8b0cb989d0956c2e00b
commit 9a7804d2c8d59c8347697d6b439daee94fa62bc0
Author: Michael Stahl <Michael.Stahl at cib.de>
Date: Thu Jul 26 16:12:57 2018 +0200
sw: assert in SwFrameFormat::MakeFrames()
This is an oddity, where the base class has an unimplemented
MakeFrames() but an implemented DelFrames(), where the latter is relied
upon by subclasses that do override MakeFrames().
Not sure if there are subclasses that don't override MakeFrames()
but which still require this base class DelFrames().
Change-Id: I5bc8a8d5cb99c9ce80fc14ef33a038e9d88eaecd
commit 7a0fe79b61a168683f89c048c569ab91f23f043f
Author: Michael Stahl <Michael.Stahl at cib.de>
Date: Thu Jul 26 14:12:53 2018 +0200
sw_redlinehide_2: add *another* flag to DocumentRedlineManager
Sadly the SwRootFrame is created too late, so we have to store the
"ShowRedlineChanges" value that is imported from ODF settings.xml
somewhere, and we can't store it in SfxBaseModel::setViewData() because
it's not in "Views" map.
Change-Id: I30eefcb0262048f7141a719917aff77182765946
commit 1fa7905733ee1da0c3ed467b66113fbde42bfac8
Author: Michael Stahl <Michael.Stahl at cib.de>
Date: Thu Jul 26 14:01:53 2018 +0200
sw: convert some obvious asserts in MakeFrames/InsertCnt_
Those are postconditions of SwNode2Lay
Change-Id: If5af97cb0fb050c95690796bcd708a31a1bdf49f
commit 93c3ab2ce1f32d3e53a15e80a8dcbdaee249fb3f
Author: Michael Stahl <Michael.Stahl at cib.de>
Date: Wed Jul 25 15:37:58 2018 +0200
sw: convert obvious asserts in SwNode2Lay
Change-Id: Ib3a4d6071ad03e68385ef5be74427282d374e966
commit c24e49b02028f4c32fc2dc9145c8b9054f05e982
Author: Michael Stahl <Michael.Stahl at cib.de>
Date: Tue Jul 24 17:00:10 2018 +0200
sw: disambiguate SwNode2Layout
For the first constructor, only RestoreUpperFrames is ever called, while
all of the other methods are called on instances created by the second
constructor. Why aren't there 2 distinct classes?
Change-Id: I1c9e8432f127a71732c762104605680089039973
commit eadb64e7c95190d9c69bf27e84fe3bddb9b5ee55
Author: Michael Stahl <Michael.Stahl at cib.de>
Date: Tue Jul 24 14:10:13 2018 +0200
sw: rename SwNode MakeFrame overloads
Change-Id: Ida4f6d55801292c509e577056140d9ff7608de9b
commit cbcc1bceefd01b30e47488b01cdfa2f3346dab45
Author: Michael Stahl <Michael.Stahl at cib.de>
Date: Mon Jul 23 17:23:32 2018 +0200
sw_redlinehide_2 more invalidations
Change-Id: Ie9d136f58ea4d81d76459663fbb70c9f07203fe2
More information about the Libreoffice-commits
mailing list