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

Heiko Tietze (via logerrit) logerrit at kemper.freedesktop.org
Thu Aug 8 14:48:02 UTC 2019 

 officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu |    5 +----
 sw/uiconfig/sglobal/menubar/menubar.xml                             |    2 +-
 sw/uiconfig/sweb/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(+), 10 deletions(-)

New commits:
commit 21a792f1756a1370476e66538e821e402df83799
Author:     Heiko Tietze <tietze.heiko at gmail.com>
AuthorDate: Thu Aug 8 13:09:17 2019 +0200
Commit:     Heiko Tietze <heiko.tietze at documentfoundation.org>
CommitDate: Thu Aug 8 16:47:10 2019 +0200

    Resolves tdf#126608 - Unclear page formatting
    
    Page entry moved into the next section and
    renamed to Page Style to make the difference
    to direct formatting more clear
    
    Change-Id: I1e75f9c82d459e35329231b06fa695651564f0c2
    Reviewed-on: https://gerrit.libreoffice.org/77148
    Reviewed-by: Tomaž Vajngerl <quikee at gmail.com>
    Tested-by: Jenkins
    Reviewed-by: Heiko Tietze <heiko.tietze at documentfoundation.org>

diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
index 8d070ffcb6af..2251c361e5a3 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
@@ -1175,11 +1175,8 @@
         </prop>
       </node>
       <node oor:name=".uno:PageDialog" oor:op="replace">
-        <prop oor:name="Label" oor:type="xs:string">
-          <value xml:lang="en-US">Page Settings</value>
-        </prop>
         <prop oor:name="ContextLabel" oor:type="xs:string">
-          <value xml:lang="en-US">~Page...</value>
+          <value xml:lang="en-US">~Page Style...</value>
         </prop>
         <prop oor:name="Properties" oor:type="xs:int">
           <value>1</value>
diff --git a/sw/uiconfig/sglobal/menubar/menubar.xml b/sw/uiconfig/sglobal/menubar/menubar.xml
index 75c79dd05940..948c4ca43d3a 100644
--- a/sw/uiconfig/sglobal/menubar/menubar.xml
+++ b/sw/uiconfig/sglobal/menubar/menubar.xml
@@ -441,8 +441,8 @@
       <menu:menuitem menu:id=".uno:FontDialog"/>
       <menu:menuitem menu:id=".uno:ParagraphDialog"/>
       <menu:menuitem menu:id=".uno:BulletsAndNumberingDialog"/>
-      <menu:menuitem menu:id=".uno:PageDialog"/>
       <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:PageDialog"/>
       <menu:menuitem menu:id=".uno:TitlePageDialog" menu:style="text"/>
       <menu:menuitem menu:id=".uno:FormatAllNotes" menu:style="text"/>
       <menu:menuitem menu:id=".uno:RubyDialog" menu:style="text"/>
diff --git a/sw/uiconfig/sweb/menubar/menubar.xml b/sw/uiconfig/sweb/menubar/menubar.xml
index f94e3e9d34ba..b7e77d4413ef 100644
--- a/sw/uiconfig/sweb/menubar/menubar.xml
+++ b/sw/uiconfig/sweb/menubar/menubar.xml
@@ -314,8 +314,8 @@
       <menu:menuitem menu:id=".uno:FontDialog"/>
       <menu:menuitem menu:id=".uno:ParagraphDialog"/>
       <menu:menuitem menu:id=".uno:BulletsAndNumberingDialog"/>
-      <menu:menuitem menu:id=".uno:PageDialog"/>
       <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:PageDialog"/>
       <menu:menuitem menu:id=".uno:FormatAllNotes" menu:style="text"/>
       <menu:menuitem menu:id=".uno:RubyDialog" menu:style="text"/>
       <menu:menuitem menu:id=".uno:FormatColumns" menu:style="text"/>
