openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From arie...@apache.org
Subject svn commit: r1425458 [1/3] - in /openoffice/trunk/main: chart2/source/controller/main/ forms/source/component/ framework/inc/uielement/ framework/source/uielement/ odk/examples/DevelopersGuide/GUI/ odk/examples/cpp/StatusbarController/SelectionModeStat...
Date Sun, 23 Dec 2012 12:29:22 GMT
Author: arielch
Date: Sun Dec 23 12:29:21 2012
New Revision: 1425458

URL: http://svn.apache.org/viewvc?rev=1425458&view=rev
Log:
i121542 - Unify the Menu API

Removed:
    openoffice/trunk/main/offapi/com/sun/star/awt/MenuLogo.idl
    openoffice/trunk/main/offapi/com/sun/star/awt/XMenuBarExtended.idl
    openoffice/trunk/main/offapi/com/sun/star/awt/XMenuExtended.idl
    openoffice/trunk/main/offapi/com/sun/star/awt/XMenuExtended2.idl
    openoffice/trunk/main/offapi/com/sun/star/awt/XPopupMenuExtended.idl
Modified:
    openoffice/trunk/main/chart2/source/controller/main/ChartController_Window.cxx
    openoffice/trunk/main/forms/source/component/ImageControl.cxx
    openoffice/trunk/main/framework/inc/uielement/controlmenucontroller.hxx
    openoffice/trunk/main/framework/inc/uielement/fontmenucontroller.hxx
    openoffice/trunk/main/framework/inc/uielement/newmenucontroller.hxx
    openoffice/trunk/main/framework/inc/uielement/recentfilesmenucontroller.hxx
    openoffice/trunk/main/framework/inc/uielement/toolbarsmenucontroller.hxx
    openoffice/trunk/main/framework/source/uielement/controlmenucontroller.cxx
    openoffice/trunk/main/framework/source/uielement/fontmenucontroller.cxx
    openoffice/trunk/main/framework/source/uielement/langselectionmenucontroller.cxx
    openoffice/trunk/main/framework/source/uielement/langselectionstatusbarcontroller.cxx
    openoffice/trunk/main/framework/source/uielement/newmenucontroller.cxx
    openoffice/trunk/main/framework/source/uielement/popupmenucontroller.cxx
    openoffice/trunk/main/framework/source/uielement/recentfilesmenucontroller.cxx
    openoffice/trunk/main/framework/source/uielement/toolbarsmenucontroller.cxx
    openoffice/trunk/main/odk/examples/DevelopersGuide/GUI/UnoMenu.java
    openoffice/trunk/main/odk/examples/DevelopersGuide/GUI/UnoMenu2.java
    openoffice/trunk/main/odk/examples/cpp/StatusbarController/SelectionModeStatusbarController/SelectionModeStatusbarController.cxx
    openoffice/trunk/main/offapi/com/sun/star/awt/MenuBar.idl
    openoffice/trunk/main/offapi/com/sun/star/awt/MenuEvent.idl
    openoffice/trunk/main/offapi/com/sun/star/awt/MenuItemStyle.idl
    openoffice/trunk/main/offapi/com/sun/star/awt/MenuItemType.idl
    openoffice/trunk/main/offapi/com/sun/star/awt/PopupMenu.idl
    openoffice/trunk/main/offapi/com/sun/star/awt/PopupMenuDirection.idl
    openoffice/trunk/main/offapi/com/sun/star/awt/XMenu.idl
    openoffice/trunk/main/offapi/com/sun/star/awt/XMenuBar.idl
    openoffice/trunk/main/offapi/com/sun/star/awt/XMenuListener.idl
    openoffice/trunk/main/offapi/com/sun/star/awt/XPopupMenu.idl
    openoffice/trunk/main/offapi/com/sun/star/awt/makefile.mk
    openoffice/trunk/main/offapi/type_reference/types.rdb
    openoffice/trunk/main/qadevOOo/tests/java/ifc/frame/_XPopupMenuController.java
    openoffice/trunk/main/svtools/inc/svtools/popupmenucontrollerbase.hxx
    openoffice/trunk/main/svtools/source/uno/popupmenucontrollerbase.cxx
    openoffice/trunk/main/svx/source/tbxctrls/extrusioncontrols.cxx
    openoffice/trunk/main/toolkit/inc/pch/precompiled_toolkit.hxx
    openoffice/trunk/main/toolkit/inc/toolkit/awt/vclxmenu.hxx
    openoffice/trunk/main/toolkit/inc/toolkit/helper/listenermultiplexer.hxx
    openoffice/trunk/main/toolkit/source/awt/vclxmenu.cxx
    openoffice/trunk/main/toolkit/source/helper/listenermultiplexer.cxx
    openoffice/trunk/main/vcl/source/app/svdata.cxx

