[Libreoffice-commits] core.git: framework/qa odk/examples qadevOOo/runner

[Gabor Kelemen]

 framework/qa/complex/contextMenuInterceptor/ContextMenuInterceptor.java |   10 ++++----
 odk/examples/DevelopersGuide/OfficeDev/ContextMenuInterceptor.java      |   12 +++++-----
 qadevOOo/runner/helper/ContextMenuInterceptor.java                      |   10 ++++----
 3 files changed, 16 insertions(+), 16 deletions(-)

New commits:
commit d77a23f8bb017024aefa63defbc64b1f7c05cda2
Author: Gabor Kelemen <kelemeng at ubuntu.com>
Date:   Thu Sep 29 10:34:07 2016 +0200

    tdf#95386 Remove remaining mentions of Help Agent
    
    Replace it with the Help on Help command
    
    Change-Id: Ia454a2f6a123b4fb68fda1eae1e07e99ba81487f
    Reviewed-on: https://gerrit.libreoffice.org/29381
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/framework/qa/complex/contextMenuInterceptor/ContextMenuInterceptor.java b/framework/qa/complex/contextMenuInterceptor/ContextMenuInterceptor.java
index 2a37129..eb0060d 100644
--- a/framework/qa/complex/contextMenuInterceptor/ContextMenuInterceptor.java
+++ b/framework/qa/complex/contextMenuInterceptor/ContextMenuInterceptor.java
@@ -78,12 +78,12 @@ public class ContextMenuInterceptor implements XContextMenuInterceptor
                 // insert menu entry to sub menu
                 xSubMenuContainer.insertByIndex(0, xMenuEntry);
 
-                // intialize help/help agent
-                // entry "Help Agent"
+                // intialize help/help on help
+                // entry "Help on Help"
                 xMenuEntry = UnoRuntime.queryInterface(com.sun.star.beans.XPropertySet.class, xMenuElementFactory.createInstance("com.sun.star.ui.ActionTrigger"));
-                xMenuEntry.setPropertyValue("Text", "Help Agent");
-                xMenuEntry.setPropertyValue("CommandURL", "slot:5962");
-                xMenuEntry.setPropertyValue("HelpURL", "5962");
+                xMenuEntry.setPropertyValue("Text", "Help on Help");
+                xMenuEntry.setPropertyValue("CommandURL", "slot:5400");
+                xMenuEntry.setPropertyValue("HelpURL", "5400");
 
                 // insert menu entry to sub menu
                 xSubMenuContainer.insertByIndex(1, xMenuEntry);
diff --git a/odk/examples/DevelopersGuide/OfficeDev/ContextMenuInterceptor.java b/odk/examples/DevelopersGuide/OfficeDev/ContextMenuInterceptor.java
index 524a2ae..642c978 100644
--- a/odk/examples/DevelopersGuide/OfficeDev/ContextMenuInterceptor.java
+++ b/odk/examples/DevelopersGuide/OfficeDev/ContextMenuInterceptor.java
@@ -70,7 +70,7 @@ public class ContextMenuInterceptor implements XContextMenuInterceptor {
             com.sun.star.text.XTextDocument xDoc =UnoRuntime.queryInterface(com.sun.star.text.XTextDocument.class,
                                       xComponent);
 
-            String infoMsg = "All context menus of the created document frame contains now a 'Help' entry with the submenus 'Content', 'Help Agent' and 'Tips'.\n\nPress 'Return' in the shell to remove the context menu interceptor and finish the example!";
+            String infoMsg = "All context menus of the created document frame contains now a 'Help' entry with the submenus 'Content', 'Help on Help' and 'Tips'.\n\nPress 'Return' in the shell to remove the context menu interceptor and finish the example!";
             xDoc.getText().setString(infoMsg);
 
             // ensure that the document content is optimal visible
@@ -101,7 +101,7 @@ public class ContextMenuInterceptor implements XContextMenuInterceptor {
                         com.sun.star.ui.XContextMenuInterceptor.class, aContextMenuInterceptor );
                     xContextMenuInterception.registerContextMenuInterceptor( xContextMenuInterceptor );
 
-                    System.out.println( "\n ... all context menus of the created document frame contains now a 'Help' entry with the\n     submenus 'Content', 'Help Agent' and 'Tips'.\n\nPress 'Return' to remove the context menu interceptor and finish the example!");
+                    System.out.println( "\n ... all context menus of the created document frame contains now a 'Help' entry with the\n     submenus 'Content', 'Help on Help' and 'Tips'.\n\nPress 'Return' to remove the context menu interceptor and finish the example!");
 
                     java.io.BufferedReader reader
                         = new java.io.BufferedReader(new java.io.InputStreamReader(System.in));
@@ -196,14 +196,14 @@ public class ContextMenuInterceptor implements XContextMenuInterceptor {
                 // insert menu entry to sub menu
                 xSubMenuContainer.insertByIndex( 0, xMenuEntry );
 
-                // intialize help/help agent
+                // intialize help/help on help
                 xMenuEntry = UnoRuntime.queryInterface(
                                  com.sun.star.beans.XPropertySet.class,
                                      xMenuElementFactory.createInstance(
                                          "com.sun.star.ui.ActionTrigger" ));
-                xMenuEntry.setPropertyValue( "Text", "Help Agent" );
-                xMenuEntry.setPropertyValue( "CommandURL", "slot:5962" );
-                xMenuEntry.setPropertyValue( "HelpURL", "5962" );
+                xMenuEntry.setPropertyValue("Text", "Help on Help");
+                xMenuEntry.setPropertyValue("CommandURL", "slot:5400");
+                xMenuEntry.setPropertyValue("HelpURL", "5400");
 
                 // insert menu entry to sub menu
                 xSubMenuContainer.insertByIndex( 1, xMenuEntry );
diff --git a/qadevOOo/runner/helper/ContextMenuInterceptor.java b/qadevOOo/runner/helper/ContextMenuInterceptor.java
index e87c296..be21ff7 100644
--- a/qadevOOo/runner/helper/ContextMenuInterceptor.java
+++ b/qadevOOo/runner/helper/ContextMenuInterceptor.java
@@ -81,14 +81,14 @@ public class ContextMenuInterceptor implements XContextMenuInterceptor {
                 // insert menu entry to sub menu
                 xSubMenuContainer.insertByIndex( 0, xMenuEntry );
 
-                // intialize help/help agent
-                // entry "Help Agent"
+                // intialize help/help on help
+                // entry "Help on Help"
                 xMenuEntry = UnoRuntime.queryInterface(
                         XPropertySet.class,
                         xMenuElementFactory.createInstance("com.sun.star.ui.ActionTrigger" ));
-                xMenuEntry.setPropertyValue( "Text", "Help Agent" );
-                xMenuEntry.setPropertyValue( "CommandURL", "slot:5962" );
-                xMenuEntry.setPropertyValue( "HelpURL", "5962" );
+                xMenuEntry.setPropertyValue("Text", "Help on Help");
+                xMenuEntry.setPropertyValue("CommandURL", "slot:5400");
+                xMenuEntry.setPropertyValue("HelpURL", "5400");
 
                 // insert menu entry to sub menu
                 xSubMenuContainer.insertByIndex( 1, xMenuEntry );