tdf#34355 sw,offapi,officecfg: show track changes in margin

In ShowTrackedChanges mode, hide tracked deletions
in text optionally and show their shortened text
in margin next to the vertical "Changed line" mark
(showing only the first deletion of the line).

Add "Tracked deletions in margin" checkbox to Writer->View page.

Add "Display tracked changes" and "Outline View" sections to View, too.

Add property ShowChangesInMargin to com::sun::star::text::ViewSettings.

Add config setting:
org/openoffice/Office/Writer/Content/Display/ShowChangesInMargin

Show more information in Manage Changes dialog window
about the tracked deletions with restricted visibility
in ShowChangesInMargin mode: show shortened text content
of a deletion in its (otherwise empty) Comment field.

Change-Id: I1d19a4bf8225f536a635c6dd5062344c51e03b79
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104350
Tested-by: László Németh <nemeth@numbertext.org>
Reviewed-by: László Németh <nemeth@numbertext.org>

1 files changed, 10 insertions, 3 deletions

diff --git a/sw/inc/viewopt.hxx b/sw/inc/viewopt.hxx
index cf501a9d181f..f1049e6b317d 100644
--- a/sw/inc/viewopt.hxx
+++ b/sw/inc/viewopt.hxx
@@ -37,7 +37,7 @@ class SwDocShell;
 namespace svtools{ class ColorConfig;}
 enum class SwFillMode;
 
-enum class ViewOptFlags1 : sal_uInt32 {
+enum class ViewOptFlags1 : sal_uInt64 {
     UseHeaderFooterMenu = 0x00000001,
     Tab           = 0x00000002,
     Blank         = 0x00000004,
@@ -65,10 +65,11 @@ enum class ViewOptFlags1 : sal_uInt32 {
     ShowInlineTooltips = 0x10000000, //tooltips on tracked changes
     ViewMetachars = 0x20000000,
     Pageback      = 0x40000000,
-    ShowOutlineContentVisibilityButton = 0x80000000
+    ShowOutlineContentVisibilityButton = 0x80000000,
+    ShowChangesInMargin = 0x100000000 //tracked deletions in margin
 };
 namespace o3tl {
-    template<> struct typed_flags<ViewOptFlags1> : is_typed_flags<ViewOptFlags1, 0xF7dfcfff> {};
+    template<> struct typed_flags<ViewOptFlags1> : is_typed_flags<ViewOptFlags1, 0x1F7dfcfff> {};
 }
 
 enum class ViewOptCoreFlags2 {
@@ -288,6 +289,12 @@ public:
     void SetShowInlineTooltips( bool b )
         { SetCoreOption(b, ViewOptFlags1::ShowInlineTooltips); }
 
+    //show/hide tracked deletions in text
+    bool IsShowChangesInMargin() const
+        { return bool(m_nCoreOptions & ViewOptFlags1::ShowChangesInMargin); }
+    void SetShowChangesInMargin( bool b )
+        { SetCoreOption(b, ViewOptFlags1::ShowChangesInMargin); }
+
     //show/hide interactive header/footer on top/bottom of pages
     bool IsUseHeaderFooterMenu() const
         { return bool(m_nCoreOptions & ViewOptFlags1::UseHeaderFooterMenu ); }