diff options
| author | Mathias Bauer <mba@openoffice.org> | 2010-07-15 15:24:06 +0200 |
|---|---|---|
| committer | Mathias Bauer <mba@openoffice.org> | 2010-07-15 15:24:06 +0200 |
| commit | 4d5f552378c194e195c7d20f3b90d2e582a70c7c (patch) | |
| tree | 9c0ab93c8e392118c41e334f3f497fde1db7e1dc /framework | |
| parent | 8eea0b1b4ba5f07a89fb2bacb39f1c8d9c3039e6 (diff) | |
CWS changehid: #i111874#: fix warning
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/inc/uielement/commandinfo.hxx | 2 | ||||
| -rw-r--r-- | framework/source/uielement/toolbarmanager.cxx | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/framework/inc/uielement/commandinfo.hxx b/framework/inc/uielement/commandinfo.hxx index 5b9822af86e6..58aa382bc6eb 100644 --- a/framework/inc/uielement/commandinfo.hxx +++ b/framework/inc/uielement/commandinfo.hxx @@ -53,7 +53,7 @@ struct CommandInfo bRotated( false ) {} USHORT nId; - sal_uInt32 nWidth; + sal_uInt16 nWidth; ::std::vector< USHORT > aIds; sal_Int16 nImageInfo; sal_Bool bMirrored : 1, diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx index 7010fe1de8be..cae11097a7be 100644 --- a/framework/source/uielement/toolbarmanager.cxx +++ b/framework/source/uielement/toolbarmanager.cxx @@ -953,7 +953,7 @@ void ToolBarManager::CreateControllers() sal_Bool bCreate( sal_True ); Reference< XStatusListener > xController; CommandToInfoMap::iterator pCommandIter = m_aCommandMap.find( aCommandURL ); - sal_Int32 nWidth = ( pCommandIter != m_aCommandMap.end() ? pCommandIter->second.nWidth : 0 ); + sal_Int16 nWidth = ( pCommandIter != m_aCommandMap.end() ? pCommandIter->second.nWidth : 0 ); svt::ToolboxController* pController( 0 ); @@ -1299,7 +1299,7 @@ void ToolBarManager::FillToolbar( const Reference< XIndexAccess >& rItemContaine rtl::OUString aHelpURL; rtl::OUString aTooltip; sal_uInt16 nType( ::com::sun::star::ui::ItemType::DEFAULT ); - sal_uInt32 nWidth( 0 ); + sal_uInt16 nWidth( 0 ); sal_Bool bIsVisible( sal_True ); sal_uInt32 nStyle( 0 ); |