Resolves: #i121542# Unify the Menu API

(cherry picked from commit 399946b82f5efec19cd82d1c320d5aa9295d235d)

Conflicts:
	chart2/source/controller/main/ChartController_Window.cxx
	framework/source/uielement/langselectionmenucontroller.cxx
	framework/source/uielement/popupmenucontroller.cxx
	framework/source/uielement/recentfilesmenucontroller.cxx
	framework/source/uielement/toolbarsmenucontroller.cxx
	odk/examples/DevelopersGuide/GUI/UnoMenu.java
	odk/examples/DevelopersGuide/GUI/UnoMenu2.java
	odk/examples/cpp/StatusbarController/SelectionModeStatusbarController/SelectionModeStatusbarController.cxx
	offapi/com/sun/star/awt/MenuBar.idl
	offapi/com/sun/star/awt/MenuEvent.idl
	offapi/com/sun/star/awt/MenuItemStyle.idl
	offapi/com/sun/star/awt/MenuItemType.idl
	offapi/com/sun/star/awt/MenuLogo.idl
	offapi/com/sun/star/awt/PopupMenu.idl
	offapi/com/sun/star/awt/PopupMenuDirection.idl
	offapi/com/sun/star/awt/XMenu.idl
	offapi/com/sun/star/awt/XMenuBar.idl
	offapi/com/sun/star/awt/XMenuBarExtended.idl
	offapi/com/sun/star/awt/XMenuExtended.idl
	offapi/com/sun/star/awt/XMenuExtended2.idl
	offapi/com/sun/star/awt/XMenuListener.idl
	offapi/com/sun/star/awt/XPopupMenu.idl
	offapi/com/sun/star/awt/XPopupMenuExtended.idl
	offapi/com/sun/star/awt/makefile.mk
	offapi/type_reference/types.rdb
	svtools/inc/svtools/popupmenucontrollerbase.hxx
	svtools/source/uno/popupmenucontrollerbase.cxx
	svx/source/tbxctrls/extrusioncontrols.cxx
	toolkit/inc/pch/precompiled_toolkit.hxx
	toolkit/inc/toolkit/awt/vclxmenu.hxx
	toolkit/inc/toolkit/helper/listenermultiplexer.hxx
	toolkit/source/awt/vclxmenu.cxx

Change-Id: I3d9a1e109b9ff35901a3075b44a4c27e7c12b5c7

Related: #i121542# css::awt::XPopupMenu::execute() needs a Rectangle

(cherry picked from commit c01a6f4f370b72f0751cf4f5c11310682e2b3248)

Conflicts:
	odk/examples/DevelopersGuide/GUI/UnoMenu2.java
	offapi/type_reference/types.rdb
	toolkit/inc/toolkit/awt/vclxmenu.hxx

Change-Id: I2cccc95086fe3d1522d03346e3c577fb2f21f621

1 files changed, 92 insertions, 1 deletions

diff --git a/qadevOOo/tests/java/ifc/frame/_XPopupMenuController.java b/qadevOOo/tests/java/ifc/frame/_XPopupMenuController.java
index dc3dbdbb932d..4808dab72b11 100644
--- a/qadevOOo/tests/java/ifc/frame/_XPopupMenuController.java
+++ b/qadevOOo/tests/java/ifc/frame/_XPopupMenuController.java
@@ -18,7 +18,9 @@
 
 package ifc.frame;
 
+import com.sun.star.graphic.XGraphic;
 import com.sun.star.awt.XPopupMenu;
+import com.sun.star.awt.KeyEvent;
 import com.sun.star.frame.XPopupMenuController;
 import lib.MultiMethodTest;
 
@@ -54,7 +56,7 @@ public class _XPopupMenuController extends MultiMethodTest {
             System.out.println("enableItem called.");
         }
 
-        public short execute(com.sun.star.awt.XWindowPeer xWindowPeer, com.sun.star.awt.Rectangle rectangle, short param) {
+        public short execute(com.sun.star.awt.XWindowPeer xWindowPeer, com.sun.star.awt.Rectangle pos, short param) {
             System.out.println("execute called.");
             return 0;
         }
@@ -126,5 +128,94 @@ public class _XPopupMenuController extends MultiMethodTest {
         public void setPopupMenu(short param, com.sun.star.awt.XPopupMenu xPopupMenu) {
             System.out.println("setPopupMenu called.");
         }
+
+        public XGraphic getItemImage(short param ) {
+            System.out.println("getItemImage called.");
+            return null;
+        }
+
+        public void setItemImage(short param, XGraphic param1, boolean param2 ) {
+            System.out.println("setItemImage called.");
+        }
+
+        public KeyEvent getAcceleratorKeyEvent(short param ) {
+            System.out.println("getAcceleratorKeyEvent called.");
+            return new KeyEvent();
+        }
+
+        public void setAcceleratorKeyEvent(short param, KeyEvent param1 ) {
+            System.out.println("setAcceleratorKeyEvent called.");
+        }
+
+        public void endExecute() {
+            System.out.println("endExecute called.");
+        }
+
+        public boolean isInExecute() {
+            System.out.println("isInExecute called.");
+            return false;
+        }
+
+        public boolean isPopupMenu() {
+            System.out.println("isPopupMenu called.");
+            return true;
+        }
+
+        public String getTipHelpText(short param ) {
+            System.out.println("getTipHelpText called.");
+            return null;
+        }
+
+        public void setTipHelpText(short param, String param1 ) {
+            System.out.println("setTipHelpText called.");
+        }
+
+        public String getHelpText(short param ) {
+            System.out.println("getHelpText called.");
+            return null;
+        }
+
+        public void setHelpText(short param, String param1 ) {
+            System.out.println("setHelpText called.");
+        }
+
+        public String getHelpCommand(short param ) {
+            System.out.println("getHelpCommand called.");
+            return null;
+        }
+
+        public void setHelpCommand(short param, String param1 ) {
+            System.out.println("setHelpCommand called.");
+        }
+
+        public String getCommand(short param ) {
+            System.out.println("getCommand called.");
+            return null;
+        }
+
+        public void setCommand(short param, String param1 ) {
+            System.out.println("setCommand called.");
+        }
+
+        public void enableAutoMnemonics(boolean param ) {
+            System.out.println("enableAutoMnemonics called.");
+        }
+
+        public void hideDisabledEntries(boolean param ) {
+            System.out.println("hideDisabledEntries called.");
+        }
+
+        public com.sun.star.awt.MenuItemType getItemType(short param ) {
+            System.out.println("getItemType called.");
+            return com.sun.star.awt.MenuItemType.DONTKNOW;
+        }
+
+        public void setItemType(com.sun.star.awt.MenuItemType param ) {
+            System.out.println("setItemType called.");
+        }
+
+        public void clear() {
+            System.out.println("clear called.");
+        }
     }
 }