summaryrefslogtreecommitdiff
path: root/patches/vba/uno-xmenu-getpopupMenu-fix.diff
diff options
context:
space:
mode:
Diffstat (limited to 'patches/vba/uno-xmenu-getpopupMenu-fix.diff')
-rw-r--r--patches/vba/uno-xmenu-getpopupMenu-fix.diff48
1 files changed, 0 insertions, 48 deletions
diff --git a/patches/vba/uno-xmenu-getpopupMenu-fix.diff b/patches/vba/uno-xmenu-getpopupMenu-fix.diff
deleted file mode 100644
index fe6180f1a..000000000
--- a/patches/vba/uno-xmenu-getpopupMenu-fix.diff
+++ /dev/null
@@ -1,48 +0,0 @@
-diff --git toolkit/inc/toolkit/awt/vclxmenu.hxx toolkit/inc/toolkit/awt/vclxmenu.hxx
-index 2f2d6c6..84ca639 100644
---- toolkit/inc/toolkit/awt/vclxmenu.hxx
-+++ toolkit/inc/toolkit/awt/vclxmenu.hxx
-@@ -48,6 +48,7 @@
- class Menu;
- class MenuBar;
- class VclSimpleEvent;
-+class PopupMenu;
-
- DECLARE_LIST( PopupMenuRefList, ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPopupMenu >* )
-
-@@ -184,6 +185,7 @@ class TOOLKIT_DLLPUBLIC VCLXPopupMenu : public VCLXMenu
- {
- public:
- VCLXPopupMenu();
-+ VCLXPopupMenu( PopupMenu* pPopMenu );
- };
-
- #endif // _TOOLKIT_AWT_VCLXMENU_HXX_
-diff --git toolkit/source/awt/vclxmenu.cxx toolkit/source/awt/vclxmenu.cxx
-index 192beab..7bbfa60 100644
---- toolkit/source/awt/vclxmenu.cxx
-+++ toolkit/source/awt/vclxmenu.cxx
-@@ -529,6 +529,14 @@ void VCLXMenu::setPopupMenu( sal_Int16 nItemId, const ::com::sun::star::uno::Ref
- break;
- }
- }
-+ // it seems the popup menu is not insert into maPopupMenueRefs
-+ // if the popup men is not created by stardiv.Toolkit.VCLXPopupMenu
-+ if( !aRef.is() )
-+ {
-+ ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPopupMenu > * pNewRef = new ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPopupMenu > ;
-+ *pNewRef = new VCLXPopupMenu( (PopupMenu*)pMenu );
-+ aRef = *pNewRef;
-+ }
- }
- return aRef;
- }
-@@ -1057,3 +1065,8 @@ VCLXPopupMenu::VCLXPopupMenu()
- DBG_CTOR( VCLXPopupMenu, 0 );
- ImplCreateMenu( TRUE );
- }
-+
-+VCLXPopupMenu::VCLXPopupMenu( PopupMenu* pPopMenu ) : VCLXMenu( (Menu *)pPopMenu )
-+{
-+ DBG_CTOR( VCLXPopupMenu, 0 );
-+}