Modified: openoffice/trunk/main/chart2/source/controller/main/ChartController_Window.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/chart2/source/controller/main/ChartController_Window.cxx?rev=1425458&r1=1425457&r2=1425458&view=diff
==============================================================================
--- openoffice/trunk/main/chart2/source/controller/main/ChartController_Window.cxx (original)
+++ openoffice/trunk/main/chart2/source/controller/main/ChartController_Window.cxx Sun Dec 23 12:29:21 2012
@@ -140,12 +140,11 @@ bool lcl_MoveObjectLogic(
 
 void lcl_insertMenuCommand(
     const uno::Reference< awt::XPopupMenu > & xMenu,
-    const uno::Reference< awt::XMenuExtended > & xMenuEx,
     sal_Int16 nId, const ::rtl::OUString & rCommand )
 {
     static ::rtl::OUString aEmptyString;
     xMenu->insertItem( nId, aEmptyString, 0, -1 );
-    xMenuEx->setCommand( nId, rCommand );
+    xMenu->setCommand( nId, rCommand );
 }
 
 OUString lcl_getFormatCommandForObjectCID( const OUString& rCID )
@@ -1041,15 +1040,14 @@ void ChartController::execute_Command( c
             uno::Reference< awt::XPopupMenu > xPopupMenu( 
                 m_xCC->getServiceManager()->createInstanceWithContext(
                     C2U("com.sun.star.awt.PopupMenu"), m_xCC ), uno::UNO_QUERY );
-            uno::Reference< awt::XMenuExtended > xMenuEx( xPopupMenu, uno::UNO_QUERY );
-            if( xPopupMenu.is() && xMenuEx.is())
+            if( xPopupMenu.is())
             {
                 sal_Int16 nUniqueId = 1;
                 ObjectType eObjectType = ObjectIdentifier::getObjectType( m_aSelection.getSelectedCID() );
                 Reference< XDiagram > xDiagram = ChartModelHelper::findDiagram( getModel() );
 
                 OUString aFormatCommand( lcl_getFormatCommandForObjectCID( m_aSelection.getSelectedCID() ) );
-                lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, aFormatCommand );
+                lcl_insertMenuCommand( xPopupMenu, nUniqueId++, aFormatCommand );
 
                 //some commands for dataseries and points:
                 //-----
@@ -1101,17 +1099,17 @@ void ChartController::execute_Command( c
                     if( bIsPoint )
                     {
                         if( bHasDataLabelAtPoint )
-                            lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:FormatDataLabel") );
+                            lcl_insertMenuCommand( xPopupMenu, nUniqueId++, C2U(".uno:FormatDataLabel") );
                         if( !bHasDataLabelAtPoint )
-                            lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:InsertDataLabel") );
+                            lcl_insertMenuCommand( xPopupMenu, nUniqueId++, C2U(".uno:InsertDataLabel") );
                         else
-                            lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:DeleteDataLabel") );
+                            lcl_insertMenuCommand( xPopupMenu, nUniqueId++, C2U(".uno:DeleteDataLabel") );
                         if( bSelectedPointIsFormatted )
-                            lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:ResetDataPoint"));
+                            lcl_insertMenuCommand( xPopupMenu, nUniqueId++, C2U(".uno:ResetDataPoint"));
 
                         xPopupMenu->insertSeparator( -1 );
 
-                        lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:FormatDataSeries") );
+                        lcl_insertMenuCommand( xPopupMenu, nUniqueId++, C2U(".uno:FormatDataSeries") );
                     }
 
                     Reference< chart2::XChartType > xChartType( DiagramHelper::getChartTypeOfSeries( xDiagram, xSeries ) );
@@ -1127,8 +1125,8 @@ void ChartController::execute_Command( c
 
                                 if( bJapaneseStyle )
                                 {
-                                    lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:FormatStockLoss") );
-                                    lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:FormatStockGain") );
+                                    lcl_insertMenuCommand( xPopupMenu, nUniqueId++, C2U(".uno:FormatStockLoss") );
+                                    lcl_insertMenuCommand( xPopupMenu, nUniqueId++, C2U(".uno:FormatStockGain") );
                                 }
                             }
                         }
@@ -1139,15 +1137,15 @@ void ChartController::execute_Command( c
                     }
                     
                     if( bHasDataLabelsAtSeries )
-                        lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:FormatDataLabels") );
+                        lcl_insertMenuCommand( xPopupMenu, nUniqueId++, C2U(".uno:FormatDataLabels") );
                     if( xTrendline.is() )
-                        lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:FormatTrendline") );
+                        lcl_insertMenuCommand( xPopupMenu, nUniqueId++, C2U(".uno:FormatTrendline") );
                     if( bHasEquation )
-                        lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:FormatTrendlineEquation") );
+                        lcl_insertMenuCommand( xPopupMenu, nUniqueId++, C2U(".uno:FormatTrendlineEquation") );
                     if( xMeanValue.is() )
-                        lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:FormatMeanValue") );
+                        lcl_insertMenuCommand( xPopupMenu, nUniqueId++, C2U(".uno:FormatMeanValue") );
                     if( bHasYErrorBars )
-                        lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:FormatYErrorBars") );
+                        lcl_insertMenuCommand( xPopupMenu, nUniqueId++, C2U(".uno:FormatYErrorBars") );
 
                     //if( nIdBeforeFormat != nUniqueId )
                         xPopupMenu->insertSeparator( -1 );
@@ -1155,15 +1153,15 @@ void ChartController::execute_Command( c
                     //const sal_Int32 nIdBeforeInsert = nUniqueId;
 
                     if( !bHasDataLabelsAtSeries )
-                        lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:InsertDataLabels") );
+                        lcl_insertMenuCommand( xPopupMenu, nUniqueId++, C2U(".uno:InsertDataLabels") );
                     if( !xTrendline.is() )
-                        lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:InsertTrendline") );
+                        lcl_insertMenuCommand( xPopupMenu, nUniqueId++, C2U(".uno:InsertTrendline") );
                     else if( !bHasEquation )
-                        lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:InsertTrendlineEquation") );
+                        lcl_insertMenuCommand( xPopupMenu, nUniqueId++, C2U(".uno:InsertTrendlineEquation") );
                     if( !xMeanValue.is() )
-                        lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:InsertMeanValue") );
+                        lcl_insertMenuCommand( xPopupMenu, nUniqueId++, C2U(".uno:InsertMeanValue") );
                     if( !bHasYErrorBars )
-                        lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:InsertYErrorBars") );
+                        lcl_insertMenuCommand( xPopupMenu, nUniqueId++, C2U(".uno:InsertYErrorBars") );
 
                     //if( nIdBeforeInsert != nUniqueId )
                     //    xPopupMenu->insertSeparator( -1 );
@@ -1171,32 +1169,31 @@ void ChartController::execute_Command( c
                     //const sal_Int32 nIdBeforeDelete = nUniqueId;
 
                     if( bHasDataLabelsAtSeries || ( bHasDataLabelsAtPoints && bHasFormattedDataPointsOtherThanSelected ) )
-                        lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:DeleteDataLabels") );
+                        lcl_insertMenuCommand( xPopupMenu, nUniqueId++, C2U(".uno:DeleteDataLabels") );
                     if( xTrendline.is() )
-                        lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:DeleteTrendline") );
+                        lcl_insertMenuCommand( xPopupMenu, nUniqueId++, C2U(".uno:DeleteTrendline") );
                     if( bHasEquation )
-                        lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:DeleteTrendlineEquation") );
+                        lcl_insertMenuCommand( xPopupMenu, nUniqueId++, C2U(".uno:DeleteTrendlineEquation") );
                     if( xMeanValue.is() )
-                        lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:DeleteMeanValue") );
+                        lcl_insertMenuCommand( xPopupMenu, nUniqueId++, C2U(".uno:DeleteMeanValue") );
                     if( bHasYErrorBars )
-                        lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:DeleteYErrorBars") );
+                        lcl_insertMenuCommand( xPopupMenu, nUniqueId++, C2U(".uno:DeleteYErrorBars") );
 
                     if( bHasFormattedDataPointsOtherThanSelected )
-                        lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:ResetAllDataPoints"));
+                        lcl_insertMenuCommand( xPopupMenu, nUniqueId++, C2U(".uno:ResetAllDataPoints"));
 
                     //if( nIdBeforeDelete != nUniqueId )
                         xPopupMenu->insertSeparator( -1 );
                     
-                    lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId, C2U(".uno:ArrangeRow"));
+                    lcl_insertMenuCommand( xPopupMenu, nUniqueId, C2U(".uno:ArrangeRow"));
                     uno::Reference< awt::XPopupMenu > xArrangePopupMenu( 
                         m_xCC->getServiceManager()->createInstanceWithContext(
                             C2U("com.sun.star.awt.PopupMenu"), m_xCC ), uno::UNO_QUERY );
-                    uno::Reference< awt::XMenuExtended > xArrangeMenuEx( xArrangePopupMenu, uno::UNO_QUERY );
-                    if( xArrangePopupMenu.is() && xArrangeMenuEx.is())
+                    if( xArrangePopupMenu.is() )
                     {
                         sal_Int16 nSubId = nUniqueId + 1;
-                        lcl_insertMenuCommand( xArrangePopupMenu, xArrangeMenuEx, nSubId++, C2U(".uno:Forward") );
-                        lcl_insertMenuCommand( xArrangePopupMenu, xArrangeMenuEx, nSubId, C2U(".uno:Backward") );
+                        lcl_insertMenuCommand( xArrangePopupMenu, nSubId++, C2U(".uno:Forward") );
+                        lcl_insertMenuCommand( xArrangePopupMenu, nSubId, C2U(".uno:Backward") );
                         xPopupMenu->setPopupMenu( nUniqueId, xArrangePopupMenu );
                         nUniqueId = nSubId;
                     }
@@ -1204,17 +1201,17 @@ void ChartController::execute_Command( c
                 }
                 else if( OBJECTTYPE_DATA_CURVE == eObjectType )
                 {
-                    lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:FormatTrendlineEquation") );
-                    lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:InsertTrendlineEquation") );
-                    lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:InsertTrendlineEquationAndR2") );
-                    lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:InsertR2Value") );
-                    lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:DeleteTrendlineEquation") );
-                    lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:DeleteR2Value") );
+                    lcl_insertMenuCommand( xPopupMenu, nUniqueId++, C2U(".uno:FormatTrendlineEquation") );
+                    lcl_insertMenuCommand( xPopupMenu, nUniqueId++, C2U(".uno:InsertTrendlineEquation") );
+                    lcl_insertMenuCommand( xPopupMenu, nUniqueId++, C2U(".uno:InsertTrendlineEquationAndR2") );
+                    lcl_insertMenuCommand( xPopupMenu, nUniqueId++, C2U(".uno:InsertR2Value") );
+                    lcl_insertMenuCommand( xPopupMenu, nUniqueId++, C2U(".uno:DeleteTrendlineEquation") );
+                    lcl_insertMenuCommand( xPopupMenu, nUniqueId++, C2U(".uno:DeleteR2Value") );
                 }
                 else if( OBJECTTYPE_DATA_CURVE_EQUATION == eObjectType )
                 {
-                    lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:InsertR2Value") );
-                    lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:DeleteR2Value") );
+                    lcl_insertMenuCommand( xPopupMenu, nUniqueId++, C2U(".uno:InsertR2Value") );
+                    lcl_insertMenuCommand( xPopupMenu, nUniqueId++, C2U(".uno:DeleteR2Value") );
                 }
 
                 //some commands for axes: and grids
@@ -1238,38 +1235,38 @@ void ChartController::execute_Command( c
                             bHasTitle = TitleHelper::getCompleteString( xTitled->getTitleObject() ).getLength()>0;
                         
                         if( OBJECTTYPE_AXIS  != eObjectType && bIsAxisVisible )
-                            lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:FormatAxis") );
+                            lcl_insertMenuCommand( xPopupMenu, nUniqueId++, C2U(".uno:FormatAxis") );
                         if( OBJECTTYPE_GRID != eObjectType && bIsMajorGridVisible && !bIsSecondaryAxis )
-                            lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:FormatMajorGrid") );
+                            lcl_insertMenuCommand( xPopupMenu, nUniqueId++, C2U(".uno:FormatMajorGrid") );
                         if( OBJECTTYPE_SUBGRID != eObjectType && bIsMinorGridVisible && !bIsSecondaryAxis )
-                            lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:FormatMinorGrid") );
+                            lcl_insertMenuCommand( xPopupMenu, nUniqueId++, C2U(".uno:FormatMinorGrid") );
 
                         xPopupMenu->insertSeparator( -1 );
 
                         if( OBJECTTYPE_AXIS  != eObjectType && !bIsAxisVisible )
-                            lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:InsertAxis") );
+                            lcl_insertMenuCommand( xPopupMenu, nUniqueId++, C2U(".uno:InsertAxis") );
                         if( OBJECTTYPE_GRID != eObjectType && !bIsMajorGridVisible && !bIsSecondaryAxis )
-                            lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:InsertMajorGrid") );
+                            lcl_insertMenuCommand( xPopupMenu, nUniqueId++, C2U(".uno:InsertMajorGrid") );
                         if( OBJECTTYPE_SUBGRID != eObjectType && !bIsMinorGridVisible && !bIsSecondaryAxis )
-                            lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:InsertMinorGrid") );
+                            lcl_insertMenuCommand( xPopupMenu, nUniqueId++, C2U(".uno:InsertMinorGrid") );
                         if( !bHasTitle )
-                            lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:InsertAxisTitle") );
+                            lcl_insertMenuCommand( xPopupMenu, nUniqueId++, C2U(".uno:InsertAxisTitle") );
 
                         if( bIsAxisVisible )
-                            lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:DeleteAxis") );
+                            lcl_insertMenuCommand( xPopupMenu, nUniqueId++, C2U(".uno:DeleteAxis") );
                         if( bIsMajorGridVisible && !bIsSecondaryAxis )
-                            lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:DeleteMajorGrid") );
+                            lcl_insertMenuCommand( xPopupMenu, nUniqueId++, C2U(".uno:DeleteMajorGrid") );
                         if( bIsMinorGridVisible && !bIsSecondaryAxis )
-                            lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:DeleteMinorGrid") );
+                            lcl_insertMenuCommand( xPopupMenu, nUniqueId++, C2U(".uno:DeleteMinorGrid") );
                     }
                 }
 
                 if( OBJECTTYPE_DATA_STOCK_LOSS == eObjectType )
-                    lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:FormatStockGain") );
+                    lcl_insertMenuCommand( xPopupMenu, nUniqueId++, C2U(".uno:FormatStockGain") );
                 else if( OBJECTTYPE_DATA_STOCK_GAIN == eObjectType )
-                    lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:FormatStockLoss") );
+                    lcl_insertMenuCommand( xPopupMenu, nUniqueId++, C2U(".uno:FormatStockLoss") );
 
-                lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:TransformDialog"));
+                lcl_insertMenuCommand( xPopupMenu, nUniqueId++, C2U(".uno:TransformDialog"));
 
                 if( OBJECTTYPE_PAGE == eObjectType || OBJECTTYPE_DIAGRAM == eObjectType
                     || OBJECTTYPE_DIAGRAM_WALL == eObjectType
@@ -1279,24 +1276,24 @@ void ChartController::execute_Command( c
                     if( OBJECTTYPE_UNKNOWN != eObjectType )
                         xPopupMenu->insertSeparator( -1 );
                     bool bHasLegend = LegendHelper::hasLegend( xDiagram );
-                    lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:InsertTitles") );
+                    lcl_insertMenuCommand( xPopupMenu, nUniqueId++, C2U(".uno:InsertTitles") );
                     if( !bHasLegend )
-                        lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:InsertLegend") );
-                    lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:InsertRemoveAxes") );    
+                        lcl_insertMenuCommand( xPopupMenu, nUniqueId++, C2U(".uno:InsertLegend") );
+                    lcl_insertMenuCommand( xPopupMenu, nUniqueId++, C2U(".uno:InsertRemoveAxes") );
                     if( bHasLegend )
-                        lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:DeleteLegend") );
+                        lcl_insertMenuCommand( xPopupMenu, nUniqueId++, C2U(".uno:DeleteLegend") );
                 }
                 //-----
                 
                 xPopupMenu->insertSeparator( -1 );
-                lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:DiagramType"));
-                lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:DataRanges"));
-                lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:DiagramData"));
-                lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:View3D"));
+                lcl_insertMenuCommand( xPopupMenu, nUniqueId++, C2U(".uno:DiagramType"));
+                lcl_insertMenuCommand( xPopupMenu, nUniqueId++, C2U(".uno:DataRanges"));
+                lcl_insertMenuCommand( xPopupMenu, nUniqueId++, C2U(".uno:DiagramData"));
+                lcl_insertMenuCommand( xPopupMenu, nUniqueId++, C2U(".uno:View3D"));
                 xPopupMenu->insertSeparator( -1 );
-                lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:Cut"));
-                lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:Copy"));
-                lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:Paste"));
+                lcl_insertMenuCommand( xPopupMenu, nUniqueId++, C2U(".uno:Cut"));
+                lcl_insertMenuCommand( xPopupMenu, nUniqueId++, C2U(".uno:Copy"));
+                lcl_insertMenuCommand( xPopupMenu, nUniqueId++, C2U(".uno:Paste"));
 
                 ::svt::ContextMenuHelper aContextMenuHelper( m_xFrame );
                 Point aPos( rCEvt.GetMousePosPixel() );

Modified: openoffice/trunk/main/forms/source/component/ImageControl.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/forms/source/component/ImageControl.cxx?rev=1425458&r1=1425457&r2=1425458&view=diff
==============================================================================
--- openoffice/trunk/main/forms/source/component/ImageControl.cxx (original)
+++ openoffice/trunk/main/forms/source/component/ImageControl.cxx Sun Dec 23 12:29:21 2012
@@ -925,7 +925,7 @@ void OImageControlControl::mousePressed(
             if ( impl_isEmptyGraphics_nothrow() )
 				xMenu->enableItem( ID_CLEAR_GRAPHICS, sal_False );
 
-			awt::Rectangle aRect( e.X, e.Y, 0, 0 );
+			awt::Point aPos( e.X, e.Y );
 			if ( ( e.X < 0 ) || ( e.Y < 0 ) )
 			{	// context menu triggered by keyboard
 				// position it in the center of the control
@@ -935,12 +935,12 @@ void OImageControlControl::mousePressed(
 				if ( xWindow.is() )
 				{
 					awt::Rectangle aPosSize = xWindow->getPosSize();
-					aRect.X = aPosSize.Width / 2;
-					aRect.Y = aPosSize.Height / 2;
+					aPos.X = aPosSize.Width / 2;
+					aPos.Y = aPosSize.Height / 2;
 				}
 			}
 
-			const sal_Int16 nResult = xMenu->execute( xWindowPeer, aRect, PopupMenuDirection::EXECUTE_DEFAULT );
+			const sal_Int16 nResult = xMenu->execute( xWindowPeer, aPos, PopupMenuDirection::EXECUTE_DEFAULT );
 
 			switch ( nResult )
 			{

Modified: openoffice/trunk/main/framework/inc/uielement/controlmenucontroller.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/framework/inc/uielement/controlmenucontroller.hxx?rev=1425458&r1=1425457&r2=1425458&view=diff
==============================================================================
--- openoffice/trunk/main/framework/inc/uielement/controlmenucontroller.hxx (original)
+++ openoffice/trunk/main/framework/inc/uielement/controlmenucontroller.hxx Sun Dec 23 12:29:21 2012
@@ -77,7 +77,7 @@ namespace framework
 		    virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException );
 
             // XMenuListener
-            virtual void SAL_CALL activate( const ::com::sun::star::awt::MenuEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException);
+            virtual void SAL_CALL itemActivated( const ::com::sun::star::awt::MenuEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException);
 
 		    // XEventListener
 		    virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& Source ) throw ( ::com::sun::star::uno::RuntimeException );

Modified: openoffice/trunk/main/framework/inc/uielement/fontmenucontroller.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/framework/inc/uielement/fontmenucontroller.hxx?rev=1425458&r1=1425457&r2=1425458&view=diff
==============================================================================
--- openoffice/trunk/main/framework/inc/uielement/fontmenucontroller.hxx (original)
+++ openoffice/trunk/main/framework/inc/uielement/fontmenucontroller.hxx Sun Dec 23 12:29:21 2012
@@ -71,7 +71,7 @@ namespace framework
 		    virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException );
 
             // XMenuListener
-            virtual void SAL_CALL activate( const ::com::sun::star::awt::MenuEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException);
+            virtual void SAL_CALL itemActivated( const ::com::sun::star::awt::MenuEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException);
             
 		    // XEventListener
 		    virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& Source ) throw ( ::com::sun::star::uno::RuntimeException );

Modified: openoffice/trunk/main/framework/inc/uielement/newmenucontroller.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/framework/inc/uielement/newmenucontroller.hxx?rev=1425458&r1=1425457&r2=1425458&view=diff
==============================================================================
--- openoffice/trunk/main/framework/inc/uielement/newmenucontroller.hxx (original)
+++ openoffice/trunk/main/framework/inc/uielement/newmenucontroller.hxx Sun Dec 23 12:29:21 2012
@@ -86,8 +86,8 @@ namespace framework
 		    virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException );
 
             // XMenuListener
-            virtual void SAL_CALL select( const ::com::sun::star::awt::MenuEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException);
-            virtual void SAL_CALL activate( const ::com::sun::star::awt::MenuEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException);
+            virtual void SAL_CALL itemSelected( const ::com::sun::star::awt::MenuEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException);
+            virtual void SAL_CALL itemActivated( const ::com::sun::star::awt::MenuEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException);
 
 		    // XEventListener
 		    virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& Source ) throw ( ::com::sun::star::uno::RuntimeException );

