tdf#138136 tdf#38093 add option to treat sub outline levels as content

Also included in this patch:

- Modifications to make all outline content visible during move
operations.

- Removal of code intended to redraw buttons when layout is changed that
seems not to work as intended.

- Function IsOutlineContentFolded changed to IsOutlineContentVisible

- Change of delay before button is shown to half of what it was.

Change-Id: I0dde555ccd0693ca382c1f15326edfdc2fc44a93
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107815
Tested-by: Jenkins
Reviewed-by: Jim Raykowski <raykowj@gmail.com>

1 files changed, 7 insertions, 1 deletions

diff --git a/sw/inc/viewopt.hxx b/sw/inc/viewopt.hxx
index ebfab960d226..996aec4848c2 100644
--- a/sw/inc/viewopt.hxx
+++ b/sw/inc/viewopt.hxx
@@ -61,6 +61,7 @@ enum class ViewOptFlags1 : sal_uInt64 {
     Synchronize   = 0x01000000,
     GridVisible   = 0x02000000,
     OnlineSpell   = 0x04000000,
+    TreatSubOutlineLevelsAsContent = 0x08000000,
     ShowInlineTooltips = 0x10000000, //tooltips on tracked changes
     ViewMetachars = 0x20000000,
     Pageback      = 0x40000000,
@@ -68,7 +69,7 @@ enum class ViewOptFlags1 : sal_uInt64 {
     ShowChangesInMargin = 0x100000000 //tracked deletions in margin
 };
 namespace o3tl {
-    template<> struct typed_flags<ViewOptFlags1> : is_typed_flags<ViewOptFlags1, 0x1F7dfcfff> {};
+    template<> struct typed_flags<ViewOptFlags1> : is_typed_flags<ViewOptFlags1, 0x1ffdfcfff> {};
 }
 
 enum class ViewOptCoreFlags2 {
@@ -306,6 +307,11 @@ public:
     void SetShowOutlineContentVisibilityButton(bool b)
         { SetCoreOption(b, ViewOptFlags1::ShowOutlineContentVisibilityButton); }
 
+    bool IsTreatSubOutlineLevelsAsContent() const;
+    void SetTreatSubOutlineLevelsAsContent(bool b)
+        { SetCoreOption(b, ViewOptFlags1::TreatSubOutlineLevelsAsContent); }
+
+
     bool IsShowHiddenChar(bool bHard = false) const
         { return !m_bReadonly && (m_nCoreOptions & ViewOptFlags1::CharHidden) &&
                             ((m_nCoreOptions & ViewOptFlags1::ViewMetachars)||bHard); }