summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorPhilippe Jung <phil.jung@free.fr>2015-06-01 01:11:37 +0200
committerYousuf Philips <philipz85@hotmail.com>2015-06-02 07:45:36 +0000
commitc7309a4822633423b0969757c494077fdc27b724 (patch)
treea601c99dbb28819fac543d037596c7b0b3c70812 /sw
parent1df41142451685d33b1821a839061c63f23e44fd (diff)
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>
Diffstat (limited to 'sw')
-rw-r--r--sw/sdi/swriter.sdi2
-rw-r--r--sw/source/uibase/uiview/view0.cxx2
-rw-r--r--sw/uiconfig/sglobal/toolbar/toolbar.xml2
-rw-r--r--sw/uiconfig/sweb/toolbar/toolbar.xml2
-rw-r--r--sw/uiconfig/swform/toolbar/toolbar.xml2
-rw-r--r--sw/uiconfig/swreport/toolbar/toolbar.xml2
-rw-r--r--sw/uiconfig/swriter/menubar/menubar.xml2
-rw-r--r--sw/uiconfig/swriter/toolbar/toolbar.xml2
-rw-r--r--sw/uiconfig/swxform/toolbar/toolbar.xml2
9 files changed, 9 insertions, 9 deletions
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