Modified: openoffice/trunk/main/framework/inc/uielement/recentfilesmenucontroller.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/framework/inc/uielement/recentfilesmenucontroller.hxx?rev=1425458&r1=1425457&r2=1425458&view=diff
==============================================================================
--- openoffice/trunk/main/framework/inc/uielement/recentfilesmenucontroller.hxx (original)
+++ openoffice/trunk/main/framework/inc/uielement/recentfilesmenucontroller.hxx Sun Dec 23 12:29:21 2012
@@ -51,8 +51,8 @@ namespace framework
 		    virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException );
 
             // XMenuListener
-            virtual void SAL_CALL select( const ::com::sun::star::awt::MenuEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException);
-            virtual void SAL_CALL activate( const ::com::sun::star::awt::MenuEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException);
+            virtual void SAL_CALL itemSelected( const ::com::sun::star::awt::MenuEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException);
+            virtual void SAL_CALL itemActivated( const ::com::sun::star::awt::MenuEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException);
 
             // XDispatchProvider
             virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > SAL_CALL queryDispatch( const ::com::sun::star::util::URL& aURL, const ::rtl::OUString& sTarget, sal_Int32 nFlags ) throw( ::com::sun::star::uno::RuntimeException );

Modified: openoffice/trunk/main/framework/inc/uielement/toolbarsmenucontroller.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/framework/inc/uielement/toolbarsmenucontroller.hxx?rev=1425458&r1=1425457&r2=1425458&view=diff
==============================================================================
--- openoffice/trunk/main/framework/inc/uielement/toolbarsmenucontroller.hxx (original)
+++ openoffice/trunk/main/framework/inc/uielement/toolbarsmenucontroller.hxx Sun Dec 23 12:29:21 2012
@@ -81,8 +81,8 @@ namespace framework
 		    virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException );
 
             // XMenuListener
-            virtual void SAL_CALL select( const ::com::sun::star::awt::MenuEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException);
-            virtual void SAL_CALL activate( const ::com::sun::star::awt::MenuEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException);
+            virtual void SAL_CALL itemSelected( const ::com::sun::star::awt::MenuEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException);
+            virtual void SAL_CALL itemActivated( const ::com::sun::star::awt::MenuEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException);
 
 		    // XEventListener
 		    virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& Source ) throw ( ::com::sun::star::uno::RuntimeException );

Modified: openoffice/trunk/main/framework/source/uielement/controlmenucontroller.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/framework/source/uielement/controlmenucontroller.cxx?rev=1425458&r1=1425457&r2=1425458&view=diff
==============================================================================
--- openoffice/trunk/main/framework/source/uielement/controlmenucontroller.cxx (original)
+++ openoffice/trunk/main/framework/source/uielement/controlmenucontroller.cxx Sun Dec 23 12:29:21 2012
@@ -346,7 +346,7 @@ void ControlMenuController::impl_select(
     }
 }
 
