diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2015-05-17 09:47:07 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-05-19 09:42:41 +0200 |
| commit | 10749bbf8247f0b17201b33f95a090dfc4fc3211 (patch) | |
| tree | c34474977546aaccb6d5cd30ac4b45b1d422c11d /framework | |
| parent | df64e7c709fc6d771546554b4026583c55609105 (diff) | |
remove the last of the OUString #defines in header files
Change-Id: Id9e8ce7987e055e83b52c7024413570f262e6e8d
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/source/classes/menumanager.cxx | 5 | ||||
| -rw-r--r-- | framework/source/fwe/classes/addonsoptions.cxx | 2 | ||||
| -rw-r--r-- | framework/source/uielement/menubarmanager.cxx | 5 |
3 files changed, 3 insertions, 9 deletions
diff --git a/framework/source/classes/menumanager.cxx b/framework/source/classes/menumanager.cxx index 610c97062914..7cd0e7dd6c06 100644 --- a/framework/source/classes/menumanager.cxx +++ b/framework/source/classes/menumanager.cxx @@ -119,8 +119,6 @@ MenuManager::MenuManager( const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings(); m_bShowMenuImages = rSettings.GetUseImagesInMenus(); - sal_Int32 nAddonsURLPrefixLength = ADDONSPOPUPMENU_URL_PREFIX.getLength(); - sal_uInt16 nItemCount = pMenu->GetItemCount(); m_aMenuItemHandlerVector.reserve(nItemCount); OUString aItemCommand; @@ -140,8 +138,7 @@ MenuManager::MenuManager( if ( pPopupMenu ) { AddMenu(pPopupMenu,aItemCommand,nItemId,bDeleteChildren,bDeleteChildren); - if (! ( aItemCommand.getLength() > nAddonsURLPrefixLength && - aItemCommand.startsWith( ADDONSPOPUPMENU_URL_PREFIX ) ) ) + if (! ( aItemCommand.startsWith( ADDONSPOPUPMENU_URL_PREFIX_STR ) ) ) { // Create addon popup menu if there exist elements and this is the tools popup menu diff --git a/framework/source/fwe/classes/addonsoptions.cxx b/framework/source/fwe/classes/addonsoptions.cxx index 925bb439b2b8..f99a4f155dec 100644 --- a/framework/source/fwe/classes/addonsoptions.cxx +++ b/framework/source/fwe/classes/addonsoptions.cxx @@ -317,7 +317,7 @@ AddonsOptions_Impl::AddonsOptions_Impl() : ConfigItem( ROOTNODE_ADDONMENU ), m_nRootAddonPopupMenuId( 0 ), m_aPathDelimiter( PATHDELIMITER ), - m_aRootAddonPopupMenuURLPrexfix( ADDONSPOPUPMENU_URL_PREFIX ) + m_aRootAddonPopupMenuURLPrexfix( ADDONSPOPUPMENU_URL_PREFIX_STR ) { // initialize array with fixed property names m_aPropNames[ INDEX_URL ] = PROPERTYNAME_URL; diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx index 594e8bb6b534..ad424fdc22c2 100644 --- a/framework/source/uielement/menubarmanager.cxx +++ b/framework/source/uielement/menubarmanager.cxx @@ -1127,8 +1127,6 @@ void MenuBarManager::FillMenuManager( Menu* pMenu, const Reference< XFrame >& rF m_bShowMenuImages = rSettings.GetUseImagesInMenus(); m_bRetrieveImages = false; - sal_Int32 nAddonsURLPrefixLength = ADDONSPOPUPMENU_URL_PREFIX.getLength(); - // Add root as ui configuration listener RetrieveImageManagers(); @@ -1219,8 +1217,7 @@ void MenuBarManager::FillMenuManager( Menu* pMenu, const Reference< XFrame >& rF } lcl_CheckForChildren(pMenu, nItemId); } - else if (( aItemCommand.getLength() > nAddonsURLPrefixLength ) && - ( aItemCommand.startsWith( ADDONSPOPUPMENU_URL_PREFIX ) )) + else if ( aItemCommand.startsWith( ADDONSPOPUPMENU_URL_PREFIX_STR ) ) { // A special addon popup menu, must be created with a different ctor MenuBarManager* pSubMenuManager = new MenuBarManager( m_xContext, m_xFrame, m_xURLTransformer, |