From 384c75b7e8b50a64a1c0e8fd1ffef1350e2522d2 Mon Sep 17 00:00:00 2001
From: Akshay Deep <akshaydeepiitr@gmail.com>
Date: Sat, 11 Jun 2016 07:51:51 +0530
Subject: tdf#61396 Possibility to edit a template not in Template Repository

Menu Sequence:
   Open Template...
   Save as Template...
   ----------------------
   Manage Templates

Change-Id: I0d0c8ca15d8dc38662e7f84a4f598933c13dd512
Reviewed-on: https://gerrit.libreoffice.org/26179
Reviewed-by: Akshay Deep <akshaydeepiitr@gmail.com>
Tested-by: Akshay Deep <akshaydeepiitr@gmail.com>
---
 configmgr/qa/unit/data.xcd                                         | 4 ++--
 .../registry/data/org/openoffice/Office/UI/GenericCommands.xcu     | 7 ++-----
 sc/uiconfig/scalc/menubar/menubar.xml                              | 2 ++
 sd/uiconfig/sdraw/menubar/menubar.xml                              | 2 ++
 sd/uiconfig/simpress/menubar/menubar.xml                           | 4 +++-
 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                            | 4 +++-
 sw/uiconfig/swxform/menubar/menubar.xml                            | 2 ++
 11 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/configmgr/qa/unit/data.xcd b/configmgr/qa/unit/data.xcd
index 12eedc2a82bf..d391aca3da0b 100644
--- a/configmgr/qa/unit/data.xcd
+++ b/configmgr/qa/unit/data.xcd
@@ -2330,7 +2330,7 @@
       </node>
       <node oor:name=".uno:SaveAsTemplate" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
-          <value xml:lang="x-no-translate"></value><value xml:lang="en-US">~Save...</value>
+          <value xml:lang="x-no-translate"></value><value xml:lang="en-US">~Save as Template...</value>
         </prop>
         <prop oor:name="Properties" oor:type="xs:int">
           <value>1</value>
@@ -2890,7 +2890,7 @@
       </node>
       <node oor:name=".uno:OpenTemplate" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
-          <value xml:lang="x-no-translate"></value><value xml:lang="en-US">~Edit...</value>
+          <value xml:lang="x-no-translate"></value><value xml:lang="en-US">~Open Template...</value>
         </prop>
       </node>
       <node oor:name=".uno:OpenUrl" oor:op="replace">
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index aaad92cdffd0..e1024f80cb7b 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -2029,9 +2029,6 @@
         <prop oor:name="Label" oor:type="xs:string">
           <value xml:lang="en-US">Manage Templates</value>
         </prop>
-        <prop oor:name="ContextLabel" oor:type="xs:string">
-          <value xml:lang="en-US">Manage</value>
-        </prop>
         <prop oor:name="Properties" oor:type="xs:int">
           <value>1</value>
         </prop>
@@ -2554,7 +2551,7 @@
       </node>
       <node oor:name=".uno:SaveAsTemplate" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
-          <value xml:lang="en-US">Save As Template...</value>
+          <value xml:lang="en-US">Save as Template...</value>
         </prop>
         <prop oor:name="Properties" oor:type="xs:int">
           <value>1</value>
@@ -3135,7 +3132,7 @@
       </node>
       <node oor:name=".uno:OpenTemplate" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
-          <value xml:lang="en-US">~Edit...</value>
+          <value xml:lang="en-US">~Open Template...</value>
         </prop>
       </node>
       <node oor:name=".uno:OpenUrl" oor:op="replace">
diff --git a/sc/uiconfig/scalc/menubar/menubar.xml b/sc/uiconfig/scalc/menubar/menubar.xml
index 39fabaa7db57..54676dd8c5d9 100644
--- a/sc/uiconfig/scalc/menubar/menubar.xml
+++ b/sc/uiconfig/scalc/menubar/menubar.xml
@@ -28,7 +28,9 @@
             <menu:menuitem menu:id=".uno:AutoPilotMenu"/>
             <menu:menu menu:id=".uno:TemplateMenu">
                 <menu:menupopup>
+                    <menu:menuitem menu:id=".uno:OpenTemplate"/>
                     <menu:menuitem menu:id=".uno:SaveAsTemplate"/>
+                    <menu:menuseparator/>
                     <menu:menuitem menu:id=".uno:NewDoc"/>
                 </menu:menupopup>
             </menu:menu>
diff --git a/sd/uiconfig/sdraw/menubar/menubar.xml b/sd/uiconfig/sdraw/menubar/menubar.xml
index a6844f85cadf..0095780fe7f1 100644
--- a/sd/uiconfig/sdraw/menubar/menubar.xml
+++ b/sd/uiconfig/sdraw/menubar/menubar.xml
@@ -28,7 +28,9 @@
       <menu:menuseparator/>
             <menu:menu menu:id=".uno:TemplateMenu">
                 <menu:menupopup>
+                    <menu:menuitem menu:id=".uno:OpenTemplate"/>
                     <menu:menuitem menu:id=".uno:SaveAsTemplate"/>
+                    <menu:menuseparator/>
                     <menu:menuitem menu:id=".uno:NewDoc"/>
                 </menu:menupopup>
             </menu:menu>
diff --git a/sd/uiconfig/simpress/menubar/menubar.xml b/sd/uiconfig/simpress/menubar/menubar.xml
index 6eb337f0505c..3402212ffcf9 100644
--- a/sd/uiconfig/simpress/menubar/menubar.xml
+++ b/sd/uiconfig/simpress/menubar/menubar.xml
@@ -27,8 +27,10 @@
             <menu:menuseparator/>
             <menu:menu menu:id=".uno:TemplateMenu">
                 <menu:menupopup>