-void SAL_CALL ControlMenuController::activate( const css::awt::MenuEvent& ) throw (RuntimeException)
+void SAL_CALL ControlMenuController::itemActivated( const css::awt::MenuEvent& ) throw (RuntimeException)
 {
     osl::ResettableMutexGuard aLock( m_aMutex );
     

Modified: openoffice/trunk/main/framework/source/uielement/fontmenucontroller.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/framework/source/uielement/fontmenucontroller.cxx?rev=1425458&r1=1425457&r2=1425458&view=diff
==============================================================================
--- openoffice/trunk/main/framework/source/uielement/fontmenucontroller.cxx (original)
+++ openoffice/trunk/main/framework/source/uielement/fontmenucontroller.cxx Sun Dec 23 12:29:21 2012
@@ -187,7 +187,7 @@ void FontMenuController::impl_select(con
 		_xDispatch->dispatch( aTargetURL, aArgs );
 }
 
-void SAL_CALL FontMenuController::activate( const css::awt::MenuEvent& ) throw (RuntimeException)
+void SAL_CALL FontMenuController::itemActivated( const css::awt::MenuEvent& ) throw (RuntimeException)
 {
     osl::MutexGuard aLock( m_aMutex );
     

Modified: openoffice/trunk/main/framework/source/uielement/langselectionmenucontroller.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/framework/source/uielement/langselectionmenucontroller.cxx?rev=1425458&r1=1425457&r2=1425458&view=diff
==============================================================================
--- openoffice/trunk/main/framework/source/uielement/langselectionmenucontroller.cxx (original)
+++ openoffice/trunk/main/framework/source/uielement/langselectionmenucontroller.cxx Sun Dec 23 12:29:21 2012
@@ -54,7 +54,6 @@
 #ifndef _VCL_MNEMONIC_HXX_
 #include <vcl/mnemonic.hxx>
 #endif
-#include <com/sun/star/awt/XMenuExtended.hpp>
 #include <comphelper/processfactory.hxx>
 
 #include <com/sun/star/document/XDocumentLanguages.hpp>

Modified: openoffice/trunk/main/framework/source/uielement/langselectionstatusbarcontroller.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/framework/source/uielement/langselectionstatusbarcontroller.cxx?rev=1425458&r1=1425457&r2=1425458&view=diff
==============================================================================
--- openoffice/trunk/main/framework/source/uielement/langselectionstatusbarcontroller.cxx (original)
+++ openoffice/trunk/main/framework/source/uielement/langselectionstatusbarcontroller.cxx Sun Dec 23 12:29:21 2012
@@ -203,10 +203,7 @@ throw (::com::sun::star::uno::RuntimeExc
     //
 
 	Reference< awt::XWindowPeer > xParent( m_xParentWindow, UNO_QUERY );
-	com::sun::star::awt::Rectangle aRectangle;
-    aRectangle.X = aPos.X;
-	aRectangle.Y = aPos.Y;
-	sal_Int16 nId = xPopupMenu->execute( xParent, aRectangle, com::sun::star::awt::PopupMenuDirection::EXECUTE_UP+16 );
+	sal_Int16 nId = xPopupMenu->execute( xParent, aPos, com::sun::star::awt::PopupMenuDirection::EXECUTE_UP+16 );
     //click "More..."
     if ( nId && m_xFrame.is() )
     {

Modified: openoffice/trunk/main/framework/source/uielement/newmenucontroller.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/framework/source/uielement/newmenucontroller.cxx?rev=1425458&r1=1425457&r2=1425458&view=diff
==============================================================================
--- openoffice/trunk/main/framework/source/uielement/newmenucontroller.cxx (original)
+++ openoffice/trunk/main/framework/source/uielement/newmenucontroller.cxx Sun Dec 23 12:29:21 2012
@@ -412,7 +412,7 @@ void SAL_CALL NewMenuController::statusC
 }
 
 // XMenuListener
-void SAL_CALL NewMenuController::select( const css::awt::MenuEvent& rEvent ) throw (RuntimeException)
+void SAL_CALL NewMenuController::itemSelected( const css::awt::MenuEvent& rEvent ) throw (RuntimeException)
 {
     Reference< css::awt::XPopupMenu > xPopupMenu;
     Reference< XDispatch >            xDispatch;
@@ -470,7 +470,7 @@ void SAL_CALL NewMenuController::select(
     }
 }
 
-void SAL_CALL NewMenuController::activate( const css::awt::MenuEvent& ) throw (RuntimeException)
+void SAL_CALL NewMenuController::itemActivated( const css::awt::MenuEvent& ) throw (RuntimeException)
 {
     vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
     if ( m_xFrame.is() && m_xPopupMenu.is() )

Modified: openoffice/trunk/main/framework/source/uielement/popupmenucontroller.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/framework/source/uielement/popupmenucontroller.cxx?rev=1425458&r1=1425457&r2=1425458&view=diff
==============================================================================
--- openoffice/trunk/main/framework/source/uielement/popupmenucontroller.cxx (original)
+++ openoffice/trunk/main/framework/source/uielement/popupmenucontroller.cxx Sun Dec 23 12:29:21 2012
@@ -211,7 +211,7 @@ Reference< awt::XWindow > SAL_CALL Popup
 
 		if( !mxPopupMenu.is() )
 		{
-			mxPopupMenu = Reference< awt::XPopupMenu >( getServiceManager()->createInstance( DECLARE_ASCII( "stardiv.Toolkit.VCLXPopupMenu" ) ), UNO_QUERY_THROW );
+			mxPopupMenu = Reference< awt::XPopupMenu >( getServiceManager()->createInstance( DECLARE_ASCII( "com.sun.star.awt.PopupMenu" ) ), UNO_QUERY_THROW );
 			mxPopupMenuController->setPopupMenu( mxPopupMenu );
 		}
 		else
@@ -221,7 +221,7 @@ Reference< awt::XWindow > SAL_CALL Popup
 		}
 		pToolBox->SetItemDown( nItemId, sal_True );
 		Reference< awt::XWindowPeer > xPeer( getParent(), UNO_QUERY_THROW );
-		mxPopupMenu->execute( xPeer, VCLUnoHelper::ConvertToAWTRect( aRect ), 0 );
+		mxPopupMenu->execute( xPeer, awt::Point( aRect.getX(), aRect.getY() ), 0 );
 		pToolBox->SetItemDown( nItemId, sal_False );
 	}
 	catch( Exception& )

Modified: openoffice/trunk/main/framework/source/uielement/recentfilesmenucontroller.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/framework/source/uielement/recentfilesmenucontroller.cxx?rev=1425458&r1=1425457&r2=1425458&view=diff
==============================================================================
--- openoffice/trunk/main/framework/source/uielement/recentfilesmenucontroller.cxx (original)
+++ openoffice/trunk/main/framework/source/uielement/recentfilesmenucontroller.cxx Sun Dec 23 12:29:21 2012
@@ -301,20 +301,18 @@ void SAL_CALL RecentFilesMenuController:
     m_bDisabled = !Event.IsEnabled;
 }
 
-void SAL_CALL RecentFilesMenuController::select( const css::awt::MenuEvent& rEvent ) throw (RuntimeException)
+void SAL_CALL RecentFilesMenuController::itemSelected( const css::awt::MenuEvent& rEvent ) throw (RuntimeException)
 {
-    Reference< css::awt::XPopupMenu >    xPopupMenu;
-    Reference< css::awt::XMenuExtended > xMenuExt;
+    Reference< css::awt::XPopupMenu > xPopupMenu;
 
     osl::ClearableMutexGuard aLock( m_aMutex );
-    xPopupMenu          = m_xPopupMenu;
-    xMenuExt            = Reference< css::awt::XMenuExtended >( m_xPopupMenu, UNO_QUERY );
+    xPopupMenu = m_xPopupMenu;
     aLock.clear();
 
-    if ( xMenuExt.is() )
+    if ( xPopupMenu.is() )
     {
-        const rtl::OUString aCommand( xMenuExt->getCommand( rEvent.MenuId ) );
-        OSL_TRACE( "RecentFilesMenuController::select() - Command : %s",
+        const rtl::OUString aCommand( xPopupMenu->getCommand( rEvent.MenuId ) );
+        OSL_TRACE( "RecentFilesMenuController::itemSelected() - Command : %s",
                    rtl::OUStringToOString( aCommand, RTL_TEXTENCODING_UTF8 ).getStr() );
 
         if ( aCommand.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( CMD_CLEAR_LIST ) ) )
@@ -324,7 +322,7 @@ void SAL_CALL RecentFilesMenuController:
     }
 }
 
-void SAL_CALL RecentFilesMenuController::activate( const css::awt::MenuEvent& ) throw (RuntimeException)
+void SAL_CALL RecentFilesMenuController::itemActivated( const css::awt::MenuEvent& ) throw (RuntimeException)
 {
     osl::MutexGuard aLock( m_aMutex );
     impl_setPopupMenu();

Modified: openoffice/trunk/main/framework/source/uielement/toolbarsmenucontroller.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/framework/source/uielement/toolbarsmenucontroller.cxx?rev=1425458&r1=1425457&r2=1425458&view=diff
==============================================================================
--- openoffice/trunk/main/framework/source/uielement/toolbarsmenucontroller.cxx (original)
+++ openoffice/trunk/main/framework/source/uielement/toolbarsmenucontroller.cxx Sun Dec 23 12:29:21 2012
@@ -187,8 +187,7 @@ void ToolbarsMenuController::addCommand(
         aLabel = rLabel;
 
 	rPopupMenu->insertItem( nItemId, aLabel, 0, nItemId );
-    Reference< awt::XMenuExtended > xMenuExtended( m_xPopupMenu, UNO_QUERY );
-    xMenuExtended->setCommand( nItemId, rCommandURL );
+    rPopupMenu->setCommand( nItemId, rCommandURL );
 
     bool bInternal = ( rCommandURL.indexOf( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( STATIC_INTERNAL_CMD_PART ))) == 0);
     if ( !bInternal )
@@ -377,9 +376,8 @@ void ToolbarsMenuController::fillPopupMe
     m_aCommandVector.clear();
 
     // Retrieve layout manager for additional information
-    rtl::OUString                   aEmptyString;
-    Reference< awt::XMenuExtended > xMenuExtended( rPopupMenu, UNO_QUERY );
-    Reference< XLayoutManager >     xLayoutManager( getLayoutManagerFromFrame( m_xFrame ));
+    rtl::OUString aEmptyString;
+    Reference< XLayoutManager > xLayoutManager( getLayoutManagerFromFrame( m_xFrame ));
 
     m_bResetActive = sal_False;
     if ( xLayoutManager.is() )
@@ -490,7 +488,7 @@ void ToolbarsMenuController::fillPopupMe
 
             // Store complete uno-command so it can also be dispatched. This is necessary to support
             // the test tool!
-		    xMenuExtended->setCommand( nIndex, aCmd );
+		    rPopupMenu->setCommand( nIndex, aCmd );
             ++nIndex;
         }
 
@@ -619,7 +617,7 @@ void SAL_CALL ToolbarsMenuController::st
 }
 
 // XMenuListener
