rework POPUPMENU_TOOLBAR_QUICKCUSTOMIZATION

don't create a menu in order to copy certain entries under certain
conditions to another menu, just insert the specific entries
from more elemental parts

Change-Id: I2254753fdc374742422afdb40fed7e78ae5dfbb2

3 files changed, 108 insertions, 101 deletions

diff --git a/framework/inc/classes/resource.hrc b/framework/inc/classes/resource.hrc
index 6075d10293cb..b4325e7f23ec 100644
--- a/framework/inc/classes/resource.hrc
+++ b/framework/inc/classes/resource.hrc
@@ -49,13 +49,17 @@
 #define STR_LANGSTATUS_HINT                     (RID_STR_START+25)
 #define STR_REMOTE_TITLE                        (RID_STR_START+26)
 #define STR_SAFEMODE_TITLE                      (RID_STR_START+27)
+#define STR_TOOLBAR_VISIBLE_BUTTONS             (RID_STR_START+28)
+#define STR_TOOLBAR_CUSTOMIZE_TOOLBAR           (RID_STR_START+29)
+#define STR_TOOLBAR_DOCK_TOOLBAR                (RID_STR_START+30)
+#define STR_TOOLBAR_DOCK_ALL_TOOLBARS           (RID_STR_START+31)
+#define STR_TOOLBAR_LOCK_TOOLBAR                (RID_STR_START+32)
+#define STR_TOOLBAR_CLOSE_TOOLBAR               (RID_STR_START+33)
 
 #define BMP_SAVEMODIFIED_SMALL                  (RID_IMAGE_START+0)
 #define BMP_SAVEMODIFIED_LARGE                  (RID_IMAGE_START+1)
 #define BMP_SAVEMODIFIED_EXTRALARGE             (RID_IMAGE_START+2)
 
-#define POPUPMENU_TOOLBAR_QUICKCUSTOMIZATION    (RID_MENU_START+0)
-
 #define MENUITEM_TOOLBAR_VISIBLEBUTTON          1
 #define MENUITEM_TOOLBAR_CUSTOMIZETOOLBAR       2
 #define MENUITEM_TOOLBAR_DOCKTOOLBAR            3
diff --git a/framework/source/classes/resource.src b/framework/source/classes/resource.src
index 998d3721797c..b045b6d9e029 100644
--- a/framework/source/classes/resource.src
+++ b/framework/source/classes/resource.src
@@ -39,53 +39,34 @@ String STR_CLOSEDOC_ANDRETURN
     Text [ en-US ] = "~Close & Return to " ;
 };
 
