diff options
| author | Noel Grandin <noel@peralex.com> | 2015-10-21 09:28:58 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-10-21 11:54:57 +0200 |
| commit | 6231a9b4e926d5dc213f94ddf35b14bab411d77d (patch) | |
| tree | 8c81281ce952049ad7f462b645e4dceecf179aa8 /include/cppuhelper | |
| parent | More plausible fix (diff) | |
| download | core-6231a9b4e926d5dc213f94ddf35b14bab411d77d.tar.gz core-6231a9b4e926d5dc213f94ddf35b14bab411d77d.zip | |
visual studio version 4 is long gone
Change-Id: Icf0b4153d07d9c412889d6a7364d4282bba33032
Diffstat (limited to 'include/cppuhelper')
| -rw-r--r-- | include/cppuhelper/proptypehlp.hxx | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/include/cppuhelper/proptypehlp.hxx b/include/cppuhelper/proptypehlp.hxx index 199a055bc093..4079e887c499 100644 --- a/include/cppuhelper/proptypehlp.hxx +++ b/include/cppuhelper/proptypehlp.hxx @@ -43,13 +43,6 @@ inline void SAL_CALL convertPropertyValue( target &value , const css::uno::Any } -// This template is needed at least for msci4 compiler -template < class target > -inline void SAL_CALL convertPropertyValue( target &value , css::uno::Any & a) -{ - convertPropertyValue( value , (const css::uno::Any & ) a ); -} - /** conversion of basic types */ @@ -384,13 +377,12 @@ inline void SAL_CALL convertPropertyValue( float &f , const css::uno::Any &a ) a >>= i64; f = ( float ) i64; } - // msci 4 does not support this conversion -/* else if( css::uno::TypeClass_UNSIGNED_HYPER == tc ) { - sal_uInt64 i64; + else if( css::uno::TypeClass_UNSIGNED_HYPER == tc ) { + sal_uInt64 i64 = 0; a >>= i64; f = ( float ) i64; } -*/ else if( css::uno::TypeClass_LONG == tc ) { + else if( css::uno::TypeClass_LONG == tc ) { sal_Int32 i32 = 0; a >>= i32; f = ( float )i32; @@ -450,13 +442,12 @@ inline void SAL_CALL convertPropertyValue( double &d , const css::uno::Any &a ) a >>= i64; d = (double) i64; } - // msci 4 does not support this -/* else if( css::uno::TypeClass_UNSIGNED_HYPER == tc ) { - sal_uInt64 i64; + else if( css::uno::TypeClass_UNSIGNED_HYPER == tc ) { + sal_uInt64 i64 = 0; a >>= i64; d = (double) i64; } -*/ else if( css::uno::TypeClass_LONG == tc ) { + else if( css::uno::TypeClass_LONG == tc ) { sal_Int32 i32; a >>= i32; d = (double)i32; |