-void SAL_CALL ToolbarsMenuController::select( const css::awt::MenuEvent& rEvent ) throw (RuntimeException)
+void SAL_CALL ToolbarsMenuController::itemSelected( const css::awt::MenuEvent& rEvent ) throw (RuntimeException)
 {
     Reference< css::awt::XPopupMenu >   xPopupMenu;
     Reference< XMultiServiceFactory >   xServiceManager;
@@ -780,7 +778,7 @@ void SAL_CALL ToolbarsMenuController::se
     }
 }
 
-void SAL_CALL ToolbarsMenuController::activate( const css::awt::MenuEvent& ) throw (RuntimeException)
+void SAL_CALL ToolbarsMenuController::itemActivated( const css::awt::MenuEvent& ) throw (RuntimeException)
 {
     std::vector< rtl::OUString >   aCmdVector;
     Reference< XDispatchProvider > xDispatchProvider( m_xFrame, UNO_QUERY );

Modified: openoffice/trunk/main/odk/examples/DevelopersGuide/GUI/UnoMenu.java
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/odk/examples/DevelopersGuide/GUI/UnoMenu.java?rev=1425458&r1=1425457&r2=1425458&view=diff
==============================================================================
--- openoffice/trunk/main/odk/examples/DevelopersGuide/GUI/UnoMenu.java (original)
+++ openoffice/trunk/main/odk/examples/DevelopersGuide/GUI/UnoMenu.java Sun Dec 23 12:29:21 2012
@@ -25,7 +25,6 @@ import com.sun.star.awt.Rectangle;
 import com.sun.star.awt.WindowAttribute;
 import com.sun.star.awt.WindowClass;
 import com.sun.star.awt.XMenuBar;
-import com.sun.star.awt.XMenuExtended;
 import com.sun.star.awt.XMenuListener;
 import com.sun.star.awt.XPopupMenu;
 import com.sun.star.awt.XToolkit;
@@ -67,21 +66,26 @@ public UnoMenu(XComponentContext _xConte
     XPopupMenu xPopupMenu = null;
     try{
         // create a popup menu
-        Object oPopupMenu = m_xMCF.createInstanceWithContext("stardiv.Toolkit.VCLXPopupMenu", m_xContext);
+        Object oPopupMenu = m_xMCF.createInstanceWithContext("com.sun.star.awt.PopupMenu", m_xContext);
         xPopupMenu = (XPopupMenu) UnoRuntime.queryInterface(XPopupMenu.class, oPopupMenu);
-        XMenuExtended xMenuExtended = (XMenuExtended) UnoRuntime.queryInterface(XMenuExtended.class, xPopupMenu);
 
-        xPopupMenu.insertItem((short) 0, "~First Entry", MenuItemStyle.AUTOCHECK, (short) 0);
-        xPopupMenu.insertItem((short) 1, "First ~Radio Entry", (short) (MenuItemStyle.RADIOCHECK + MenuItemStyle.AUTOCHECK), (short) 1);
-        xPopupMenu.insertItem((short) 2, "~Second Radio Entry", (short) (MenuItemStyle.RADIOCHECK + MenuItemStyle.AUTOCHECK), (short) 2);
-        xPopupMenu.insertItem((short) 3, "~Third RadioEntry",(short) (MenuItemStyle.RADIOCHECK + MenuItemStyle.AUTOCHECK), (short) 3);
-        xPopupMenu.insertSeparator((short)4);
-        xPopupMenu.insertItem((short) 4, "F~ifth Entry", (short) (MenuItemStyle.CHECKABLE + MenuItemStyle.AUTOCHECK), (short) 5);
-        xPopupMenu.insertItem((short) 5, "~Fourth Entry", (short) (MenuItemStyle.CHECKABLE + MenuItemStyle.AUTOCHECK), (short) 6);
-        xPopupMenu.enableItem((short) 1, false);
-        xPopupMenu.insertItem((short) 6, "~Sixth Entry", (short) 0, (short) 7);
-        xPopupMenu.insertItem((short) 7, "~Close Dialog", (short) 0, (short) 8);
-        xPopupMenu.checkItem((short) 2, true);
+        // ID must start be > 0
+        short nId = 1;
+        short nPos = 0;
+
+        xPopupMenu.insertItem(nId++, "First Entry", MenuItemStyle.AUTOCHECK, nPos++);
+        xPopupMenu.insertItem(nId++, "First Radio Entry", (short) (MenuItemStyle.RADIOCHECK + MenuItemStyle.AUTOCHECK), nPos++);
+        xPopupMenu.insertItem(nId++, "Second Radio Entry", (short) (MenuItemStyle.RADIOCHECK + MenuItemStyle.AUTOCHECK), nPos++);
+        xPopupMenu.insertItem(nId++, "Third RadioEntry",(short) (MenuItemStyle.RADIOCHECK + MenuItemStyle.AUTOCHECK), nPos++);
+        xPopupMenu.insertSeparator(nPos++);
+        xPopupMenu.insertItem(nId++, "Fifth Entry", (short) (MenuItemStyle.CHECKABLE + MenuItemStyle.AUTOCHECK), nPos++);
+        xPopupMenu.insertItem(nId++, "Fourth Entry", (short) (MenuItemStyle.CHECKABLE + MenuItemStyle.AUTOCHECK), nPos++);
+        xPopupMenu.insertItem(nId++, "Sixth Entry", (short) 0, nPos++);
+        xPopupMenu.insertItem(nId++, "Close Dialog", (short) 0, nPos++);
+
+        xPopupMenu.enableItem((short) 2, false);
+        xPopupMenu.checkItem((short) 3, true);
+
         xPopupMenu.addMenuListener(this);
     }catch( Exception e ) {
         throw new java.lang.RuntimeException("cannot happen...");    
@@ -93,12 +97,12 @@ public UnoMenu(XComponentContext _xConte
     public void addMenuBar(XTopWindow _xTopWindow, XMenuListener _xMenuListener){
     try{
         // create a menubar at the global MultiComponentFactory...
-        Object oMenuBar = m_xMCF.createInstanceWithContext("stardiv.Toolkit.VCLXMenuBar", m_xContext);
+        Object oMenuBar = m_xMCF.createInstanceWithContext("com.sun.star.awt.MenuBar", m_xContext);
         // add the menu items...
         XMenuBar xMenuBar = (XMenuBar) UnoRuntime.queryInterface(XMenuBar.class, oMenuBar);
-        xMenuBar.insertItem((short) 0, "~First MenuBar Item", com.sun.star.awt.MenuItemStyle.AUTOCHECK, (short) 0);
-        xMenuBar.insertItem((short) 1, "~Second MenuBar Item", com.sun.star.awt.MenuItemStyle.AUTOCHECK, (short) 1);
-        xMenuBar.setPopupMenu((short) 0, getPopupMenu());
+        xMenuBar.insertItem((short) 1, "~First MenuBar Item", com.sun.star.awt.MenuItemStyle.AUTOCHECK, (short) 0);
+        xMenuBar.insertItem((short) 2, "~Second MenuBar Item", com.sun.star.awt.MenuItemStyle.AUTOCHECK, (short) 1);
+        xMenuBar.setPopupMenu((short) 1, getPopupMenu());
         xMenuBar.addMenuListener(_xMenuListener);
         _xTopWindow.setMenuBar(xMenuBar);
     }catch( Exception e ) {
@@ -157,31 +161,31 @@ public UnoMenu(XComponentContext _xConte
         addMenuBar(xTopWindow, this);
     }
 
-    public void select(MenuEvent menuEvent){
+    public void itemSelected(MenuEvent menuEvent){
         // find out which menu item has been triggered,
         // by getting the menu-id...
         switch (menuEvent.MenuId){
-            case 0:
+            case 1:
                 // add your menu-item-specific code here:
                 break;
-            case 1:
+            case 2:
                 // add your menu-item-specific code here:
                 break;
-            case 7:
+            case 8:
                 closeDialog();
             default:
                 //..
         }
     }
 
-    public void highlight(MenuEvent menuEvent) {
+    public void itemHighlighted(MenuEvent menuEvent) {
         int i = 0;
     }
 
-    public void deactivate(MenuEvent menuEvent) {
+    public void itemDeactivated(MenuEvent menuEvent) {
         int i = 0;    }
 
-    public void activate(MenuEvent menuEvent) {
+    public void itemActivated(MenuEvent menuEvent) {
         int i = 0;
     }
 

Modified: openoffice/trunk/main/odk/examples/DevelopersGuide/GUI/UnoMenu2.java
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/odk/examples/DevelopersGuide/GUI/UnoMenu2.java?rev=1425458&r1=1425457&r2=1425458&view=diff
==============================================================================
--- openoffice/trunk/main/odk/examples/DevelopersGuide/GUI/UnoMenu2.java (original)
+++ openoffice/trunk/main/odk/examples/DevelopersGuide/GUI/UnoMenu2.java Sun Dec 23 12:29:21 2012
@@ -20,7 +20,7 @@
  *************************************************************/
 
 import com.sun.star.awt.MouseEvent;
-import com.sun.star.awt.Rectangle;
+import com.sun.star.awt.Point;
 import com.sun.star.awt.XControl;
 import com.sun.star.awt.XMouseListener;
 import com.sun.star.awt.XTopWindow;
@@ -99,9 +99,9 @@ public UnoMenu2(XComponentContext _xCont
 
     public void mousePressed(MouseEvent mouseEvent) {
         if (mouseEvent.PopupTrigger){
-            Rectangle aRectangle = new Rectangle(mouseEvent.X, mouseEvent.Y, 0, 0);
+            Point aPos = new Point(mouseEvent.X, mouseEvent.Y);
             XControl xControl = (XControl) UnoRuntime.queryInterface(XControl.class, mouseEvent.Source);
-            getPopupMenu().execute( xControl.getPeer(), aRectangle, com.sun.star.awt.PopupMenuDirection.DEFAULT);    
+            getPopupMenu().execute( xControl.getPeer(), aPos, com.sun.star.awt.PopupMenuDirection.EXECUTE_DEFAULT);
         }
     }
 

Modified: openoffice/trunk/main/odk/examples/cpp/StatusbarController/SelectionModeStatusbarController/SelectionModeStatusbarController.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/odk/examples/cpp/StatusbarController/SelectionModeStatusbarController/SelectionModeStatusbarController.cxx?rev=1425458&r1=1425457&r2=1425458&view=diff
==============================================================================
--- openoffice/trunk/main/odk/examples/cpp/StatusbarController/SelectionModeStatusbarController/SelectionModeStatusbarController.cxx (original)
+++ openoffice/trunk/main/odk/examples/cpp/StatusbarController/SelectionModeStatusbarController/SelectionModeStatusbarController.cxx Sun Dec 23 12:29:21 2012
@@ -186,13 +186,8 @@ void SelectionModeStatusbarController::E
 
         xPopupMenu->checkItem( nIdOffset + m_eSelectionMode, sal_True );
 
-        Rectangle aRect;
-        aRect.X = aPos.X;
-        aRect.Y = aPos.Y;
-
         Reference< XWindowPeer > xParent( m_xStatusbarWindow, UNO_QUERY );
-
-        const sal_Int16 nSelId = xPopupMenu->execute( xParent, aRect, PopupMenuDirection::EXECUTE_UP );
+        const sal_Int16 nSelId = xPopupMenu->execute( xParent, aPos, PopupMenuDirection::EXECUTE_UP );
         if ( nSelId )
         {
             Sequence< PropertyValue > aArgs( 1 );

Modified: openoffice/trunk/main/offapi/com/sun/star/awt/MenuBar.idl
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/offapi/com/sun/star/awt/MenuBar.idl?rev=1425458&r1=1425457&r2=1425458&view=diff
==============================================================================
--- openoffice/trunk/main/offapi/com/sun/star/awt/MenuBar.idl (original)
+++ openoffice/trunk/main/offapi/com/sun/star/awt/MenuBar.idl Sun Dec 23 12:29:21 2012
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,46 +7,36 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
+#ifndef __com_sun_star_awt_MenuBar_idl__
+#define __com_sun_star_awt_MenuBar_idl__
 
-#ifndef __com_sun_star_awt_MenuBar_idl__ 
-#define __com_sun_star_awt_MenuBar_idl__ 
- 
-#ifndef __com_sun_star_awt_XMenuBar_idl__ 
-#include <com/sun/star/awt/XMenuBar.idl> 
-#endif 
+#include <com/sun/star/awt/XMenuBar.idl>
 
-//============================================================================= 
- 
 module com {  module sun {  module star {  module awt {
-    
-//============================================================================= 
- 
+
 /** describes a menu for top-level windows.
-		
-	<p>A menu bar can only be used by top-level windows. They support
+    <p>A menu bar can only be used by top-level windows. They support
        the interface <type scope="com::sun::star::awt">XTopWindow</type>
        to set an menu bar object.
     </p>
  */
 published service MenuBar
-{ 
-	interface XMenuBar; 
-}; 
- 
-//============================================================================= 
- 
-}; }; }; };  
- 
-#endif 
+{
+    interface XMenuBar;
+};
+
+}; }; }; };
+
+#endif

Modified: openoffice/trunk/main/offapi/com/sun/star/awt/MenuEvent.idl
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/offapi/com/sun/star/awt/MenuEvent.idl?rev=1425458&r1=1425457&r2=1425458&view=diff
==============================================================================
--- openoffice/trunk/main/offapi/com/sun/star/awt/MenuEvent.idl (original)
+++ openoffice/trunk/main/offapi/com/sun/star/awt/MenuEvent.idl Sun Dec 23 12:29:21 2012
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,47 +7,35 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
+#ifndef __com_sun_star_awt_MenuEvent_idl__
+#define __com_sun_star_awt_MenuEvent_idl__
+
+#include <com/sun/star/lang/EventObject.idl>
+
+module com {  module sun {  module star {  module awt {
 
-#ifndef __com_sun_star_awt_MenuEvent_idl__ 
-#define __com_sun_star_awt_MenuEvent_idl__ 
- 
-#ifndef __com_sun_star_lang_EventObject_idl__ 
-#include <com/sun/star/lang/EventObject.idl> 
-#endif 
- 
- 
-//============================================================================= 
- 
- module com {  module sun {  module star {  module awt {  
- 
-//============================================================================= 
- 
 /** specifies a menu event.
  */
 published struct MenuEvent: com::sun::star::lang::EventObject
-{ 
-	//------------------------------------------------------------------------- 
-	 
-	/** contains the item id.
-	 */
-	short MenuId; 
- 
-}; 
- 
-//============================================================================= 
- 
-}; }; }; };  
- 
-#endif 
+{
+    /** contains the item ID.
+     */
+    short MenuId;
+
+};
+
+}; }; }; };
+
+#endif

Modified: openoffice/trunk/main/offapi/com/sun/star/awt/MenuItemStyle.idl
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/offapi/com/sun/star/awt/MenuItemStyle.idl?rev=1425458&r1=1425457&r2=1425458&view=diff
==============================================================================
--- openoffice/trunk/main/offapi/com/sun/star/awt/MenuItemStyle.idl (original)
+++ openoffice/trunk/main/offapi/com/sun/star/awt/MenuItemStyle.idl Sun Dec 23 12:29:21 2012
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,58 +7,43 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 
-#ifndef __com_sun_star_awt_MenuItemStyle_idl__ 
-#define __com_sun_star_awt_MenuItemStyle_idl__ 
- 
- 
-//============================================================================= 
- 
- module com {  module sun {  module star {  module awt {  
- 
-//============================================================================= 
- 
-/** These values are used to specify the properties of a menu item. 
-		 
-	<p>They may be expanded in future versions.</p>
+#ifndef __com_sun_star_awt_MenuItemStyle_idl__
+#define __com_sun_star_awt_MenuItemStyle_idl__
+
+module com {  module sun {  module star {  module awt {
+
+/** These values are used to specify the properties of a menu item.
  */
-published constants MenuItemStyle
-{ 
-	//------------------------------------------------------------------------- 
-		
-	/** specifies an item which can be checked independently.
-	 */
-	const short CHECKABLE = 1; 
- 
-	//------------------------------------------------------------------------- 
-		
-	/** specifies an item which can be checked dependent on the neighbouring
+constants MenuItemStyle
+{
+    /** specifies an item which can be checked independently.
+     */
+    const short CHECKABLE = 1;
+
+    /** specifies an item which can be checked dependent on the neighbouring
         items.
-	 */
-	const short RADIOCHECK = 2; 
- 
-	//------------------------------------------------------------------------- 
-		
-	/** specifies to check this item automatically on select.
-	 */
-	const short AUTOCHECK = 4; 
- 
-}; 
- 
-//============================================================================= 
- 
-}; }; }; };  
- 
-#endif 
+     */
+    const short RADIOCHECK = 2;
+
+    /** specifies to check this item automatically on select.
+     */
+    const short AUTOCHECK = 4;
+
+};
+
+}; }; }; };
+
+#endif

Modified: openoffice/trunk/main/offapi/com/sun/star/awt/MenuItemType.idl
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/offapi/com/sun/star/awt/MenuItemType.idl?rev=1425458&r1=1425457&r2=1425458&view=diff
==============================================================================
--- openoffice/trunk/main/offapi/com/sun/star/awt/MenuItemType.idl (original)
+++ openoffice/trunk/main/offapi/com/sun/star/awt/MenuItemType.idl Sun Dec 23 12:29:21 2012
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,31 +7,25 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
-
 #ifndef __com_sun_star_awt_MenuItemType_idl__
 #define __com_sun_star_awt_MenuItemType_idl__
 
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
+module com {  module sun {  module star {  module awt {
 
 /** specifies the type of a menu item, as returned by
-    <member scope="com::sun::star::awt">XMenuExtended2::getItemType()</member>.
+    <member scope="com::sun::star::awt">XMenu::getItemType()</member>.
  */
 published enum MenuItemType
 {
@@ -57,8 +51,6 @@ published enum MenuItemType
 
 };
 
-//=============================================================================
-
 }; }; }; };
 
 #endif

Modified: openoffice/trunk/main/offapi/com/sun/star/awt/PopupMenu.idl
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/offapi/com/sun/star/awt/PopupMenu.idl?rev=1425458&r1=1425457&r2=1425458&view=diff
==============================================================================
--- openoffice/trunk/main/offapi/com/sun/star/awt/PopupMenu.idl (original)
+++ openoffice/trunk/main/offapi/com/sun/star/awt/PopupMenu.idl Sun Dec 23 12:29:21 2012
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,45 +7,35 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
+#ifndef __com_sun_star_awt_PopupMenu_idl__
+#define __com_sun_star_awt_PopupMenu_idl__
 
-#ifndef __com_sun_star_awt_PopupMenu_idl__ 
-#define __com_sun_star_awt_PopupMenu_idl__ 
- 
-#ifndef __com_sun_star_awt_XPopupMenu_idl__ 
-#include <com/sun/star/awt/XPopupMenu.idl> 
-#endif 
+#include <com/sun/star/awt/XPopupMenu.idl>
 
-//============================================================================= 
- 
 module com {  module sun {  module star {  module awt {
-    
-//============================================================================= 
- 
+
 /** describes a popup menu which is a recursive container for commands
-		
-	<p>A popup menu can be used as a standalone object to display a context 
-       menu. It's also possible to use a popup menu to integrate it into 
+    <p>A popup menu can be used as a standalone object to display a context
+       menu. It's also possible to use a popup menu to integrate it into
        another menu.</p>
  */
 published service PopupMenu
-{ 
-	interface XPopupMenu; 
-}; 
- 
-//============================================================================= 
- 
-}; }; }; };  
- 
-#endif 
+{
+    interface XPopupMenu;
+};
+
+}; }; }; };
+
+#endif

