[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - officecfg/registry sd/uiconfig

[Yousuf Philips]

 officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu |   32 ++++++++++
 sd/uiconfig/simpress/menubar/menubar.xml                                 |    8 +-
 2 files changed, 36 insertions(+), 4 deletions(-)

New commits:
commit a4bba04f339d9714fa7ca22cfa76f09163c70e38
Author: Yousuf Philips <philipz85 at hotmail.com>
Date:   Sat Dec 2 22:18:10 2017 +0400

    tdf#114207 create commands for slide number and slide fields
    
    Change-Id: I5b7cfaf602568d9254dfeafd6afe27b9b0895d37
    Reviewed-on: https://gerrit.libreoffice.org/45722
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Yousuf Philips <philipz85 at hotmail.com>
    (cherry picked from commit 495ac1bc97f3deea8e13cb1a2b9f59d087873c3f)
    Reviewed-on: https://gerrit.libreoffice.org/45969

diff --git a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
index 9bc0208e54d6..c91b33b9fe9e 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
@@ -500,16 +500,40 @@
           <value xml:lang="en-US">~Page Number</value>
         </prop>
       </node>
+      <node oor:name=".uno:InsertSlideField" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+          <value xml:lang="en-US">~Slide Number</value>
+        </prop>
+        <prop oor:name="TargetURL" oor:type="xs:string">
+          <value>.uno:InsertPageField</value>
+        </prop>
+      </node>
       <node oor:name=".uno:InsertPageTitleField" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
           <value xml:lang="en-US">Page Tit~le</value>
         </prop>
       </node>
+      <node oor:name=".uno:InsertSlideTitleField" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+          <value xml:lang="en-US">Slide Tit~le</value>
+        </prop>
+        <prop oor:name="TargetURL" oor:type="xs:string">
+          <value>.uno:InsertPageTitleField</value>
+        </prop>
+      </node>
       <node oor:name=".uno:InsertPagesField" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
           <value xml:lang="en-US">Page ~Count</value>
         </prop>
       </node>
+      <node oor:name=".uno:InsertSlidesField" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+          <value xml:lang="en-US">Slide ~Count</value>
+        </prop>
+        <prop oor:name="TargetURL" oor:type="xs:string">
+          <value>.uno:InsertPagesField</value>
+        </prop>
+      </node>
       <node oor:name=".uno:ModifyField" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
           <value xml:lang="en-US">F~ields...</value>
@@ -1629,6 +1653,14 @@
           <value xml:lang="en-US">P~age Number...</value>
         </prop>
       </node>
+      <node oor:name=".uno:InsertSlideNumber" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+          <value xml:lang="en-US">S~lide Number...</value>
+        </prop>
+        <prop oor:name="TargetURL" oor:type="xs:string">
+          <value>.uno:InsertPageNumber</value>
+        </prop>
+      </node>
       <node oor:name=".uno:InsertDateAndTime" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
           <value xml:lang="en-US">Date and ~Time...</value>
diff --git a/sd/uiconfig/simpress/menubar/menubar.xml b/sd/uiconfig/simpress/menubar/menubar.xml
index 0de1b9dadd42..c146eb1ac5ca 100644
--- a/sd/uiconfig/simpress/menubar/menubar.xml
+++ b/sd/uiconfig/simpress/menubar/menubar.xml
@@ -241,7 +241,7 @@
                 </menu:menupopup>
             </menu:menu>
             <menu:menuseparator/>
-            <menu:menuitem menu:id=".uno:InsertPageNumber"/>
+            <menu:menuitem menu:id=".uno:InsertSlideNumber"/>
             <menu:menu menu:id=".uno:FieldMenu">
                 <menu:menupopup>
                     <menu:menuitem menu:id=".uno:InsertDateFieldFix"/>
@@ -250,9 +250,9 @@
                     <menu:menuitem menu:id=".uno:InsertTimeFieldVar"/>
                     <menu:menuseparator/>
                     <menu:menuitem menu:id=".uno:InsertAuthorField"/>
-                    <menu:menuitem menu:id=".uno:InsertPageField"/>
-                    <menu:menuitem menu:id=".uno:InsertPageTitleField"/>
-                    <menu:menuitem menu:id=".uno:InsertPagesField"/>
+                    <menu:menuitem menu:id=".uno:InsertSlideField"/>
+                    <menu:menuitem menu:id=".uno:InsertSlideTitleField"/>
+                    <menu:menuitem menu:id=".uno:InsertSlidesField"/>
                     <menu:menuitem menu:id=".uno:InsertFileField"/>
                 </menu:menupopup>
             </menu:menu>