tdf#91783 - Reverse the toggle behaviour of .uno:Graphic Change

Rename:
- .uno:Graphic to .uno:ShowGraphics
- View->Hide Images to View->Images and Charts and invert toggle state

Change-Id: Ife4954e17f7e169b234f477d01409cae52c32efe
Reviewed-on: https://gerrit.libreoffice.org/16010
Reviewed-by: Yousuf Philips <philipz85@hotmail.com>
Tested-by: Yousuf Philips <philipz85@hotmail.com>

13 files changed, 21 insertions, 13 deletions

diff --git a/icon-themes/breeze/links.txt b/icon-themes/breeze/links.txt
index 32d8aac85ed1..8a4be900aaba 100644
--- a/icon-themes/breeze/links.txt
+++ b/icon-themes/breeze/links.txt
@@ -109,3 +109,6 @@ database/linked_text_table.png cmd/sc_dataimport.png
 # text background colour Impress/Draw
 cmd/sc_charbackcolor.png cmd/sc_backcolor.png
 cmd/lc_charbackcolor.png cmd/lc_backcolor.png
+
+# Toggle graphics visibility in Writer
+cmd/sc_showgraphics.png cmd/sc_graphic.png
diff --git a/icon-themes/galaxy/links.txt b/icon-themes/galaxy/links.txt
index 0a898a768048..318946e078d6 100644
--- a/icon-themes/galaxy/links.txt
+++ b/icon-themes/galaxy/links.txt
@@ -72,3 +72,6 @@ cmd/sc_showannotations.png cmd/sc_insertannotation.png
 # text background colour Impress/Draw
 cmd/sc_charbackcolor.png cmd/sc_backcolor.png
 cmd/lc_charbackcolor.png cmd/lc_backcolor.png
+
+# Toggle graphics visibility in Writer
+cmd/sc_showgraphics.png cmd/sc_graphic.png
diff --git a/icon-themes/tango/links.txt b/icon-themes/tango/links.txt
index e9590f4898e3..c5d69149735a 100644
--- a/icon-themes/tango/links.txt
+++ b/icon-themes/tango/links.txt
@@ -208,8 +208,6 @@ cmd/lc_hyperlinkdialog.png cmd/lc_inserthyperlink.png
 cmd/sc_hyperlinkdialog.png cmd/sc_inserthyperlink.png
 cmd/lc_draw.png cmd/lc_reload.png
 cmd/sc_draw.png cmd/sc_reload.png
-cmd/lc_graphic.png cmd/lc_insertgraphic.png
-cmd/sc_graphic.png cmd/sc_insertgraphic.png
 cmd/lc_selectmode.png cmd/lc_selectobject.png
 cmd/lc_drawselect.png cmd/lc_selectobject.png
 cmd/sc_selectmode.png cmd/sc_selectobject.png
@@ -556,3 +554,7 @@ cmd/sc_showannotations.png cmd/sc_insertannotation.png
 # text background colour Impress/Draw
 cmd/sc_charbackcolor.png cmd/sc_backcolor.png
 cmd/lc_charbackcolor.png cmd/lc_backcolor.png
+
+# Toggle graphics visibility in Writer
+cmd/sc_showgraphics.png cmd/sc_insertgraphic.png
+cmd/lc_showgraphics.png cmd/lc_insertgraphic.png
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
index 7c6fbd281b90..501409e98fe1 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
@@ -2146,9 +2146,9 @@
           <value xml:lang="en-US">~Line Numbering...</value>
         </prop>
       </node>
-      <node oor:name=".uno:Graphic" oor:op="replace">
+      <node oor:name=".uno:ShowGraphics" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
-          <value xml:lang="en-US">Hide ~Images</value>
+          <value xml:lang="en-US">~Images and Charts</value>
         </prop>
         <prop oor:name="Properties" oor:type="xs:int">
           <value>1</value>
