INTEGRATION: CWS fwk76_SRC680 (1.48.40); FILE MERGED

2007/10/16 11:39:24 cd 1.48.40.2: #i82479# Don't disable popup menu when there is no menu dispatcher
2007/10/12 10:02:00 cd 1.48.40.1: #i82479# Add-on menu must check for popup menu controller association and create empty popup for setPopupMenu function

1 files changed, 16 insertions, 3 deletions

diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx
index 9e0039a179..7fa6d6c676 100644
--- a/framework/source/uielement/menubarmanager.cxx
+++ b/framework/source/uielement/menubarmanager.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: menubarmanager.cxx,v $
  *
- *  $Revision: 1.48 $
+ *  $Revision: 1.49 $
  *
- *  last change: $Author: ihi $ $Date: 2007-07-10 15:12:18 $
+ *  last change: $Author: hr $ $Date: 2007-11-01 17:49:38 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -485,6 +485,19 @@ MenuBarManager::MenuBarManager(
                 }
 
                 pMenuItemHandler->aMenuItemURL = aItemCommand;
+                
+                // Check if we have to create a popup menu for a uno based popup menu controller.
+                // We have to set an empty popup menu into our menu structure so the controller also
+                // works with inplace OLE.
+                if ( m_xPopupMenuControllerRegistration.is() &&
+                     m_xPopupMenuControllerRegistration->hasController( aItemCommand, rtl::OUString() ))
+                {
+                    VCLXPopupMenu* pVCLXPopupMenu = new VCLXPopupMenu;
+                    PopupMenu* pCtlPopupMenu = (PopupMenu *)pVCLXPopupMenu->GetMenu();
+                    pAddonPopupMenu->SetPopupMenu( pMenuItemHandler->nItemId, pCtlPopupMenu );
+                    pMenuItemHandler->xPopupMenu = Reference< com::sun::star::awt::XPopupMenu >( (OWeakObject *)pVCLXPopupMenu, UNO_QUERY );
+                    
+                }
                 m_aMenuItemHandlerVector.push_back( pMenuItemHandler );
             }
         }
@@ -1330,7 +1343,7 @@ IMPL_LINK( MenuBarManager, Activate, Menu *, pMenu )
                                     xMenuItemDispatch->removeStatusListener( static_cast< XStatusListener* >( this ), aTargetURL );
                                 }
                             }
-                            else
+                            else if ( !bPopupMenu )
                                 pMenu->EnableItem( pMenuItemHandler->nItemId, sal_False );
                         }
                     }