-Menu POPUPMENU_TOOLBAR_QUICKCUSTOMIZATION
-{
-    ItemList =
-    {
-        MenuItem
-        {
-            Identifier = MENUITEM_TOOLBAR_VISIBLEBUTTON;
-            SubMenu = Menu
-            {
-            };
-            Text[ en-US ] = "Visible ~Buttons";
-        };
-        MenuItem
-        {
-            Identifier = MENUITEM_TOOLBAR_CUSTOMIZETOOLBAR;
-            Command = ".uno:ConfigureToolboxVisible" ;
-            Text[ en-US ] = "~Customize Toolbar...";
-        };
-        MenuItem
-        {
-            Separator = TRUE ;
-        };
-        MenuItem
-        {
-            Identifier = MENUITEM_TOOLBAR_DOCKTOOLBAR;
-            Text[ en-US ] = "~Dock Toolbar" ;
-        };
-        MenuItem
-        {
-            Identifier = MENUITEM_TOOLBAR_DOCKALLTOOLBAR;
-            Text[ en-US ] = "Dock ~All Toolbars" ;
-        };
-        MenuItem
-        {
-            Separator = TRUE ;
-        };
-        MenuItem
-        {
-            Identifier = MENUITEM_TOOLBAR_LOCKTOOLBARPOSITION;
-            Text[ en-US ] = "~Lock Toolbar Position" ;
-        };
-        MenuItem
-        {
-            Identifier = MENUITEM_TOOLBAR_CLOSE;
-            Text[ en-US ] = "Close ~Toolbar" ;
-        };
-    };
+String STR_TOOLBAR_VISIBLE_BUTTONS
+{
+    Text[ en-US ] = "Visible ~Buttons";
+};
+
+String STR_TOOLBAR_CUSTOMIZE_TOOLBAR
+{
+    Text[ en-US ] = "~Customize Toolbar...";
+};
+
+String STR_TOOLBAR_DOCK_TOOLBAR
+{
+    Text[ en-US ] = "~Dock Toolbar" ;
+};
+
+String STR_TOOLBAR_DOCK_ALL_TOOLBARS
+{
+    Text[ en-US ] = "Dock ~All Toolbars" ;
+};
+
+String STR_TOOLBAR_LOCK_TOOLBAR
+{
+    Text[ en-US ] = "~Lock Toolbar Position" ;
+};
+
+String STR_TOOLBAR_CLOSE_TOOLBAR
+{
+    Text[ en-US ] = "Close ~Toolbar" ;
 };
 
 String STR_SAVECOPYDOC
diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx
index 0ad9f1a01f85..0f792ccb0519 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -1399,8 +1399,6 @@ bool ToolBarManager::MenuItemAllowed( sal_uInt16 ) const
 
 void ToolBarManager::AddCustomizeMenuItems(ToolBox* pToolBar)
 {
-    ::PopupMenu *pMenu = pToolBar->GetMenu();
-
     // No config menu entries if command ".uno:ConfigureDialog" is not enabled
     Reference< XDispatch > xDisp;
     css::util::URL aURL;
@@ -1418,12 +1416,56 @@ void ToolBarManager::AddCustomizeMenuItems(ToolBox* pToolBar)
 
     // popup menu for quick customization
     bool bHideDisabledEntries = !SvtMenuOptions().IsEntryHidingEnabled();
-    ScopedVclPtrInstance<::PopupMenu> aQuickCustomizationMenu( FwkResId( POPUPMENU_TOOLBAR_QUICKCUSTOMIZATION ));
 
-    if ( m_pToolBar->IsCustomize() )
+    ::PopupMenu *pMenu = pToolBar->GetMenu();
+
+    // copy all menu items 'Visible buttons, Customize toolbar, Dock toolbar,
+    // Dock all Toolbars) from the loaded resource into the toolbar menu
+    sal_uInt16 nGroupLen = pMenu->GetItemCount();
+    if (nGroupLen)
+        pMenu->InsertSeparator();
+
+    VclPtr<PopupMenu> xVisibleItemsPopupMenu;
+
+    if (MenuItemAllowed(MENUITEM_TOOLBAR_VISIBLEBUTTON))
+    {
+        pMenu->InsertItem(MENUITEM_TOOLBAR_VISIBLEBUTTON, FWK_RESSTR(STR_TOOLBAR_VISIBLE_BUTTONS));
+        xVisibleItemsPopupMenu = VclPtr<PopupMenu>::Create();
+        pMenu->SetPopupMenu(MENUITEM_TOOLBAR_VISIBLEBUTTON, xVisibleItemsPopupMenu);
+    }
+
+    if (MenuItemAllowed(MENUITEM_TOOLBAR_CUSTOMIZETOOLBAR) && m_pToolBar->IsCustomize())
+    {
+        pMenu->InsertItem(MENUITEM_TOOLBAR_CUSTOMIZETOOLBAR, FWK_RESSTR(STR_TOOLBAR_CUSTOMIZE_TOOLBAR));
+        pMenu->SetItemCommand(MENUITEM_TOOLBAR_CUSTOMIZETOOLBAR, ".uno:ConfigureToolboxVisible");
+    }
+
+    if (nGroupLen != pMenu->GetItemCount())
     {
-        ::PopupMenu*  pVisibleItemsPopupMenu( aQuickCustomizationMenu->GetPopupMenu( 1 ));
+        pMenu->InsertSeparator();
+        nGroupLen = pMenu->GetItemCount();
+    }
+
+    if (MenuItemAllowed(MENUITEM_TOOLBAR_DOCKTOOLBAR))
+        pMenu->InsertItem(MENUITEM_TOOLBAR_DOCKTOOLBAR, FWK_RESSTR(STR_TOOLBAR_DOCK_TOOLBAR));
+
+    if (MenuItemAllowed(MENUITEM_TOOLBAR_DOCKALLTOOLBAR))
+        pMenu->InsertItem(MENUITEM_TOOLBAR_DOCKALLTOOLBAR, FWK_RESSTR(STR_TOOLBAR_DOCK_ALL_TOOLBARS));
+
+    if (nGroupLen != pMenu->GetItemCount())
+    {
+        pMenu->InsertSeparator();
+        nGroupLen = pMenu->GetItemCount();
+    }
+
+    if (MenuItemAllowed(MENUITEM_TOOLBAR_LOCKTOOLBARPOSITION))
+        pMenu->InsertItem(MENUITEM_TOOLBAR_LOCKTOOLBARPOSITION, FWK_RESSTR(STR_TOOLBAR_LOCK_TOOLBAR));
+
+    if (MenuItemAllowed(MENUITEM_TOOLBAR_CLOSE))
+        pMenu->InsertItem(MENUITEM_TOOLBAR_CLOSE, FWK_RESSTR(STR_TOOLBAR_CLOSE_TOOLBAR));
 
+    if (m_pToolBar->IsCustomize())
+    {
         bool    bIsFloating( false );
 
         DockingManager* pDockMgr = vcl::Window::GetDockingManager();
@@ -1432,52 +1474,51 @@ void ToolBarManager::AddCustomizeMenuItems(ToolBox* pToolBar)
 
         if ( !bIsFloating )
         {
-            aQuickCustomizationMenu->EnableItem( MENUITEM_TOOLBAR_DOCKTOOLBAR, false );
-            aQuickCustomizationMenu->EnableItem( MENUITEM_TOOLBAR_DOCKALLTOOLBAR, false );
+            pMenu->EnableItem(MENUITEM_TOOLBAR_DOCKTOOLBAR, false);
+            pMenu->EnableItem(MENUITEM_TOOLBAR_DOCKALLTOOLBAR, false);
             Reference< XDockableWindow > xDockable( VCLUnoHelper::GetInterface( m_pToolBar ), UNO_QUERY );
             if( xDockable.is() )
-                aQuickCustomizationMenu->CheckItem( MENUITEM_TOOLBAR_LOCKTOOLBARPOSITION, xDockable->isLocked() );
+                pMenu->CheckItem(MENUITEM_TOOLBAR_LOCKTOOLBARPOSITION, xDockable->isLocked());
         }
         else
-            aQuickCustomizationMenu->EnableItem( MENUITEM_TOOLBAR_LOCKTOOLBARPOSITION, false );
+            pMenu->EnableItem(MENUITEM_TOOLBAR_LOCKTOOLBARPOSITION, false);
 
-        if ( SvtMiscOptions().DisableUICustomization() )
+        if (SvtMiscOptions().DisableUICustomization())
         {
-            aQuickCustomizationMenu->EnableItem( MENUITEM_TOOLBAR_VISIBLEBUTTON, false );
-            aQuickCustomizationMenu->EnableItem( MENUITEM_TOOLBAR_CUSTOMIZETOOLBAR, false );
-            aQuickCustomizationMenu->EnableItem( MENUITEM_TOOLBAR_LOCKTOOLBARPOSITION, false );
+            pMenu->EnableItem(MENUITEM_TOOLBAR_VISIBLEBUTTON, false);
+            pMenu->EnableItem(MENUITEM_TOOLBAR_CUSTOMIZETOOLBAR, false);
+            pMenu->EnableItem(MENUITEM_TOOLBAR_LOCKTOOLBARPOSITION, false);
         }
 
         // Disable menu item CLOSE if the toolbar has no closer
         if( !(pToolBar->GetFloatStyle() & WB_CLOSEABLE) )
-            aQuickCustomizationMenu->EnableItem(MENUITEM_TOOLBAR_CLOSE, false);
+            pMenu->EnableItem(MENUITEM_TOOLBAR_CLOSE, false);
 
         // Temporary stores a Command --> Url map to update contextual menu with the
         // correct icons. The popup icons are by default the same as those in the
         // toolbar. They are not correct for contextual popup menu.
         std::map< OUString, Image > commandToImage;
 
-        // Go through all toolbar items and add them to the context menu
-        for ( ToolBox::ImplToolItems::size_type nPos = 0; nPos < m_pToolBar->GetItemCount(); ++nPos )
+        if (xVisibleItemsPopupMenu)
         {
-            if ( m_pToolBar->GetItemType(nPos) == ToolBoxItemType::BUTTON )
+            // Go through all toolbar items and add them to the context menu
+            for ( ToolBox::ImplToolItems::size_type nPos = 0; nPos < m_pToolBar->GetItemCount(); ++nPos )
             {
-                sal_uInt16 nId = m_pToolBar->GetItemId(nPos);
-                OUString aCommandURL = m_pToolBar->GetItemCommand( nId );
-                pVisibleItemsPopupMenu->InsertItem( STARTID_CUSTOMIZE_POPUPMENU+nPos, m_pToolBar->GetItemText( nId ), MenuItemBits::CHECKABLE );
-                    //TODO: ToolBox::ImplToolItems::size_type -> sal_uInt16!
-                pVisibleItemsPopupMenu->CheckItem( STARTID_CUSTOMIZE_POPUPMENU+nPos, m_pToolBar->IsItemVisible( nId ) );
-                    //TODO: ToolBox::ImplToolItems::size_type -> sal_uInt16!
-                pVisibleItemsPopupMenu->SetItemCommand( STARTID_CUSTOMIZE_POPUPMENU+nPos, aCommandURL );
-                    //TODO: ToolBox::ImplToolItems::size_type -> sal_uInt16!
-                Image aImage(vcl::CommandInfoProvider::GetImageForCommand(aCommandURL, m_xFrame));
-                commandToImage[aCommandURL] = aImage;
-                pVisibleItemsPopupMenu->SetItemImage( STARTID_CUSTOMIZE_POPUPMENU+nPos, aImage );
-                    //TODO: ToolBox::ImplToolItems::size_type -> sal_uInt16!
-            }
-            else
-            {
-                pVisibleItemsPopupMenu->InsertSeparator();
+                if ( m_pToolBar->GetItemType(nPos) == ToolBoxItemType::BUTTON )
+                {
+                    sal_uInt16 nId = m_pToolBar->GetItemId(nPos);
+                    OUString aCommandURL = m_pToolBar->GetItemCommand( nId );
+                    xVisibleItemsPopupMenu->InsertItem( STARTID_CUSTOMIZE_POPUPMENU+nPos, m_pToolBar->GetItemText( nId ), MenuItemBits::CHECKABLE );
+                    xVisibleItemsPopupMenu->CheckItem( STARTID_CUSTOMIZE_POPUPMENU+nPos, m_pToolBar->IsItemVisible( nId ) );
+                    xVisibleItemsPopupMenu->SetItemCommand( STARTID_CUSTOMIZE_POPUPMENU+nPos, aCommandURL );
+                    Image aImage(vcl::CommandInfoProvider::GetImageForCommand(aCommandURL, m_xFrame));
+                    commandToImage[aCommandURL] = aImage;
+                    xVisibleItemsPopupMenu->SetItemImage( STARTID_CUSTOMIZE_POPUPMENU+nPos, aImage );
+                }
+                else
+                {
+                    xVisibleItemsPopupMenu->InsertSeparator();
+                }
             }
         }
 
@@ -1493,25 +1534,6 @@ void ToolBarManager::AddCustomizeMenuItems(ToolBox* pToolBar)
             }
         }
     }
-    else
-    {
-        sal_uInt16 nPos = aQuickCustomizationMenu->GetItemPos( MENUITEM_TOOLBAR_CUSTOMIZETOOLBAR );
-        if ( nPos != MENU_ITEM_NOTFOUND )
-            aQuickCustomizationMenu->RemoveItem( nPos );
-    }
-
-    // copy all menu items 'Visible buttons, Customize toolbar, Dock toolbar,
-    // Dock all Toolbars) from the loaded resource into the toolbar menu
-    if( pMenu->GetItemCount() )
-        pMenu->InsertSeparator();
-
-    sal_uInt16 i;
-    for( i=0; i< aQuickCustomizationMenu->GetItemCount(); i++)
-    {
-        sal_uInt16 nId = aQuickCustomizationMenu->GetItemId( i );
-        if ( MenuItemAllowed( nId ))
-            pMenu->CopyItem( *aQuickCustomizationMenu.get(), i );
-    }
 
     // Set the title of the menu
     pMenu->SetText( pToolBar->GetText() );