[Libreoffice-commits] .: Branch 'feature/unitymenus-master' - 3 commits - framework/inc framework/source vcl/inc

[Libreoffice Gerrit user]

 framework/inc/uielement/menubarwrapper.hxx    |    1 -
 framework/source/uielement/menubarwrapper.cxx |   14 --------------
 vcl/inc/vcl/menu.hxx                          |    8 ++++----
 3 files changed, 4 insertions(+), 19 deletions(-)

New commits:
commit 17e54bd38382b08abeb31d43685e4a12081a7039
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Tue Nov 13 11:58:11 2012 +0100

    revert messing with OSX
    
    Change-Id: I53686801301122c7964b9a6cce276845329f784a

diff --git a/vcl/inc/vcl/menu.hxx b/vcl/inc/vcl/menu.hxx
index 2d2adcf..a0dae64 100644
--- a/vcl/inc/vcl/menu.hxx
+++ b/vcl/inc/vcl/menu.hxx
@@ -289,10 +289,10 @@ public:
                             Menu();
                             Menu( sal_Bool bMenuBar );
     SAL_DLLPRIVATE Window*  ImplGetWindow() const { return pWindow; }
-//#if defined(QUARTZ)
-//    // ImplSelectWithStart() is used in vcl/aqua/source/window/salnsmenu.mm
-//    SAL_DLLPRIVATE void ImplSelectWithStart( Menu* pStartMenu = NULL );
-//#endif
+#if defined(QUARTZ)
+    // ImplSelectWithStart() is used in vcl/aqua/source/window/salnsmenu.mm
+    SAL_DLLPRIVATE void ImplSelectWithStart( Menu* pStartMenu = NULL );
+#endif
     void ImplSelectWithStart( Menu* pStartMenu = NULL );
 
     public:
commit f50bc4f8299adf6bd3aa83ede41cbeee8a7cc630
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Tue Nov 13 11:55:51 2012 +0100

    more cleanup
    
    Change-Id: Ia8cd81ca5944d3b33ddc684e5a65bedce444f85b

diff --git a/framework/source/uielement/menubarwrapper.cxx b/framework/source/uielement/menubarwrapper.cxx
index b1f781d..1804566 100644
--- a/framework/source/uielement/menubarwrapper.cxx
+++ b/framework/source/uielement/menubarwrapper.cxx
@@ -121,19 +121,6 @@ void SAL_CALL MenuBarWrapper::dispose() throw (::com::sun::star::uno::RuntimeExc
     m_bDisposed = sal_True;
 }
 
-//void generateFullMenuBar( MenuBarManager *pMenuBarManager, MenuBar *pMenuBar )
-//{
-//    for (int i=0; i < pMenuBar->GetItemCount(); i++)
-//    {
-//        sal_Int16 nId = pMenuBar->GetItemId( i );
-
-//        String aCommandLabel = pMenuBar->GetItemCommand( nId );
-
-//        String label = pMenuBarManager->RetrieveLabelFromCommand( aCommandLabel );
-//        pMenuBar->SetItemText( nId, label );
-//    }
-//}
-
 // XInitialization
 void SAL_CALL MenuBarWrapper::initialize( const Sequence< Any >& aArguments ) throw ( Exception, RuntimeException )
 {
@@ -216,7 +203,6 @@ void SAL_CALL MenuBarWrapper::initialize( const Sequence< Any >& aArguments ) th
 
                 m_xMenuBarManager = Reference< XComponent >( static_cast< OWeakObject *>( pMenuBarManager ), UNO_QUERY );
 
-//                pMenuBarManager->GenerateFullMenuHierarchy( pVCLMenuBar );
                 pVCLMenuBar->Freeze();
             }
 
commit 8272775baa3f3e60d7bc1d4b46626e5365cadd6b
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Tue Nov 13 11:54:47 2012 +0100

    cleanup line noise
    
    Change-Id: Ief6e0b235a0707a805a0dbe9f0a32136a132dcf0

diff --git a/framework/inc/uielement/menubarwrapper.hxx b/framework/inc/uielement/menubarwrapper.hxx
index 10ef799..47bfcce 100644
--- a/framework/inc/uielement/menubarwrapper.hxx
+++ b/framework/inc/uielement/menubarwrapper.hxx
@@ -76,7 +76,6 @@ class MenuBarWrapper : public UIConfigElementWrapperBase,
     private:
         virtual void impl_fillNewData();
         void fillPopupControllerCache();
-//        void GenerateFullMenuBar( MenuBar *pMenuBar );
 
         sal_Bool                                                                                m_bRefreshPopupControllerCache : 1;
         com::sun::star::uno::Reference< com::sun::star::lang::XComponent >                      m_xMenuBarManager;