diff options
| author | László Németh <nemeth@numbertext.org> | 2021-04-08 10:20:02 +0200 |
|---|---|---|
| committer | László Németh <nemeth@numbertext.org> | 2021-04-12 10:44:49 +0200 |
| commit | d89786054715b44aa983d0752484216825c74ae2 (patch) | |
| tree | 55e4a6e4c771eae960af6754a27eac003d3fc3be /include | |
| parent | 02529315289b8a5ef546e5df33283a424d68d8fd (diff) | |
tdf#125909 tdf#141298 sw: show (Hidden) Track Changes infobar
instead of enabling Track Changes toolbar automatically,
when there are hidden track changes data or settings in
the document, i.e. Track Changes toolbar and Show Changes
are disabled, but
– the document contains (not visible) recorded changes, or
– Record Track Changes is enabled (which will result hidden
recording, e.g. unintended publishing of the deletions of
the document); or
– both of them.
Messages of the infobar show these cases.
Button of the Track Changes infobar allows to show/hide the
Track Changes toolbar. Hiding the Track Changes toolbar with
button of the Track Changes infobar closes the infobar, too.
Regression from commit afbbfb3b55beb937555a972d9edbb47ede91001a
"tdf#83958: sw: enable Track Changes toolbar automatically" and
commit 1989201c56c03b1ef13a282cfd09af69620040ea
"tdf#138870 sw: fix Track Changes toolbar reappearing".
Change-Id: I9162102d63d671b412fa0228e6bbfb5c356ee03e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113792
Tested-by: Jenkins
Reviewed-by: László Németh <nemeth@numbertext.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/sfx2/strings.hrc | 2 | ||||
| -rw-r--r-- | include/sfx2/viewfrm.hxx | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/include/sfx2/strings.hrc b/include/sfx2/strings.hrc index 14e1066447ba..c5d3c003e313 100644 --- a/include/sfx2/strings.hrc +++ b/include/sfx2/strings.hrc @@ -292,6 +292,8 @@ #define STR_SIGNATURE_NOTVALIDATED_PARTIAL_OK NC_("STR_SIGNATURE_NOTVALIDATED_PARTIAL_OK", "The certificate could not be validated and the document is only partially signed.") #define STR_SIGNATURE_OK NC_("STR_SIGNATURE_OK", "This document is digitally signed and the signature is valid.") #define STR_SIGNATURE_SHOW NC_("STR_SIGNATURE_SHOW", "Show Signatures") +#define STR_TRACK_CHANGES_BUTTON NC_("STR_TRACK_CHANGES_BUTTON", "Show Toolbar") +#define STR_TRACK_CHANGES_BUTTON_HIDE NC_("STR_TRACK_CHANGES_BUTTON_HIDE", "Hide Toolbar") #define STR_CLOSE_PANE NC_("STR_CLOSE_PANE", "Close Pane") diff --git a/include/sfx2/viewfrm.hxx b/include/sfx2/viewfrm.hxx index 7692636fd24c..c01da176b847 100644 --- a/include/sfx2/viewfrm.hxx +++ b/include/sfx2/viewfrm.hxx @@ -67,6 +67,7 @@ protected: DECL_LINK(WhatsNewHandler, weld::Button&, void); DECL_LINK(SwitchReadOnlyHandler, weld::Button&, void); DECL_LINK(SignDocumentHandler, weld::Button&, void); + DECL_LINK(HiddenTrackChangesHandler, weld::Button&, void); SAL_DLLPRIVATE void KillDispatcher_Impl(); virtual ~SfxViewFrame() override; |