New branch 'private/thb/sw_redlinehide-6-1' available with the following
commits:
commit 5741955a2027fc20e1f37a1a8dd93f52818a4610
Author: Caolán McNamara <caol...@redhat.com>
Date: Mon Jun 11 09:10:50 2018 +0100
coverity#1436014 silence Dereference null return value
Change-Id: I5ba1f864b5fcf69e3437792f99d24367f5f5a44d
Reviewed-on: https://gerrit.libreoffice.org/55603
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
commit 9618360cae63c423d08b9b0b6d3441f3dabc3b96
Author: Caolán McNamara <caol...@redhat.com>
Date: Mon Jun 11 09:27:39 2018 +0100
coverity#1436013 Unintended sign extension
Change-Id: Ic8dd5523d774f84627cd13ad53508386071f92e9
Reviewed-on: https://gerrit.libreoffice.org/55606
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
commit b11ee145ba0be38e413d68d7a3005a76fd83fcdc
Author: Caolán McNamara <caol...@redhat.com>
Date: Mon Jun 11 09:17:34 2018 +0100
coverity#1436018 Dereference after null check
Change-Id: Id6a8ebdde5a08d9581c165a85f067ffaef490cab
Reviewed-on: https://gerrit.libreoffice.org/55604
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
commit 985d7f8d2cac776fa1076a873e7b073e4bcd83a7
Author: Michael Stahl <michael.st...@cib.de>
Date: Sat Jun 9 19:14:56 2018 +0200
coverity#1436017 DEADCODE
Ass-umption is that nLen == 0 requires no changes here.
Change-Id: I9af1110aed7998fdf0247c1fa8473f0180e8774e
commit 84bcdcc561426b21a30506f6cade0d2c21088db2
Author: Michael Stahl <michael.st...@cib.de>
Date: Sat Jun 9 09:31:06 2018 +0200
sw_redlinehide: old GCC needs a cast here
Change-Id: I45f340fff2d3285e1af6f6448c807d4997e5a42b
commit 3577fbcfc299604dfd11dba76888a7bcd83b8504
Author: Michael Stahl <michael.st...@cib.de>
Date: Thu May 17 13:00:33 2018 +0200
sw_redlinehide: let the Show menu item toggle new mode
Change-Id: I1201e84b231be17e6a5ec2294acfb1e3111c9ada
commit 6279efd17bf5a7559bfd4ca22134f34ca944f530
Author: Michael Stahl <michael.st...@cib.de>
Date: Thu May 17 14:16:27 2018 +0200
sw_redlinehide: very incomplete impl. of SwRootFrame::SetHideRedlines()
Change-Id: Icff1b1aac20a0a6d3f957e7025f6a08a6d0edbee
commit 355e2217c8ea2a235de7db3d757d3057b69da6cb
Author: Michael Stahl <michael.st...@cib.de>
Date: Thu Jun 7 19:36:06 2018 +0200
sw_redlinehide: trivial conversions in lcl_DrawLineForWrongListData
Change-Id: I7425bac439df7518b7fe1b62cd6f3fd7a9f88fec
commit 13d7b287725cb22bf5868bacdda382c874d63499
Author: Michael Stahl <michael.st...@cib.de>
Date: Thu Jun 7 17:37:00 2018 +0200
sw_redlinehide: use WrongListIterator in text formatting code
Change-Id: Ie13119d456fa6fe3919871cc541a9ad927b5982e
commit 04af80c1278c3654dbcb0c7e317795c35fb9aa34
Author: Michael Stahl <michael.st...@cib.de>
Date: Thu Jun 7 17:37:52 2018 +0200
sw_redlinehide: Add sw::WrongListIterator
The simplest way to deal with the problem that wrong-lists are on the
SwTextNode is to just take them as-is and iterate over them in a merged
SwTextFrame. This may give results that users may disapprove of, but
i'm not sure how likely it is in practice to e.g. start a delete redline
in the middle of a word and end it in another paragraph.
Perhaps it would be better to move the SwWrongLists to the SwTextFrame,
but that is probably more work.
Also add missing SwTextNode function overloads for "const", so we don't
need mutable SwTextNodes.
Change-Id: I9742e3793abe090cf58ad3f27b51e89be86a1964
commit d8fdf208046a080d649c92eb7029772a411be240
Author: Michael Stahl <michael.st...@cib.de>
Date: Tue Jun 5 13:41:58 2018 +0200
sw_redlinehide: send a hint to the SwTextFrame when Delete redline
... is created or updated; there is already a SwUpdateAttr
hint being sent from SwRangeRedline::InvalidateRange(),
but it doesn't contain any info about the redline other than the
position; add a new hint sw::RedlineDelText and send it from there in
addition to the existing one.
Change-Id: I37150b2a5ca6a0e70ea4a5788f720f8522227631
commit dab9a7f126d233d4acbd33d3b11eacfe21254efc
Author: Michael Stahl <michael.st...@cib.de>
Date: Fri Jun 1 22:45:55 2018 +0200
sw_redlinehide: SwTextNode::Insert(): send SwInsText hint before
... adjusting hints, as the latter sends RES_UPDATE_ATTR hints
and the ModelToViewPos() asserts because the mergedText is too short.
Change-Id: I48bf6388ce69f3294decf96dc6dd11ba3bf4bc7b
commit ac5a173163724ca3020529245eebb7cfe4e68d07
Author: Michael Stahl <michael.st...@cib.de>
Date: Thu Jun 7 10:27:52 2018 +0200
sw_redlinehide: convert spelling SwTextFrame funcs called by DoIdleJob_
These currently get passed the current shell cursor position, which
seems quite pointless as the caller DoIdleJob_ can handle that case
in one place.
Instead, pass in the actual node that should be checked, since the
SwTextFrame can have multiple nodes now.
Change-Id: Id7a8a7a2a5a3eaeb700963eff5147d37b194a953
commit e15a8fe4ebc13a54ea684704ff49382e40a1c1ce
Author: Michael Stahl <michael.st...@cib.de>
Date: Wed Jun 6 17:23:49 2018 +0200
sw_redlinehide: SwAttrIter direct ctor gets a SwTextFrame arg
... and use it in SwTextPainter::CheckSpecialUnderline()
Change-Id: I904cb955f0bc8dc1f92612b47dc129922865c198
commit e157865c914324fdb0cccf9635c7740949fbeab4
Author: Michael Stahl <michael.st...@cib.de>
Date: Wed Jun 6 13:29:04 2018 +0200
sw_redlinehide: convert SwTextSizeInfo::GetMultiCreator()
Very tricky ... i'd be surprised if this actually works :-/
Change-Id: I309db66e64838aaf92609313d04c4fe3d096c6ee
commit 0fd13249dc343d5ab976b6c53c6e87bad40e77aa
Author: Michael Stahl <michael.st...@cib.de>
Date: Fri Jun 1 22:41:06 2018 +0200
sw_redlinehide: convert GetAttrSet() in txtfrm.cxx, frmtool.cxx
Change-Id: I3541fa79ff48f6829fc459ab5bd8224c29c51cbb
commit a284ece2e82551ca4e80d7c0e395ed58b1a144fc
Author: Michael Stahl <michael.st...@cib.de>
Date: Fri Jun 1 22:37:02 2018 +0200
sw_redlinehide: move SwContentNode::GetNode() to SwNoTextNode
SwTextNode's GetDep() may be a WriterMultiListener, which isn't even a
node.
SwTextNode has GetTextNodeForParaProps()/GetTextNodeFirst().
Change-Id: Ica177a6a3cf7c886c9a8d2733fb9cb452a475450
commit c1dc4243f3d43d65aae035baaab5b81228814fc0
Author: Michael Stahl <michael.st...@cib.de>
Date: Fri May 4 13:45:09 2018 +0200
sw_redlinehide: use FrameContainsNode in anchoredobjectposition.cxx
Change-Id: I648810c1d5549d700a64f120a52416a951d56dca
commit 4c527a29648c1e6eb70fcf0a6211dd5961f6aea8
Author: Michael Stahl <michael.st...@cib.de>
Date: Fri Jun 1 22:32:26 2018 +0200
sw_redlinehide: convert GetNode(), use FrameContainsNode(), txtfly.cxx
Change-Id: I0e4961acc191a764db74ede75e140e63ad1318a0
commit fc76192ddb3cb54d62385eeafb814c77875525e3
Author: Michael Stahl <michael.st...@cib.de>
Date: Fri Jun 1 22:30:58 2018 +0200
sw_redlinehide: iterate merged nodes in SwLayIdle::DoIdleJob_()
Change-Id: I42924448749385bb0e5bc2c187e37053e104c0da
commit 4fdadbb0d5dd101df452bb6fb311f0af93330196
Author: Michael Stahl <michael.st...@cib.de>
Date: Fri Jun 1 22:29:16 2018 +0200
sw_redlinehide: convert GetNode() in frmtool.cxx
Change-Id: I6787ec787190ad297717ab01a78414cac34aa2cb
commit cf156b1e1d445a95665f042d411e5289bd94851c
Author: Michael Stahl <michael.st...@cib.de>
Date: Fri Jun 1 22:26:52 2018 +0200
sw_redlinehide: convert GetNode(), use FrameContainsNode() in flycnt.cxx
Change-Id: I551d37c961149bb043bed4cde7b52822f5e3db81
commit d852a19e0f08596e1401f15ee1819e621bcbe202
Author: Michael Stahl <michael.st...@cib.de>
Date: Fri Jun 1 22:24:24 2018 +0200
sw_redlinehide: convert GetNode() in SwFlowFrame::BwdMoveNecessary()
Change-Id: Iaefed6ebee4f4cf47697c174abc275b1287f643f
commit 83c70745b67e6d44e7a2c8e5992e568a2e3170d4
Author: Michael Stahl <michael.st...@cib.de>
Date: Fri Jun 1 22:22:48 2018 +0200
sw_redlinehide: convert GetNode() in SwCursor::IsSelOvr()
Change-Id: I3cca2091f4a3fe903bbd606c93a368662e997899
commit 6747adb013922adea4b45f4541ec8df324e15b39
Author: Michael Stahl <michael.st...@cib.de>
Date: Fri Jun 1 22:16:28 2018 +0200
sw_redlinehide: refactor AppendObjs to iterate merged paragraphs
Change-Id: I5860b9791c0839d4b83eec6a3db0b2d1926d2ccd
commit 2922e4d0ea5409927cef5bb2277c97701b5a1a5d
Author: Michael Stahl <michael.st...@cib.de>
Date: Fri Jun 1 22:03:42 2018 +0200
sw_redlinehide: trivial convert to GetPageDescItem()/GetBreakItem()
Change-Id: Ia652ff428c232b9307e41da8f6b9648f486f7179
commit d3ffd1ebb3045804560f2cc5aa21c9eced7ff477
Author: Michael Stahl <michael.st...@cib.de>
Date: Fri Jun 1 21:53:39 2018 +0200
sw_redlinehide: refactor SwFlowFrame::IsKeep()
This thing uses 2 items, a normal one and RES_BREAK, so they need to be
passed in separately, a merged text frame does not necessarily have any
item set with the matching items.
Change-Id: I5e50ac60137ba8d94adeaee2ef015551d8a3bdd8
commit 40b2d830277b8d86f047c465fbafc29c2210a8ab
Author: Michael Stahl <michael.st...@cib.de>
Date: Fri Jun 1 21:45:07 2018 +0200
sw_redlinehide: add SwFrame::GetBreakItem()/GetPageDescItem()
SwFrame::GetAttrSet() can work for merged text frame for most
paragraph/frame items, but not for these two, which are special cased
in the node joining code so they're always from the first node.
Change-Id: Ib63203a67e15e208aa50bc46ae0f5a82d1b9081c
commit d62bcdbaab5b0d07b9cc80dd136bd016f7f85364
Author: Michael Stahl <michael.st...@cib.de>
Date: Fri Jun 1 21:39:15 2018 +0200
sw_redlinehide: add sw::FrameContainsNode()
Change-Id: I13fde1bc95211ecbf5ff2a3f54cd85f41b5418d7
commit 633c82765cfd2990ac52cf9136379ad849f09c33
Author: Michael Stahl <michael.st...@cib.de>
Date: Fri Jun 1 21:32:22 2018 +0200
sw_redlinehide: SwContentFrame::LeftMargin()/RightMargin() pure virtual
... because it's using GetNode().
Change-Id: Iba99a2c4213d389e8b281b689f7bcfc6027baf28
commit fda55a729d4ae7a9bbe556ab809554e83328beba
Author: Michael Stahl <michael.st...@cib.de>
Date: Fri Jun 1 21:24:11 2018 +0200
sw_redlinehide: make GetRegisteredIn() private in SwFrame
Use GetDep() instead, which is a unique identifier in sw.
Change-Id: I66e60a175165673c2962124fdec691b03a5f0e4a
commit 0e4c560c75560eae45f971f11d61e206f4a82531
Author: Michael Stahl <michael.st...@cib.de>
Date: Fri Jun 1 21:19:07 2018 +0200
sw_redlinehide: SwContentFrame::DestroyImpl()
Change-Id: I4539ef0a7dc04de1c87cf6f54ca319dbdc719755
commit 04b3af13ea4d90a4f2122af5658e5c24d0ef3440
Author: Michael Stahl <michael.st...@cib.de>
Date: Fri Jun 1 20:52:35 2018 +0200
sw_redlinehide: convert to GetDep()
Change-Id: I3b128fe797e8fd6989821cfd540dc5e630e74d37
commit 393ff769b797bd9e84e74509808a585fb10dca38
Author: Michael Stahl <michael.st...@cib.de>
Date: Fri Jun 1 20:46:26 2018 +0200
sw_redlinehide: convert SwDeletionChecker to GetDep()
Such a lovely class!
Change-Id: Id03795b1c62c35829cab093198daf082ca78d174
commit a188b07a0bbd602dc8f84ca29100f6e5cc0e8ef6
Author: Michael Stahl <michael.st...@cib.de>
Date: Fri Jun 1 20:40:15 2018 +0200
sw_redlinehide: SwXFlatParagraphIterator::getNextPara() iterate ...
... the MergedPara here.
Change-Id: I1a76c9d4a13277987218426a787b5b1b421d36ea
commit 5c49c0df7d5cae7834f8f620226a128b7ac9e1bc
Author: Michael Stahl <michael.st...@cib.de>
Date: Fri Jun 1 20:38:13 2018 +0200
sw_redlinehide: trivial GetNode() in PageBreakWin.cxx
Change-Id: I7bdf58d1f2233ab77a1b774a99aa068fe9438ae8
commit a9a5287a2ec083b0100afa95cc083c28cccebff1
Author: Michael Stahl <michael.st...@cib.de>
Date: Fri Jun 1 20:34:02 2018 +0200
sw_redlinehide: trivial GetNode() in text
Change-Id: Ied6e80e30ced49b11952c44c36e86e8575e42c0f
commit 7a84afba4d4c298fdbe0c55776e9a1a05e99c907
Author: Michael Stahl <michael.st...@cib.de>
Date: Fri Jun 1 20:25:07 2018 +0200
sw_redlinehide: trivial GetNode() conversions in pagechg.cxx,wsfrm.cxx
Change-Id: I2378dd76100d335e24ec21f4cfe62afa61b4e0e4
commit 44d876ae22c871a774095a41b485052791602054
Author: Michael Stahl <michael.st...@cib.de>
Date: Fri Jun 1 20:21:07 2018 +0200
sw_redlinehide: GetNode() conversion in trvlfrm.cxx
Change-Id: I8621546fcff000e93b3ea0593a5f1f8df94811a4
commit a8ad2e046dc44157dd6e7a83cf459bdae5263920
Author: Michael Stahl <michael.st...@cib.de>
Date: Fri Jun 1 20:12:50 2018 +0200
sw_redlinehide: trivial GetNode() in atrfrm.cxx,fly.cxx,flylay.cxx
Change-Id: Id15b867e8a275529822bab8ce82da5eb2eeb484b
commit 5d3c2783544922513c11cd8f17a3b03165f78ff6
Author: Michael Stahl <michael.st...@cib.de>
Date: Fri Jun 1 19:11:42 2018 +0200
sw_redlinehide: trivial GetNode() in fetab.cxx,fedesc.cxx
Change-Id: I655431923f24bb04826a814d7d8e59dea4bb7fc6
commit 74c3a7a7d90178ff28f06b39c77e4574d85d9286
Author: Michael Stahl <michael.st...@cib.de>
Date: Fri Jun 1 19:10:06 2018 +0200
sw_redlinehide: GetNode() conversion in fefly1.cxx
A bit hairy sometimes...
Change-Id: Ic4b55bce4939001fe18f99d4902c7b5ef52f1fb7
commit 13a0141f6bc9ca6ecd1e4dfeb15854d5962aadbb
Author: Michael Stahl <michael.st...@cib.de>
Date: Fri Jun 1 19:03:00 2018 +0200
sw_redlinehide: GetNode() conversion in feshview.cxx
Change-Id: I304b7b3fe92c7614e3a5bc887407487751423e71
commit 1ab75a61ff0d8c9a329b58cc7de08d7b46b91f62
Author: Michael Stahl <michael.st...@cib.de>
Date: Fri Jun 1 18:59:39 2018 +0200
sw_redlinehide: trivial GetNode() conversion in fields
Change-Id: I69e438575e76f67701d951dfeab0fd7fdda0e66f
commit c48bb1b33665cdcfbbb2d667f5d9bc0ebe1624a4
Author: Michael Stahl <michael.st...@cib.de>
Date: Fri Jun 1 18:58:35 2018 +0200
sw_redlinehide: trivial GetNode() conversion in draw/
Change-Id: I660953a6e101aae0f6dad38b74d0a5fa8f254221
commit 2325a96d7a98dc48f7a0d6c3681f0040cb828549
Author: Michael Stahl <michael.st...@cib.de>
Date: Fri Jun 1 18:56:48 2018 +0200
sw_redlinehide: trivial GetNode() in docfld.cxx,docfly.cxx,doclay.cxx
Change-Id: I2f95b413a65fac0a68678eb06f90238707c57e68
commit e5cba3beaad410bdabc5c4a97b633548e001f106
Author: Michael Stahl <michael.st...@cib.de>
Date: Fri Jun 1 18:53:30 2018 +0200
sw_redlinehide: trivial GetNode() conversion in access
Change-Id: I5e1e18ee4033d9c5776d856aaa61ead9dde3e702
commit 6123843003b55b02012ad68a40b51916d5fdb58c
Author: Michael Stahl <michael.st...@cib.de>
Date: Fri Jun 1 18:39:32 2018 +0200
sw: SwTextFly cleanup, prefix some members & clarify SwTextFrame type
Change-Id: If9ecad6bf396f459335177579f665fffaf917135
commit 93d5876f18312e70ad609e4a289e6917b28379f5
Author: Michael Stahl <michael.st...@cib.de>
Date: Wed May 30 18:10:44 2018 +0200
sw_redlinehide: adapt SwFrame::InvalidatePage()
Change-Id: I38f2b4b34e3c740f94f2d6564e1a923a8ee4aaf8
commit df2baf88b6121ce467260bb9e9f55cd6f9142046
Author: Michael Stahl <michael.st...@cib.de>
Date: Wed May 30 16:41:11 2018 +0200
sw_redlinehide: SwTextFrame::IsHiddenNow() needs some work
Iterating the fields here looks a bit expensive, maybe it would be
better to check the ViewOptions first...
Change-Id: I41830e89a4fd683eee35bd2b0901fb9fb121b51c
commit fbaa0bc9fd8119d6014525f946fa5165601ab39c
Author: Michael Stahl <michael.st...@cib.de>
Date: Wed May 30 16:05:19 2018 +0200
sw_redlinehide: SwTextFrame::HideAndShowObjects()
Let it get the SwTextNode from the fly's anchor position, instead of
from SwTextFrame.
Change-Id: I833db32b2d7dd689c04fe93d75910364b6b91a3c
commit 4c397636deb03e41290f462a310134f93a88b33f
Author: Michael Stahl <michael.st...@cib.de>
Date: Wed May 30 14:43:11 2018 +0200
sw_redlinehide: SwTextFrame::DestroyImpl() needs to remove more
... footnotes for merged paragraphs.
Change-Id: Ia32a2a776cb3a383f9ea0ecf51dcea872d6378be
commit 364b8f49accb16a9cba93938d46056f16a7d578f
Author: Michael Stahl <michael.st...@cib.de>
Date: Wed May 30 14:16:02 2018 +0200
sw_redlinehide: TextFrameIndex conversion in SwTextFrame::SwClientNotify
... etc.
Change-Id: I34336fa923b5c40a040490dd618633035efd5d94
commit fe6531678520ed0769a079bd1d56def82882dab8
Author: Michael Stahl <michael.st...@cib.de>
Date: Wed May 30 13:08:43 2018 +0200
sw_redlinehide: update MergedPara in SwTextFrame::SwClientNotify()
Change-Id: Ic61309f7ae56b014a19b86173d520fb72a33667e
commit c8eaa4276745177c667509842779a68c0e7eb9fd
Author: Michael Stahl <michael.st...@cib.de>
Date: Tue May 29 18:33:06 2018 +0200
sw_redlinehide: replace SwTextFrame::Modify() with SwClientNotify()
This is critical because it needs to know what SwTextNode sent the hint.
Fortunately it looks like we can just convert this one implementation
and the backward compat stuff in SwClient will keep the other
SwFrames working as before with their Modify().
Change-Id: I16f0bf7495002e7393148429640262cb38dc4849
commit 840695dde2c8ee0d70789516f2b34f21423467a5
Author: Michael Stahl <michael.st...@cib.de>
Date: Tue May 29 18:28:15 2018 +0200
sw_redlinehide: SwFrame::IsCollapse() needs an extra check
Could be that the node is empty but the frame not.
Change-Id: I9b9af31f2ef9a6d862cfe38038222b5a46e6b0ab
commit 1a3604bb1dcedb212ac3d2a900d8025bec243be3
Author: Michael Stahl <michael.st...@cib.de>
Date: Fri Jun 8 15:30:30 2018 +0200
sw_redlinehide: ListenerEntry::SwClientNotify should not call ...
... ModifyNotification() but SwClientNotify(), and let its default
implementation call Modify(), because this allows for
incremental migration of subclasses to SwClientNotify() while
superclass still uses Modify().
Change-Id: Ieb7590507a80183e68341b3dee9ca5801d01bec0
commit 5f6ed184a070d8fc9df4bde2a6ad69bf567ff406
Author: Michael Stahl <michael.st...@cib.de>
Date: Tue May 29 14:09:08 2018 +0200
sw_redlinehide: use WriterMultiListener to connect SwTextFrame
... with multiple SwTextNodes in CheckParaRedlineMerge()
Change-Id: I57402ca7d2210fc30015b9a7e2e05216e0b8a8eb
commit 5062c20333140f187da5bbf16e65004fba69ffc2
Author: Michael Stahl <michael.st...@cib.de>
Date: Tue May 29 13:12:15 2018 +0200
sw_redlinehide: disable optimisation in ContentIdxStoreImpl::SaveFlys()
... if there's a merged text frame.
Change-Id: Ida468518ab3f0c2a077a831ec81522f7d3b2c9ff
commit b85f3b39f694dba745a79e14dc9b9091b3d315cc
Author: Michael Stahl <michael.st...@cib.de>
Date: Tue May 29 13:07:32 2018 +0200
sw_redlinehide: add some checks in places that require the node
... that contains the first text of the frame.
Change-Id: I8efc1acd87a7fcb9e4e38925f1ba91ec1a004dfd
commit dc07c89b761abefdd3245518951404f6ca0df69b
Author: Michael Stahl <michael.st...@cib.de>
Date: Tue May 29 13:03:27 2018 +0200
sw_redlinehide: convert SwCursorShell::GotoTOXMarkBase()
Better not to assume that index 0 of the node is visible.
Change-Id: I50f4a53d853cc59d3d0403eae34af48a56b1776a
commit 0fa3c8f145b7ea83f2281c9c0a8d04a5ecb9dd7f
Author: Michael Stahl <michael.st...@cib.de>
Date: Tue May 29 13:01:27 2018 +0200
sw_redlinehide: convert the SwIterators in SwNode2Layout too
Change-Id: Id0fb0ea0be731f2f4af372c2034d56fd6e20b4a1
commit 4f6b3580b023f9caaf300e6b1c8e915a8e09ab54
Author: Michael Stahl <michael.st...@cib.de>
Date: Tue May 29 12:40:51 2018 +0200
sw_redlinehide: use unwrapping SwIterator when iterating SwModify
... that could be a SwTextNode, too.
Change-Id: I5627564966ce331b07b69010d42d61ff8a04364c
commit f51a0439d2b5485bcacf01ffa5ccf9b59cd540bf
Author: Michael Stahl <michael.st...@cib.de>
Date: Tue May 29 11:50:52 2018 +0200
sw_redlinehide: use unwrapping SwIterator when iterating SwTextNode
... or SwContentNode.
Change-Id: Ib05038fd5a5550f5ed6dd90e129a2d7c3da74c1e
commit 7660763dd6aa38a1c2e114e18789edfc9681cdeb
Author: Michael Stahl <michael.st...@cib.de>
Date: Tue May 29 11:37:29 2018 +0200
sw_redlinehide: add an indirect iteration mode to SwIterator
There are lots of existing loops over SwTextFrames of SwTextNodes,
and these need to keep finding the frames if there's a
WriterMultiListener in between.
Add a template parameter to SwIterator that can be used to make the
iteration transparent, i.e. return the client of the
WriterMultiListener instead of the ListenerEntry itself.
Change-Id: I8b67a027b392b08408f5fbf26be22884384aa6cf
commit 75dd6d31dd0b93dc365e6a2cf1a2efce2a61a9de
Author: Michael Stahl <michael.st...@cib.de>
Date: Fri May 25 18:41:52 2018 +0200
sw_redlinehide: fix SwCursorShell::GetContentAtPos() redline code
This calls SwTextFrame::GetCharRect() on the frame where the mouse
cursor is, with SwPositions that may be in a unrelated SwTextNode.
Bogus positions now triggers asserts, so let's fix it.
Change-Id: Idedb335ffd79c299976ad91b683dfb30cd0ceac2
commit 1298d92094e61a7f5df3e6f3b06ad2ed78965eff
Author: Michael Stahl <michael.st...@cib.de>
Date: Fri May 25 14:04:33 2018 +0200
sw_redlinehide: hyphenation
There's a loop over nodes, calling SwTextNode::Hyphenate() each time.
Introduce a new class SwInterHyphInfoTextFrame that is used in the
SwTextFrame functions, and SwTextNode::Hyphenate() converts between
the 2 types.
Not sure if this will hyphenate a word that is split across nodes in the
model, but perhaps this is good enough in practice.
Change-Id: I78dec370e15c372284c934d9658b2dd5b3b97ae0
commit d6a8adc63ca87cd0b5925199b91a40293b62182a
Author: Michael Stahl <michael.st...@cib.de>
Date: Fri May 25 10:42:34 2018 +0200
sw_redlinehide: make SwScanner independent of SwTextNode
Abstract out the GetLang function into a parameter.
SwScanner also uses a ModelToViewHelper but at this place it's used in
"pass-through" mode which does an identity mapping.
Change-Id: I45557c4e4446d1b4d95a206c414bbb6477593f8a
commit 024e79821826f487aee547ca241fb670693a0ed4
Author: Michael Stahl <michael.st...@cib.de>
Date: Thu May 24 18:40:28 2018 +0200
sw_redlinehide: what to do about SwParaPortion::GetDelta()
This has type "long", which is unusal. Presumably because it needed to
represent numbers from -USHRT_MAX to +USHRT_MAX back in the day.
Now we have sal_Int32 which happens to be signed and TextFrameIndex,
but these are always positive currently; would it be too confusing
to have a potentially negative TextFrameIndex here?
Change-Id: I18c4893d9d24b59e98e9a3994139842ea25ae716
commit b5804d46773eb015f21d48139ec9a8de05c89c61
Author: Michael Stahl <michael.st...@cib.de>
Date: Thu May 24 18:02:40 2018 +0200
sw_redlinehide: add SwTextFrame::GetLangOfChar()
The text formatting calls SwTextNode::GetLang(), which is a bit of a
problem now, but fortunately it calls it only for 0 or 1 character,
and in that case we can easily indirect this to a single call to
SwTextNode::Lang() in the right node.
Change-Id: Id151cd6ae277bd2880fc8fc63305110ec2bf88c2
commit bbad214c25bf1876a8b825e2183e65b19b352c06
Author: Michael Stahl <michael.st...@cib.de>
Date: Thu May 24 16:09:02 2018 +0200
sw_redlinehide: SwScriptInfo conversion swcrsr.cxx,edattr.cxx,editsh.cxx
Change-Id: I3676357fbba242fe7f5ed632d704a6704e802217
commit 6bf192dcef14e4363f92d4d26f118e57c79dc6d4
Author: Michael Stahl <michael.st...@cib.de>
Date: Thu May 24 15:59:10 2018 +0200
sw_redlinehide: SwScriptInfo::GetScriptInfo() should return frame too
The SwScriptInfo comes from the frame, and if both are used together
they have to match.
Change-Id: I3de0754d9ff316180fc04708889886684d6868e5
commit 6a3b05f6d9cc985280193399be122a7c322cfcf7
Author: Michael Stahl <michael.st...@cib.de>
Date: Thu May 24 15:56:19 2018 +0200
sw_redlinehide: SwScriptInfo conversion in itradj.cxx
Have to reinterpret_cast arrays here to pass them to VCL.
Change-Id: Ia0d1b9ab159e55bae01f1cabf3c137a9c8676c79
commit fff311981b809a6f2bcd3540166cb0bf9615e65e
Author: Michael Stahl <michael.st...@cib.de>
Date: Thu May 24 14:26:53 2018 +0200
sw_redlinehide: add a SwTextFrame::GetDropLen()
Copy the SwTextNode::GetDropLen, as it can't be used in case the
drop-text would include a delete redline, but the SwTextNode one is
apparently needed by the WW8 filter.
Change-Id: I26a8a15e977120d601d87a76d712005e2888b713
commit d5aca358474b25bd8dda2031deb50f785a0b5346
Author: Michael Stahl <michael.st...@cib.de>
Date: Thu May 24 14:02:53 2018 +0200
sw_redlinehide: SwScriptInfo conversion in txtdrop.cxx
Change-Id: I65a8c7a1fc6a16dc602dfb73f8a17424ab01f162
commit ce8e72ad58697e56d7ca55599739cf3f0d58314b
Author: Michael Stahl <michael.st...@cib.de>
Date: Thu May 24 13:18:53 2018 +0200
sw_redlinehide: SwScriptInfo conversion in itrform2.cxx
Change-Id: Ia591961a27bed76fb762cfe9060f245b31ca2e01
commit eb82bf039064ef6c9017ad0125c64c72479ba4bf
Author: Michael Stahl <michael.st...@cib.de>
Date: Thu May 24 12:57:53 2018 +0200
sw_redlinehide: convert SwFieldPortion::CheckScript()
Change-Id: I85dd0a194e0a406c4a2af51676c996fcfc558961
commit 9f6a4a142a9730be7bfcba907220fd0491e5107b
Author: Michael Stahl <michael.st...@cib.de>
Date: Thu May 24 12:30:07 2018 +0200
sw_redlinehide: disambiguate SwScriptInfo::GetBoundsOfHiddenRange()
Remove the "fast-path" from the static to the member function,
as it won't work with merged paragraphs.
This was the only caller that used the PositionList parameter, so remove
that.
Change-Id: Ide00cccca4bbc5cd2447477c34cb7b04f9eccfc6
commit 1f25d59b317bd869ac49f4c5a89ba0c22bc213d2
Author: Michael Stahl <michael.st...@cib.de>
Date: Thu May 24 12:27:14 2018 +0200
sw_redlinehide: SwScriptInfo::InitScriptInfo() init m_HiddenChg
... in the MergedPara case. For now, keep the CalcHiddenRanges()
per-node, and rely on it marking all redlines as "visible" so
the range comparison is quite simple.
Change-Id: Ida0435800caf3efdea963079b756f47cc78e95a5
commit c87400a9aa3954b60a6dd2420b54fb50c62ff0ba
Author: Michael Stahl <michael.st...@cib.de>
Date: Thu May 24 10:44:06 2018 +0200
sw_redlinehide: convert SwSubFont::DrawText_ to static SwScriptInfo
Change-Id: I7bdcb5f787b6a82def4f7ca5aca29a16b6881e38
commit e87a5cd60ef07ad441b2a8b5346394d941d24daf
Author: Michael Stahl <michael.st...@cib.de>
Date: Thu May 24 10:40:59 2018 +0200
sw_redlinehide: convert impl. of SwScriptInfo static funcs
Change-Id: I17393f2d4ea3dda63ab2becda5f44f959248b538
commit 54936511917c9bfca09016cbcdc9f8791478b502
Author: Michael Stahl <michael.st...@cib.de>
Date: Thu May 24 10:40:07 2018 +0200
sw_redlinehide: static functions of SwScriptInfo
Some of these are only called with TextFrameIndex, so just convert the
parameter types to that for simplicity.
Change-Id: I73d418bd42ec95b15548b3df44736de0092ad87d
commit 8bf3f12cecc20b7be96094e428549b0f999a8af4
Author: Michael Stahl <michael.st...@cib.de>
Date: Wed May 23 18:41:15 2018 +0200
sw_redlinehide: portxt.cxx
Not sure if these space-counting functions should use TextFrameIndex or
not, but there's quite a lot of them and half already converted...
Change-Id: I27adbd752eada7cfe8b4782a6e183563b4c057f3
commit c67ec62676bd9d12703ff9ada7c06719e8d24ee7
Author: Michael Stahl <michael.st...@cib.de>
Date: Wed May 23 18:35:01 2018 +0200
sw_redlinehide: more portxt.cxx
Change-Id: I0400794e30231d98e69569306aeaf9e43a5d5907
commit 01d61901bc8f970581ed3f64bc16a32ba0bd45bb
Author: Michael Stahl <michael.st...@cib.de>
Date: Wed May 23 18:01:48 2018 +0200
sw_redlinehide: convert SwTextFrame::PrepareVisualMove()
Change-Id: Icc9a7f44ad10f0ea556681d832bc3716e9341da7
commit 1be72437e0347709a58967c2b6fb8756fe435195
Author: Michael Stahl <michael.st...@cib.de>
Date: Wed May 23 17:33:20 2018 +0200
sw_redlinehide: split up SwScriptInfo::WhichFont confusion
Change-Id: Ic300ddc7fba4294317096c17b9b907b8b794b646
commit daeaaf8bde94adea2972ce5ae67259383162c821
Author: Michael Stahl <michael.st...@cib.de>
Date: Wed May 23 16:19:21 2018 +0200
sw_redlinehide: trivial conversions in SwScriptInfo
Change-Id: Idab0b0a351c5f1ee176f9a2c8f1d3780e21ecf26
commit ee1d609d4e4cd19b8cf4bc5c26adac5315547ade
Author: Michael Stahl <michael.st...@cib.de>
Date: Wed May 23 14:29:42 2018 +0200
sw_redlinehide: SwScriptInfo must be inited with MergedPara
Change-Id: Ie7c9e6aa960ec5d3ac90f1aef0ea6c2a7f7cb92b
commit e42fa1a0058a57169ae021676919b27ab03694b1
Author: Michael Stahl <michael.st...@cib.de>
Date: Wed May 23 14:02:29 2018 +0200
sw_redlinehide: convert SwScriptInfo header
Only the non-static functions for now.
Actually, aKashidaInvalid stores indexes into aKashida...
Change-Id: Ie8b30e9c12ecda50e77470400042d9e343f9d33f
commit 09ede001ac35184953e60b0c95fff059a699f271
Author: Michael Stahl <michael.st...@cib.de>
Date: Wed May 23 11:36:15 2018 +0200
sw_redlinehide: SwDrawTextInfo conversion in frmpaint.cxx etc.
Change-Id: I64bb3478b11888373d9b5e0c8d4716065a625f6c
commit 64839cd9522df1243625d70c9e30173771960812
Author: Michael Stahl <michael.st...@cib.de>
Date: Wed May 23 11:37:20 2018 +0200
sw_redlinehide: SwDrawTextInfo conversion in itratr.cxx
Change-Id: Ibce3ce21e3ddeb762d082b641a4f5d49099b1a6d
commit be9930604d202b95e4ea2e33dbe6d2bd5078272c
Author: Michael Stahl <michael.st...@cib.de>
Date: Wed May 23 11:34:15 2018 +0200
sw_redlinehide: trivial conversions in swfont.cxx
Change-Id: I41880720c0e9d076a8cbe6cb42fdbf70862f6544
commit 8b3062f4046f41c09693a3d4967d1ec604801714
Author: Michael Stahl <michael.st...@cib.de>
Date: Wed May 23 11:33:19 2018 +0200
sw_redlinehide: trivial conversions in fntcache.cxx, part 2
Change-Id: I7d0bd7c2bfa84914a0659123b75282e7d0c54f1f
commit 78035d83b406569cf725d79392c0f489ffc5ccfd
Author: Michael Stahl <michael.st...@cib.de>
Date: Wed May 23 11:32:31 2018 +0200
sw_redlinehide: trivial conversions in fntcache.cxx, part 1
Change-Id: I3564ad15d3913a6de4f6f978d8a357e3ff18e52f
commit 792115dcfe4c61632fdb477ea3a899f58418bf4f
Author: Michael Stahl <michael.st...@cib.de>
Date: Wed May 23 11:28:06 2018 +0200
sw_redlinehide: trivial conversions in fntcap.cxx
Change-Id: Idf7a334f2ab77fdcb21372569e069e2318396503
commit ff593b47a230c8a65489e4a3a6e743b35112ba63
Author: Michael Stahl <michael.st...@cib.de>
Date: Tue May 22 17:02:41 2018 +0200
sw_redlinehide: convert font/SwDrawTextInfo/SwFntObj headers
Change-Id: If5d7ef45cf1c722728c4f31dd1390ce5d76aa255
commit d4993f9d1d9513307f7901904d3db3c38393819c
Author: Michael Stahl <michael.st...@cib.de>
Date: Tue May 22 10:50:19 2018 +0200
sw_redlinehide: trivial conversions in editsh.cxx,ndtxt.cxx
Change-Id: Ife3df66e1873b2325a41ff196299008ce2422901
commit 62d9212622019f2514d4ab76d5b7bf14100e3413
Author: Michael Stahl <michael.st...@cib.de>
Date: Tue May 22 10:49:36 2018 +0200
sw_redlinehide: trivial conversions in reffld.cxx
Change-Id: If40199166d63595edccc8d8329f36c7af67d5643
commit 967e693ce79372a35d37c6ccf845a2980674f584
Author: Michael Stahl <michael.st...@cib.de>
Date: Tue May 22 10:47:01 2018 +0200
sw_redlinehide: trivial conversions in dcontact.cxx
Change-Id: I735a0879db5b44ab14202f6b3a75766c9a2d9cd0
commit fb2f3c065e59907eed79686651c84203f8c72da3
Author: Michael Stahl <michael.st...@cib.de>
Date: Fri May 18 18:45:54 2018 +0200
sw_redlinehide: odd conversion in SwNodes::TextToTable()
Change-Id: I0afe1bed882b8256b58aeaeaa0f3331fe5c1c680
commit 91c5691f961498df5552674a0a22a032289542e7
Author: Michael Stahl <michael.st...@cib.de>
Date: Fri May 18 18:45:04 2018 +0200
sw_redlinehide: trivial conversions in doc.cxx,doctxm.cxx
Change-Id: Ic8737c8d06ca7d43241b39f4ad60d78eedcb42bb
commit 05af92d03dad451ab7c3673292638a042c081c62
Author: Michael Stahl <michael.st...@cib.de>
Date: Fri May 18 18:27:40 2018 +0200
sw_redlinehide: trivial conversions callnk.cxx,swcrsr.cxx,trvlfnfl.cxx
Change-Id: Ice8d5b3356ac8fa84439eaf0b785ae56c2de9274
commit a1308d787563a6e49998568916699c061e80b2b2
Author: Michael Stahl <michael.st...@cib.de>
Date: Fri May 18 18:25:40 2018 +0200
sw_redlinehide: trivial conversions in EnhancedPDFExportHelper.cxx
Change-Id: I1365c06d4ff50c9dd537f43dd47d119e0dbf0e78
commit 44d0a133e904159f9cebde7c6ee549344a910762
Author: Michael Stahl <michael.st...@cib.de>
Date: Fri May 18 18:00:17 2018 +0200
sw_redlinehide: SwTextFrame::LeftMargin()/RightMargin():
The callers apparently pass in only pams that point to the node already,
so just assert the precondition instead of this nonsense of assigning
nNode but not nContent.
Change-Id: I78f6d425ebe156a9ac89ffa134d71c0bec7fc9cb
commit 900c9884a26c53a2a4660e1f395af58ab5b33e11
Author: Michael Stahl <michael.st...@cib.de>
Date: Fri May 18 18:00:00 2018 +0200
sw_redlinehide: trivial conversions in frmcrsr.cxx
Change-Id: I15e6fc1eecebab0c497eda66c74633651fa446a6
commit ddba4cd4741c7540cd40e5569e40295f44cd494d
Author: Michael Stahl <michael.st...@cib.de>
Date: Fri May 18 16:18:42 2018 +0200
sw_redlinehide: trivial conversions in porfld.cxx
Change-Id: Ic124bc328482f4c28a92cb0a83bd1f5c5cd9d3a2
commit 57566339082635652ac3c5403f15172420b7f386
Author: Michael Stahl <michael.st...@cib.de>
Date: Fri May 18 16:09:32 2018 +0200
sw_redlinehide: trivial conversions in portxt.cxx
Change-Id: I88206586f89f9a799ee23b1d48922e06f74953f2
commit 54fcdf480142acec0e1b760dd6a1551b0f50dce0
Author: Michael Stahl <michael.st...@cib.de>
Date: Fri May 18 15:32:28 2018 +0200
sw_redlinehide: trivial node conversions in widorp.cxx
Change-Id: I58e9b241e543e72be410d88f640635e9dbe42ff0
commit 6e0913ddf212076eb7da12d23a94e46468f2d001
Author: Michael Stahl <michael.st...@cib.de>
Date: Fri May 18 15:31:37 2018 +0200
sw_redlinehide: trivial node conversions in porrst.cxx
Change-Id: Idecf55238d42b3ec89278cfb792afe72471b0793
commit 427c03d75c54703b99050eab72af929c78d2c612
Author: Michael Stahl <michael.st...@cib.de>
Date: Fri May 18 15:09:04 2018 +0200
sw_redlinehide: convert SwTextFrame::MakePos() which has...
... and odd LOKit notification loop that looks a bit unoptimised.
Change-Id: I9b510f1bc8c295bb9b871ce5cc6060dbd8b96bcb
commit a834eda25799465da6210c7704d8fc83049c6a4c
Author: Michael Stahl <michael.st...@cib.de>
Date: Fri May 18 14:49:39 2018 +0200
sw_redlinehide: trivial node conversions in headers
Change-Id: I74607928dbc8e07df0bba8f3179797735f37a92a
commit 7964ee63c6a53d025f1bfa759b193011ec98cba3
Author: Michael Stahl <michael.st...@cib.de>
Date: Fri May 18 14:47:36 2018 +0200
sw_redlinehide: trivial node conversions in txtfly.cxx,txttab.cxx
Change-Id: I6da08994e2f3f23f583f41bfc5ac6c4f6e5a5112
commit 6726790a89022d342ae5edefc859338474aee3f5
Author: Michael Stahl <michael.st...@cib.de>
Date: Fri May 18 14:28:22 2018 +0200
sw_redlinehide: trivial node conversions in inftxt.cxx
Change-Id: Ic823676c3a6a752aa90b9bccc6d425d982a075ce
commit 451f4adbf08bc2a5ce8e574b9a6413106be18dd3
Author: Michael Stahl <michael.st...@cib.de>
Date: Fri May 18 14:21:21 2018 +0200
sw_redlinehide: trivial node conversions in itrcrsr.cxx
Change-Id: Id47d46cf376391c7156f3f1eea5d5a48e09367b2
commit e0e46b41859ba52979b62fd5b41808178ee4aeb8
Author: Michael Stahl <michael.st...@cib.de>
Date: Fri May 18 14:10:15 2018 +0200
sw_redlinehide: trivial node conversions in itrform2.cxx/itrpaint.cxx
Change-Id: I25fcfb14dee92a9072608fe741f0cf335a749688
commit 2041cd854c397b60e8a6a0329ed0f5c01bbdf1e7
Author: Michael Stahl <michael.st...@cib.de>
Date: Fri May 18 13:58:10 2018 +0200
sw_redlinehide: trivial node conversions in frmpaint.cxx
Change-Id: I8ef3d0ca495d65d72506763fd10c137d53cfc47a
commit a94ad8288876f44cd096e088e97bbe066099a040
Author: Michael Stahl <michael.st...@cib.de>
Date: Fri May 18 13:37:30 2018 +0200
sw_redlinehide: trivial node conversion in itrtxt.cxx
Change-Id: I9b23edb5463d9483ba33b4d569414ff5ac723d17
commit 94214dab6986c2a007cd2db87f54d5396a839598
Author: Michael Stahl <michael.st...@cib.de>
Date: Fri May 18 13:21:15 2018 +0200
sw_redlinehide: dump the MergedPara to layout.xml
Change-Id: I211a92823e7b949fe55e50e6b172a0883056a189
commit 58d493b88fb0a4e7b6199ee4d74e65d204e0af7b
Author: Michael Stahl <michael.st...@cib.de>
Date: Fri May 18 12:56:31 2018 +0200
sw_redlinehide: convert checkApplyParagraphMarkFormatToNumbering()
Put in an early exit too; for whatever reason this is only interested in
empty hints at the end of the text...
Change-Id: Ief9112ab9f610a8507707b3dcc11de4c26f75ec9
commit 6959ea530dc8d611801885c1cc2febd1d0cab6aa
Author: Michael Stahl <michael.st...@cib.de>
Date: Fri May 18 12:54:24 2018 +0200
sw_redlinehide: trivial conversions in txtfld.cxx
Change-Id: I1b8d05a6d274f3826d99dd3f064f90232c54b384
commit 4a154abf7266d5f6f55d85e0d35e34bb8fc5bf37
Author: Michael Stahl <michael.st...@cib.de>
Date: Thu May 17 18:52:09 2018 +0200
sw_redlinehide: more trivial conversions in txtfrm.cxx
Change-Id: Ib83f46bf9bb3acb03e5e5537686385fd398cdc3d
commit 44f810051c8e7ca187335ba821b0db87dd370b24
Author: Michael Stahl <michael.st...@cib.de>
Date: Thu May 17 18:13:55 2018 +0200
sw_redlinehide: trivial node conversions in frmform.cxx
Change-Id: Ie92995ca729f394c5d332626591021918ff9db72
commit 3ea0eb8b75b83cad433b140f3e5aa66cba99bfd4
Author: Michael Stahl <michael.st...@cib.de>
Date: Thu May 17 12:54:33 2018 +0200
sw_redlinehide: set node merge flag in CheckParaRedlineMerge
Change-Id: Ie11096ce9c3d62fbe54dc53954caf6665c374b12
commit 5c187646d4761701f35d342f3611dcc40bd131c4
Author: Michael Stahl <michael.st...@cib.de>
Date: Thu May 17 12:13:36 2018 +0200
sw_redlinehide: fix the fieldmark toxic waste in GetNextAttr()
Out of bounds indexes returned here trigger assertions in new
mapping functions.
Why would you set it to p+1 anyway?
Change-Id: I024e1ab6f40b5545c2e9f71f63620be57fba31d2
commit 1eb36be88abb5615d64cfad0534f8d274ce47072
Author: Michael Stahl <michael.st...@cib.de>
Date: Wed May 16 12:54:27 2018 +0200
sw_redlinehide: remove "protected" SwAttrIter::m_pHints member
Just get it from the current node when needed; it's a trivially
inlinable function call.
Change-Id: Ic2ba291fb43da263300ddaedc9ae21cd86cb07ac
commit 9761ee46a05d99a93de1c070ada06a50d305f2c4
Author: Michael Stahl <michael.st...@cib.de>
Date: Wed May 16 12:44:19 2018 +0200
sw_redlinehide: rename it to SwAttrIter::MaybeHasHints()
... because it's only used as an optimization currently, so we just use
the slow-path if there is a merged paragraph.
Change-Id: I8b577174e65edd0e5210971511e054fd719de96a
commit 6315bcbf4009e473ba7fc0431832d726432f9629
Author: Michael Stahl <michael.st...@cib.de>
Date: Wed May 16 12:26:35 2018 +0200
sw_redlinehide: convert iteration in
SwTextFormatter::TryNewNoLengthPortion()
This is a bit slower, but the feature is virtually unused anyway...
Change-Id: I338a03a3edf27911cd2da55c7e3a438d9c020d40
commit 79da8e0e98b44dad2a54c318caf5ba23bc87e5b4
Author: Michael Stahl <michael.st...@cib.de>
Date: Wed May 16 11:40:44 2018 +0200
sw_redlinehide: convert loop in SwTextPainter::CheckSpecialUnderline()
If we first select by paragraph attributes, and then override that with
hints, it ought to give the right result.
Change-Id: I6929bb746db1229593ca1c2331d80650248e24d3
commit 8b75fd40e36a3d56726b6af5329c7ee68e24f7fc
Author: Michael Stahl <michael.st...@cib.de>
Date: Fri May 25 17:47:24 2018 +0200
sw_redlinehide: remove pointless Seek_ indirection
Change-Id: I30b13433ab1c42532a7dea852938b654a8f0a72a
commit 19fbdf36ac8858bfdca4b6d42729a2e98f2b8dfa
Author: Michael Stahl <michael.st...@cib.de>
Date: Tue May 15 18:04:06 2018 +0200
sw_redlinehide: adapt more functions of SwAttrIter
Change-Id: I17c14f9e66c82cafa2fb5b3e8e45b3bf94fc4a88
commit 54f4c78a73d0bf2f7b606a97024d391578433162
Author: Michael Stahl <michael.st...@cib.de>
Date: Tue May 15 17:30:22 2018 +0200
sw_redlinehide: SwAttrIter::Seek()
Change-Id: Ieb884f678d6521b609714def3f42c8494dc47769
commit 2d0069437a835e9251c0024f57bd054941eed901
Author: Michael Stahl <michael.st...@cib.de>
Date: Tue May 15 16:56:19 2018 +0200
sw_redlinehide: split font/SwAttrHandler init out of CtorInitAttrIter
... so we can call it again later, when the text node changes.
Change-Id: I4cd2ff064b829a70652bf1861bacf365be7277a2
commit 2afa6282cb1dbf315020f98019cd18ed443c4fb9
Author: Michael Stahl <michael.st...@cib.de>
Date: Tue May 15 11:37:54 2018 +0200
sw_redlinehide: SwRedlineItr::Seek_() needs to do something
... in Hide mode, such as locate the next Delete that GetNextRedln looks
for.
Change-Id: Ie0ab35c99f34bd3a071798fd54efd12f1f82a118
commit 03c8ea8942e669f9b334d7dc89d02955383a4745
Author: Michael Stahl <michael.st...@cib.de>
Date: Tue May 15 11:37:23 2018 +0200
sw_redlinehide: more work on SwRedlineItr::GetNextRedln()
Change-Id: I9f79a3f6ace1914f516e89c7ddb16835a63ddc00
commit 438f84a3437256f55866b2a4e26d4e2d6678f718
Author: Michael Stahl <michael.st...@cib.de>
Date: Tue May 15 14:47:49 2018 +0200
sw_redlinehide: this m_nCurrentIndexOffset is giving me headaches
Just use the mapping functions in GetNextAttr().
Change-Id: I4108e62ffbefbf3b0afe03b31ff97013969ea3a3
commit d4f589df2aa3436fc7b46e88d31c4cade53a0377
Author: Michael Stahl <michael.st...@cib.de>
Date: Mon May 14 17:47:08 2018 +0200
sw_redlinehide: don't need SwAttrIter::m_pFirstNode
Change-Id: Icdadd3d9daa5c0031c044004032723d7108d71ab
commit 9f566bdfc32d08ebe4d4be5cab9c426f874b264f
Author: Michael Stahl <michael.st...@cib.de>
Date: Mon May 14 16:25:19 2018 +0200
sw_redlinehide: add 3rd mode to SwRedlineItr
So it can work both in the old ignore-redlines mode and in the new
hide-redlines mode.
Change-Id: I29b23c6749a0f314aff5e9b2342fb389b53bd107
commit 89f9ed7c96ed73d9f4017377e8ed0deb5813ee55
Author: Michael Stahl <michael.st...@cib.de>
Date: Mon May 14 17:42:39 2018 +0200
sw_redlinehide: add MergedPara member to SwAttrIter
Change-Id: I304c333bb6aaca8933606b662743a1642c655de5
commit 86c5e0f611df3cfde662f0554b08448cab1aa9cc
Author: Michael Stahl <michael.st...@cib.de>
Date: Mon May 14 17:39:32 2018 +0200
sw_redlinehide: SwRedlineItr::m_nNdIdx can be const
Change-Id: I6231e25dd1cae8360b2561051cc06fb16788398a
commit 49e5d951ac7cc5747657e09ac702b79717b48973
Author: Michael Stahl <michael.st...@cib.de>
Date: Mon May 14 14:38:08 2018 +0200
sw_redlinehide: SwRedlineItr::CheckLine()
... should just return early... but keep the changed interface.
Change-Id: I6da6f62ebd66f1017946abac60c5f20d2dbb1fc5
commit 853d6c7bfc188a3fbf69b4b8fe29099d230f6fe7
Author: Michael Stahl <michael.st...@cib.de>
Date: Fri May 11 18:48:12 2018 +0200
sw_redlinehide: adapt SwExtend to merged paragraph
It needs a new member to know what node it's in, plus all the methods
need a node passed in to compare.
Change-Id: Ibcc5a1fb7031fbdc048cc6716bb5b74cd4b8f0bf
commit b1126f3863a36afc2de554727737eb4ddf87087d
Author: Michael Stahl <michael.st...@cib.de>
Date: Fri May 11 18:35:48 2018 +0200
sw_redlinehide: SwExtend needs a node index for merged para
Change-Id: I0742eea80e881f1a5f3714e283f4b913260c46ee
commit 80e6174d597de5bbaebe3c15ad5ebc4106a60e3a
Author: Michael Stahl <michael.st...@cib.de>
Date: Fri May 11 17:35:28 2018 +0200
sw_redlinehide: SwAttrIter::GetHints only used to check if there are
hints, so replace it with something less dangerous.
Change-Id: If35cf8157e6b88ee6873789847ed9c5ceea6e37e
commit a0ec1445817de7e3bf5b3e669b04d49ab045cc31
Author: Michael Stahl <michael.st...@cib.de>
Date: Mon May 7 14:45:50 2018 +0200
sw_redlinehide: reinit m_pMergedPara on split node
Change-Id: I560f1cdb537fa848fdbaf719424d4e6608ceda0d
commit 92d3c937a9911e30c8319dff13361f944308c98d
Author: Michael Stahl <michael.st...@cib.de>
Date: Mon May 7 14:44:21 2018 +0200
sw_redlinehide: move SwContentFrame::RegisterToNode to SwTextFrame
It is only called on SwTextFrame, since other SwContentFrame do not
register at SwTextNode but their own node type.
Change-Id: I2bbb4571810a407c33f526f6df526727bde67b65
commit f7aba5cd57a281d3dc074b1764fae805ee6b6791
Author: Michael Stahl <michael.st...@cib.de>
Date: Wed May 9 18:40:21 2018 +0200
sw_redlinehide: trivial conversions in objectpositioning/
Change-Id: Ice9c49596d478bd02728827dbd0dc2c77d7a13db
commit f1b6005e54fe5f9eee40d9415bea93a16e7efe33
Author: Michael Stahl <michael.st...@cib.de>
Date: Wed May 9 18:39:59 2018 +0200
sw_redlinehide: trivial conversions in trvlfrm.cxx
Change-Id: I812ba7a03b9bd25134dab2e85fcead1c7bed617a
commit 8c3dc79e06d32dd5539a96f06a7ea481bb8d17cb
Author: Michael Stahl <michael.st...@cib.de>
Date: Wed May 9 18:39:09 2018 +0200
sw_redlinehide: trivial conversions in softpagebreak.cxx
Still a bit TODO here wrt. finding the frame from every node...
Change-Id: Icff33d2fae3afee77c4329db0938b444f0e47537
commit e275692ee45e0623a485fef2d75931a0280c6098
Author: Michael Stahl <michael.st...@cib.de>
Date: Wed May 9 18:38:03 2018 +0200
sw_redlinehide: trivial conversions in layout/
Change-Id: I5ce4590af52b3bfc08f89915999e86f4973fa9e3
commit 5d44297ba3b0035cc5a861d87ea1c46630c0e2cf
Author: Michael Stahl <michael.st...@cib.de>
Date: Wed May 9 17:36:39 2018 +0200
sw_redlinehide: convert SwTextIter::TruncLines() to MergedAttrIter
Change-Id: I84d405df29139361dc521b490a50c16c95d10efa
commit 77ee62ad497285c7e9156418bf4c012d29395d58
Author: Michael Stahl <michael.st...@cib.de>
Date: Wed May 9 17:30:32 2018 +0200
sw_redlinehide: trivial conversions in itrtxt.cxx
Change-Id: Ia61fbdff0aa87669e643fa7d3d3fe08e23becd74
commit 4dc4f5f1da810dff68590960afb6fffebf17eb6b
Author: Michael Stahl <michael.st...@cib.de>
Date: Wed May 9 17:24:01 2018 +0200
sw_redlinehide: trivial conversions in xmldump.cxx
Change-Id: I37015a42cc1efdc324ccf7ac92423d9dbfb50be1
commit 02c7c2aa44f08cb407f91d58964ac06fcfd117a8
Author: Michael Stahl <michael.st...@cib.de>
Date: Wed May 9 17:17:57 2018 +0200
sw_redlinehide: trivial conversions in itrpaint.cxx
Change-Id: I12cdc805c3e07840b5b914397026a48a589785ea
commit ee4a707d0b83452ea1f51fb2840f47f249138b97
Author: Michael Stahl <michael.st...@cib.de>
Date: Wed May 9 16:46:46 2018 +0200
sw_redlinehide: trivial conversions in itrform2.cxx
Change-Id: I83c0dd85f2f6c68edb7a48928db68fb4e84e5387
commit 73a04f369bffa1b00c0134d6793aa3168e721443
Author: Michael Stahl <michael.st...@cib.de>
Date: Wed May 9 16:00:22 2018 +0200
sw_redlinehide: trivial conversions in itrcrsr.cxx
Change-Id: Ic402f6f2d8bbe92b7cfa65f5f4018ad47f44eed8
commit aea5aa1218fe49067c84ef31e71cd2c743d8bd5c
Author: Michael Stahl <michael.st...@cib.de>
Date: Wed May 9 14:57:26 2018 +0200
sw_redlinehide: trivial conversions in itradj.cxx
Change-Id: Ifc9cc3187e16e63aa468e31efa454c70fd907f50
commit 2d1f8cb89fa672a1f4c4d4b4666cdd6be8ab8a63
Author: Michael Stahl <michael.st...@cib.de>
Date: Wed May 9 14:31:28 2018 +0200
sw_redlinehide: trivial conversions in inftxt.cxx
Change-Id: I8a9af6677edb1c8e2744a7909b0ff4a9d04c6a7d
commit f8dcf0af6815ac597dd0b0e984f7e13958589ba9
Author: Michael Stahl <michael.st...@cib.de>
Date: Wed May 9 14:03:02 2018 +0200
sw_redlinehide: trivial conversions in txttab.cxx
Change-Id: I13b7668fc2cf4b7886c1f96a4a7775dea206e05b
commit c3514187e6028972015c48d6a826fa436fbaf4fe
Author: Michael Stahl <michael.st...@cib.de>
Date: Wed May 9 13:50:55 2018 +0200
sw_redlinehide: trivial conversions in txthyph.cxx
Change-Id: I6300ff1e6618f80c59bd97deeb4e850c5d2b1244
commit 97e170717d03f8db51868feeedc4e9e84da1152e
Author: Michael Stahl <michael.st...@cib.de>
Date: Wed May 9 12:53:25 2018 +0200
sw_redlinehide: trivial conversions in txtdrop.cxx
Change-Id: Ic1a982011d39002ffafb27d03944eede967bb19f
commit e73343e6860f251cae0774189bc05bb9b587a82e
Author: Michael Stahl <michael.st...@cib.de>
Date: Wed May 9 12:37:21 2018 +0200
sw_redlinehide: trivial conversions in txtfld.cxx
Change-Id: Ie2b17b4dba14359a1358d4be50846750ef8939b0
commit 2d54bd8281a7518855bf0336d935699dcb59afb2
Author: Michael Stahl <michael.st...@cib.de>
Date: Wed May 9 12:04:03 2018 +0200
sw_redlinehide: convert FindFootnoteRef() and GetFootnoteLine()
SwTextFootnote has a GetTextNode(), neat...
Change-Id: I527f3c3318b56b582fdf3fb6e3044cb76586730f
commit 6d920cbc2075dfa1f7f1ecab9d802345a85522a4
Author: Michael Stahl <michael.st...@cib.de>
Date: Wed May 9 11:54:51 2018 +0200
sw_redlinehide: convert SwTextFrame::RemoveFootnote() to MergedAttrIter
Change-Id: I19a04ec615bc0b679f79ade680026cf26a0b2ff6
commit 8855869f28eb052e7807e0c78652f27f3a249a1a
Author: Michael Stahl <michael.st...@cib.de>
Date: Wed May 9 11:39:05 2018 +0200
sw_redlinehide: convert SwTextFrame::CalcFootnoteFlag to MergedAttrIter
Change-Id: Ib92ec14baece3a7c99683df9008837525e692760
commit ca525fe6c01f48e6060fd04d5ca80fd917834340
Author: Michael Stahl <michael.st...@cib.de>
Date: Tue May 8 16:56:56 2018 +0200
sw_redlinehide: convert SwTextFrame::Prepare() to MergedAttrIter
Change-Id: I13b3aab31dadc092df20d5f448d16891b731d34e
commit f2c1017ba557f5ff2259548a05e0077abbd91c2d
Author: Michael Stahl <michael.st...@cib.de>
Date: Tue May 8 16:37:17 2018 +0200
sw_redlinehide: convert SwTextFrame::SplitFrame to MergedAttrIter
Change-Id: I98475e1136eedfcd7d4b19d1c8b7e83f350b5c4b
commit 1fbab4bcd895945298ae1f34974643bd33dbbdfe
Author: Michael Stahl <michael.st...@cib.de>
Date: Tue May 8 16:02:42 2018 +0200
sw_redlinehide: convert SwTextFrame::JoinFrame to MergedAttrIter
Change-Id: I88fb8480ee592304ac64f29cea9c5c15b01f7dfc
commit c521365809a7bd9a3f00a7868fb65697ee7e87ca
Author: Michael Stahl <michael.st...@cib.de>
Date: Tue May 8 15:28:42 2018 +0200
sw_redlinehide: trivial conversions in porref.cxx,porrst.cxx,portox.cxx
Change-Id: Ia5067d8e20e783389cc84c79a3909c8053d970eb
commit e2f7c76ce4e00dc7f54b41a66a8959c8e0b7a7ef
Author: Michael Stahl <michael.st...@cib.de>
Date: Mon May 7 19:09:02 2018 +0200
sw_redlinehide: convert SwTextFrame::HideFootnotes()
Change-Id: I86b49510ddc82cc64937bb1e2388f95ca7fc886e
commit 9d7e9e0648c6f127feaa1addaf42eee099796ea6
Author: Michael Stahl <michael.st...@cib.de>
Date: Fri May 4 16:58:10 2018 +0200
sw: add back this OSL_ENSURE for now, it was checking the wrong variable
Change-Id: I4dc8eed525b891ade9951f92d497069ca5e335a7
commit 6481825298fa490d11ed9772d09f4ac570e8ac7c
Author: Michael Stahl <michael.st...@cib.de>
Date: Fri May 4 16:55:06 2018 +0200
sw_redlinehide: convert SwTextFrame::CalcFlyPos with MergedAttrIter
Change-Id: Ib3a954763f8aa901ea487019b006b16c27dd4e90
commit 932900554458ce65f8794d26ec3f4fa2331a1666
Author: Michael Stahl <michael.st...@cib.de>
Date: Fri May 4 18:47:38 2018 +0200
sw_redlinehide: trivial conversions in pormulti.cxx
Change-Id: I9f9e2aa60381f913419d06be04235486a40f0cc9
commit c295972f0a36370cf5469229ff82036c6cc05bf6
Author: Michael Stahl <michael.st...@cib.de>
Date: Fri May 4 18:15:00 2018 +0200
sw_redlinehide: trivial conversions in porlin.cxx
Change-Id: Iac5e40c045a7a71c446c2eb1181f375e88df2011
commit 7b1f0c749566fbcca29d06868880594ca8a0352e
Author: Michael Stahl <michael.st...@cib.de>
Date: Fri May 4 18:12:38 2018 +0200
sw_redlinehide: trivial conversions in porlay.cxx
Change-Id: Ica73ca5c1bd36454c69cb391882be5783357d81a
commit 3f1ba468fdc4df7e6bb5575f9a350d0e66d4c187
Author: Michael Stahl <michael.st...@cib.de>
Date: Fri May 4 18:03:14 2018 +0200
sw_redlinehide: trivial conversions in porglue.cxx
Change-Id: Id8ddc1abaa68448ab8445550ce38dbbfd208a380
commit 474dccba5f1388474d4d6652b8018317e754df26
Author: Michael Stahl <michael.st...@cib.de>
Date: Fri May 4 17:14:39 2018 +0200
sw_redlinehide: trivial conversions in porfld.cxx
Change-Id: Id4a80bcd6b530db0d27101397cebe06f26cba1e9
commit e432dd71f67db4da58ae073ec8851093a7fe56be
Author: Michael Stahl <michael.st...@cib.de>
Date: Fri May 4 15:37:27 2018 +0200
sw_redlinehide: trivial conversions in porfly.cxx
Change-Id: I129eaabeb173ccf8d5530bf3afc9f1cb1b749f9e
commit 1e7f99ff4bd772d0027a6a9c86403c1fe9d37083
Author: Michael Stahl <michael.st...@cib.de>
Date: Fri May 4 14:59:58 2018 +0200
sw_redlinehide: trivial conversions in porexp.cxx
Change-Id: I203b3c0655a3bab47b5f272d8af2658a3d350315
commit 05a6b596db80acf3e18dc07e321c6ba47aa44623
Author: Michael Stahl <michael.st...@cib.de>
Date: Fri May 4 14:28:09 2018 +0200
sw_redlinehide: trivial conversions in EnhancedPDFExportHelper.cxx
Change-Id: I0f6c0842988f49e293c56c105f3eae13c21f0024
commit b436e273f4bd919779a3d5729c537ef4843a1559
Author: Michael Stahl <michael.st...@cib.de>
Date: Fri May 4 14:10:35 2018 +0200
sw_redlinehide: trivial conversions in parachangetrackinginfo.cxx
This case is trivial because of the early return in the Hide case.
Change-Id: Id9891dfa13db4d0e33f28dd9e50a64f1b17fafaa
commit a6295c16f953abe2a0183b9ddb5658d241e2e596
Author: Michael Stahl <michael.st...@cib.de>
Date: Fri May 4 13:56:14 2018 +0200
sw_redlinehide: trivial node conversions in inftxt.cxx
Change-Id: Ia3f6038679afe7d85eeaa31c79870a481cfb9f0b
commit 803e381e6a8458d31eb2d2ff9e2e5df9377b7529
Author: Michael Stahl <michael.st...@cib.de>
Date: Fri May 4 13:54:07 2018 +0200
sw_redlinehide: trivial node conversions in EnhancedPDFExportHelper.cxx
Change-Id: Iac478d0ed1325e03694cd231e4a7074d34566d6b
commit d14c73f181c1165e7bb021b4288b4beae9cc0eee
Author: Michael Stahl <michael.st...@cib.de>
Date: Fri May 4 13:52:49 2018 +0200
sw_redlinehide: trivial node conversions in guess.cxx
Change-Id: I112579701af651020dd0dcb7fb465179ce3719fe
commit f335db3a7cbc429c381a35a763e84b7228ec8251
Author: Michael Stahl <michael.st...@cib.de>
Date: Fri May 4 13:46:17 2018 +0200
sw_redlinehide: trivial node conversions in tabfrm.cxx
Change-Id: I392fa355d8f9d765ae912c03b1c85b2fb14e1f7d
commit 0a26b0a0ae41486c1d7ec510fe6cf02360a3fedb
Author: Michael Stahl <michael.st...@cib.de>
Date: Fri May 4 13:43:22 2018 +0200
sw_redlinehide: movedfwdfrmsbyobjpos.cxx: assume that...
... this map wants to identify all text frames belonging to the same
paragraph, so use the first text node.
Change-Id: I465551f0e9836e7f7e4bd2d21127ad07c2c65a34
commit d678e37cf0a12aecb9ea69fa556e51be87e006f8
Author: Michael Stahl <michael.st...@cib.de>
Date: Fri May 4 13:42:46 2018 +0200
sw_redlinehide: trivial node conversions in frmtool.cxx
Change-Id: Ia5ebc9bbfd8d8892e78fcf1308aeb97114778dd9
commit bb0112c0e28b1923fb26a36d682b649600869222
Author: Michael Stahl <michael.st...@cib.de>
Date: Fri May 4 13:41:56 2018 +0200
sw_redlinehide: trivial node conv. in calcmove.cxx,flowfrm.cxx,fly.cxx
Change-Id: Ied51cc903e024c6db510c55fd364562115e58157
commit 03c478a1222c76568659df10eb0ebcc252ff414f
Author: Michael Stahl <michael.st...@cib.de>
Date: Fri May 4 13:39:58 2018 +0200
sw_redlinehide: trivial in anchoreddrawobject.cxx: no need to check
... if hints exist.
Change-Id: I50ad322d7de800d24135ea8e168ef3488c39f0ba
commit 497e9f78ac04559ccd12ebfecae4b31a2932bb9c
Author: Michael Stahl <michael.st...@cib.de>
Date: Fri May 4 13:38:26 2018 +0200
sw_redlinehide: trivial conversions in fews.cxx,feshview.cxx
Change-Id: I97008fe1669f5bc0538b5810cd62abd9d46551eb
commit 8511d9bc3df5fb328a76c611cca10c1741781da8
Author: Michael Stahl <michael.st...@cib.de>
Date: Fri May 4 13:37:18 2018 +0200
sw_redlinehide: trivial conversions in ndtbl.cxx
Change-Id: I87363524385cb6ade77b459656c3d5825a8424dc
commit f0556324673ee873bed852d6bf1fa8bc6bf20112
Author: Michael Stahl <michael.st...@cib.de>
Date: Fri May 4 13:12:16 2018 +0200
sw_redlinehide: convert and add an assert in acccontext.cxx
Change-Id: I9b5c1bb02011c15d527ca66ec85227b6e87fee62
commit 7ec8ac0555dbbf9a79fbb7b5606479f65731a7e1
Author: Michael Stahl <michael.st...@cib.de>
Date: Fri May 4 12:43:22 2018 +0200
sw_redlinehide: convert SwFEShell::MoveAnchor(), not entirely trivial
Change-Id: I9aa8e0f9a6e0ee21d740f95e0fbee337f468f876
commit 4516d370e6cac166c294ec4156021336654b5bd6
Author: Michael Stahl <michael.st...@cib.de>
Date: Thu May 3 19:01:19 2018 +0200
sw_redlinehide: trivial conv. in acccontext.cxx,accpara.cxx
Change-Id: I537d218afbd7d2832461e24fd98cc1d63304e17a
commit 7c9751889d1ded53b5efe07ca5a342761acc767f
Author: Michael Stahl <michael.st...@cib.de>
Date: Thu May 3 18:46:10 2018 +0200
sw_redlinehide: do all trivial conversions in txtftn.cxx
Change-Id: I80a7303d73ff1e5f2d6496add4a31121f3fbfd8e
commit 90ac25df2a5c805a5aa1e36c9202d61602ecc9eb
Author: Michael Stahl <michael.st...@cib.de>
Date: Thu May 3 18:30:07 2018 +0200
sw_redlinehide: some trivial conversions in txtfrm.cxx
Change-Id: I3c5392370b36c30ad86062c72402049ef294a4a4
commit c859180b3e4cbc384d7f4f7a0c68ac419779fdf3
Author: Michael Stahl <michael.st...@cib.de>
Date: Thu May 3 18:15:44 2018 +0200
sw_redlinehide: do all trivial conversions in guess.cxx
Change-Id: I43c174aa39b6a4e6a2fdfb92f880934cec3edff3
commit cd9b2e61cc11d2b1f6a2b78eaa40c35428cc2238
Author: Michael Stahl <michael.st...@cib.de>
Date: Thu May 3 18:04:36 2018 +0200
sw_redlinehide: do all trivial conversions in frminf.cxx
Change-Id: I57b5ca913e3289c3d168e2717e991af16b55df9c
commit b4c0fd190e65f341dda48f9f3f913a6a452a11c9
Author: Michael Stahl <michael.st...@cib.de>
Date: Thu May 3 17:37:14 2018 +0200
sw_redlinehide: do all trivial conversions in frmcrsr.cxx
Change-Id: I87f83a10043f3d5f7edbca5c4f5cf56720a42661
commit 6944da9165001ccd4c0660a36a66e8831dca3677
Author: Michael Stahl <michael.st...@cib.de>
Date: Thu May 3 17:28:15 2018 +0200
sw_redlinehide: do all trivial conversions in frmform.cxx
Change-Id: Ib79eb02fe6487f555381f0ef9c290503646fb54d
commit 33b5e56f6a283e66444122155d20855f8418add4
Author: Michael Stahl <michael.st...@cib.de>
Date: Fri May 4 13:10:55 2018 +0200
sw_redlinehide: trivial node conversion in itrtxt.hxx
Change-Id: I6654bab24ee9a8598d94aecd79139b90a6148e8d
commit 647714dde44cfe8bde374ed7300e137cd379b9e9
Author: Michael Stahl <michael.st...@cib.de>
Date: Fri May 4 14:37:38 2018 +0200
sw_redlinehide: convert header SwPortionHandler.hxx
Change-Id: Iff9eae2410a9a2497a78a51a9165ab8ace09ee46
commit 1dcfbec828f43d028b42e1509fed98f01b5683a4
Author: Michael Stahl <michael.st...@cib.de>
Date: Wed May 16 12:23:56 2018 +0200
sw_redlinehide: need a MergedIterByEnd too...
Change-Id: If806c41886510b7f7296d234fbec1e9164f88396
commit 25d8744216c8f9a8ed624b7edf18f92160e1838b
Author: Michael Stahl <michael.st...@cib.de>
Date: Tue May 8 18:40:50 2018 +0200
sw_redlinehide: need a MergedAttrIterReverse too
Change-Id: I7bb805ffeea2f9bb27234cd521926dbca58e656d
commit 8740baf7c11d8c10d41fe2045908bd8ab52558ae
Author: Michael Stahl <michael.st...@cib.de>
Date: Fri May 4 16:47:19 2018 +0200
sw_redlinehide: add iterator for all the text attributes in merged...
paragraph, because one SwAttrIter isn't enough for everyone.
Change-Id: Iceff5c26a98bdcc09c0a810b9ac8ca77aa750c17
commit b536c15a2d142b60a73ba3c70267aa5700da444c
Author: Michael Stahl <michael.st...@cib.de>
Date: Thu May 3 16:59:19 2018 +0200
sw_redlinehide: convert itratr.hxx to TextFrameIndex
Change-Id: Id02fbcf5112358fb12f4069e5bedc3292ad200b1
commit d183161da4bdf1f5c7a2bd9f56b94162805bb1b7
Author: Michael Stahl <michael.st...@cib.de>
Date: Fri May 11 18:45:24 2018 +0200
sw_redlinehide: need to map without a SwTextFrame too
Change-Id: I3cf2f4334658245e0010d6c31bfea97c64996d15
commit 59b6be922b9cb4cf4905a9dc9b86a49aacb7c712
Author: Michael Stahl <michael.st...@cib.de>
Date: Mon May 7 13:12:50 2018 +0200
sw_redlinehide: move MergedPara to SwTextFrame
Unfortunately it's needed quite early.
4 in SwTextFrame::GetTextNodeFirst() const (this=0x7fffad6ba000) at
sw/source/core/text/txtfrm.cxx:600
5 in SwTextFrame::GetDoc() const (this=0x7fffad6ba000) at
sw/source/core/text/txtfrm.cxx:610
6 in SwContentNotify::SwContentNotify(SwContentFrame*)
(this=0x60b0001ac960, pContentFrame=0x7fffad6ba000) at
sw/source/core/layout/frmtool.cxx:738
7 in SwContentFrame::MakeAll(OutputDevice*) (this=0x7fffad6ba000) at
sw/source/core/layout/calcmove.cxx:1182
8 in SwFrame::OptPrepareMake() (this=0x7fffad6ba000) at
sw/source/core/layout/calcmove.cxx:367
9 in SwFrame::OptCalc() const (this=0x7fffad6ba000) at
sw/source/core/inc/frame.hxx:1038
10 in SwLayAction::FormatLayout(OutputDevice*, SwLayoutFrame*, bool)
(this=0x7ffff31b98a0, pRenderContext=0x6190001a8b80, pLay=0x7fffad6b9000,
bAddRect=true) at sw/source/core/layout/layact.cxx:1366
11 in SwLayAction::FormatLayout(OutputDevice*, SwLayoutFrame*, bool)
(this=0x7ffff31b98a0, pRenderContext=0x6190001a8b80, pLay=0x7fffb9010000,
bAddRect=true) at sw/source/core/layout/layact.cxx:1361
Also add another mapping function.
Change-Id: I270092774755fcf46bc56ef5115d86db4ece0efb
commit 35f928011674c6803a5facf885898dd5ef923aaa
Author: Michael Stahl <michael.st...@cib.de>
Date: Fri Apr 27 18:42:06 2018 +0200
sw_redlinehide: SwAttrIter::GetNextAttr() skips over delete redlines
That's a bunch of new code.
Change-Id: Ibb0170bf398c5e09bce75797206710de9b9ee893
commit 454fa6e3359dd9a8e4a80fe7f67a40d64a7ff5ca
Author: Michael Stahl <michael.st...@cib.de>
Date: Thu May 3 15:06:58 2018 +0200
sw_redlinehide: convert headers to TextFrameIndex
Only convert the interfaces now, convert the implementations later.
Change-Id: I8a84f239d59a5fe21c62615d9ff8e2defa07badc
commit e0f06e513e97f829e30d7b28b0fa3767c70d3c28
Author: Michael Stahl <michael.st...@cib.de>
Date: Thu May 3 12:25:00 2018 +0200
sw_redlinehide: more SwTextFrame::GetTextNode() alternatives
GetTextNode() is ambiguous and needs to be removed.
Change-Id: I4145492b464870e5879427c6761a3f8e56e793cd
commit c609da53d718df50b955257a77970902b00ade4a
Author: Michael Stahl <michael.st...@cib.de>
Date: Fri Apr 27 18:41:46 2018 +0200
sw_redlinehide: add TextFrameIndex type & SwTextFrame mapping functions
By default, it's an alias for sal_Int32 for now, but if it's a
strong_int we can find all the code that needs changing.
Change-Id: I455bb8e04e0b1e7c0d8788367dabca0a071f02bd
commit 7dbdee1204e36e853d2cd587081b54d9f294180b
Author: Michael Stahl <michael.st...@cib.de>
Date: Fri Apr 27 13:43:58 2018 +0200
sw_redlinehide: add function to create merged paragraph data
Add the data to ParaPortion for now; there is one per SwTextFrame but
there doesn't seem to be anything currently in the layout that exists
once per SwTextNode.
Change-Id: Id86f742f09e5036485690acbe6f831ba9f69c08c
commit 0969d28ae42ab9d87e155c8a1f16abdd15234d62
Author: Michael Stahl <michael.st...@cib.de>
Date: Thu May 17 12:35:10 2018 +0200
sw_redlinehide: add a flag SwRootFrame::mbHideRedlines
This flag should be stored somewhere owned by the ViewShell, since it's
a View setting. But currently there is only a single layout (while
ideally every ViewShell should have its own layout), so add the flag to
SwRootFrame.
The SetHideRedlines implementation is very incomplete and only handles
Show->Hide for now, if the document contains only SwTextNodes.
Change-Id: Ie5fde9314665aaaf10b7359bb47f77641c9d8b1f
commit 338e2c11cfda92439032697ce4e96311a4ed13e1
Author: Michael Stahl <michael.st...@cib.de>
Date: Thu May 17 12:41:45 2018 +0200
sw_redlinehide: add merge state flag to SwNode
Since checking redlines for every node is probably inefficient, the
SwNode should cache if it's merged by delete redlines and hence if a
layout that hides redlines should create frames for it.
Change-Id: I846d94a95efe9c32f44e1ac17bf2cd5600ebf8b7
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