Modified: openoffice/trunk/main/offapi/com/sun/star/awt/PopupMenuDirection.idl
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/offapi/com/sun/star/awt/PopupMenuDirection.idl?rev=1425458&r1=1425457&r2=1425458&view=diff
==============================================================================
--- openoffice/trunk/main/offapi/com/sun/star/awt/PopupMenuDirection.idl (original)
+++ openoffice/trunk/main/offapi/com/sun/star/awt/PopupMenuDirection.idl Sun Dec 23 12:29:21 2012
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,82 +7,50 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
+#ifndef __com_sun_star_awt_PopupMenuDirection_idl__
+#define __com_sun_star_awt_PopupMenuDirection_idl__
 
-#ifndef __com_sun_star_awt_PopupMenuDirection_idl__ 
-#define __com_sun_star_awt_PopupMenuDirection_idl__ 
- 
- 
-//============================================================================= 
- 
- module com {  module sun {  module star {  module awt {  
- 
-//============================================================================= 
- 
-/** These values are used to specify the direction in which  
-    a popup menu will grow. 
-		 
-	<p>They may be expanded in future versions.</p>
+module com {  module sun {  module star {  module awt {
+
+/** These values are used to specify the direction in which
+    a popup menu will grow.
  */
 published constants PopupMenuDirection
-{ 
-	//------------------------------------------------------------------------- 
-	 
-	/** @deprecated
-	 */
-	const short DEFAULT = 0; 
- 
-	//------------------------------------------------------------------------- 
-	 
-	/** @deprecated
-	 */
-	const short DOWN = 1; 
- 
-	//------------------------------------------------------------------------- 
-		
-	/** opens on execute in a default direction.
-	 */
-	const short EXECUTE_DEFAULT = 0; 
- 
-	//------------------------------------------------------------------------- 
-		
-	/** opens on execute downwards.
-	 */
-	const short EXECUTE_DOWN = 1; 
- 
-	//------------------------------------------------------------------------- 
-		
-	/** opens on execute upwards.
-	 */
-	const short EXECUTE_UP = 2; 
- 
-	//------------------------------------------------------------------------- 
-		
-	/** opens on execute to the left.
-	 */
-	const short EXECUTE_LEFT = 4; 
- 
-	//------------------------------------------------------------------------- 
-		
-	/** opens on execute to the right.
-	 */
-	const short EXECUTE_RIGHT = 8; 
- 
-}; 
- 
-//============================================================================= 
- 
-}; }; }; };  
- 
-#endif 
+{
+    /** opens on execute in a default direction.
+     */
+    const short EXECUTE_DEFAULT = 0;
+
+    /** opens on execute downwards.
+     */
+    const short EXECUTE_DOWN = 1;
+
+    /** opens on execute upwards.
+     */
+    const short EXECUTE_UP = 2;
+
+    /** opens on execute to the left.
+     */
+    const short EXECUTE_LEFT = 4;
+
+    /** opens on execute to the right.
+     */
+    const short EXECUTE_RIGHT = 8;
+
+};
+
+}; }; }; };
+
+#endif

