summaryrefslogtreecommitdiff
path: root/framework/source/uielement/comboboxtoolbarcontroller.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'framework/source/uielement/comboboxtoolbarcontroller.cxx')
-rw-r--r--framework/source/uielement/comboboxtoolbarcontroller.cxx6
1 files changed, 3 insertions, 3 deletions
diff --git a/framework/source/uielement/comboboxtoolbarcontroller.cxx b/framework/source/uielement/comboboxtoolbarcontroller.cxx
index d17ffcb78f9d..0185c68726dd 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 )
@@ -420,7 +420,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;
@@ -436,7 +436,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;