diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2018-01-12 20:13:22 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2018-01-12 20:13:22 +0100 |
commit | 75ca2d04abc96f88ee63852e070f84984f27ad3f (patch) | |
tree | 39be302f78a5c274df2d721cb1a3072644e7a964 /toolkit/source/controls | |
parent | 8456c2ba408b3bed160d3e5f050738301b225bd5 (diff) |
More loplugin:cstylecast: toolkit
auto-rewrite with <https://gerrit.libreoffice.org/#/c/47798/> "Enable
loplugin:cstylecast for some more cases" plus
solenv/clang-format/reformat-formatted-files
Change-Id: Iaee0fee0cbc6e5311342b83d847cb89bd1056973
Diffstat (limited to 'toolkit/source/controls')
-rw-r--r-- | toolkit/source/controls/animatedimages.cxx | 2 | ||||
-rw-r--r-- | toolkit/source/controls/controlmodelcontainerbase.cxx | 2 | ||||
-rw-r--r-- | toolkit/source/controls/formattedcontrol.cxx | 2 | ||||
-rw-r--r-- | toolkit/source/controls/geometrycontrolmodel.cxx | 16 | ||||
-rw-r--r-- | toolkit/source/controls/grid/defaultgridcolumnmodel.cxx | 2 | ||||
-rw-r--r-- | toolkit/source/controls/roadmapcontrol.cxx | 20 | ||||
-rw-r--r-- | toolkit/source/controls/stdtabcontrollermodel.cxx | 4 | ||||
-rw-r--r-- | toolkit/source/controls/tabpagecontainer.cxx | 2 | ||||
-rw-r--r-- | toolkit/source/controls/tkspinbutton.cxx | 2 | ||||
-rw-r--r-- | toolkit/source/controls/tree/treedatamodel.cxx | 8 | ||||
-rw-r--r-- | toolkit/source/controls/unocontrolcontainer.cxx | 2 | ||||
-rw-r--r-- | toolkit/source/controls/unocontrolcontainermodel.cxx | 2 | ||||
-rw-r--r-- | toolkit/source/controls/unocontrolmodel.cxx | 94 | ||||
-rw-r--r-- | toolkit/source/controls/unocontrols.cxx | 40 |
14 files changed, 99 insertions, 99 deletions
diff --git a/toolkit/source/controls/animatedimages.cxx b/toolkit/source/controls/animatedimages.cxx index 9357b20e5fe8..4d8f55f8ff6e 100644 --- a/toolkit/source/controls/animatedimages.cxx +++ b/toolkit/source/controls/animatedimages.cxx @@ -336,7 +336,7 @@ namespace toolkit { return makeAny( css::awt::VisualEffect::NONE ); case BASEPROPERTY_STEP_TIME: - return makeAny( (sal_Int32) 100 ); + return makeAny( sal_Int32(100) ); case BASEPROPERTY_AUTO_REPEAT: return makeAny( true ); diff --git a/toolkit/source/controls/controlmodelcontainerbase.cxx b/toolkit/source/controls/controlmodelcontainerbase.cxx index 3aaff3f1f459..88012e542899 100644 --- a/toolkit/source/controls/controlmodelcontainerbase.cxx +++ b/toolkit/source/controls/controlmodelcontainerbase.cxx @@ -857,7 +857,7 @@ void SAL_CALL ControlModelContainerBase::getGroup( sal_Int32 _nGroup, Sequence< implUpdateGroupStructure(); - if ( ( _nGroup < 0 ) || ( _nGroup >= (sal_Int32)maGroups.size() ) ) + if ( ( _nGroup < 0 ) || ( _nGroup >= static_cast<sal_Int32>(maGroups.size()) ) ) { SAL_WARN("toolkit", "invalid argument and I am not allowed to throw an exception!" ); _rGroup.realloc( 0 ); diff --git a/toolkit/source/controls/formattedcontrol.cxx b/toolkit/source/controls/formattedcontrol.cxx index b25f2c2a582c..fcacdf3178f0 100644 --- a/toolkit/source/controls/formattedcontrol.cxx +++ b/toolkit/source/controls/formattedcontrol.cxx @@ -361,7 +361,7 @@ namespace toolkit throw IllegalArgumentException( ("Unable to convert the given value for the property " - + GetPropertyName((sal_uInt16)nPropId) + + GetPropertyName(static_cast<sal_uInt16>(nPropId)) + " (double, integer, or string expected)."), static_cast< XPropertySet* >(this), 1); diff --git a/toolkit/source/controls/geometrycontrolmodel.cxx b/toolkit/source/controls/geometrycontrolmodel.cxx index bababc8c81d0..e7c27c0e896f 100644 --- a/toolkit/source/controls/geometrycontrolmodel.cxx +++ b/toolkit/source/controls/geometrycontrolmodel.cxx @@ -188,13 +188,13 @@ switch ( nHandle ) { - case GCM_PROPERTY_ID_POS_X: aDefault <<= (sal_Int32) 0; break; - case GCM_PROPERTY_ID_POS_Y: aDefault <<= (sal_Int32) 0; break; - case GCM_PROPERTY_ID_WIDTH: aDefault <<= (sal_Int32) 0; break; - case GCM_PROPERTY_ID_HEIGHT: aDefault <<= (sal_Int32) 0; break; + case GCM_PROPERTY_ID_POS_X: aDefault <<= sal_Int32(0); break; + case GCM_PROPERTY_ID_POS_Y: aDefault <<= sal_Int32(0); break; + case GCM_PROPERTY_ID_WIDTH: aDefault <<= sal_Int32(0); break; + case GCM_PROPERTY_ID_HEIGHT: aDefault <<= sal_Int32(0); break; case GCM_PROPERTY_ID_NAME: aDefault <<= OUString(); break; - case GCM_PROPERTY_ID_TABINDEX: aDefault <<= (sal_Int16) -1; break; - case GCM_PROPERTY_ID_STEP: aDefault <<= (sal_Int32) 0; break; + case GCM_PROPERTY_ID_TABINDEX: aDefault <<= sal_Int16(-1); break; + case GCM_PROPERTY_ID_STEP: aDefault <<= sal_Int32(0); break; case GCM_PROPERTY_ID_TAG: aDefault <<= OUString(); break; case GCM_PROPERTY_ID_RESOURCERESOLVER: aDefault <<= Reference< resource::XStringResourceResolver >(); break; default: OSL_FAIL( "ImplGetDefaultValueByHandle - unknown Property" ); @@ -516,8 +516,8 @@ ::cppu::IPropertyArrayHelper* OCommonGeometryControlModel::createArrayHelper( sal_Int32 _nId ) const { OSL_ENSURE( _nId == m_nPropertyMapId, "OCommonGeometryControlModel::createArrayHelper: invalid argument!" ); - OSL_ENSURE( _nId < (sal_Int32)AggregateProperties::get().size(), "OCommonGeometryControlModel::createArrayHelper: invalid status info (1)!" ); - OSL_ENSURE( _nId < (sal_Int32)AmbiguousPropertyIds::get().size(), "OCommonGeometryControlModel::createArrayHelper: invalid status info (2)!" ); + OSL_ENSURE( _nId < static_cast<sal_Int32>(AggregateProperties::get().size()), "OCommonGeometryControlModel::createArrayHelper: invalid status info (1)!" ); + OSL_ENSURE( _nId < static_cast<sal_Int32>(AmbiguousPropertyIds::get().size()), "OCommonGeometryControlModel::createArrayHelper: invalid status info (2)!" ); // our own properties Sequence< Property > aProps; diff --git a/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx b/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx index 7ece076514cb..4fb3025032d9 100644 --- a/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx +++ b/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx @@ -231,7 +231,7 @@ private: { ::comphelper::ComponentGuard aGuard( *this, rBHelper ); - if ( index >=0 && index < ((sal_Int32)m_aColumns.size())) + if ( index >=0 && index < static_cast<sal_Int32>(m_aColumns.size())) return m_aColumns[index]; throw css::lang::IndexOutOfBoundsException(); diff --git a/toolkit/source/controls/roadmapcontrol.cxx b/toolkit/source/controls/roadmapcontrol.cxx index 8d0a3ce774ee..48e7902b2a93 100644 --- a/toolkit/source/controls/roadmapcontrol.cxx +++ b/toolkit/source/controls/roadmapcontrol.cxx @@ -108,12 +108,12 @@ static void lcl_throwIndexOutOfBoundsException( ) aReturn <<= true; break; case BASEPROPERTY_CURRENTITEMID: - aReturn <<= (sal_Int16) -1; + aReturn <<= sal_Int16(-1); break; case BASEPROPERTY_TEXT: break; case BASEPROPERTY_BORDER: - aReturn <<= (sal_Int16) 2; // No Border + aReturn <<= sal_Int16(2); // No Border break; case BASEPROPERTY_DEFAULTCONTROL: aReturn <<= OUString::createFromAscii( szServiceName_UnoControlRoadmap ); @@ -182,7 +182,7 @@ static void lcl_throwIndexOutOfBoundsException( ) Any SAL_CALL UnoControlRoadmapModel::getByIndex( sal_Int32 Index ) { - if (( Index >= (sal_Int32)maRoadmapItems.size()) || (Index < 0)) + if (( Index >= static_cast<sal_Int32>(maRoadmapItems.size())) || (Index < 0)) lcl_throwIndexOutOfBoundsException( ); Any aAny( maRoadmapItems.at( Index ) ); return aAny; @@ -191,7 +191,7 @@ static void lcl_throwIndexOutOfBoundsException( ) void UnoControlRoadmapModel::MakeRMItemValidation( sal_Int32 Index, const Reference< XInterface >& xRoadmapItem ) { - if ((Index > (sal_Int32)maRoadmapItems.size()) || ( Index < 0 ) ) + if ((Index > static_cast<sal_Int32>(maRoadmapItems.size())) || ( Index < 0 ) ) lcl_throwIndexOutOfBoundsException( ); if ( !xRoadmapItem.is() ) lcl_throwIllegalArgumentException(); @@ -271,7 +271,7 @@ static void lcl_throwIndexOutOfBoundsException( ) void SAL_CALL UnoControlRoadmapModel::insertByIndex( const sal_Int32 Index, const Any& Element) { - if ( ( Index >= ( (sal_Int32)maRoadmapItems.size() + 1 ) ) || (Index < 0)) + if ( ( Index >= ( static_cast<sal_Int32>(maRoadmapItems.size()) + 1 ) ) || (Index < 0)) lcl_throwIndexOutOfBoundsException( ); Reference< XInterface > xRoadmapItem; Element >>= xRoadmapItem; @@ -284,7 +284,7 @@ static void lcl_throwIndexOutOfBoundsException( ) sal_Int16 n_CurrentItemID = GetCurrentItemID( xPropertySet ); if ( Index <= n_CurrentItemID ) { - Any aAny(( sal_Int16 ) ( n_CurrentItemID + 1 ) ); + Any aAny(static_cast<sal_Int16>( n_CurrentItemID + 1 ) ); xPropertySet->setPropertyValue( GetPropertyName( BASEPROPERTY_CURRENTITEMID ), aAny ); } } @@ -292,7 +292,7 @@ static void lcl_throwIndexOutOfBoundsException( ) void SAL_CALL UnoControlRoadmapModel::removeByIndex( sal_Int32 Index) { - if (( Index > (sal_Int32)maRoadmapItems.size()) || (Index < 0)) + if (( Index > static_cast<sal_Int32>(maRoadmapItems.size())) || (Index < 0)) lcl_throwIndexOutOfBoundsException( ); Reference< XInterface > xRoadmapItem; maRoadmapItems.erase( maRoadmapItems.begin() + Index ); @@ -303,7 +303,7 @@ static void lcl_throwIndexOutOfBoundsException( ) Any aAny; if ( Index <= n_CurrentItemID ) { - if ( n_CurrentItemID >= (sal_Int32)maRoadmapItems.size() ) + if ( n_CurrentItemID >= static_cast<sal_Int32>(maRoadmapItems.size()) ) { n_CurrentItemID = sal::static_int_cast< sal_Int16 >( maRoadmapItems.size()-1); @@ -312,9 +312,9 @@ static void lcl_throwIndexOutOfBoundsException( ) aAny <<= n_CurrentItemID; } else if (Index == n_CurrentItemID) - aAny <<= ( sal_Int16 ) -1; + aAny <<= sal_Int16(-1); else if( Index < n_CurrentItemID) - aAny <<= ( sal_Int16 ) ( n_CurrentItemID - 1 ); + aAny <<= static_cast<sal_Int16>( n_CurrentItemID - 1 ); xPropertySet->setPropertyValue( GetPropertyName( BASEPROPERTY_CURRENTITEMID ), aAny ); } } diff --git a/toolkit/source/controls/stdtabcontrollermodel.cxx b/toolkit/source/controls/stdtabcontrollermodel.cxx index 2a7dc44a6d8f..ca35f7fad168 100644 --- a/toolkit/source/controls/stdtabcontrollermodel.cxx +++ b/toolkit/source/controls/stdtabcontrollermodel.cxx @@ -31,7 +31,7 @@ #include <tools/debug.hxx> -#define UNOCONTROL_STREAMVERSION (short)2 +#define UNOCONTROL_STREAMVERSION short(2) // class UnoControlModelEntryList @@ -330,7 +330,7 @@ void StdTabControllerModel::getGroup( sal_Int32 nGroup, css::uno::Sequence< css: UnoControlModelEntry* pEntry = maControls[ n ]; if ( pEntry->bGroup ) { - if ( nG == (sal_uInt32)nGroup ) + if ( nG == static_cast<sal_uInt32>(nGroup) ) { sal_uInt32 nCount = ImplGetControlCount( *pEntry->pGroup ); aSeq = css::uno::Sequence< css::uno::Reference< css::awt::XControlModel > >( nCount ); diff --git a/toolkit/source/controls/tabpagecontainer.cxx b/toolkit/source/controls/tabpagecontainer.cxx index 5102f883b5a8..59b20b6c71ea 100644 --- a/toolkit/source/controls/tabpagecontainer.cxx +++ b/toolkit/source/controls/tabpagecontainer.cxx @@ -73,7 +73,7 @@ uno::Any UnoControlTabPageContainerModel::ImplGetDefaultValue( sal_uInt16 nPropI case BASEPROPERTY_DEFAULTCONTROL: return uno::makeAny( OUString("com.sun.star.awt.tab.UnoControlTabPageContainer") ); case BASEPROPERTY_BORDER: - return uno::makeAny((sal_Int16) 0); // No Border + return uno::makeAny(sal_Int16(0)); // No Border default: return UnoControlModel::ImplGetDefaultValue( nPropId ); } diff --git a/toolkit/source/controls/tkspinbutton.cxx b/toolkit/source/controls/tkspinbutton.cxx index e4200d3fd04a..000e8698e443 100644 --- a/toolkit/source/controls/tkspinbutton.cxx +++ b/toolkit/source/controls/tkspinbutton.cxx @@ -156,7 +156,7 @@ public: return makeAny( OUString("com.sun.star.awt.UnoControlSpinButton") ); case BASEPROPERTY_BORDER: - return makeAny( (sal_Int16) 0 ); + return makeAny( sal_Int16(0) ); case BASEPROPERTY_REPEAT: return makeAny( true ); diff --git a/toolkit/source/controls/tree/treedatamodel.cxx b/toolkit/source/controls/tree/treedatamodel.cxx index fd43049ca663..0c5cd4347b6b 100644 --- a/toolkit/source/controls/tree/treedatamodel.cxx +++ b/toolkit/source/controls/tree/treedatamodel.cxx @@ -325,7 +325,7 @@ void SAL_CALL MutableTreeNode::insertChildByIndex( sal_Int32 nChildIndex, const { ::osl::Guard< ::osl::Mutex > aGuard( maMutex ); - if( (nChildIndex < 0) || (nChildIndex > (sal_Int32)maChildren.size()) ) + if( (nChildIndex < 0) || (nChildIndex > static_cast<sal_Int32>(maChildren.size())) ) throw IndexOutOfBoundsException(); Reference< XTreeNode > xNode( xChildNode.get() ); @@ -349,7 +349,7 @@ void SAL_CALL MutableTreeNode::removeChildByIndex( sal_Int32 nChildIndex ) { ::osl::Guard< ::osl::Mutex > aGuard( maMutex ); - if( (nChildIndex < 0) || (nChildIndex >= (sal_Int32)maChildren.size()) ) + if( (nChildIndex < 0) || (nChildIndex >= static_cast<sal_Int32>(maChildren.size())) ) throw IndexOutOfBoundsException(); MutableTreeNodeRef xImpl; @@ -439,7 +439,7 @@ Reference< XTreeNode > SAL_CALL MutableTreeNode::getChildAt( sal_Int32 nChildInd { ::osl::Guard< ::osl::Mutex > aGuard( maMutex ); - if( (nChildIndex < 0) || (nChildIndex >= (sal_Int32)maChildren.size()) ) + if( (nChildIndex < 0) || (nChildIndex >= static_cast<sal_Int32>(maChildren.size())) ) throw IndexOutOfBoundsException(); return getReference( maChildren[nChildIndex].get() ); } @@ -447,7 +447,7 @@ Reference< XTreeNode > SAL_CALL MutableTreeNode::getChildAt( sal_Int32 nChildInd sal_Int32 SAL_CALL MutableTreeNode::getChildCount( ) { ::osl::Guard< ::osl::Mutex > aGuard( maMutex ); - return (sal_Int32)maChildren.size(); + return static_cast<sal_Int32>(maChildren.size()); } Reference< XTreeNode > SAL_CALL MutableTreeNode::getParent( ) diff --git a/toolkit/source/controls/unocontrolcontainer.cxx b/toolkit/source/controls/unocontrolcontainer.cxx index 5b533dddb22a..be64fb6eee17 100644 --- a/toolkit/source/controls/unocontrolcontainer.cxx +++ b/toolkit/source/controls/unocontrolcontainer.cxx @@ -628,7 +628,7 @@ sal_Int32 UnoControlContainer::impl_addControl( const uno::Reference< awt::XCont { container::ContainerEvent aEvent; aEvent.Source = *this; - _pName ? ( aEvent.Accessor <<= *_pName ) : ( aEvent.Accessor <<= (sal_Int32)id ); + _pName ? ( aEvent.Accessor <<= *_pName ) : ( aEvent.Accessor <<= static_cast<sal_Int32>(id) ); aEvent.Element <<= _rxControl; maCListeners.elementInserted( aEvent ); } diff --git a/toolkit/source/controls/unocontrolcontainermodel.cxx b/toolkit/source/controls/unocontrolcontainermodel.cxx index 5c7b11c76043..d7ded7950c2f 100644 --- a/toolkit/source/controls/unocontrolcontainermodel.cxx +++ b/toolkit/source/controls/unocontrolcontainermodel.cxx @@ -64,7 +64,7 @@ css::uno::Any UnoControlContainerModel::ImplGetDefaultValue( sal_uInt16 nPropId { css::uno::Any aDefault; if ( nPropId == BASEPROPERTY_BORDER ) - aDefault <<= (sal_Int16) 0; + aDefault <<= sal_Int16(0); else aDefault = UnoControlModel::ImplGetDefaultValue( nPropId ); return aDefault; diff --git a/toolkit/source/controls/unocontrolmodel.cxx b/toolkit/source/controls/unocontrolmodel.cxx index e28a6d8aa2c4..642575a5a2ea 100644 --- a/toolkit/source/controls/unocontrolmodel.cxx +++ b/toolkit/source/controls/unocontrolmodel.cxx @@ -60,7 +60,7 @@ using namespace ::com::sun::star::i18n; using ::com::sun::star::awt::FontDescriptor; -#define UNOCONTROL_STREAMVERSION (short)2 +#define UNOCONTROL_STREAMVERSION short(2) static void lcl_ImplMergeFontProperty( FontDescriptor& rFD, sal_uInt16 nPropId, const Any& rValue ) { @@ -80,7 +80,7 @@ static void lcl_ImplMergeFontProperty( FontDescriptor& rFD, sal_uInt16 nPropId, break; case BASEPROPERTY_FONTDESCRIPTORPART_CHARSET: rValue >>= rFD.CharSet; break; - case BASEPROPERTY_FONTDESCRIPTORPART_HEIGHT: rValue >>= nExtractFloat; rFD.Height = (sal_Int16)nExtractFloat; + case BASEPROPERTY_FONTDESCRIPTORPART_HEIGHT: rValue >>= nExtractFloat; rFD.Height = static_cast<sal_Int16>(nExtractFloat); break; case BASEPROPERTY_FONTDESCRIPTORPART_WEIGHT: rValue >>= rFD.Weight; break; @@ -174,7 +174,7 @@ css::uno::Any UnoControlModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const case BASEPROPERTY_FONTDESCRIPTORPART_STYLENAME: aDefault <<= aFD.StyleName; break; case BASEPROPERTY_FONTDESCRIPTORPART_FAMILY: aDefault <<= aFD.Family; break; case BASEPROPERTY_FONTDESCRIPTORPART_CHARSET: aDefault <<= aFD.CharSet; break; - case BASEPROPERTY_FONTDESCRIPTORPART_HEIGHT: aDefault <<= (float)aFD.Height; break; + case BASEPROPERTY_FONTDESCRIPTORPART_HEIGHT: aDefault <<= static_cast<float>(aFD.Height); break; case BASEPROPERTY_FONTDESCRIPTORPART_WEIGHT: aDefault <<= aFD.Weight; break; case BASEPROPERTY_FONTDESCRIPTORPART_SLANT: aDefault <<= (sal_Int16)aFD.Slant; break; case BASEPROPERTY_FONTDESCRIPTORPART_UNDERLINE: aDefault <<= aFD.Underline; break; @@ -224,35 +224,35 @@ css::uno::Any UnoControlModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const case BASEPROPERTY_STATE: case BASEPROPERTY_EXTDATEFORMAT: case BASEPROPERTY_EXTTIMEFORMAT: - case BASEPROPERTY_ECHOCHAR: aDefault <<= (sal_Int16) 0; break; - case BASEPROPERTY_BORDER: aDefault <<= (sal_Int16) 1; break; - case BASEPROPERTY_DECIMALACCURACY: aDefault <<= (sal_Int16) 2; break; - case BASEPROPERTY_LINECOUNT: aDefault <<= (sal_Int16) 5; break; - case BASEPROPERTY_ALIGN: aDefault <<= (sal_Int16) PROPERTY_ALIGN_LEFT; break; - case BASEPROPERTY_IMAGEALIGN: aDefault <<= (sal_Int16) 1 /*ImageAlign::Top*/; break; - case BASEPROPERTY_IMAGEPOSITION: aDefault <<= (sal_Int16) 12 /*ImagePosition::Centered*/; break; - case BASEPROPERTY_PUSHBUTTONTYPE: aDefault <<= (sal_Int16) 0 /*PushButtonType::STANDARD*/; break; - case BASEPROPERTY_MOUSE_WHEEL_BEHAVIOUR:aDefault <<= (sal_Int16) awt::MouseWheelBehavior::SCROLL_FOCUS_ONLY; break; + case BASEPROPERTY_ECHOCHAR: aDefault <<= sal_Int16(0); break; + case BASEPROPERTY_BORDER: aDefault <<= sal_Int16(1); break; + case BASEPROPERTY_DECIMALACCURACY: aDefault <<= sal_Int16(2); break; + case BASEPROPERTY_LINECOUNT: aDefault <<= sal_Int16(5); break; + case BASEPROPERTY_ALIGN: aDefault <<= sal_Int16(PROPERTY_ALIGN_LEFT); break; + case BASEPROPERTY_IMAGEALIGN: aDefault <<= sal_Int16(1) /*ImageAlign::Top*/; break; + case BASEPROPERTY_IMAGEPOSITION: aDefault <<= sal_Int16(12) /*ImagePosition::Centered*/; break; + case BASEPROPERTY_PUSHBUTTONTYPE: aDefault <<= sal_Int16(0) /*PushButtonType::STANDARD*/; break; + case BASEPROPERTY_MOUSE_WHEEL_BEHAVIOUR:aDefault <<= sal_Int16(awt::MouseWheelBehavior::SCROLL_FOCUS_ONLY); break; case BASEPROPERTY_DATEMAX: aDefault <<= util::Date( 31, 12, 2200 ); break; case BASEPROPERTY_DATEMIN: aDefault <<= util::Date( 1, 1, 1900 ); break; case BASEPROPERTY_TIMEMAX: aDefault <<= util::Time(0, 0, 59, 23, false); break; case BASEPROPERTY_TIMEMIN: aDefault <<= util::Time(); break; - case BASEPROPERTY_VALUEMAX_DOUBLE: aDefault <<= (double) 1000000; break; - case BASEPROPERTY_VALUEMIN_DOUBLE: aDefault <<= (double) -1000000; break; - case BASEPROPERTY_VALUESTEP_DOUBLE: aDefault <<= (double ) 1; break; - case BASEPROPERTY_PROGRESSVALUE_MAX: aDefault <<= (sal_Int32) 100; break; - case BASEPROPERTY_PROGRESSVALUE_MIN: aDefault <<= (sal_Int32) 0; break; - case BASEPROPERTY_SCROLLVALUE_MAX: aDefault <<= (sal_Int32) 100; break; - case BASEPROPERTY_SCROLLVALUE_MIN: aDefault <<= (sal_Int32) 0; break; - case BASEPROPERTY_LINEINCREMENT: aDefault <<= (sal_Int32) 1; break; - case BASEPROPERTY_BLOCKINCREMENT: aDefault <<= (sal_Int32) 10; break; - case BASEPROPERTY_ORIENTATION: aDefault <<= (sal_Int32) 0; break; - case BASEPROPERTY_SPINVALUE: aDefault <<= (sal_Int32) 0; break; - case BASEPROPERTY_SPININCREMENT: aDefault <<= (sal_Int32) 1; break; - case BASEPROPERTY_SPINVALUE_MIN: aDefault <<= (sal_Int32) 0; break; - case BASEPROPERTY_SPINVALUE_MAX: aDefault <<= (sal_Int32) 100; break; - case BASEPROPERTY_REPEAT_DELAY: aDefault <<= (sal_Int32) 50; break; // 50 milliseconds + case BASEPROPERTY_VALUEMAX_DOUBLE: aDefault <<= double(1000000); break; + case BASEPROPERTY_VALUEMIN_DOUBLE: aDefault <<= double(-1000000); break; + case BASEPROPERTY_VALUESTEP_DOUBLE: aDefault <<= double(1); break; + case BASEPROPERTY_PROGRESSVALUE_MAX: aDefault <<= sal_Int32(100); break; + case BASEPROPERTY_PROGRESSVALUE_MIN: aDefault <<= sal_Int32(0); break; + case BASEPROPERTY_SCROLLVALUE_MAX: aDefault <<= sal_Int32(100); break; + case BASEPROPERTY_SCROLLVALUE_MIN: aDefault <<= sal_Int32(0); break; + case BASEPROPERTY_LINEINCREMENT: aDefault <<= sal_Int32(1); break; + case BASEPROPERTY_BLOCKINCREMENT: aDefault <<= sal_Int32(10); break; + case BASEPROPERTY_ORIENTATION: aDefault <<= sal_Int32(0); break; + case BASEPROPERTY_SPINVALUE: aDefault <<= sal_Int32(0); break; + case BASEPROPERTY_SPININCREMENT: aDefault <<= sal_Int32(1); break; + case BASEPROPERTY_SPINVALUE_MIN: aDefault <<= sal_Int32(0); break; + case BASEPROPERTY_SPINVALUE_MAX: aDefault <<= sal_Int32(100); break; + case BASEPROPERTY_REPEAT_DELAY: aDefault <<= sal_Int32(50); break; // 50 milliseconds case BASEPROPERTY_DEFAULTCONTROL: aDefault <<= const_cast<UnoControlModel*>(this)->getServiceName(); break; case BASEPROPERTY_AUTOHSCROLL: @@ -741,7 +741,7 @@ void UnoControlModel::write( const css::uno::Reference< css::io::XObjectOutputSt sal::static_int_cast< sal_Int16 >(aFD.Slant) ); OutStream->writeShort( aFD.Underline ); OutStream->writeShort( aFD.Strikeout ); - OutStream->writeShort( (short)(aFD.Orientation * 10) ); + OutStream->writeShort( static_cast<short>(aFD.Orientation * 10) ); OutStream->writeBoolean( aFD.Kerning ); OutStream->writeBoolean( aFD.WordLineMode ); } @@ -767,7 +767,7 @@ void UnoControlModel::read( const css::uno::Reference< css::io::XObjectInputStre DBG_ASSERT( xMark.is(), "read: no css::io::XMarkableStream!" ); short nVersion = InStream->readShort(); - sal_uInt32 nProps = (sal_uInt32)InStream->readLong(); + sal_uInt32 nProps = static_cast<sal_uInt32>(InStream->readLong()); css::uno::Sequence< OUString> aProps( nProps ); css::uno::Sequence< css::uno::Any> aValues( nProps ); bool bInvalidEntries = false; @@ -784,7 +784,7 @@ void UnoControlModel::read( const css::uno::Reference< css::io::XObjectInputStre sal_Int32 nPropDataBeginMark = xMark->createMark(); sal_Int32 nPropDataLen = InStream->readLong(); - sal_uInt16 nPropId = (sal_uInt16)InStream->readShort(); + sal_uInt16 nPropId = static_cast<sal_uInt16>(InStream->readShort()); css::uno::Any aValue; bool bIsVoid = InStream->readBoolean(); @@ -838,12 +838,12 @@ void UnoControlModel::read( const css::uno::Reference< css::io::XObjectInputStre aFD.Family = InStream->readShort(); aFD.CharSet = InStream->readShort(); aFD.Pitch = InStream->readShort(); - aFD.CharacterWidth = (float)InStream->readDouble(); - aFD.Weight = (float)InStream->readDouble(); + aFD.CharacterWidth = static_cast<float>(InStream->readDouble()); + aFD.Weight = static_cast<float>(InStream->readDouble()); aFD.Slant = (css::awt::FontSlant)InStream->readShort(); aFD.Underline = InStream->readShort(); aFD.Strikeout = InStream->readShort(); - aFD.Orientation = (float)InStream->readDouble(); + aFD.Orientation = static_cast<float>(InStream->readDouble()); aFD.Kerning = InStream->readBoolean() != 0; aFD.WordLineMode = InStream->readBoolean() != 0; aFD.Type = InStream->readShort(); @@ -877,7 +877,7 @@ void UnoControlModel::read( const css::uno::Reference< css::io::XObjectInputStre long nEntries = InStream->readLong(); css::uno::Sequence<sal_uInt16> aSeq( nEntries ); for ( long n = 0; n < nEntries; n++ ) - aSeq.getArray()[n] = (sal_uInt16)InStream->readShort(); + aSeq.getArray()[n] = static_cast<sal_uInt16>(InStream->readShort()); aValue <<= aSeq; } else if ( *pType == cppu::UnoType< css::uno::Sequence<sal_Int16> >::get() ) @@ -885,7 +885,7 @@ void UnoControlModel::read( const css::uno::Reference< css::io::XObjectInputStre long nEntries = InStream->readLong(); css::uno::Sequence<sal_Int16> aSeq( nEntries ); for ( long n = 0; n < nEntries; n++ ) - aSeq.getArray()[n] = (sal_Int16)InStream->readShort(); + aSeq.getArray()[n] = static_cast<sal_Int16>(InStream->readShort()); aValue <<= aSeq; } else if ( pType->getTypeClass() == TypeClass_ENUM ) @@ -934,8 +934,8 @@ void UnoControlModel::read( const css::uno::Reference< css::io::XObjectInputStre if ( maData.find(BASEPROPERTY_FONTDESCRIPTOR) != maData.end() ) // due to defaults... maData[BASEPROPERTY_FONTDESCRIPTOR] >>= *pFD; } - pFD->Width = (sal_Int16)InStream->readLong(); - pFD->Height = (sal_Int16)InStream->readLong(); + pFD->Width = static_cast<sal_Int16>(InStream->readLong()); + pFD->Height = static_cast<sal_Int16>(InStream->readLong()); InStream->readShort(); // ignore css::awt::FontWidth - it was // misspelled and is no longer needed pFD->CharacterWidth = css::awt::FontWidth::DONTKNOW; @@ -955,7 +955,7 @@ void UnoControlModel::read( const css::uno::Reference< css::io::XObjectInputStre pFD->Slant = (css::awt::FontSlant)InStream->readShort(); pFD->Underline = InStream->readShort(); pFD->Strikeout = InStream->readShort(); - pFD->Orientation = ( (float)(double)InStream->readShort() ) / 10; + pFD->Orientation = static_cast<float>(static_cast<double>(InStream->readShort())) / 10; pFD->Kerning = InStream->readBoolean() != 0; pFD->WordLineMode = InStream->readBoolean() != 0; } @@ -992,7 +992,7 @@ void UnoControlModel::read( const css::uno::Reference< css::io::XObjectInputStre } if ( bInvalidEntries ) { - for ( i = 0; i < (sal_uInt32)aProps.getLength(); i++ ) + for ( i = 0; i < static_cast<sal_uInt32>(aProps.getLength()); i++ ) { if ( aProps.getConstArray()[i].isEmpty() ) { @@ -1052,7 +1052,7 @@ sal_Bool UnoControlModel::convertFastPropertyValue( Any & rConvertedValue, Any & } else { - const css::uno::Type* pDestType = GetPropertyType( (sal_uInt16)nPropId ); + const css::uno::Type* pDestType = GetPropertyType( static_cast<sal_uInt16>(nPropId) ); if ( pDestType->getTypeClass() == TypeClass_ANY ) { rConvertedValue = rValue; @@ -1082,7 +1082,7 @@ sal_Bool UnoControlModel::convertFastPropertyValue( Any & rConvertedValue, Any & sal_Int32 nAsInteger = 0; bConverted = ( rValue >>= nAsInteger ); if ( bConverted ) - rConvertedValue <<= (double)nAsInteger; + rConvertedValue <<= static_cast<double>(nAsInteger); } } break; @@ -1146,7 +1146,7 @@ sal_Bool UnoControlModel::convertFastPropertyValue( Any & rConvertedValue, Any & { throw css::lang::IllegalArgumentException( "Unable to convert the given value for the property " - + GetPropertyName( (sal_uInt16)nPropId ) + + GetPropertyName( static_cast<sal_uInt16>(nPropId) ) + ".\nExpected type: " + pDestType->getTypeName() + "\nFound type: " + rValue.getValueType().getTypeName(), static_cast< css::beans::XPropertySet* >(this), @@ -1169,7 +1169,7 @@ void UnoControlModel::setFastPropertyValue_NoBroadcast( sal_Int32 nPropId, const const css::uno::Any* pProp = it == maData.end() ? nullptr : &(it->second); ENSURE_OR_RETURN_VOID( pProp, "UnoControlModel::setFastPropertyValue_NoBroadcast: invalid property id!" ); - DBG_ASSERT( ( rValue.getValueType().getTypeClass() != css::uno::TypeClass_VOID ) || ( GetPropertyAttribs( (sal_uInt16)nPropId ) & css::beans::PropertyAttribute::MAYBEVOID ), "Property should not be VOID!" ); + DBG_ASSERT( ( rValue.getValueType().getTypeClass() != css::uno::TypeClass_VOID ) || ( GetPropertyAttribs( static_cast<sal_uInt16>(nPropId) ) & css::beans::PropertyAttribute::MAYBEVOID ), "Property should not be VOID!" ); maData[ nPropId ] = rValue; } @@ -1197,7 +1197,7 @@ void UnoControlModel::getFastPropertyValue( css::uno::Any& rValue, sal_Int32 nPr break; case BASEPROPERTY_FONTDESCRIPTORPART_CHARSET: rValue <<= aFD.CharSet; break; - case BASEPROPERTY_FONTDESCRIPTORPART_HEIGHT: rValue <<= (float)aFD.Height; + case BASEPROPERTY_FONTDESCRIPTORPART_HEIGHT: rValue <<= static_cast<float>(aFD.Height); break; case BASEPROPERTY_FONTDESCRIPTORPART_WEIGHT: rValue <<= aFD.Weight; break; @@ -1236,7 +1236,7 @@ void UnoControlModel::setPropertyValue( const OUString& rPropertyName, const css sal_Int32 nPropId = 0; { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); - nPropId = (sal_Int32) GetPropertyId( rPropertyName ); + nPropId = static_cast<sal_Int32>(GetPropertyId( rPropertyName )); DBG_ASSERT( nPropId, "Invalid ID in UnoControlModel::setPropertyValue" ); } if( !nPropId ) @@ -1261,7 +1261,7 @@ void UnoControlModel::setFastPropertyValue( sal_Int32 nPropId, const css::uno::A (*pProp) >>= aOldFontDescriptor; FontDescriptor aNewFontDescriptor( aOldFontDescriptor ); - lcl_ImplMergeFontProperty( aNewFontDescriptor, (sal_uInt16)nPropId, rValue ); + lcl_ImplMergeFontProperty( aNewFontDescriptor, static_cast<sal_uInt16>(nPropId), rValue ); Any aNewValue; aNewValue <<= aNewFontDescriptor; @@ -1320,7 +1320,7 @@ void UnoControlModel::setPropertyValues( const css::uno::Sequence< OUString >& r pFD.reset( new awt::FontDescriptor ); (*pProp) >>= *pFD; } - lcl_ImplMergeFontProperty( *pFD, (sal_uInt16)pHandles[n], pValues[n] ); + lcl_ImplMergeFontProperty( *pFD, static_cast<sal_uInt16>(pHandles[n]), pValues[n] ); pHandles[n] = -1; nValidHandles--; } diff --git a/toolkit/source/controls/unocontrols.cxx b/toolkit/source/controls/unocontrols.cxx index f74f468b7562..dd2d11eaccd2 100644 --- a/toolkit/source/controls/unocontrols.cxx +++ b/toolkit/source/controls/unocontrols.cxx @@ -130,7 +130,7 @@ uno::Any UnoControlEditModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const switch ( nPropId ) { case BASEPROPERTY_LINE_END_FORMAT: - aReturn <<= (sal_Int16)awt::LineEndFormat::LINE_FEED; // LF + aReturn <<= sal_Int16(awt::LineEndFormat::LINE_FEED); // LF break; case BASEPROPERTY_DEFAULTCONTROL: aReturn <<= OUString::createFromAscii( szServiceName_UnoControlEdit ); @@ -719,7 +719,7 @@ uno::Any UnoControlButtonModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const case BASEPROPERTY_TOGGLE: return uno::makeAny( false ); case BASEPROPERTY_ALIGN: - return uno::makeAny( (sal_Int16)PROPERTY_ALIGN_CENTER ); + return uno::makeAny( sal_Int16(PROPERTY_ALIGN_CENTER) ); case BASEPROPERTY_FOCUSONCLICK: return uno::makeAny( true ); } @@ -865,7 +865,7 @@ void SAL_CALL UnoButtonControl::disposing( const lang::EventObject& Source ) void SAL_CALL UnoButtonControl::itemStateChanged( const awt::ItemEvent& rEvent ) { // forward to model - ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_STATE ), uno::Any((sal_Int16)rEvent.Selected), false ); + ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_STATE ), uno::Any(static_cast<sal_Int16>(rEvent.Selected)), false ); // multiplex ItemEvent aEvent( rEvent ); @@ -1123,7 +1123,7 @@ uno::Any UnoControlRadioButtonModel::ImplGetDefaultValue( sal_uInt16 nPropId ) c return uno::makeAny( OUString::createFromAscii( szServiceName_UnoControlRadioButton ) ); case BASEPROPERTY_VISUALEFFECT: - return uno::makeAny( (sal_Int16)awt::VisualEffect::LOOK3D ); + return uno::makeAny( sal_Int16(awt::VisualEffect::LOOK3D) ); } return GraphicControlModel::ImplGetDefaultValue( nPropId ); @@ -1282,7 +1282,7 @@ sal_Bool UnoRadioButtonControl::getState() void UnoRadioButtonControl::itemStateChanged( const awt::ItemEvent& rEvent ) { - ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_STATE ), uno::Any((sal_Int16)rEvent.Selected), false ); + ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_STATE ), uno::Any(static_cast<sal_Int16>(rEvent.Selected)), false ); // compatibility: // in OOo 1.0.x, when the user clicked a radio button in a group of buttons, this resulted @@ -1370,7 +1370,7 @@ uno::Any UnoControlCheckBoxModel::ImplGetDefaultValue( sal_uInt16 nPropId ) cons return uno::makeAny( OUString::createFromAscii( szServiceName_UnoControlCheckBox ) ); case BASEPROPERTY_VISUALEFFECT: - return uno::makeAny( (sal_Int16)awt::VisualEffect::LOOK3D ); + return uno::makeAny( sal_Int16(awt::VisualEffect::LOOK3D) ); } return GraphicControlModel::ImplGetDefaultValue( nPropId ); @@ -1506,7 +1506,7 @@ void UnoCheckBoxControl::setLabel( const OUString& rLabel ) void UnoCheckBoxControl::setState( short n ) { - ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_STATE ), uno::Any((sal_Int16) n), true ); + ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_STATE ), uno::Any(static_cast<sal_Int16>(n)), true ); } short UnoCheckBoxControl::getState() @@ -1524,7 +1524,7 @@ void UnoCheckBoxControl::enableTriState( sal_Bool b ) void UnoCheckBoxControl::itemStateChanged( const awt::ItemEvent& rEvent ) { - ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_STATE ), uno::Any((sal_Int16) rEvent.Selected), false ); + ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_STATE ), uno::Any(static_cast<sal_Int16>(rEvent.Selected)), false ); if ( maItemListeners.getLength() ) maItemListeners.itemStateChanged( rEvent ); @@ -1589,7 +1589,7 @@ uno::Any UnoControlFixedHyperlinkModel::ImplGetDefaultValue( sal_uInt16 nPropId } else if ( nPropId == BASEPROPERTY_BORDER ) { - return uno::Any((sal_Int16) 0); + return uno::Any(sal_Int16(0)); } else if ( nPropId == BASEPROPERTY_URL ) { @@ -1684,7 +1684,7 @@ OUString UnoFixedHyperlinkControl::getURL( ) void UnoFixedHyperlinkControl::setAlignment( short nAlign ) { - ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_ALIGN ), uno::Any((sal_Int16) nAlign), true ); + ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_ALIGN ), uno::Any(static_cast<sal_Int16>(nAlign)), true ); } short UnoFixedHyperlinkControl::getAlignment() @@ -1780,7 +1780,7 @@ uno::Any UnoControlFixedTextModel::ImplGetDefaultValue( sal_uInt16 nPropId ) con } else if ( nPropId == BASEPROPERTY_BORDER ) { - return uno::Any((sal_Int16)0); + return uno::Any(sal_Int16(0)); } return UnoControlModel::ImplGetDefaultValue( nPropId ); @@ -1875,7 +1875,7 @@ OUString UnoFixedTextControl::getText() void UnoFixedTextControl::setAlignment( short nAlign ) { - ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_ALIGN ), uno::Any((sal_Int16) nAlign), true ); + ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_ALIGN ), uno::Any(static_cast<sal_Int16>(nAlign)), true ); } short UnoFixedTextControl::getAlignment() @@ -2732,8 +2732,8 @@ void UnoListBoxControl::addItems( const uno::Sequence< OUString>& aItems, sal_In uno::Any aVal = ImplGetPropertyValue( GetPropertyName( BASEPROPERTY_STRINGITEMLIST ) ); uno::Sequence< OUString> aSeq; aVal >>= aSeq; - sal_uInt16 nNewItems = (sal_uInt16)aItems.getLength(); - sal_uInt16 nOldLen = (sal_uInt16)aSeq.getLength(); + sal_uInt16 nNewItems = static_cast<sal_uInt16>(aItems.getLength()); + sal_uInt16 nOldLen = static_cast<sal_uInt16>(aSeq.getLength()); sal_uInt16 nNewLen = nOldLen + nNewItems; uno::Sequence< OUString> aNewSeq( nNewLen ); @@ -2764,7 +2764,7 @@ void UnoListBoxControl::removeItems( sal_Int16 nPos, sal_Int16 nCount ) uno::Any aVal = ImplGetPropertyValue( GetPropertyName( BASEPROPERTY_STRINGITEMLIST ) ); uno::Sequence< OUString> aSeq; aVal >>= aSeq; - sal_uInt16 nOldLen = (sal_uInt16)aSeq.getLength(); + sal_uInt16 nOldLen = static_cast<sal_uInt16>(aSeq.getLength()); if ( nOldLen && ( nPos < nOldLen ) ) { if ( nCount > ( nOldLen-nPos ) ) @@ -2794,7 +2794,7 @@ sal_Int16 UnoListBoxControl::getItemCount() uno::Any aVal = ImplGetPropertyValue( GetPropertyName( BASEPROPERTY_STRINGITEMLIST ) ); uno::Sequence< OUString> aSeq; aVal >>= aSeq; - return (sal_Int16)aSeq.getLength(); + return static_cast<sal_Int16>(aSeq.getLength()); } OUString UnoListBoxControl::getItem( sal_Int16 nPos ) @@ -3341,8 +3341,8 @@ void UnoComboBoxControl::addItems( const uno::Sequence< OUString>& aItems, sal_I uno::Any aVal = ImplGetPropertyValue( GetPropertyName( BASEPROPERTY_STRINGITEMLIST ) ); uno::Sequence< OUString> aSeq; aVal >>= aSeq; - sal_uInt16 nNewItems = (sal_uInt16)aItems.getLength(); - sal_uInt16 nOldLen = (sal_uInt16)aSeq.getLength(); + sal_uInt16 nNewItems = static_cast<sal_uInt16>(aItems.getLength()); + sal_uInt16 nOldLen = static_cast<sal_uInt16>(aSeq.getLength()); sal_uInt16 nNewLen = nOldLen + nNewItems; uno::Sequence< OUString> aNewSeq( nNewLen ); @@ -3373,7 +3373,7 @@ void UnoComboBoxControl::removeItems( sal_Int16 nPos, sal_Int16 nCount ) uno::Any aVal = ImplGetPropertyValue( GetPropertyName( BASEPROPERTY_STRINGITEMLIST ) ); uno::Sequence< OUString> aSeq; aVal >>= aSeq; - sal_uInt16 nOldLen = (sal_uInt16)aSeq.getLength(); + sal_uInt16 nOldLen = static_cast<sal_uInt16>(aSeq.getLength()); if ( nOldLen && ( nPos < nOldLen ) ) { if ( nCount > ( nOldLen-nPos ) ) @@ -3403,7 +3403,7 @@ sal_Int16 UnoComboBoxControl::getItemCount() uno::Any aVal = ImplGetPropertyValue( GetPropertyName( BASEPROPERTY_STRINGITEMLIST ) ); uno::Sequence< OUString> aSeq; aVal >>= aSeq; - return (sal_Int16)aSeq.getLength(); + return static_cast<sal_Int16>(aSeq.getLength()); } OUString UnoComboBoxControl::getItem( sal_Int16 nPos ) |