[Libreoffice-commits] .: 2 commits - framework/inc framework/source

[Ivan Timofeev]

 framework/inc/uielement/toolbarmanager.hxx          |    3 +--
 framework/source/uielement/addonstoolbarmanager.cxx |    4 ----
 framework/source/uielement/toolbarmanager.cxx       |    6 ++----
 3 files changed, 3 insertions(+), 10 deletions(-)

New commits:
commit 5ac28548c03f474f26ae07377098416f109e61f3
Author: Ivan Timofeev <timofeev.i.s at gmail.com>
Date:   Fri Jun 8 22:26:02 2012 +0400

    remove protected m_bCanBeCustomized
    
    Change-Id: I538c0090cba5f5ddce94285a31d48ec7169956fb

diff --git a/framework/inc/uielement/toolbarmanager.hxx b/framework/inc/uielement/toolbarmanager.hxx
index 73a631b..27a19c9 100644
--- a/framework/inc/uielement/toolbarmanager.hxx
+++ b/framework/inc/uielement/toolbarmanager.hxx
@@ -219,8 +219,7 @@ class ToolBarManager : public ::com::sun::star::frame::XFrameActionListener
                                                                                                m_bFrameActionRegistered : 1,
                                                                                                m_bUpdateControllers : 1;
         sal_Bool                                                                               m_bImageOrientationRegistered : 1,
-                                                                                               m_bImageMirrored : 1,
-                                                                                               m_bCanBeCustomized : 1;
+                                                                                               m_bImageMirrored : 1;
         long                                                                                   m_lImageRotation;
         ToolBar*                                                                               m_pToolBar;
         rtl::OUString                                                                          m_aModuleIdentifier;
diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx
index a8ec4be..a4eed09 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -241,7 +241,6 @@ ToolBarManager::ToolBarManager( const Reference< XMultiServiceFactory >& rServic
     m_bUpdateControllers( sal_False ),
     m_bImageOrientationRegistered( sal_False ),
     m_bImageMirrored( sal_False ),
-    m_bCanBeCustomized( !SvtMiscOptions().DisableUICustomization() ),
     m_lImageRotation( 0 ),
     m_pToolBar( pToolBar ),
     m_aResourceName( rResourceName ),
@@ -472,7 +471,7 @@ void ToolBarManager::UpdateControllers()
 {
     RTL_LOGFILE_CONTEXT( aLog, "framework (cd100003) ::ToolBarManager::UpdateControllers" );
 
-    if( !m_bCanBeCustomized )
+    if( SvtMiscOptions().DisableUICustomization() )
     {
         Any a;
         Reference< XLayoutManager > xLayoutManager;
@@ -1774,9 +1773,8 @@ PopupMenu * ToolBarManager::GetToolBarCustomMenu(ToolBox* pToolBar)
         else
             aPopupMenu.EnableItem( MENUITEM_TOOLBAR_LOCKTOOLBARPOSITION, sal_False );
 
-        if ( !m_bCanBeCustomized )
+        if ( SvtMiscOptions().DisableUICustomization() )
         {
-            // Non-configurable toolbars should disable configuration menu items
             aPopupMenu.EnableItem( MENUITEM_TOOLBAR_VISIBLEBUTTON, sal_False );
             aPopupMenu.EnableItem( MENUITEM_TOOLBAR_CUSTOMIZETOOLBAR, sal_False );
             aPopupMenu.EnableItem( MENUITEM_TOOLBAR_LOCKTOOLBARPOSITION, sal_False );
commit 3768e71344a298d8e7ac07fb38a97ccf58f83a10
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

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) );