diff options
| author | Xiaofei Zhang <Zhangxiaofei@openoffice.org> | 2010-11-05 10:31:15 +0800 |
|---|---|---|
| committer | Xiaofei Zhang <Zhangxiaofei@openoffice.org> | 2010-11-05 10:31:15 +0800 |
| commit | 7799914b16ac11d59524a9e5aa1d2a2c06645185 (patch) | |
| tree | 57355efb2efc4bd3c51248dcd8f5f3695dde8636 /framework/source/uielement/comboboxtoolbarcontroller.cxx | |
| parent | 1997e52744a405eb43b23acf794e6b11afbc261b (diff) | |
removetooltypes01: #i112600# remove tooltypes from toolkit, svtools and framework
Diffstat (limited to 'framework/source/uielement/comboboxtoolbarcontroller.cxx')
| -rw-r--r-- | framework/source/uielement/comboboxtoolbarcontroller.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/framework/source/uielement/comboboxtoolbarcontroller.cxx b/framework/source/uielement/comboboxtoolbarcontroller.cxx index 058005ffdc40..cd5c4e6aadf4 100644 --- a/framework/source/uielement/comboboxtoolbarcontroller.cxx +++ b/framework/source/uielement/comboboxtoolbarcontroller.cxx @@ -170,7 +170,7 @@ ComboboxToolbarController::ComboboxToolbarController( const Reference< XMultiServiceFactory >& rServiceManager, const Reference< XFrame >& rFrame, ToolBox* pToolbar, - USHORT nID, + sal_uInt16 nID, sal_Int32 nWidth, const ::rtl::OUString& aCommand ) : ComplexToolbarController( rServiceManager, rFrame, pToolbar, nID, aCommand ) @@ -409,7 +409,7 @@ void ComboboxToolbarController::executeControlCommand( const ::com::sun::star::f com::sun::star::util::Color aColor(0); if ( rControlCommand.Arguments[i].Value >>= aColor ) { - ::Color aBackColor( static_cast< UINT32 >( aColor )); + ::Color aBackColor( static_cast< sal_uInt32 >( aColor )); m_pComboBox->SetControlBackground( aBackColor ); } break; @@ -425,7 +425,7 @@ void ComboboxToolbarController::executeControlCommand( const ::com::sun::star::f com::sun::star::util::Color aColor(0); if ( rControlCommand.Arguments[i].Value >>= aColor ) { - ::Color aForeColor( static_cast< UINT32 >( aColor )); + ::Color aForeColor( static_cast< sal_uInt32 >( aColor )); m_pComboBox->SetControlForeground( aForeColor ); } break; |