[Libreoffice-commits] .: Branch 'libreoffice-3-6' - framework/source

Ivan Timofeev ivantimofeev at kemper.freedesktop.org
Fri Jun 8 11:33:27 PDT 2012


 framework/source/uielement/addonstoolbarmanager.cxx |    4 ----
 1 file changed, 4 deletions(-)

New commits:
commit 8e8527e8491c1c6bed1514ac6a8692f6a7f772c1
Author: Ivan Timofeev <timofeev.i.s at gmail.com>
Date:   Fri Jun 8 21:31:06 2012 +0400

    fdo#42405: remove this, nowadays MenuItemAllowed disables menu entries
    
    since c4461665bd030a555a8b7ffa5bd6717cfb787b9d m_bCanBeCustomized = false
    will lead to toolbar locking, but we don't want this, indeed.
    
    Change-Id: I42f16a017c7f1cf6e8321c7fe26c027ec79c7953
    (cherry picked from commit 3768e71344a298d8e7ac07fb38a97ccf58f83a10)

diff --git a/framework/source/uielement/addonstoolbarmanager.cxx b/framework/source/uielement/addonstoolbarmanager.cxx
index 110f7a1..c661727 100644
--- a/framework/source/uielement/addonstoolbarmanager.cxx
+++ b/framework/source/uielement/addonstoolbarmanager.cxx
@@ -104,10 +104,6 @@ AddonsToolBarManager::AddonsToolBarManager( const Reference< XMultiServiceFactor
                                 ToolBar* pToolBar ) :
     ToolBarManager( rServiceManager, rFrame, rResourceName, pToolBar )
 {
-    // Configuration data is retrieved from non-writable configuration layer. Therefor we
-    // must disable some menu entries.
-    m_bCanBeCustomized = sal_False;
-
     m_pToolBar->SetMenuType( TOOLBOX_MENUTYPE_CLIPPEDITEMS );
     m_pToolBar->SetSelectHdl( LINK( this, AddonsToolBarManager, Select) );
     m_pToolBar->SetActivateHdl( LINK( this, AddonsToolBarManager, Activate) );


More information about the Libreoffice-commits mailing list