[Libreoffice-commits] core.git: Changes to 'feature/sw_redlinehide_4a_for_libreoffice-6-2'
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Fri Dec 7 09:39:13 UTC 2018
New branch 'feature/sw_redlinehide_4a_for_libreoffice-6-2' available with the following commits:
commit 8df9a443e693adbc4d48d1dfefa6335ed075aa5d
Author: Michael Stahl <Michael.Stahl at cib.de>
Date: Fri Nov 30 16:28:04 2018 +0100
sw_redlinehide_4a: MoveDeletedPrevFrames() should only move
... frames from a layout with hidden redlines.
Change-Id: I8f5d5bbbc5bfd49a8a52579a1c34157b9c5c4515
(cherry picked from commit c1d7cc390c6e095d6e58b856758ba86f7666195f)
commit 1d96e8ee08d288ac1507e3d9eac2647bfb157972
Author: Michael Stahl <Michael.Stahl at cib.de>
Date: Thu Nov 29 15:56:18 2018 +0100
sw_redlinehide_4a: fix infinite loop in SwAttrIter::Seek()
It's actually possible for Seek to be invoked with a position that is
neither 0 nor >= the current position:
lcl_CalcOptRepaint(), called from SwTextFormatter::FormatLine(), will
move backwards via some funny heuristic and call GetCharRect(), which
then seeks.
Change-Id: If061a768b9a0155d9a95b190c44e7048312f4ba3
(cherry picked from commit c985eba6e9d6f9d3fece903a6b72eca611894b16)
commit 56883e2702b8aad26d6fa9eb2dbcb1ca3a7ae857
Author: Michael Stahl <Michael.Stahl at cib.de>
Date: Thu Nov 29 14:50:20 2018 +0100
sw_redlinehide_4a: fix asserts caused by invalid index in SwUpdateAttr
There is no reason for SwpHints::TryInsertHint() to add 1 to the end
index of an empty hint, which results in an invalid index when the end
of the hint is at the end of the node.
The only user of the indexes in SwUpdateAttr is
SwTextFrame::SwClientNotify() and it already extends a 0 range to 1.
Change-Id: I7355bac931cd8dd390f96d04546d73273f364cda
(cherry picked from commit 109a573a644ab7aa760cde30538b1122155adc9f)
commit b2890b9288b71d12902048b60c1f10f756fafd31
Author: Michael Stahl <Michael.Stahl at cib.de>
Date: Wed Nov 28 18:15:41 2018 +0100
sw_redlinehide_4a: stop toggling ShowDelete in SwAutoFormat
Change-Id: Ib6495d4248faa679d5a55642ac51baf419708287
(cherry picked from commit e7283ebe7a2ba9b608a04d1efbe5504f182369a7)
commit b16d335056a4692276e45a55a6df5ccaac841663
Author: Michael Stahl <Michael.Stahl at cib.de>
Date: Wed Nov 28 17:41:09 2018 +0100
sw_redlinehide_4a: TextFrameIndex goes live
Change-Id: Ie59c09bdc57505e16022c43791d5e65cc233d5b9
(cherry picked from commit aa4f245efa24e25bfd78114ab8651220d0723757)
commit d2806dade9c1f60f6a5f5f432627c084dc1d9d20
Author: Michael Stahl <Michael.Stahl at cib.de>
Date: Wed Nov 28 17:27:39 2018 +0100
sw_redlinehide_4a: SwEditShell::AutoCorrect() etc.
The hope is that the AutoCorrect never deletes nodes, hence never
deletes SwTextFrames, hence we can pass in the SwTextFrame::GetText()
result and it will be updated via the SwTextFrame::SwClientNotify()
on editing operations.
Change-Id: Ib644d0373963119b9f7fe6767b028fd89724feb3
(cherry picked from commit 7481e8b5500e86626be5f8eae1e7f48b7f51e21a)
commit d2af657fc34e726cd1bb9077ebab3bf2ed7c1aad
Author: Michael Stahl <Michael.Stahl at cib.de>
Date: Wed Nov 28 17:09:22 2018 +0100
sw_redlinehide_4a: SwAutoFormat::AutoCorrect()
Change-Id: I0ab7665f8635d6716fce996408db1e2bedf54d0c
(cherry picked from commit c03da6a4a429327244bbe27e32e2f6e82b18163d)
commit ea6b0e9059d726a031b375a9e3f91dcec19521be
Author: Michael Stahl <Michael.Stahl at cib.de>
Date: Wed Nov 28 15:51:02 2018 +0100
sw_redlinehide_4a: SwAutoCorrDoc iterates frames, not nodes
Adapt this in a similar way, with a DeleteSel() that skips over
delete redlines.
The Replace functions fortunately only have callers that replace 1
character currently, but there is another ReplaceRange() call that
needs a litte more complicated handling.
Change-Id: Idd5c80e96c0f355d3dc965b2f70376258d23e1a3
(cherry picked from commit 9926ea7dd07f1f3d012ddf97941a42bb7fa5717d)
commit a9472e3a68b4e1f0e4d3c5ee5cd3424e8fd33517
Author: Michael Stahl <Michael.Stahl at cib.de>
Date: Tue Nov 27 18:28:41 2018 +0100
sw_redlinehide_4a: SwAutoFormat iterates frames, not nodes
In order to not require moving the delete redlines out of the document
body, rely on the DeleteSel() implementation skipping over the redlines,
and also pass the shell's layout to the various SwDoc functions that
are called.
Previously, the redlines were not deleted by DeleteSel() due to
SwAutoFormat setting RedlineFlags::Ignore.
Change-Id: Ib05ecb534993368d81f66e70124617968b4c8e9a
(cherry picked from commit eb92dc08f2abf5ed088da0d736266f213adf00de)
commit 9894b12c8743d1e54a4c41998f0290005bff4a81
Author: Michael Stahl <Michael.Stahl at cib.de>
Date: Fri Nov 23 18:02:49 2018 +0100
sw_redlinehide_4a: SwAutoFormat: manually skip redlines when deleting
Change-Id: I001e61305ee8416f851f834d3068bd91de8281f8
(cherry picked from commit b9a5d49761351eee327e9bc8518d9388d409058d)
commit 75c63c4ffd224c6bad53858f685eecffa6a59349
Author: Michael Stahl <Michael.Stahl at cib.de>
Date: Fri Nov 23 14:14:17 2018 +0100
sw: fix wrong title of AutoFormat with redlining dialog
(regression from 9fcef57a34dbd88a98621dfaf8668fa076dd98f1)
Change-Id: Id6ea5841dd25a30519deb825c3ae0aaa7469c250
(cherry picked from commit 564260804ee3a8846b921188e36bc269fc8ba98e)
commit 5450e84cd2a960745d6de4d1c0ba81e81e0f29fd
Author: Michael Stahl <Michael.Stahl at cib.de>
Date: Thu Nov 22 17:47:08 2018 +0100
sw: rename misleading DeleteCurrentParagraph()
Rename also DelPrevPara() and DeleteCurNxtPara().
Also document the state transitions.
Change-Id: I0b874852a4c1aab8d5d3a55b9dfef360e313089c
(cherry picked from commit c1f1cad3e63afcf6b9bbf6e42f28efa74ec49189)
commit 2c7e1591b997179952628965b3979230c0b6fd64
Author: Michael Stahl <Michael.Stahl at cib.de>
Date: Thu Nov 22 11:57:15 2018 +0100
sw_redlinehide_4a: some page break calls in SwFEShell/PageBreakWin
... should use layout.
Change-Id: Iabb29bb49558ef1c805ede3300042b815f62136a
(cherry picked from commit 1af5ca57dc89fffd460a3168a937036b589c3cd7)
commit 8f6fba33a8b1cf1931387221ea20c9182a1f120b
Author: Michael Stahl <Michael.Stahl at cib.de>
Date: Wed Nov 21 17:50:28 2018 +0100
sw_redlinehide_4a: fix SwDoubleLinePortion/SwMultiCreator/SwBracket
Missing TextFrameIndex conversion.
Change-Id: Ie7b58b74aa6bb1e2ff8199031a9f59f5c3ba68c0
(cherry picked from commit fd04c73a3897c1a0c450a09b911a14c2128c16b3)
commit c52bead4d4da040f0e0ddce6a1396fe2d4d85861
Author: Michael Stahl <Michael.Stahl at cib.de>
Date: Wed Nov 21 16:53:30 2018 +0100
sw_redlinehide_4a: finish conversions guess.cxx,itrcrsr.cxx,porfld.cxx
... and tests.
Change-Id: I847a9441b73cdfc9bd826fad2c9075a9aa1d7d2d
(cherry picked from commit 23b008ee75e22cbd3c2b08b7a7968dec22257791)
commit 154bec102a4c25d8b3168120eee513b265ef132d
Author: Michael Stahl <Michael.Stahl at cib.de>
Date: Wed Nov 21 14:06:40 2018 +0100
sw_redlinehide_4a: SwEditShell::GetLineCount()
Change-Id: Ib9a13eab25b02b919d472ae864213b110e7794c7
(cherry picked from commit a4165e1b08c82b667b209ee38b4d2a2c534c1def)
commit 1f1aebabaa97951aae38de51e8abf5f6aab9c944
Author: Michael Stahl <Michael.Stahl at cib.de>
Date: Wed Nov 21 13:01:50 2018 +0100
sw_redlinehide_4a: convert SwTextNode::GetMinMaxSize()
Change-Id: I1ac09d3dfd95f2a98142c4bfe51aad04926e2d38
(cherry picked from commit 6b54554d93bb0683ae63836a85975f0b17bd1324)
commit 570037ddd5f46b0ef6cc8b100dda0aefbb50fbb6
Author: Michael Stahl <Michael.Stahl at cib.de>
Date: Wed Nov 21 12:28:03 2018 +0100
sw_redlinehide_4a: convert SwEditShell::GetScalingOfSelectedText()
Move SwTextNode::GetScalingOfSelectedText() to SwTextFrame & simplify.
Change-Id: I9e9f0059665fb128de6be12a15ca2b4a95ebc5ff
(cherry picked from commit 782506335e2b5a1c6d4c0222520165900a91aeb8)
commit 188092a7113b958e3cea49fca646eceb18842b5e
Author: Michael Stahl <Michael.Stahl at cib.de>
Date: Wed Nov 21 11:15:01 2018 +0100
sw_redlinehide_4a: fix the number handling in SwEditShell::GetScriptType()
This is really to complicated & should be simplified, but while it seems
reasonable to assume that a frame always exists (or that nodes without
frames should be skipped), there needs to be a way to update a
SwScriptInfo if it turns out to be invalid...
Change-Id: I185733c2e1e93b0c4d2453eeb3ea48cd4b9b6779
(cherry picked from commit 025ebb415e7dd2d91e6be7b3a913ef78dca7c9a6)
commit ac41061391921ee11e815fa1c457d72489fb01f3
Author: Michael Stahl <Michael.Stahl at cib.de>
Date: Tue Nov 20 18:26:18 2018 +0100
sw_redlinehide_4a: SwEditShell::IsMoveLeftMargin(), MoveLeftMargin()
Change-Id: I2bc29816af93ae265c0f0d11977b2d694e00ad6c
(cherry picked from commit b070202b420129b5edd368420e0e50ec45261d01)
commit 88f520b3123f7e8576581c3ba1ab8966583b51d6
Author: Michael Stahl <Michael.Stahl at cib.de>
Date: Tue Nov 20 18:00:27 2018 +0100
sw_redlinehide_4a: adapt SwEditShell::GetPaMParAttr()
Change-Id: I97a2081a142fd1f74a5d6be534f094fdc4db45ab
(cherry picked from commit a382ecb5689ee425e77f830fd81b8696dc90a68b)
commit 2bf89fb088c4ab35a9a26d1c3525dd8ca80a2868
Author: Michael Stahl <Michael.Stahl at cib.de>
Date: Tue Nov 20 16:32:04 2018 +0100
sw_redlinehide_4a: adapt SwEditShell::FillByEx()
Change-Id: I8a85d1fe580ce8c8a52d0ee00d36e499b5e903dc
(cherry picked from commit 695a7f10fa9dd55359fbc99b7fdced1c1a7fe025)
commit f8af85f29987afd358e6a2f619b2d5fcf7f32cb1
Author: Michael Stahl <Michael.Stahl at cib.de>
Date: Tue Nov 20 15:27:45 2018 +0100
sw_redlinehide_4a: more adapting of SwDoc::SetCounted()/SetNumRule()
Apply to/reset only the paragraph properties node.
Change-Id: I4dd3973a758f4afcc30f905b7351e9687d050e33
(cherry picked from commit c2932c1005968b9d0f1500c6a018704e2ccd4658)
commit 90d3c959a13f66f90e6342d6b3cf7b1cd3e9a2d1
Author: Michael Stahl <Michael.Stahl at cib.de>
Date: Tue Nov 20 14:38:55 2018 +0100
sw_redlinehide_4a: adapt SwEditShell::ResetAttr()
Change-Id: I5131f5a3ff261a4d86e65b4afff3eb8cdd98cebf
(cherry picked from commit 68093f957d936f938213290c790443ed83435361)
commit 64d67593d95d5b0a1f2c46a891e388a03451a0fc
Author: Michael Stahl <Michael.Stahl at cib.de>
Date: Tue Nov 20 14:37:40 2018 +0100
sw_redlinehide_4a: adapt SwEditShell::SetTextFormatColl()
Skip hidden nodes, apply to properties-node.
Change-Id: I9c511e87c431bd39dc6efdcddf2cad9bbf18c592
(cherry picked from commit 6bbec38ae2f795b2ca839224a5997f2a883256f8)
commit 13e92a9650ca9fbaff597843be05c70e89f94437
Author: Michael Stahl <Michael.Stahl at cib.de>
Date: Tue Nov 20 11:04:41 2018 +0100
sw_redlinehide_4a: adapt SwEditShell::ReplaceDropText()/GetDropText()
Change-Id: Iaf6101f02bd5dbeb9a07e796932186b5e2b1a563
(cherry picked from commit 3b3a81ce2324a11530142c15c62ce64ac2bfaef5)
commit 31b55ab3277433a8595808e15dde56dc46c02aef
Author: Michael Stahl <Michael.Stahl at cib.de>
Date: Mon Nov 19 17:44:37 2018 +0100
sw_redlinehide_4a: InsertItemSet()/InsertPoolItem()
It's really quite annoying to have RES_BREAK applied to all nodes; so
apply the node-items only to the first-/properties-node and skip hidden
nodes.
Keep applying text/character items as before, except skip over hidden
nodes.
Change-Id: I085afd59af78caf1ca8dac4080c53bdbdb4e56a1
(cherry picked from commit c253dde883b2cc7fd1fd0a460fd969bcb941d32c)
commit 95ed9879737c850e8608a1a33f02ea594cbf7a78
Author: Michael Stahl <Michael.Stahl at cib.de>
Date: Mon Nov 19 12:47:59 2018 +0100
sw_redlinehide_4a: ignore hidden nodes in SwEditShell::GetPaMAttr()
MergeValues would set everything to invalid.
Change-Id: I45795fe9bd113399e276ac42851cbf5a198c9694
(cherry picked from commit 2ad1767c58a46266401c07d4dd4625f1fc816ac2)
commit 1957cfc2b4e14dba1274b062a85859f0ffd3a13a
Author: Michael Stahl <Michael.Stahl at cib.de>
Date: Fri Nov 16 18:52:32 2018 +0100
sw_redlinehide_4a: add layout to SwTextNode::GetParaAttr()
Merge items from first-node and props-node, as they are used in the
text formatting.
Change-Id: I4cbab55bc3b0f8bc6dc5bd3577da53b3160018a3
(cherry picked from commit eb3481d9d0d67c88e04a9da86e0cee6a7585c386)
commit 18ed62160e6bcd06ccd13ddda2d6c8459f015041
Author: Michael Stahl <Michael.Stahl at cib.de>
Date: Fri Nov 16 16:45:20 2018 +0100
sw: rename to SwTextNode::GetParaAttr(), at least that's unique
Change-Id: I1de6b544a4868f0d30077ba2c6d195bffd2e8b00
(cherry picked from commit 2b61043032e2e408e3a721bb91dd13577aa673dc)
commit 1a8606c8c649a71e1fc0a6686682e7b46df6aaf9
Author: Michael Stahl <Michael.Stahl at cib.de>
Date: Fri Nov 16 16:44:41 2018 +0100
sw: simplify SwTextNode::GetAttr()
Change-Id: I78d32031ebc42d749dbc750b7127983810bbfb1d
(cherry picked from commit cb53a34d663626a2ae26ab85d5735bc1371c8aab)
commit eed52ea109cb11179907a2dc14c4f206f1b2fc0a
Author: Michael Stahl <Michael.Stahl at cib.de>
Date: Fri Nov 16 16:26:38 2018 +0100
sw: SwTextNode::GetAttr() inconsistency
If there are hints, the aFormatSet.Differentiate(rSet) will cause the
pre-existing items in the parameter rSet to win, whereas without hints
the SwContentNode::GetAttr() calls rSet.Set() which clears everything.
It looks like WW8Export::WriteFootnoteBegin() was sort of relying on
this; presumably it wants the pCFormat to win over node's items but
hints on the position to win over pCFormat. Well that's what it
currently gets anyway, so try to preserve that.
The other use in SwUnoCursorHelper::SetPropertyValues() looks like an
oversight.
Change-Id: I80e18e040413fcf26f6f77844ed731de31a464d2
(cherry picked from commit a91992e7b3e7f59e9116aef859696d517a93dab7)
commit 39eeddaf4240a3988fbb7f293ecc0880fd8416a3
Author: Michael Stahl <Michael.Stahl at cib.de>
Date: Mon Nov 19 12:21:59 2018 +0100
sw_redlinehide_4a: the SwTextNode item set contains XATTR_FILL too
... so handle them as well in SwTextFrame::SwClientNotify().
Change-Id: Ifa8bf8f44bcd08a64dc36939bad58efefbd7af55
(cherry picked from commit 52e8b41f1ceec33cd774d3e6b61e208b61a65eb3)
commit fcb94899362442df8f584223864ba1343c6859e8
Author: himajin100000 <himajin100000 at gmail.com>
Date: Thu Dec 6 16:42:04 2018 +0900
adapt to the change from sal_Int32 to TextFrameIndex
see commit 2136dc24 and commit e721f958
Change-Id: I07ace74f93adc2568003314b5f05c41611d6f77c
Reviewed-on: https://gerrit.libreoffice.org/64671
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
(cherry picked from commit a10dd637dc842e0b0221b8ec10965c8f130b4059)
More information about the Libreoffice-commits
mailing list