-                    <menu:menuitem menu:id=".uno:NewDoc"/>
+                    <menu:menuitem menu:id=".uno:OpenTemplate"/>
                     <menu:menuitem menu:id=".uno:SaveAsTemplate"/>
+                    <menu:menuseparator/>
+                    <menu:menuitem menu:id=".uno:NewDoc"/>
                 </menu:menupopup>
             </menu:menu>
             <menu:menuitem menu:id=".uno:AutoPilotMenu"/>
diff --git a/sw/uiconfig/sglobal/menubar/menubar.xml b/sw/uiconfig/sglobal/menubar/menubar.xml
index 6a4eb3b7ece1..a9cc7416bb02 100644
--- a/sw/uiconfig/sglobal/menubar/menubar.xml
+++ b/sw/uiconfig/sglobal/menubar/menubar.xml
@@ -27,7 +27,9 @@
       <menu:menuseparator/>
       <menu:menu menu:id=".uno:TemplateMenu">
           <menu:menupopup>
+              <menu:menuitem menu:id=".uno:OpenTemplate"/>
               <menu:menuitem menu:id=".uno:SaveAsTemplate"/>
+              <menu:menuseparator/>
               <menu:menuitem menu:id=".uno:NewDoc"/>
           </menu:menupopup>
       </menu:menu>
diff --git a/sw/uiconfig/sweb/menubar/menubar.xml b/sw/uiconfig/sweb/menubar/menubar.xml
index 65828e57e012..b4dce273a1db 100644
--- a/sw/uiconfig/sweb/menubar/menubar.xml
+++ b/sw/uiconfig/sweb/menubar/menubar.xml
@@ -27,7 +27,9 @@
       <menu:menuseparator/>
       <menu:menu menu:id=".uno:TemplateMenu">
           <menu:menupopup>
+              <menu:menuitem menu:id=".uno:OpenTemplate"/>
               <menu:menuitem menu:id=".uno:SaveAsTemplate"/>
+              <menu:menuseparator/>
               <menu:menuitem menu:id=".uno:NewDoc"/>
           </menu:menupopup>
       </menu:menu>
diff --git a/sw/uiconfig/swform/menubar/menubar.xml b/sw/uiconfig/swform/menubar/menubar.xml
index d3502cbdaf08..e3f2c857efe3 100644
--- a/sw/uiconfig/swform/menubar/menubar.xml
+++ b/sw/uiconfig/swform/menubar/menubar.xml
@@ -27,7 +27,9 @@
       <menu:menuseparator/>
       <menu:menu menu:id=".uno:TemplateMenu">
           <menu:menupopup>
+              <menu:menuitem menu:id=".uno:OpenTemplate"/>
               <menu:menuitem menu:id=".uno:SaveAsTemplate"/>
+              <menu:menuseparator/>
               <menu:menuitem menu:id=".uno:NewDoc"/>
           </menu:menupopup>
       </menu:menu>
diff --git a/sw/uiconfig/swreport/menubar/menubar.xml b/sw/uiconfig/swreport/menubar/menubar.xml
index 37d1d4076718..c72ae0fdeeed 100644
--- a/sw/uiconfig/swreport/menubar/menubar.xml
+++ b/sw/uiconfig/swreport/menubar/menubar.xml
@@ -27,7 +27,9 @@
       <menu:menuseparator/>
       <menu:menu menu:id=".uno:TemplateMenu">
           <menu:menupopup>
+              <menu:menuitem menu:id=".uno:OpenTemplate"/>
               <menu:menuitem menu:id=".uno:SaveAsTemplate"/>
+              <menu:menuseparator/>
               <menu:menuitem menu:id=".uno:NewDoc"/>
           </menu:menupopup>
       </menu:menu>
diff --git a/sw/uiconfig/swriter/menubar/menubar.xml b/sw/uiconfig/swriter/menubar/menubar.xml
index 31f2d77232cd..914a6ae149fb 100644
--- a/sw/uiconfig/swriter/menubar/menubar.xml
+++ b/sw/uiconfig/swriter/menubar/menubar.xml
@@ -28,8 +28,10 @@
       <menu:menuitem menu:id=".uno:AutoPilotMenu"/>
       <menu:menu menu:id=".uno:TemplateMenu">
           <menu:menupopup>
-              <menu:menuitem menu:id=".uno:NewDoc"/>
+              <menu:menuitem menu:id=".uno:OpenTemplate"/>
               <menu:menuitem menu:id=".uno:SaveAsTemplate"/>
+              <menu:menuseparator/>
+              <menu:menuitem menu:id=".uno:NewDoc"/>
           </menu:menupopup>
       </menu:menu>
       <menu:menuseparator/>
diff --git a/sw/uiconfig/swxform/menubar/menubar.xml b/sw/uiconfig/swxform/menubar/menubar.xml
index e24ab308eaed..288f4460c466 100644
--- a/sw/uiconfig/swxform/menubar/menubar.xml
+++ b/sw/uiconfig/swxform/menubar/menubar.xml
@@ -27,7 +27,9 @@
       <menu:menuseparator/>
       <menu:menu menu:id=".uno:TemplateMenu">
           <menu:menupopup>
+              <menu:menuitem menu:id=".uno:OpenTemplate"/>
               <menu:menuitem menu:id=".uno:SaveAsTemplate"/>
+              <menu:menuseparator/>
               <menu:menuitem menu:id=".uno:NewDoc"/>
           </menu:menupopup>
       </menu:menu>
-- 
cgit v1.2.3