tdf#124686 HideWhiteSpace should be positive Show Whitespace

"Hide Whitespace" under View menu changes to "Show Whitespace". Functions and associated strings are renamed accordingly.

Change-Id: Id0c91ecf5c59a8c0cd5d00574f3ce0f38d6dd6d7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90324
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>

7 files changed, 42 insertions, 3 deletions

diff --git a/sw/inc/cmdid.h b/sw/inc/cmdid.h
index b43a852d38e4..6513bf5032a8 100644
--- a/sw/inc/cmdid.h
+++ b/sw/inc/cmdid.h
@@ -184,6 +184,8 @@
 #define FN_VIEW_HIDE_WHITESPACE (FN_VIEW + 59)  /* Hide header, footer, and pagebreak */
 #define FN_SHOW_INLINETOOLTIPS  (FN_VIEW + 60)  /* Show tooltips for tracked changes */
 #define FN_USE_HEADERFOOTERMENU (FN_VIEW + 61)  /* Show advanced header/footer menu */
+#define FN_VIEW_SHOW_WHITESPACE (FN_VIEW + 62)  /* Show header, footer, and pagebreak */
+
 
 // Region: Insert
 #define FN_INSERT_BOOKMARK      (FN_INSERT + 2 )  /* Bookmark */
diff --git a/sw/sdi/_viewsh.sdi b/sw/sdi/_viewsh.sdi
index ad97fe844319..acef4c75f26a 100644
--- a/sw/sdi/_viewsh.sdi
+++ b/sw/sdi/_viewsh.sdi
@@ -811,6 +811,13 @@ interface BaseTextEditView
         Export = FALSE;
     ]
 
+    FN_VIEW_SHOW_WHITESPACE
+    [
+        ExecMethod = ExecViewOptions ;
+        StateMethod = StateViewOptions ;
+        Export = FALSE;
+    ]
+
     SID_TOGGLE_NOTES
     [
         ExecMethod = ExecViewOptions ;
diff --git a/sw/sdi/swriter.sdi b/sw/sdi/swriter.sdi
index 4634ad612069..851a086492d4 100644
--- a/sw/sdi/swriter.sdi
+++ b/sw/sdi/swriter.sdi
@@ -5476,6 +5476,24 @@ SfxBoolItem HideWhitespace FN_VIEW_HIDE_WHITESPACE
     GroupId = SfxGroupId::View;
 ]
 
+SfxBoolItem ShowWhitespace FN_VIEW_SHOW_WHITESPACE
+
+[
+    AutoUpdate = TRUE,
+    FastCall = FALSE,
+    ReadOnlyDoc = TRUE,
+    Toggle = TRUE,
+    Container = FALSE,
+    RecordAbsolute = FALSE,
+    RecordPerSet;
+
+
+    AccelConfig = TRUE,
+    MenuConfig = TRUE,
+    ToolBoxConfig = TRUE,
+    GroupId = SfxGroupId::View;
+]
+
 SfxBoolItem ShowTrackedChanges FN_REDLINE_SHOW
 
 [
diff --git a/sw/source/uibase/uiview/view0.cxx b/sw/source/uibase/uiview/view0.cxx
index ca7657481c30..d15c0bcc176d 100644
--- a/sw/source/uibase/uiview/view0.cxx
+++ b/sw/source/uibase/uiview/view0.cxx
@@ -292,6 +292,11 @@ void SwView::StateViewOptions(SfxItemSet &rSet)
                     aBool.SetValue(pOpt->IsHideWhitespaceMode());
                 break;
             }
+            case FN_VIEW_SHOW_WHITESPACE:
+            {
+                aBool.SetValue(!pOpt->IsHideWhitespaceMode());
+                break;
+            }
             case SID_GRID_VISIBLE:
                 aBool.SetValue( pOpt->IsGridVisible() ); break;
             case SID_GRID_USE:
@@ -452,6 +457,13 @@ void SwView::ExecViewOptions(SfxRequest &rReq)
         pOpt->SetHideWhitespaceMode(bFlag);
         break;
 
+    case FN_VIEW_SHOW_WHITESPACE:
+        if ( STATE_TOGGLE == eState )
+            bFlag = pOpt->IsHideWhitespaceMode();
+
+        pOpt->SetHideWhitespaceMode(!bFlag);
+        break;
+
     case FN_VIEW_SMOOTH_SCROLL:
 
         if ( STATE_TOGGLE == eState )
diff --git a/sw/uiconfig/sglobal/menubar/menubar.xml b/sw/uiconfig/sglobal/menubar/menubar.xml
index 268b30cf68b8..50cf8f708584 100644
--- a/sw/uiconfig/sglobal/menubar/menubar.xml
+++ b/sw/uiconfig/sglobal/menubar/menubar.xml
@@ -200,7 +200,7 @@
       <menu:menuitem menu:id=".uno:ViewBounds" menu:style="text"/>
       <menu:menuitem menu:id=".uno:TableBoundaries" menu:style="text"/>
       <menu:menuitem menu:id=".uno:ShowGraphics" menu:style="text"/>
-      <menu:menuitem menu:id=".uno:HideWhitespace" menu:style="text"/>
+      <menu:menuitem menu:id=".uno:ShowWhitespace" menu:style="text"/>
       <menu:menuseparator/>
       <menu:menuitem menu:id=".uno:ViewTrackChanges"/>
       <menu:menuitem menu:id=".uno:ShowAnnotations" menu:style="text"/>
diff --git a/sw/uiconfig/swriter/menubar/menubar.xml b/sw/uiconfig/swriter/menubar/menubar.xml
index 896d2f205a31..5c88d7159346 100644
--- a/sw/uiconfig/swriter/menubar/menubar.xml
+++ b/sw/uiconfig/swriter/menubar/menubar.xml
@@ -206,7 +206,7 @@
       <menu:menuitem menu:id=".uno:ViewBounds" menu:style="text"/>
       <menu:menuitem menu:id=".uno:TableBoundaries" menu:style="text"/>
       <menu:menuitem menu:id=".uno:ShowGraphics"/>
-      <menu:menuitem menu:id=".uno:HideWhitespace" menu:style="text"/>
+      <menu:menuitem menu:id=".uno:ShowWhitespace" menu:style="text"/>
       <menu:menuseparator/>
       <menu:menuitem menu:id=".uno:ViewTrackChanges"/>
       <menu:menuitem menu:id=".uno:ShowAnnotations" menu:style="text"/>
diff --git a/sw/uiconfig/swxform/menubar/menubar.xml b/sw/uiconfig/swxform/menubar/menubar.xml
index c81b5be0eaa0..0bb0b5f2e7bb 100644
--- a/sw/uiconfig/swxform/menubar/menubar.xml
+++ b/sw/uiconfig/swxform/menubar/menubar.xml
@@ -199,7 +199,7 @@
       <menu:menuitem menu:id=".uno:ViewBounds" menu:style="text"/>
       <menu:menuitem menu:id=".uno:TableBoundaries" menu:style="text"/>
       <menu:menuitem menu:id=".uno:ShowGraphics" menu:style="text"/>
-      <menu:menuitem menu:id=".uno:HideWhitespace" menu:style="text"/>
+      <menu:menuitem menu:id=".uno:ShowWhitespace" menu:style="text"/>
       <menu:menuseparator/>
       <menu:menuitem menu:id=".uno:ViewTrackChanges"/>
       <menu:menuitem menu:id=".uno:ShowAnnotations" menu:style="text"/>