Modified: openoffice/trunk/main/offapi/com/sun/star/awt/XMenu.idl
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/offapi/com/sun/star/awt/XMenu.idl?rev=1425458&r1=1425457&r2=1425458&view=diff
==============================================================================
--- openoffice/trunk/main/offapi/com/sun/star/awt/XMenu.idl (original)
+++ openoffice/trunk/main/offapi/com/sun/star/awt/XMenu.idl Sun Dec 23 12:29:21 2012
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,132 +7,294 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
+#ifndef __com_sun_star_awt_XMenu_idl__
+#define __com_sun_star_awt_XMenu_idl__
+
+#include <com/sun/star/uno/XInterface.idl>
+#include <com/sun/star/awt/MenuItemType.idl>
+
+module com {  module sun {  module star {  module awt {
+
+published interface XPopupMenu;
+published interface XMenuListener;
 
-#ifndef __com_sun_star_awt_XMenu_idl__ 
-#define __com_sun_star_awt_XMenu_idl__ 
- 
-#ifndef __com_sun_star_uno_XInterface_idl__ 
-#include <com/sun/star/uno/XInterface.idl> 
-#endif 
-
-
-//============================================================================= 
- 
- module com {  module sun {  module star {  module awt {  
- 
- published interface XPopupMenu; 
- published interface XMenuListener; 
- 
-//============================================================================= 
- 
 /** specifies a simple menu.
  */
 published interface XMenu: com::sun::star::uno::XInterface
-{ 
-	//------------------------------------------------------------------------- 
-	 
-	/** adds the specified menu listener to receive events from this menu.
-	 */
-	[oneway] void addMenuListener( [in] XMenuListener xListener ); 
- 
-	//------------------------------------------------------------------------- 
-	 
-	/** removes the specified menu listener so that it no longer
-		receives events from this menu.
-	 */
-	[oneway] void removeMenuListener( [in] XMenuListener xListener ); 
- 
-	//------------------------------------------------------------------------- 
-	 
-	/** inserts an item into the menu.
-        
-		<p>The item is appended if the position is greater than or equal to
-		<code>getItemCount()</code> or if it is negative.</p>
-	 */
-	[oneway] void insertItem( [in] short nItemId, 
-			 [in] string aText, 
-			 [in] short nItemStyle, 
-			 [in] short nPos ); 
- 
-	//------------------------------------------------------------------------- 
-	 
-	/** removes one or more items from the menu.
-	 */
-	[oneway] void removeItem( [in] short nPos, 
-			 [in] short nCount ); 
- 
-	//------------------------------------------------------------------------- 
-	 
-	/** returns the number of items in the menu.
-	 */
-	short getItemCount(); 
- 
-	//------------------------------------------------------------------------- 
-	 
-	/** returns the id of the item at the specified position.
-	 */
-	short getItemId( [in] short nPos ); 
- 
-	//------------------------------------------------------------------------- 
-	 
-	/** returns the position of the item with the specified id.
-	 */
-	short getItemPos( [in] short nId ); 
- 
-	//------------------------------------------------------------------------- 
-	 
-	/** enables or disables the menu item.
-	 */
-	[oneway] void enableItem( [in] short nItemId, 
-			 [in] boolean bEnable ); 
- 
-	//------------------------------------------------------------------------- 
-	 
-	/** returns the state of the menu item.
-	 */
-	boolean isItemEnabled( [in] short nItemId ); 
- 
-	//------------------------------------------------------------------------- 
-	 
-	/** sets the text for the menu item.
-	 */
-	[oneway] void setItemText( [in] short nItemId, 
-			 [in] string aText ); 
- 
-	//------------------------------------------------------------------------- 
-	 
-	/** returns the string for the given item id.
-	 */
-	string getItemText( [in] short nItemId ); 
- 
-	//------------------------------------------------------------------------- 
-	 
-	/** sets the popup menu for a specified menu item.
-	 */
-	[oneway] void setPopupMenu( [in] short nItemId, 
-			 [in] XPopupMenu aPopupMenu ); 
- 
-	//------------------------------------------------------------------------- 
-	 
-	/** returns the popup menu from the menu item.
-	 */
-	XPopupMenu getPopupMenu( [in] short nItemId ); 
- 
-}; 
- 
- 
-}; }; }; };  
- 
-#endif 
+{
+    /** adds the specified menu listener to receive events from this menu.
+
+        @param xListener
+            the <type>XMenuListener</type> to be added.
+     */
+    [oneway] void addMenuListener( [in] XMenuListener xListener );
+
+    /** removes the specified menu listener so that it no longer
+        receives events from this menu.
+
+        @param xListener
+            the <type>XMenuListener</type> to be removed.
+     */
+    [oneway] void removeMenuListener( [in] XMenuListener xListener );
+
+    /** inserts an item into the menu.
+        <p>The item is appended if the position is greater than or equal to
+        <member>getItemCount()</member> or if it is negative.</p>
+
+        @param nItemId
+            specifies the ID of the menu item to be insterted.
+
+        @param aText
+            specifies the label of the menu item.
+
+        @param nItemStyle
+            specifies the style of the menu item, as defined in
+            <type>MenuItemStyle</type>.
+
+        @param nItemPos
+            specifies the position where the menu item will be insterted.
+     */
+    [oneway] void insertItem( [in] short nItemId,
+                              [in] string aText,
+                              [in] short nItemStyle,
+                              [in] short nItemPos );
+
+    /** removes one or more items from the menu.
+
+        @param nItemPos
+            specifies the position of the (first) menu item to be removed.
+
+        @param nCount
+            specifies the number of menu items to remove.
+     */
+    [oneway] void removeItem( [in] short nItemPos,
+                              [in] short nCount );
+
+    /** removes all items from the menu.
+     */
+    void clear();
+
+    /** returns the number of items in the menu.
+
+        @return
+            the number of items in this <type>XMenu</type>.
+     */
+    short getItemCount();
+
+    /** returns the ID of the item at the specified position.
+
+        @param nItemPos
+            specifies the position of the menu item for which the item ID is queried.
+
+        @return
+            the ID of the menu item at the given position.
+     */
+    short getItemId( [in] short nItemPos );
+
+    /** returns the position of the item with the specified ID.
+
+        @param nItemId
+            specifies the ID of the menu item for which the item position is queried.
+
+        @return
+            the position of the menu item with the specified ID.
+     */
+    short getItemPos( [in] short nItemId );
+
+    /** retrieves the type of the menu item.
+
+        @param nItemPos
+            specifies the position of the menu item for which the item type is queried.
+
+        @return
+            a <type>MenuItemType</type> indicating the item type.
+    */
+    ::com::sun::star::awt::MenuItemType getItemType( [in] short nItemPos );
+
+    /** enables or disables the menu item.
+
+        @param nItemId
+            specifies the menu item ID.
+
+        @param bEnable
+            specifies whether the menu item should be enabled (<TRUE/>) or
+            disabled (<FALSE/>).
+     */
+    [oneway] void enableItem( [in] short nItemId,
+                              [in] boolean bEnable );
+
+    /** returns the state of the menu item.
+
+        @param nItemId
+            specifies the menu item ID.
+
+        @return
+            <TRUE/> if the item is enabled, <FALSE/> otherwise.
+     */
+    boolean isItemEnabled( [in] short nItemId );
+
+    /** specifies whether disabled menu entries should be hidden, or not.
+
+        @param bHide
+            if <TRUE/>, disabled menu entries are hidden.
+    */
+    void hideDisabledEntries( [in] boolean bHide );
+
+    /** specifies whether mnemonics are automatically assigned to menu items, or not.
+
+        @param bEnable
+            if <TRUE/>, mnemonics are automatically assigned to menu items.
+    */
+    void enableAutoMnemonics( [in] boolean bEnable );
+
+    /** sets the text for the menu item.
+
+        @param nItemId
+            specifies the ID of the menu item.
+
+        @param aText
+            specifies the label of the menu item.
+     */
+    [oneway] void setItemText( [in] short nItemId,
+                               [in] string aText );
+
+    /** returns the string for the given item id.
+
+        @param nItemId
+            specifies the ID of the menu item.
+
+        @return
+            the label of the menu item.
+     */
+    string getItemText( [in] short nItemId );
+
+    /** sets the command string for the menu item.
+
+        @param nItemId
+            specifies the menu item ID for which the command should be set.
+
+        @param aCommand
+            specifies the command for the menu item.
+    */
+    void setCommand( [in] short nItemId,
+                     [in] string aCommand );
+
+    /** retrieves the command string for the menu item.
+
+        @param nItemId
+            specifies the menu item ID for which the command URL should be set.
+
+        @return
+            the command of the menu item.
+    */
+    string getCommand( [in] short nItemId );
+
+    /** sets the help command string for the menu item.
+
+        @param nItemId
+            specifies the menu item ID for which the help command URL be set.
+
+        @param aCommand
+            specifies the help command for the menu item.
+    */
+    void setHelpCommand( [in] short nItemId,
+                         [in] string aCommand );
+
+    /** retrieves the help command string for the menu item.
+
+        @param nItemId
+            specifies the menu item ID for which the help command should be set.
+
+        @return
+            the help command of the menu item.
+    */
+    string getHelpCommand( [in] short nItemId );
+
+    /** sets the help text for the menu item.
+
+        @param nItemId
+            specifies the menu item identifier for which the help text should be set.
+
+        @param sHelpText
+            specifies the help text for the menu item.
+    */
+    void setHelpText( [in] short nItemId,
+                      [in] string sHelpText );
+
+    /** retrieves the help text for the menu item.
+
+        @param nItemId
+            specifies the menu item identifier for which the help text should be retrieved.
+
+        @return
+            a string with the help text.
+    */
+    string getHelpText( [in] short nItemId );
+
+    /** sets the tip help text for the menu item.
+
+        @param nItemId
+            specifies the menu item identifier for which the tip help text should be set.
+
+        @param sTipHelpText
+            specifies the tip help text for the menu item.
+    */
+    void setTipHelpText( [in] short nItemId,
+                         [in] string sTipHelpText );
+
+    /** retrieves the tip help text for the menu item.
+
+        @param nItemId
+            specifies the menu item identifier for which the tip help text should be retrieved.
+
+        @return
+            a string with the tip help text.
+    */
+    string getTipHelpText( [in] short nItemId );
+
+    /** checks whether an <type>XMenu</type> is an <type>XPopupMenu</type>.
+
+        @return
+                <TRUE/> if the menu is a <type>PopupMenu</type>,
+                <FALSE/> if it is a <type>MenuBar</type>.
+    */
+    boolean isPopupMenu();
+
+    /** sets the popup menu for a specified menu item.
+
+        @param nItemId
+            specifies the menu item ID for which the <type>XPopupMenu</type> should be set.
+
+        @param aPopupMenu
+            specifies a <type>XPopupMenu</type>.
+     */
+    [oneway] void setPopupMenu( [in] short nItemId,
+                                [in] XPopupMenu aPopupMenu );
+
+    /** returns the popup menu from the menu item.
+
+        @param nItemId
+            specifies the menu item ID for which the <type>XPopupMenu</type> should be retrieved.
+
+        @return
+            a <type>XPopupMenu</type>.
+     */
+    XPopupMenu getPopupMenu( [in] short nItemId );
+
+};
+
+}; }; }; };
+
+#endif

