diff options
author | Vladimir Glazunov <vg@openoffice.org> | 2010-02-15 15:55:35 +0100 |
---|---|---|
committer | Vladimir Glazunov <vg@openoffice.org> | 2010-02-15 15:55:35 +0100 |
commit | d83ecc038137d32e538a4a3d8c346693aeaf38c8 (patch) | |
tree | d0ffd5922350ead96d9f76f0deba05cea011b7f2 | |
parent | 302d95cf82fa785f4205a3bab2ea783123cbb007 (diff) | |
parent | 48b6b43693291d2bd4f90472d631dc1d8ccbcdfd (diff) |
CWS-TOOLING: integrate CWS cmcfixes71
-rw-r--r-- | io/test/stm/datatest.cxx | 6 | ||||
-rw-r--r-- | pyuno/source/module/pyuno_runtime.cxx | 10 | ||||
-rw-r--r-- | stoc/test/testintrosp.cxx | 16 |
3 files changed, 16 insertions, 16 deletions
diff --git a/io/test/stm/datatest.cxx b/io/test/stm/datatest.cxx index b7515b3c5417..72762c50116f 100644 --- a/io/test/stm/datatest.cxx +++ b/io/test/stm/datatest.cxx @@ -853,8 +853,8 @@ sal_Bool compareMyPropertySet( Reference< XPropertySet > &r1 , Reference < XProp b = b && ( r1->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("float")) ) == r2->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("float")) ) ); if( ! b ){ - float f1; - float f2; + float f1(0.0); + float f2(0.0); r1->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("float")) ) >>= f1; r2->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("float")) ) >>= f2; fprintf( stderr, "compareMyPropertySet: %f %f 3\n",f1,f2 ); @@ -864,7 +864,7 @@ sal_Bool compareMyPropertySet( Reference< XPropertySet > &r1 , Reference < XProp r2->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("double" ))) ); if( ! b ) fprintf( stderr, "compareMyPropertySet: 4\n" ); - sal_Bool b1 ,b2; + sal_Bool b1(sal_False), b2(sal_False); Any a =r1->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("bool")) ); a >>= b1; a = r2->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("bool")) ); diff --git a/pyuno/source/module/pyuno_runtime.cxx b/pyuno/source/module/pyuno_runtime.cxx index 3a93cb91eaf7..3cbde5ef1930 100644 --- a/pyuno/source/module/pyuno_runtime.cxx +++ b/pyuno/source/module/pyuno_runtime.cxx @@ -449,31 +449,31 @@ PyRef Runtime::any2PyObject (const Any &a ) const } case typelib_TypeClass_UNSIGNED_LONG: { - sal_uInt32 l; + sal_uInt32 l = 0; a >>= l; return PyRef( PyLong_FromUnsignedLong (l), SAL_NO_ACQUIRE ); } case typelib_TypeClass_HYPER: { - sal_Int64 l; + sal_Int64 l = 0; a >>= l; return PyRef( PyLong_FromLongLong (l), SAL_NO_ACQUIRE); } case typelib_TypeClass_UNSIGNED_HYPER: { - sal_uInt64 l; + sal_uInt64 l = 0; a >>= l; return PyRef( PyLong_FromUnsignedLongLong (l), SAL_NO_ACQUIRE); } case typelib_TypeClass_FLOAT: { - float f; + float f = 0.0; a >>= f; return PyRef(PyFloat_FromDouble (f), SAL_NO_ACQUIRE); } case typelib_TypeClass_DOUBLE: { - double d; + double d = 0.0; a >>= d; return PyRef( PyFloat_FromDouble (d), SAL_NO_ACQUIRE); } diff --git a/stoc/test/testintrosp.cxx b/stoc/test/testintrosp.cxx index 36ff7d47f519..1176f4549aaa 100644 --- a/stoc/test/testintrosp.cxx +++ b/stoc/test/testintrosp.cxx @@ -169,7 +169,7 @@ OUString AnyToString( const Any& aValue, sal_Bool bIncludeType, const Reference< } case TypeClass_FLOAT: { - float f; + float f(0.0); aValue >>= f; snprintf( pBuffer, sizeof( pBuffer ), "%f", f ); aRetStr = OUString( pBuffer, strlen( pBuffer ), RTL_TEXTENCODING_ASCII_US ); @@ -177,7 +177,7 @@ OUString AnyToString( const Any& aValue, sal_Bool bIncludeType, const Reference< } case TypeClass_DOUBLE: { - double d; + double d(0.0); aValue >>= d; snprintf( pBuffer, sizeof( pBuffer ), "%f", d ); aRetStr = OUString( pBuffer, strlen( pBuffer ), RTL_TEXTENCODING_ASCII_US ); @@ -185,21 +185,21 @@ OUString AnyToString( const Any& aValue, sal_Bool bIncludeType, const Reference< } case TypeClass_BYTE: { - sal_Int8 n; + sal_Int8 n(0); aValue >>= n; aRetStr = OUString::valueOf( (sal_Int32) n ); break; } case TypeClass_SHORT: { - sal_Int16 n; + sal_Int16 n(0); aValue >>= n; aRetStr = OUString::valueOf( (sal_Int32) n ); break; } case TypeClass_LONG: { - sal_Int32 n; + sal_Int32 n(0); aValue >>= n; aRetStr = OUString::valueOf( n ); break; @@ -1308,21 +1308,21 @@ static sal_Bool test_introsp( Reference< XMultiServiceFactory > xMgr, } case TypeClass_DOUBLE: { - double d; + double d(0.0); aPropVal >>= d; aNewVal <<= d + 1.0; break; } case TypeClass_SHORT: { - sal_Int16 n; + sal_Int16 n(0); aPropVal >>= n; aNewVal <<= sal_Int16( n + 1 ); break; } case TypeClass_LONG: { - sal_Int32 n; + sal_Int32 n(0); aPropVal >>= n; aNewVal <<= sal_Int32( n + 1 ); break; |