diff options
| author | László Németh <nemeth@numbertext.org> | 2019-01-29 14:53:43 +0100 |
|---|---|---|
| committer | László Németh <nemeth@numbertext.org> | 2019-01-29 20:40:30 +0100 |
| commit | 9c4eef7d809ad7d283860c7b47b0f561aa240906 (patch) | |
| tree | 72ee40f8545473ab8240082c9dc3b9a25994dde4 /include | |
| parent | 930ec0e6ab7bd5492fb4cf4a8f6860e3b728929d (diff) | |
tdf#52391 reject/clear formatting of format-only changes
Format-only changes had 1) disabled (in Manage Changes
dialog window) or 2) bad rejection (Track Changes toolbar
icons and Edit->Track Changes menu item functions
"Reject"/"Reject All" resulted acception of the tracked
format-only changes instead of rejection).
Because format-only changes haven't had real rejection
support, yet, this commit 1) adds an often useful
reject-like function in the Manage Changes dialog window:
instead of disabling Reject/Reject All, now these buttons
clears direct text formatting in the area of the tracked
format-only changes. Because this may be not a rejection
(ie. the original text can contain direct text formatting),
the labels of the button warn about it: "Reject/Clear
formatting" and "Reject All/Clear formatting".
Note: "Reject All" still rejects only
insertions/deletions at (now first) pressing,
as from commit a8a3928bd3614e52edc0a4df6f67ce53e787905c.
2) Icons and menu items "Reject"/"Reject All" clear
direct text formatting in the areas of the tracked
format-only changes. Note: this is still not ideal,
but it can help to avoid of unintended direct
text formatting until implementing upcoming ODF 1.3
change tracking.
Change-Id: I87c3ac6165019cae9c49ed4591eaadef9e06beb5
Reviewed-on: https://gerrit.libreoffice.org/67080
Tested-by: Jenkins
Reviewed-by: László Németh <nemeth@numbertext.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/svx/ctredlin.hxx | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/svx/ctredlin.hxx b/include/svx/ctredlin.hxx index e83b9eec7e0c..7e2260b4f1c4 100644 --- a/include/svx/ctredlin.hxx +++ b/include/svx/ctredlin.hxx @@ -329,6 +329,9 @@ public: void EnableAcceptAll(bool bFlag); void EnableReject(bool bFlag); void EnableRejectAll(bool bFlag); + static void EnableClearFormatButton(VclPtr<PushButton>, bool bFlag); + void EnableClearFormat(bool bFlag); + void EnableClearFormatAll(bool bFlag); void EnableUndo(bool bFlag=true); void DisableUndo() {EnableUndo(false);} void ShowUndo(); |