[Libreoffice-commits] core.git: include/cppuhelper

[Noel Grandin]

 include/cppuhelper/proptypehlp.hxx |   21 ++++++---------------
 1 file changed, 6 insertions(+), 15 deletions(-)

New commits:
commit 6231a9b4e926d5dc213f94ddf35b14bab411d77d
Author: Noel Grandin <noel at peralex.com>
Date:   Wed Oct 21 09:28:58 2015 +0200

    visual studio version 4 is long gone
    
    Change-Id: Icf0b4153d07d9c412889d6a7364d4282bba33032

diff --git a/include/cppuhelper/proptypehlp.hxx b/include/cppuhelper/proptypehlp.hxx
index 199a055..4079e88 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;