diff --git a/sw/sdi/swriter.sdi b/sw/sdi/swriter.sdi
index 76987c789f3b..2368d9dada44 100644
--- a/sw/sdi/swriter.sdi
+++ b/sw/sdi/swriter.sdi
@@ -3144,7 +3144,7 @@ SfxBoolItem GoUp FN_LINE_UP
     GroupId = GID_NAVIGATOR;
 ]
 
-SfxBoolItem Graphic FN_VIEW_GRAPHIC
+SfxBoolItem ShowGraphics FN_VIEW_GRAPHIC
 
 [
     /* flags: */
diff --git a/sw/source/uibase/uiview/view0.cxx b/sw/source/uibase/uiview/view0.cxx
index a77ae11b771c..bd38b880477c 100644
--- a/sw/source/uibase/uiview/view0.cxx
+++ b/sw/source/uibase/uiview/view0.cxx
@@ -278,7 +278,7 @@ void SwView::StateViewOptions(SfxItemSet &rSet)
             case FN_VIEW_BOUNDS:
                 aBool.SetValue( SwViewOption::IsDocBoundaries()); break;
             case FN_VIEW_GRAPHIC:
-                aBool.SetValue( !pOpt->IsGraphic() ); break;
+                aBool.SetValue( pOpt->IsGraphic() ); break;
             case FN_VIEW_FIELDS:
                 aBool.SetValue( SwViewOption::IsFieldShadings() ); break;
             case FN_VIEW_FIELDNAME:
diff --git a/sw/uiconfig/sglobal/toolbar/toolbar.xml b/sw/uiconfig/sglobal/toolbar/toolbar.xml
index e83bae606c23..d413866c2d1f 100644
--- a/sw/uiconfig/sglobal/toolbar/toolbar.xml
+++ b/sw/uiconfig/sglobal/toolbar/toolbar.xml
@@ -25,6 +25,6 @@
  <toolbar:toolbaritem xlink:href=".uno:Hyphenate" toolbar:helpid="20605"/>
  <toolbar:toolbaritem xlink:href=".uno:ThesaurusDialog" toolbar:helpid="20603"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Graphic" toolbar:helpid="20213"/>
+ <toolbar:toolbaritem xlink:href=".uno:ShowGraphics" toolbar:helpid="20213"/>
  <toolbar:toolbaritem xlink:href=".uno:BrowseView" toolbar:helpid="6313"/>
 </toolbar:toolbar>
diff --git a/sw/uiconfig/sweb/toolbar/toolbar.xml b/sw/uiconfig/sweb/toolbar/toolbar.xml
index 4cd15b8a826f..44d62e97a0c5 100644
--- a/sw/uiconfig/sweb/toolbar/toolbar.xml
+++ b/sw/uiconfig/sweb/toolbar/toolbar.xml
@@ -23,6 +23,6 @@
  <toolbar:toolbaritem xlink:href=".uno:Hyphenate" toolbar:helpid="20605"/>
  <toolbar:toolbaritem xlink:href=".uno:ThesaurusDialog" toolbar:helpid="20603"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Graphic" toolbar:helpid="20213"/>
+ <toolbar:toolbaritem xlink:href=".uno:ShowGraphics" toolbar:helpid="20213"/>
  <toolbar:toolbaritem xlink:href=".uno:ImageMapDialog" toolbar:helpid="10371"/>
 </toolbar:toolbar>
diff --git a/sw/uiconfig/swform/toolbar/toolbar.xml b/sw/uiconfig/swform/toolbar/toolbar.xml
index 76612abc6b76..8e23f73cac1d 100644
--- a/sw/uiconfig/swform/toolbar/toolbar.xml
+++ b/sw/uiconfig/swform/toolbar/toolbar.xml
@@ -25,6 +25,6 @@
  <toolbar:toolbaritem xlink:href=".uno:Hyphenate" toolbar:helpid="20605"/>
  <toolbar:toolbaritem xlink:href=".uno:ThesaurusDialog" toolbar:helpid="20603"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Graphic" toolbar:helpid="20213"/>
+ <toolbar:toolbaritem xlink:href=".uno:ShowGraphics" toolbar:helpid="20213"/>
  <toolbar:toolbaritem xlink:href=".uno:BrowseView" toolbar:helpid="6313"/>
 </toolbar:toolbar>
\ No newline at end of file
diff --git a/sw/uiconfig/swreport/toolbar/toolbar.xml b/sw/uiconfig/swreport/toolbar/toolbar.xml
index 76612abc6b76..8e23f73cac1d 100644
--- a/sw/uiconfig/swreport/toolbar/toolbar.xml
+++ b/sw/uiconfig/swreport/toolbar/toolbar.xml
@@ -25,6 +25,6 @@
  <toolbar:toolbaritem xlink:href=".uno:Hyphenate" toolbar:helpid="20605"/>
  <toolbar:toolbaritem xlink:href=".uno:ThesaurusDialog" toolbar:helpid="20603"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Graphic" toolbar:helpid="20213"/>
+ <toolbar:toolbaritem xlink:href=".uno:ShowGraphics" toolbar:helpid="20213"/>
  <toolbar:toolbaritem xlink:href=".uno:BrowseView" toolbar:helpid="6313"/>
 </toolbar:toolbar>
\ No newline at end of file
diff --git a/sw/uiconfig/swriter/menubar/menubar.xml b/sw/uiconfig/swriter/menubar/menubar.xml
index 0a0cd0001f35..8794c9720779 100644
--- a/sw/uiconfig/swriter/menubar/menubar.xml
+++ b/sw/uiconfig/swriter/menubar/menubar.xml
@@ -140,7 +140,7 @@
       <menu:menuitem menu:id=".uno:ShowHiddenParagraphs"/>
       <menu:menuitem menu:id=".uno:ControlCodes"/>
       <menu:menuitem menu:id=".uno:ShowAnnotations"/>
-      <menu:menuitem menu:id=".uno:Graphic"/>
+      <menu:menuitem menu:id=".uno:ShowGraphics"/>
       <menu:menuseparator/>
       <menu:menuitem menu:id=".uno:Sidebar"/>
       <menu:menuitem menu:id=".uno:Gallery"/>
diff --git a/sw/uiconfig/swriter/toolbar/toolbar.xml b/sw/uiconfig/swriter/toolbar/toolbar.xml
index 76612abc6b76..8e23f73cac1d 100644
--- a/sw/uiconfig/swriter/toolbar/toolbar.xml
+++ b/sw/uiconfig/swriter/toolbar/toolbar.xml
@@ -25,6 +25,6 @@
  <toolbar:toolbaritem xlink:href=".uno:Hyphenate" toolbar:helpid="20605"/>
  <toolbar:toolbaritem xlink:href=".uno:ThesaurusDialog" toolbar:helpid="20603"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Graphic" toolbar:helpid="20213"/>
+ <toolbar:toolbaritem xlink:href=".uno:ShowGraphics" toolbar:helpid="20213"/>
  <toolbar:toolbaritem xlink:href=".uno:BrowseView" toolbar:helpid="6313"/>
 </toolbar:toolbar>
\ No newline at end of file
diff --git a/sw/uiconfig/swxform/toolbar/toolbar.xml b/sw/uiconfig/swxform/toolbar/toolbar.xml
index 76612abc6b76..8e23f73cac1d 100644
--- a/sw/uiconfig/swxform/toolbar/toolbar.xml
+++ b/sw/uiconfig/swxform/toolbar/toolbar.xml
@@ -25,6 +25,6 @@
  <toolbar:toolbaritem xlink:href=".uno:Hyphenate" toolbar:helpid="20605"/>
  <toolbar:toolbaritem xlink:href=".uno:ThesaurusDialog" toolbar:helpid="20603"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Graphic" toolbar:helpid="20213"/>
+ <toolbar:toolbaritem xlink:href=".uno:ShowGraphics" toolbar:helpid="20213"/>
  <toolbar:toolbaritem xlink:href=".uno:BrowseView" toolbar:helpid="6313"/>
 </toolbar:toolbar>
\ No newline at end of file