df-libreoffice:private/mst/sw_redlinehide_4b

Branch merges

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related charm recipes

789644b... by Michael Stahl <email address hidden> on 2018-12-21

sw_redlinehide: adapt ToX Update

The ToX exists only once in the model, so it either has to have the
content corresponding to redlines being shown, or hidden.

Adapt Update based on current layout setting.

Change-Id: Ibf5ec092632cf3a5f513965afdb840fd8239a7fd

0d8170e... by Michael Stahl <email address hidden> on 2018-12-20

sw_redlinehide: SwTextNode::GetExpandText() HideDeletions

Always enable this when the layout hides redlines (not sure why it
wasn't done like this before...).

Change-Id: Icddf8a23352565c0091a79eb64628054d0028928

5f55edb... by Michael Stahl <email address hidden> on 2018-12-20

sw_redlinehide: don't return COMPLETE_STRING from MapModelToView()

The anchor position of a fly frame can be on an empty node after the
last non-deleted text, and SwAnchoredObject::CheckCharRect()
needs to get a valid frame index for that.

This can be reproduced with ooo69593-1.odt.

Change-Id: I448bb49d64e72b0af24306bd7c45755aa631b57d

0b5e058... by Michael Stahl <email address hidden> on 2018-12-19

sw: fix assert in SwViewShell::FillPrtDoc()

The point node isn't necessarily the start node; this will assert in
SwTextFrame::MapModelToView: Assertion `SwFrame::GetDep() == pNode' failed
when selecting a table and then File->Print->Print Selection.

Thanks Samuel for the hint.

(regression from 067a53bbcd209d7458b04142f989e1ff7ec1f785)

Change-Id: I7f58b79e068e8b7817261e81f999721ebfcfdcf1

9147b9e... by Michael Stahl <email address hidden> on 2018-12-18

sw_redlinehide_4b: visibility of flys anchored at empty nodes

The new mode would consider a fly anchored at a node that contains the
start or end of a redline but has no visible text displayed to be
hidden, while the old move-code would move it to the merged SwTextNode
and therefore keep it visible.

Change this to give the same result both on layout creation
AppendObjs() and switching AddRemoveFlysAnchoredToFrameStartingAtNode().

Reproduces with ooo108073-2.odt, tdf104735-1.odt

Change-Id: Ibac795dcf7848d78e8a2200124bc2557f35ba434

086539a... by Michael Stahl <email address hidden> on 2018-12-17

Revert "HACK: ODF import: always hide redlines"

This reverts commit da23ebcb675ce57d84bb02a3db04751b8988afa9.

050fbb5... by Michael Stahl <email address hidden> on 2018-11-30

HACK: ODF import: always hide redlines

Change-Id: I275c6738943ee0d74ccacea69af1c1f4c9ede1df

273c901... by Thorsten Behrens <email address hidden> on 2018-12-17

sw_redlinehide: fix tdf#113479 by removing nag dialog

No need to suggest showing redlines beyond 250 changes anymore.

Change-Id: Ia219a4eb3af64079979538b8ab4aaf2a94ec19c8

a7a8d0b... by Michael Stahl <email address hidden> on 2018-12-18

sw_redlinehide_4b: tdf#113479 SetRedlineFlags() calls no longer...

...able to be triggered by the UI, so the performance problem should be
gone.

The SwXTextDocument "ShowChanges" property allows API clients to call
SetRedlineFlags() and change the model; this API should be retained
as-is for now, because there is no way currently (outside of the rather
specialised a11y API) to get a "merged view" of the paragraphs in the
document, so API clients may want to (temporarily) toggle this property
to then retrieve properties from the model. In case we later find that
there are no API clients that want to do such things, the property can
be removed.

A run with assert() instead of SAL_WARN_IF() found only 2 tests that
explicitly call SetRedlineFlags() to clear ShowDelete.

Change-Id: I44aee90f7727948ca0bbaaff9d04f8dd6b97cbd1

b025f0c... by Michael Stahl <email address hidden> on 2018-11-30

sw_redlinehide: make layout based Show/Hide mode the default

remove ExperimentalMode checks

Change-Id: Ie098eda0840bbd3231696cae43cc572ad61379fc