summaryrefslogtreecommitdiff
path: root/framework/source/uielement/toolbarmanager.cxx
diff options
context:
space:
mode:
authorIngrid Halama [iha] <Ingrid.Halama@oracle.com>2011-02-15 13:28:01 +0100
committerIngrid Halama [iha] <Ingrid.Halama@oracle.com>2011-02-15 13:28:01 +0100
commit8f9b8a80c32063ebe3d5d0e034e1d2432e87423e (patch)
tree5572a7235419cd34d37cdb06d8c3ac5d0209d6d5 /framework/source/uielement/toolbarmanager.cxx
parent293b43ae4de478c550c8461de164f7cb8883daab (diff)
parentcd0d6a5a6775f197fdb7e78b54c8133074a7a236 (diff)
chart52: merge with DEV300_m100
Diffstat (limited to 'framework/source/uielement/toolbarmanager.cxx')
-rw-r--r--framework/source/uielement/toolbarmanager.cxx46
1 files changed, 23 insertions, 23 deletions
diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx
index 8d5169101c8d..8162307f87ad 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -145,7 +145,7 @@ static const sal_Int32 ITEM_DESCRIPTOR_STYLE_LEN = 5;
static const char HELPID_PREFIX[] = "helpid:";
static const char HELPID_PREFIX_TESTTOOL[] = ".HelpId:";
//static sal_Int32 HELPID_PREFIX_LENGTH = 7;
-static const USHORT STARTID_CUSTOMIZE_POPUPMENU = 1000;
+static const sal_uInt16 STARTID_CUSTOMIZE_POPUPMENU = 1000;
#define MENUPREFIX "private:resource/menubar/"
@@ -296,7 +296,7 @@ ToolBarManager::ToolBarManager( const Reference< XMultiServiceFactory >& rServic
// enables a menu for clipped items and customization
SvtCommandOptions aCmdOptions;
- USHORT nMenuType = TOOLBOX_MENUTYPE_CLIPPEDITEMS;
+ sal_uInt16 nMenuType = TOOLBOX_MENUTYPE_CLIPPEDITEMS;
if ( !aCmdOptions.Lookup( SvtCommandOptions::CMDOPTION_DISABLED, ::rtl::OUString::createFromAscii( "CreateDialog" )))
nMenuType |= TOOLBOX_MENUTYPE_CUSTOMIZE;
//added for issue33668 by shizhoubo
@@ -383,7 +383,7 @@ void ToolBarManager::CheckAndUpdateImages()
{
if ( !m_bIsHiContrast )
{
- bRefreshImages = TRUE;
+ bRefreshImages = sal_True;
m_bIsHiContrast = sal_True;
}
}
@@ -418,9 +418,9 @@ void ToolBarManager::RefreshImages()
ResetableGuard aGuard( m_aLock );
sal_Bool bBigImages( SvtMiscOptions().AreCurrentSymbolsLarge() );
- for ( USHORT nPos = 0; nPos < m_pToolBar->GetItemCount(); nPos++ )
+ for ( sal_uInt16 nPos = 0; nPos < m_pToolBar->GetItemCount(); nPos++ )
{
- USHORT nId( m_pToolBar->GetItemId( nPos ) );
+ sal_uInt16 nId( m_pToolBar->GetItemId( nPos ) );
if ( nId > 0 )
{
@@ -470,9 +470,9 @@ void ToolBarManager::UpdateImageOrientation()
}
}
- for ( USHORT nPos = 0; nPos < m_pToolBar->GetItemCount(); nPos++ )
+ for ( sal_uInt16 nPos = 0; nPos < m_pToolBar->GetItemCount(); nPos++ )
{
- USHORT nId = m_pToolBar->GetItemId( nPos );
+ sal_uInt16 nId = m_pToolBar->GetItemId( nPos );
if ( nId > 0 )
{
rtl::OUString aCmd = m_pToolBar->GetItemCommand( nId );
@@ -482,7 +482,7 @@ void ToolBarManager::UpdateImageOrientation()
{
if ( pIter->second.bRotated )
{
- m_pToolBar->SetItemImageMirrorMode( nId, FALSE );
+ m_pToolBar->SetItemImageMirrorMode( nId, sal_False );
m_pToolBar->SetItemImageAngle( nId, m_lImageRotation );
}
if ( pIter->second.bMirrored )
@@ -806,7 +806,7 @@ void ToolBarManager::impl_elementChanged(bool _bRemove,const ::com::sun::star::u
}
void ToolBarManager::setToolBarImage(const Image& _aImage,const CommandToInfoMap::const_iterator& _pIter)
{
- const ::std::vector< USHORT >& _rIDs = _pIter->second.aIds;
+ const ::std::vector< sal_uInt16 >& _rIDs = _pIter->second.aIds;
m_pToolBar->SetItemImage( _pIter->second.nId, _aImage );
::std::for_each(_rIDs.begin(),_rIDs.end(),::boost::bind(&ToolBar::SetItemImage,m_pToolBar,_1,_aImage));
}
@@ -941,9 +941,9 @@ void ToolBarManager::CreateControllers()
if ( xProps.is() )
xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ))) >>= xComponentContext;
- for ( USHORT i = 0; i < m_pToolBar->GetItemCount(); i++ )
+ for ( sal_uInt16 i = 0; i < m_pToolBar->GetItemCount(); i++ )
{
- USHORT nId = m_pToolBar->GetItemId( i );
+ sal_uInt16 nId = m_pToolBar->GetItemId( i );
if ( nId == 0 )
continue;
@@ -1238,7 +1238,7 @@ void ToolBarManager::FillToolbar( const Reference< XIndexAccess >& rItemContaine
if ( m_bDisposed )
return;
- USHORT nId( 1 );
+ sal_uInt16 nId( 1 );
::rtl::OUString aHelpIdPrefix( RTL_CONSTASCII_USTRINGPARAM( HELPID_PREFIX ));
Reference< XModuleManager > xModuleManager( Reference< XModuleManager >(
@@ -1628,7 +1628,7 @@ long ToolBarManager::HandleClick(void ( SAL_CALL XToolbarController::*_pClick )(
if ( m_bDisposed )
return 1;
- USHORT nId( m_pToolBar->GetCurItemId() );
+ sal_uInt16 nId( m_pToolBar->GetCurItemId() );
ToolBarControllerMap::const_iterator pIter = m_aControllerMap.find( nId );
if ( pIter != m_aControllerMap.end() )
{
@@ -1652,7 +1652,7 @@ IMPL_LINK( ToolBarManager, DropdownClick, ToolBox*, EMPTYARG )
if ( m_bDisposed )
return 1;
- USHORT nId( m_pToolBar->GetCurItemId() );
+ sal_uInt16 nId( m_pToolBar->GetCurItemId() );
ToolBarControllerMap::const_iterator pIter = m_aControllerMap.find( nId );
if ( pIter != m_aControllerMap.end() )
{
@@ -1692,7 +1692,7 @@ void ToolBarManager::ImplClearPopupMenu( ToolBox *pToolBar )
}
// remove all items that were not added by the toolbar itself
- USHORT i;
+ sal_uInt16 i;
for( i=0; i<pMenu->GetItemCount(); )
{
if( pMenu->GetItemId( i ) < TOOLBOX_MENUITEM_START )
@@ -1778,7 +1778,7 @@ PopupMenu * ToolBarManager::GetToolBarCustomMeun(ToolBox* pToolBar)
if ( m_pToolBar->IsCustomize() )
{
- USHORT nPos( 0 );
+ sal_uInt16 nPos( 0 );
PopupMenu* pItemMenu( aPopupMenu.GetPopupMenu( 1 ));
sal_Bool bIsFloating( sal_False );
@@ -1818,7 +1818,7 @@ PopupMenu * ToolBarManager::GetToolBarCustomMeun(ToolBox* pToolBar)
{
if ( m_pToolBar->GetItemType(nPos) == TOOLBOXITEM_BUTTON )
{
- USHORT nId = m_pToolBar->GetItemId(nPos);
+ sal_uInt16 nId = m_pToolBar->GetItemId(nPos);
::rtl::OUString aCommandURL = m_pToolBar->GetItemCommand( nId );
pItemMenu->InsertItem( STARTID_CUSTOMIZE_POPUPMENU+nPos, m_pToolBar->GetItemText( nId ), MIB_CHECKABLE );
pItemMenu->CheckItem( STARTID_CUSTOMIZE_POPUPMENU+nPos, m_pToolBar->IsItemVisible( nId ) );
@@ -1837,7 +1837,7 @@ PopupMenu * ToolBarManager::GetToolBarCustomMeun(ToolBox* pToolBar)
}
else
{
- USHORT nPos = aPopupMenu.GetItemPos( MENUITEM_TOOLBAR_CUSTOMIZETOOLBAR );
+ sal_uInt16 nPos = aPopupMenu.GetItemPos( MENUITEM_TOOLBAR_CUSTOMIZETOOLBAR );
if ( nPos != MENU_ITEM_NOTFOUND )
aPopupMenu.RemoveItem( nPos );
}
@@ -1846,7 +1846,7 @@ PopupMenu * ToolBarManager::GetToolBarCustomMeun(ToolBox* pToolBar)
if( pMenu->GetItemCount() )
pMenu->InsertSeparator();
- USHORT i;
+ sal_uInt16 i;
for( i=0; i< aPopupMenu.GetItemCount(); i++)
{
sal_uInt16 nId = aPopupMenu.GetItemId( i );
@@ -2005,7 +2005,7 @@ IMPL_LINK( ToolBarManager, MenuSelect, Menu*, pMenu )
default:
{
- USHORT nId = pMenu->GetCurItemId();
+ sal_uInt16 nId = pMenu->GetCurItemId();
if(( nId > 0 ) && ( nId < TOOLBOX_MENUITEM_START ))
{
// toggle toolbar button visibility
@@ -2087,7 +2087,7 @@ IMPL_LINK( ToolBarManager, Select, ToolBox*, EMPTYARG )
return 1;
sal_Int16 nKeyModifier( (sal_Int16)m_pToolBar->GetModifier() );
- USHORT nId( m_pToolBar->GetCurItemId() );
+ sal_uInt16 nId( m_pToolBar->GetCurItemId() );
ToolBarControllerMap::const_iterator pIter = m_aControllerMap.find( nId );
if ( pIter != m_aControllerMap.end() )
@@ -2148,9 +2148,9 @@ IMPL_LINK( ToolBarManager, DataChanged, DataChangedEvent*, pDataChangedEvent )
CheckAndUpdateImages();
}
- for ( USHORT nPos = 0; nPos < m_pToolBar->GetItemCount(); ++nPos )
+ for ( sal_uInt16 nPos = 0; nPos < m_pToolBar->GetItemCount(); ++nPos )
{
- const USHORT nId = m_pToolBar->GetItemId(nPos);
+ const sal_uInt16 nId = m_pToolBar->GetItemId(nPos);
Window* pWindow = m_pToolBar->GetItemWindow( nId );
if ( pWindow )
{
generated by cgit (git 2.34.1) at 2025-03-21 22:43:08 +0000