diff options
| author | Noel Grandin <noel@peralex.com> | 2014-11-04 21:10:34 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2014-11-05 06:45:07 +0000 |
| commit | 3c58f0768049718fae3d47d5ebfa6c7485ad52b1 (patch) | |
| tree | 33235262521b5721e09a299a8fe47e444adb477c /framework | |
| parent | 705c48d32eec0aa5180e60ca157daca4b154e4a3 (diff) | |
fdo#84938: replace TOOLBOXITEM_ constants with enum
Change-Id: I08c4a456f9e80f70719ca8c3ad5c0f0d2d8282f6
Reviewed-on: https://gerrit.libreoffice.org/12258
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/source/uielement/addonstoolbarmanager.cxx | 4 | ||||
| -rw-r--r-- | framework/source/uielement/toolbarmanager.cxx | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/framework/source/uielement/addonstoolbarmanager.cxx b/framework/source/uielement/addonstoolbarmanager.cxx index 35abdcab9d43..467976dd2d7d 100644 --- a/framework/source/uielement/addonstoolbarmanager.cxx +++ b/framework/source/uielement/addonstoolbarmanager.cxx @@ -242,7 +242,7 @@ void AddonsToolBarManager::FillToolbar( const Sequence< Sequence< PropertyValue if ( aURL == TOOLBOXITEM_SEPARATOR_STR ) { sal_uInt16 nCount = m_pToolBar->GetItemCount(); - if ( nCount > 0 && ( m_pToolBar->GetItemType( nCount-1 ) != TOOLBOXITEM_SEPARATOR ) && nElements > 0 ) + if ( nCount > 0 && ( m_pToolBar->GetItemType( nCount-1 ) != ToolBoxItemType::SEPARATOR ) && nElements > 0 ) { nElements = 0; m_pToolBar->InsertSeparator(); @@ -251,7 +251,7 @@ void AddonsToolBarManager::FillToolbar( const Sequence< Sequence< PropertyValue else { sal_uInt16 nCount = m_pToolBar->GetItemCount(); - if ( bAppendSeparator && nCount > 0 && ( m_pToolBar->GetItemType( nCount-1 ) != TOOLBOXITEM_SEPARATOR )) + if ( bAppendSeparator && nCount > 0 && ( m_pToolBar->GetItemType( nCount-1 ) != ToolBoxItemType::SEPARATOR )) { // We have to append a separator first if the last item is not a separator m_pToolBar->InsertSeparator(); diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx index c211604f8afc..01541fcf0402 100644 --- a/framework/source/uielement/toolbarmanager.cxx +++ b/framework/source/uielement/toolbarmanager.cxx @@ -1719,7 +1719,7 @@ bool ToolBarManager::MenuItemAllowed( sal_uInt16 ) const for ( nPos = 0; nPos < m_pToolBar->GetItemCount(); ++nPos ) { - if ( m_pToolBar->GetItemType(nPos) == TOOLBOXITEM_BUTTON ) + if ( m_pToolBar->GetItemType(nPos) == ToolBoxItemType::BUTTON ) { sal_uInt16 nId = m_pToolBar->GetItemId(nPos); OUString aCommandURL = m_pToolBar->GetItemCommand( nId ); |