diff --git a/sw/uiconfig/swform/menubar/menubar.xml b/sw/uiconfig/swform/menubar/menubar.xml
index bb1d9c0dae6e..af9c0cc25cae 100644
--- a/sw/uiconfig/swform/menubar/menubar.xml
+++ b/sw/uiconfig/swform/menubar/menubar.xml
@@ -393,8 +393,8 @@
       <menu:menuitem menu:id=".uno:FontDialog"/>
       <menu:menuitem menu:id=".uno:ParagraphDialog"/>
       <menu:menuitem menu:id=".uno:BulletsAndNumberingDialog"/>
-      <menu:menuitem menu:id=".uno:PageDialog"/>
       <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:PageDialog"/>
       <menu:menuitem menu:id=".uno:TitlePageDialog" menu:style="text"/>
       <menu:menuitem menu:id=".uno:FormatAllNotes" menu:style="text"/>
       <menu:menuitem menu:id=".uno:RubyDialog" menu:style="text"/>
diff --git a/sw/uiconfig/swreport/menubar/menubar.xml b/sw/uiconfig/swreport/menubar/menubar.xml
index dfad1b71be72..e186e9086933 100644
--- a/sw/uiconfig/swreport/menubar/menubar.xml
+++ b/sw/uiconfig/swreport/menubar/menubar.xml
@@ -379,8 +379,8 @@
       <menu:menuitem menu:id=".uno:FontDialog"/>
       <menu:menuitem menu:id=".uno:ParagraphDialog"/>
       <menu:menuitem menu:id=".uno:BulletsAndNumberingDialog"/>
-      <menu:menuitem menu:id=".uno:PageDialog"/>
       <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:PageDialog"/>
       <menu:menuitem menu:id=".uno:RubyDialog" menu:style="text"/>
       <menu:menuitem menu:id=".uno:FormatColumns" menu:style="text"/>
       <menu:menuitem menu:id=".uno:EditRegion" menu:style="text"/>
diff --git a/sw/uiconfig/swriter/menubar/menubar.xml b/sw/uiconfig/swriter/menubar/menubar.xml
index 90fce81ab199..2ad9f9b0186e 100644
--- a/sw/uiconfig/swriter/menubar/menubar.xml
+++ b/sw/uiconfig/swriter/menubar/menubar.xml
@@ -444,8 +444,8 @@
       <menu:menuitem menu:id=".uno:FontDialog"/>
       <menu:menuitem menu:id=".uno:ParagraphDialog"/>
       <menu:menuitem menu:id=".uno:BulletsAndNumberingDialog"/>
-      <menu:menuitem menu:id=".uno:PageDialog"/>
       <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:PageDialog"/>
       <menu:menuitem menu:id=".uno:TitlePageDialog"/>
       <menu:menuitem menu:id=".uno:FormatAllNotes" menu:style="text"/>
       <menu:menuitem menu:id=".uno:RubyDialog" menu:style="text"/>
diff --git a/sw/uiconfig/swxform/menubar/menubar.xml b/sw/uiconfig/swxform/menubar/menubar.xml
index 443c70d29e61..36505aaaab49 100644
--- a/sw/uiconfig/swxform/menubar/menubar.xml
+++ b/sw/uiconfig/swxform/menubar/menubar.xml
@@ -440,8 +440,8 @@
       <menu:menuitem menu:id=".uno:FontDialog"/>
       <menu:menuitem menu:id=".uno:ParagraphDialog"/>
       <menu:menuitem menu:id=".uno:BulletsAndNumberingDialog"/>
-      <menu:menuitem menu:id=".uno:PageDialog"/>
       <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:PageDialog"/>
       <menu:menuitem menu:id=".uno:TitlePageDialog" menu:style="text"/>
       <menu:menuitem menu:id=".uno:FormatAllNotes" menu:style="text"/>
       <menu:menuitem menu:id=".uno:RubyDialog" menu:style="text"/>

More information about the Libreoffice-commits mailing list