Modified: openoffice/trunk/main/offapi/com/sun/star/awt/XMenuBar.idl
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/offapi/com/sun/star/awt/XMenuBar.idl?rev=1425458&r1=1425457&r2=1425458&view=diff
==============================================================================
--- openoffice/trunk/main/offapi/com/sun/star/awt/XMenuBar.idl (original)
+++ openoffice/trunk/main/offapi/com/sun/star/awt/XMenuBar.idl Sun Dec 23 12:29:21 2012
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,41 +7,31 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
+#ifndef __com_sun_star_awt_XMenuBar_idl__
+#define __com_sun_star_awt_XMenuBar_idl__
+
+#include <com/sun/star/awt/XMenu.idl>
+
+module com {  module sun {  module star {  module awt {
 
-#ifndef __com_sun_star_awt_XMenuBar_idl__ 
-#define __com_sun_star_awt_XMenuBar_idl__ 
- 
-#ifndef __com_sun_star_awt_XMenu_idl__ 
-#include <com/sun/star/awt/XMenu.idl> 
-#endif 
- 
- 
-//============================================================================= 
- 
- module com {  module sun {  module star {  module awt {  
- 
-//============================================================================= 
- 
 /** identifies a menu bar.
  */
-published interface XMenuBar: com::sun::star::awt::XMenu
-{ 
-}; 
- 
-//============================================================================= 
- 
-}; }; }; };  
- 
-#endif 
+published interface XMenuBar: XMenu
+{
+};
+
+}; }; }; };
+
+#endif

Modified: openoffice/trunk/main/offapi/com/sun/star/awt/XMenuListener.idl
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/offapi/com/sun/star/awt/XMenuListener.idl?rev=1425458&r1=1425457&r2=1425458&view=diff
==============================================================================
--- openoffice/trunk/main/offapi/com/sun/star/awt/XMenuListener.idl (original)
+++ openoffice/trunk/main/offapi/com/sun/star/awt/XMenuListener.idl Sun Dec 23 12:29:21 2012
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,69 +7,49 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 
-#ifndef __com_sun_star_awt_XMenuListener_idl__ 
-#define __com_sun_star_awt_XMenuListener_idl__ 
- 
-#ifndef __com_sun_star_lang_XEventListener_idl__ 
-#include <com/sun/star/lang/XEventListener.idl> 
-#endif 
- 
-#ifndef __com_sun_star_awt_MenuEvent_idl__ 
-#include <com/sun/star/awt/MenuEvent.idl> 
-#endif 
- 
- 
-//============================================================================= 
- 
- module com {  module sun {  module star {  module awt {  
- 
-//============================================================================= 
- 
+#ifndef __com_sun_star_awt_XMenuListener_idl__
+#define __com_sun_star_awt_XMenuListener_idl__
+
+#include <com/sun/star/lang/XEventListener.idl>
+#include <com/sun/star/awt/MenuEvent.idl>
+
+module com {  module sun {  module star {  module awt {
+
 /** makes it possible to receive menu events on a window.
  */
 published interface XMenuListener: com::sun::star::lang::XEventListener
-{ 
-	//------------------------------------------------------------------------- 
-	 
-	/** is invoked when a menu item is highlighted.
-	 */
-	[oneway] void highlight( [in] com::sun::star::awt::MenuEvent rEvent ); 
- 
-	//------------------------------------------------------------------------- 
-	 
-	/** is invoked when a menu item is selected.
-	 */
-	[oneway] void select( [in] com::sun::star::awt::MenuEvent rEvent ); 
- 
-	//------------------------------------------------------------------------- 
-	 
-	/** is invoked when a menu is activated.
-	 */
-	[oneway] void activate( [in] com::sun::star::awt::MenuEvent rEvent ); 
- 
-	//------------------------------------------------------------------------- 
-	 
-	/** is invoked when a menu is deactivated.
-	 */
-	[oneway] void deactivate( [in] com::sun::star::awt::MenuEvent rEvent ); 
- 
-}; 
- 
-//============================================================================= 
- 
-}; }; }; };  
- 
-#endif 
+{
+    /** is invoked when a menu item is highlighted.
+     */
+    [oneway] void itemHighlighted( [in] MenuEvent aEvent );
+
+    /** is invoked when a menu item is selected.
+     */
+    [oneway] void itemSelected( [in] MenuEvent aEvent );
+
+    /** is invoked when a menu is activated.
+     */
+    [oneway] void itemActivated( [in] MenuEvent aEvent );
+
+    /** is invoked when a menu is deactivated.
+     */
+    [oneway] void itemDeactivated( [in] MenuEvent aEvent );
+
+};
+
+}; }; }; };
+
+#endif



Mime
View raw message