diff options
| author | Ivan Timofeev <timofeev.i.s@gmail.com> | 2012-06-08 22:26:02 +0400 |
|---|---|---|
| committer | Ivan Timofeev <timofeev.i.s@gmail.com> | 2012-06-08 22:28:02 +0400 |
| commit | 5ac28548c03f474f26ae07377098416f109e61f3 (patch) | |
| tree | 044663b25a3f83be5cbed3bf852a6f417a4d7cde | |
| parent | 3768e71344a298d8e7ac07fb38a97ccf58f83a10 (diff) | |
remove protected m_bCanBeCustomized
Change-Id: I538c0090cba5f5ddce94285a31d48ec7169956fb
| -rw-r--r-- | framework/inc/uielement/toolbarmanager.hxx | 3 | ||||
| -rw-r--r-- | framework/source/uielement/toolbarmanager.cxx | 6 |
2 files changed, 3 insertions, 6 deletions
diff --git a/framework/inc/uielement/toolbarmanager.hxx b/framework/inc/uielement/toolbarmanager.hxx index 73a631b31303..27a19c9489a3 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 a8ec4be8319c..a4eed099fab6 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 ); |