[Libreoffice-commits] .: officecfg/registry sw/sdi sw/uiconfig

[Cédric Bosdonnat]

 officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu |    2 +-
 sw/sdi/swriter.sdi                                                  |    2 +-
 sw/uiconfig/sglobal/menubar/menubar.xml                             |    2 +-
 sw/uiconfig/swform/menubar/menubar.xml                              |    2 +-
 sw/uiconfig/swreport/menubar/menubar.xml                            |    2 +-
 sw/uiconfig/swriter/menubar/menubar.xml                             |    2 +-
 sw/uiconfig/swxform/menubar/menubar.xml                             |    2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit 769b78c8d2694e85632a97873a68f289d3abea4f
Author: Thomas Arnhold <thomas at arnhold.org>
Date:   Wed Aug 3 18:18:20 2011 +0200

    Use EditHeaderAndFooter like calc does.
    
    This fixes a missing icon bug for writer. Writer tried to load
    cmd/sc_editheaderfooter.png but only cmd/sc_editheaderandfooter.png
    existed. Calc is using cmd/sc_editheaderandfooter.png so I assumed
    this is the right way.

diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
index 81b2299..d3dfac6 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
@@ -301,7 +301,7 @@
                     <value>1</value>
                 </prop>
             </node>
-            <node oor:name=".uno:EditHeaderFooter" oor:op="replace">
+            <node oor:name=".uno:EditHeaderAndFooter" oor:op="replace">
                 <prop oor:name="Label" oor:type="xs:string">
                     <value xml:lang="en-US">Headers/Footers</value>
                 </prop>
diff --git a/sw/sdi/swriter.sdi b/sw/sdi/swriter.sdi
index 152b3fd..4d5df44 100644
--- a/sw/sdi/swriter.sdi
+++ b/sw/sdi/swriter.sdi
@@ -10419,7 +10419,7 @@ SfxVoidItem NavigateForward FN_NAVIGATION_FORWARD
 ]
 
 //--------------------------------------------------------------------------
-SfxVoidItem EditHeaderFooter FN_EDIT_HEADER_FOOTER
+SfxVoidItem EditHeaderAndFooter FN_EDIT_HEADER_FOOTER
 [
     /* flags: */
     AutoUpdate = FALSE,
diff --git a/sw/uiconfig/sglobal/menubar/menubar.xml b/sw/uiconfig/sglobal/menubar/menubar.xml
index 9cd6d3c..fc479ea 100755
--- a/sw/uiconfig/sglobal/menubar/menubar.xml
+++ b/sw/uiconfig/sglobal/menubar/menubar.xml
@@ -90,7 +90,7 @@
       <menu:menuitem menu:id=".uno:EditGlossary"/>
       <menu:menuseparator/>
       <menu:menuitem menu:id=".uno:ChangeDatabaseField"/>
-      <menu:menuitem menu:id=".uno:EditHeaderFooter"/>
+      <menu:menuitem menu:id=".uno:EditHeaderAndFooter"/>
       <menu:menuitem menu:id=".uno:FieldDialog"/>
       <menu:menuitem menu:id=".uno:EditFootnote"/>
       <menu:menuitem menu:id=".uno:IndexEntryDialog"/>
diff --git a/sw/uiconfig/swform/menubar/menubar.xml b/sw/uiconfig/swform/menubar/menubar.xml
index d5e073f..c9972e9 100755
--- a/sw/uiconfig/swform/menubar/menubar.xml
+++ b/sw/uiconfig/swform/menubar/menubar.xml
@@ -90,7 +90,7 @@
       <menu:menuitem menu:id=".uno:EditGlossary"/>
       <menu:menuseparator/>
       <menu:menuitem menu:id=".uno:ChangeDatabaseField"/>
-      <menu:menuitem menu:id=".uno:EditHeaderFooter"/>
+      <menu:menuitem menu:id=".uno:EditHeaderAndFooter"/>
       <menu:menuitem menu:id=".uno:FieldDialog"/>
       <menu:menuitem menu:id=".uno:EditFootnote"/>
       <menu:menuitem menu:id=".uno:IndexEntryDialog"/>
diff --git a/sw/uiconfig/swreport/menubar/menubar.xml b/sw/uiconfig/swreport/menubar/menubar.xml
index d5e073f..c9972e9 100755
--- a/sw/uiconfig/swreport/menubar/menubar.xml
+++ b/sw/uiconfig/swreport/menubar/menubar.xml
@@ -90,7 +90,7 @@
       <menu:menuitem menu:id=".uno:EditGlossary"/>
       <menu:menuseparator/>
       <menu:menuitem menu:id=".uno:ChangeDatabaseField"/>
-      <menu:menuitem menu:id=".uno:EditHeaderFooter"/>
+      <menu:menuitem menu:id=".uno:EditHeaderAndFooter"/>
       <menu:menuitem menu:id=".uno:FieldDialog"/>
       <menu:menuitem menu:id=".uno:EditFootnote"/>
       <menu:menuitem menu:id=".uno:IndexEntryDialog"/>
diff --git a/sw/uiconfig/swriter/menubar/menubar.xml b/sw/uiconfig/swriter/menubar/menubar.xml
index e7b7d7f..bb562a5 100755
--- a/sw/uiconfig/swriter/menubar/menubar.xml
+++ b/sw/uiconfig/swriter/menubar/menubar.xml
@@ -93,7 +93,7 @@
       <menu:menuitem menu:id=".uno:EditGlossary"/>
       <menu:menuseparator/>
       <menu:menuitem menu:id=".uno:ChangeDatabaseField"/>
-      <menu:menuitem menu:id=".uno:EditHeaderFooter"/>
+      <menu:menuitem menu:id=".uno:EditHeaderAndFooter"/>
       <menu:menuitem menu:id=".uno:FieldDialog"/>
       <menu:menuitem menu:id=".uno:EditFootnote"/>
       <menu:menuitem menu:id=".uno:IndexEntryDialog"/>
diff --git a/sw/uiconfig/swxform/menubar/menubar.xml b/sw/uiconfig/swxform/menubar/menubar.xml
index 584955e..2e6cca6 100755
--- a/sw/uiconfig/swxform/menubar/menubar.xml
+++ b/sw/uiconfig/swxform/menubar/menubar.xml
@@ -91,7 +91,7 @@
       <menu:menuitem menu:id=".uno:EditGlossary"/>
       <menu:menuseparator/>
       <menu:menuitem menu:id=".uno:ChangeDatabaseField"/>
-      <menu:menuitem menu:id=".uno:EditHeaderFooter"/>
+      <menu:menuitem menu:id=".uno:EditHeaderAndFooter"/>
       <menu:menuitem menu:id=".uno:FieldDialog"/>
       <menu:menuitem menu:id=".uno:EditFootnote"/>
       <menu:menuitem menu:id=".uno:IndexEntryDialog"/>