summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--cppu/qa/cppumaker/test_cppumaker.cxx6
-rw-r--r--include/com/sun/star/uno/Any.h2
-rw-r--r--include/com/sun/star/uno/Type.h2
-rw-r--r--include/com/sun/star/uno/Type.hxx4
4 files changed, 7 insertions, 7 deletions
diff --git a/cppu/qa/cppumaker/test_cppumaker.cxx b/cppu/qa/cppumaker/test_cppumaker.cxx
index fd0d63935772..87802cba6b60 100644
--- a/cppu/qa/cppumaker/test_cppumaker.cxx
+++ b/cppu/qa/cppumaker/test_cppumaker.cxx
@@ -430,15 +430,15 @@ void Test::testBigStruct() {
CPPUNIT_ASSERT_EQUAL(guard.p->m10, 0.0);
CPPUNIT_ASSERT_EQUAL(guard.p->m11, u'\0');
CPPUNIT_ASSERT_EQUAL(guard.p->m12.getLength(), static_cast< sal_Int32 >(0));
- CPPUNIT_ASSERT_EQUAL((sal_Int32)guard.p->m13.getTypeClass(), (sal_Int32)css::uno::TypeClass_VOID);
+ CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(guard.p->m13.getTypeClass()), sal_Int32(css::uno::TypeClass_VOID));
CPPUNIT_ASSERT_EQUAL(guard.p->m14.hasValue(), false);
CPPUNIT_ASSERT_EQUAL(guard.p->m15.getLength(), static_cast< sal_Int32 >(0));
- CPPUNIT_ASSERT_EQUAL((int)guard.p->m16, (int)test::codemaker::cppumaker::HelperEnum_ZERO);
+ CPPUNIT_ASSERT_EQUAL(static_cast<int>(guard.p->m16), int(test::codemaker::cppumaker::HelperEnum_ZERO));
CPPUNIT_ASSERT_EQUAL(guard.p->m17.m1, sal_False);
CPPUNIT_ASSERT_EQUAL(guard.p->m17.m2.is(), false);
CPPUNIT_ASSERT_EQUAL(guard.p->m18.is(), false);
CPPUNIT_ASSERT_EQUAL(guard.p->m19, static_cast< sal_Int8 >(0));
- CPPUNIT_ASSERT_EQUAL((sal_Int32)guard.p->m20, (sal_Int32)test::codemaker::cppumaker::HelperEnum_ZERO);
+ CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(guard.p->m20), sal_Int32(test::codemaker::cppumaker::HelperEnum_ZERO));
CPPUNIT_ASSERT_EQUAL(guard.p->m21.getLength(), static_cast< sal_Int32 >(0));
CPPUNIT_ASSERT_EQUAL(guard.p->m22.getLength(), static_cast< sal_Int32 >(0));
CPPUNIT_ASSERT_EQUAL(guard.p->m23.getLength(), static_cast< sal_Int32 >(0));
diff --git a/include/com/sun/star/uno/Any.h b/include/com/sun/star/uno/Any.h
index 2e216719b59e..4c52167a6b67 100644
--- a/include/com/sun/star/uno/Any.h
+++ b/include/com/sun/star/uno/Any.h
@@ -168,7 +168,7 @@ public:
@return the type class of the set value
*/
TypeClass SAL_CALL getValueTypeClass() const
- { return (TypeClass)pType->eTypeClass; }
+ { return static_cast<TypeClass>(pType->eTypeClass); }
/** Gets the type name of the set value.
diff --git a/include/com/sun/star/uno/Type.h b/include/com/sun/star/uno/Type.h
index 55b9c8317aef..5ca395e881fb 100644
--- a/include/com/sun/star/uno/Type.h
+++ b/include/com/sun/star/uno/Type.h
@@ -132,7 +132,7 @@ public:
@return type class of set type
*/
TypeClass SAL_CALL getTypeClass() const
- { return (TypeClass)_pType->eTypeClass; }
+ { return static_cast<TypeClass>(_pType->eTypeClass); }
/** Gets the name of the set type.
diff --git a/include/com/sun/star/uno/Type.hxx b/include/com/sun/star/uno/Type.hxx
index 171f52e113ee..770734f99df3 100644
--- a/include/com/sun/star/uno/Type.hxx
+++ b/include/com/sun/star/uno/Type.hxx
@@ -47,13 +47,13 @@ inline Type::Type()
inline Type::Type( TypeClass eTypeClass, const ::rtl::OUString & rTypeName )
: _pType( NULL )
{
- ::typelib_typedescriptionreference_new( &_pType, (typelib_TypeClass)eTypeClass, rTypeName.pData );
+ ::typelib_typedescriptionreference_new( &_pType, static_cast<typelib_TypeClass>(eTypeClass), rTypeName.pData );
}
inline Type::Type( TypeClass eTypeClass, const sal_Char * pTypeName )
: _pType( NULL )
{
- ::typelib_typedescriptionreference_newByAsciiName( &_pType, (typelib_TypeClass)eTypeClass, pTypeName );
+ ::typelib_typedescriptionreference_newByAsciiName( &_pType, static_cast<typelib_TypeClass>(eTypeClass), pTypeName );
}
inline Type::Type( typelib_TypeDescriptionReference * pType )