Some clean-up

Change-Id: I6a46af4e6ba42f1c104662e7a035b7ecfc404752
Reviewed-on: https://gerrit.libreoffice.org/30111
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>

1 files changed, 181 insertions, 406 deletions

diff --git a/include/cppuhelper/proptypehlp.hxx b/include/cppuhelper/proptypehlp.hxx
index 9f3dcf41caf5..a9c55df8bd9c 100644
--- a/include/cppuhelper/proptypehlp.hxx
+++ b/include/cppuhelper/proptypehlp.hxx
@@ -16,6 +16,7 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
+
 #ifndef INCLUDED_CPPUHELPER_PROPTYPEHLP_HXX
 #define INCLUDED_CPPUHELPER_PROPTYPEHLP_HXX
 
@@ -26,13 +27,6 @@
 namespace cppu
 {
 
-/** Converts the value stored in an any to a concrete C++ type.
-    The function does the same as the operator >>= () at the
-    Any class, except that it throws an IllegalArgumentException in case of
-    failures (the value cannot be extracted without data loss )
-
-   @exception css::lang::IllegalArgumentException when the type could not be converted.
- */
 template < class target >
 inline void SAL_CALL convertPropertyValue( target &value , const  css::uno::Any & a)
 {
@@ -42,48 +36,38 @@ inline void SAL_CALL convertPropertyValue( target &value , const  css::uno::Any
     }
 }
 
-
-/**
-  conversion of basic types
-*/
 inline void SAL_CALL convertPropertyValue( sal_Bool & b   , const css::uno::Any & a )
 {
-    const enum css::uno::TypeClass tc = a.getValueType().getTypeClass();
-
-    if( css::uno::TypeClass_LONG == tc ) {
-        sal_Int32 i32 = 0;
-        a >>= i32;
-        b = i32 != 0;
-    }
-    else if ( css::uno::TypeClass_CHAR  == tc ) {
-        sal_Unicode c = *static_cast<sal_Unicode const *>(a.getValue());
-        b = c != 0;
-    }
-    else if ( css::uno::TypeClass_SHORT == tc ) {
-        sal_Int16 i16 = 0;
-        a >>= i16;
-        b = i16 != 0;
-    }
-    else if ( css::uno::TypeClass_BOOLEAN == tc ) {
-        a >>= b;
-    }
-    else if ( css::uno::TypeClass_BYTE == tc ) {
-        sal_Int8 i8 = 0;
-        a >>= i8;
-        b = i8 != 0;
-    }
-    else if ( css::uno::TypeClass_UNSIGNED_SHORT == tc ) {
-        sal_uInt16 i16 = 0;
-        a >>= i16;
-        b = i16 != 0;
-    }
-    else if ( css::uno::TypeClass_UNSIGNED_LONG == tc ) {
-        sal_uInt32 i32 = 0;
-        a >>= i32;
-        b = i32 != 0;
-    }
-    else {
-        throw css::lang::IllegalArgumentException();
+    if( !(a >>= b) ) {
+        switch( a.getValueType().getTypeClass() ) {
+        case css::uno::TypeClass_BYTE:
+            b = a.get<sal_Int8>() != 0;
+            break;
+        case css::uno::TypeClass_SHORT:
+            b = a.get<sal_Int16>() != 0;
+            break;
+        case css::uno::TypeClass_UNSIGNED_SHORT:
+            {
+                sal_uInt16 i16 = 0;
+                a >>= i16;
+                b = i16 != 0;
+                break;
+            }
+        case css::uno::TypeClass_LONG:
+            b = a.get<sal_Int32>() != 0;
+            break;
+        case css::uno::TypeClass_UNSIGNED_LONG:
+            b = a.get<sal_uInt32>() != 0;
+            break;
+        case css::uno::TypeClass_CHAR:
+            {
+                sal_Unicode c = *static_cast<sal_Unicode const *>(a.getValue());
+                b = c != 0;
+                break;
+            }
+        default:
+            throw css::lang::IllegalArgumentException();
+        }
     }
 }
 
@@ -95,410 +79,202 @@ void convertPropertyValue(bool & target, css::uno::Any const & source) {
 
 inline void SAL_CALL convertPropertyValue( sal_Int64 & i  , const css::uno::Any & a )
 {
-    const enum css::uno::TypeClass tc = a.getValueType().getTypeClass();
-
-    if( css::uno::TypeClass_HYPER == tc ) {
-        a >>= i;
-    }
-    else if( css::uno::TypeClass_UNSIGNED_HYPER == tc ) {
-        sal_uInt64 i64 = 0;
-        a >>= i64;
-        i = ( sal_Int64 ) i64;
-    }
-    else if( css::uno::TypeClass_LONG == tc ) {
-        sal_Int32 i32 = 0;
-        a >>= i32;
-        i = ( sal_Int64 )i32;
-    }
-    else if ( css::uno::TypeClass_CHAR  == tc ) {
-        sal_Unicode c;
-        c = *static_cast<sal_Unicode const *>(a.getValue());
-        i = ( sal_Int64 ) c;
-    }
-    else if ( css::uno::TypeClass_SHORT == tc ) {
-        sal_Int16 i16 = 0;
-        a >>= i16;
-        i = ( sal_Int64 ) i16;
-    }
-    else if ( css::uno::TypeClass_BOOLEAN == tc ) {
-        bool b;
-        a >>= b;
-        i = ( sal_Int64 ) b;
-    }
-    else if ( css::uno::TypeClass_BYTE == tc ) {
-        sal_Int8 i8 = 0;
-        a >>= i8;
-        i = ( sal_Int64 ) i8;
-    }
-    else if ( css::uno::TypeClass_UNSIGNED_SHORT == tc ) {
-        sal_uInt16 i16 = 0;
-        a >>= i16;
-        i = ( sal_Int64 ) i16;
-    }
-    else if ( css::uno::TypeClass_UNSIGNED_LONG == tc ) {
-        sal_uInt32 i32 = 0;
-        a >>= i32;
-        i = ( sal_Int64 ) i32;
-    }
-    else {
-        throw css::lang::IllegalArgumentException();
+    if( !(a >>= i) ) {
+        switch( a.getValueType().getTypeClass() ) {
+        case css::uno::TypeClass_BOOLEAN:
+            i = static_cast<sal_Int64>(a.get<bool>());
+            break;
+        case css::uno::TypeClass_CHAR:
+            {
+                sal_Unicode c;
+                c = *static_cast<sal_Unicode const *>(a.getValue());
+                i = ( sal_Int64 ) c;
+                break;
+            }
+        default:
+            throw css::lang::IllegalArgumentException();
+        }
     }
 }
 
 
 inline void SAL_CALL convertPropertyValue( sal_uInt64 & i  , const css::uno::Any & a )
 {
-    const enum css::uno::TypeClass tc = a.getValueType().getTypeClass();
-
-    if( css::uno::TypeClass_UNSIGNED_HYPER == tc ) {
-        a >>= i;
-    }
-    if( css::uno::TypeClass_HYPER == tc ) {
-        sal_Int64 i64;
-        a >>= i64;
-        i = ( sal_uInt64 ) i64;
-    }
-    else if( css::uno::TypeClass_LONG == tc ) {
-        sal_Int32 i32;
-        a >>= i32;
-        i = ( sal_uInt64 )i32;
-    }
-    else if ( css::uno::TypeClass_CHAR  == tc ) {
-        sal_Unicode c;
-        c = *static_cast<sal_Unicode const *>(a.getValue());
-        i = ( sal_uInt64 ) c;
-    }
-    else if ( css::uno::TypeClass_SHORT == tc ) {
-        sal_Int16 i16;
-        a >>= i16;
-        i = ( sal_uInt64 ) i16;
-    }
-    else if ( css::uno::TypeClass_BOOLEAN == tc ) {
-        bool b;
-        a >>= b;
-        i = ( sal_uInt64 ) b;
-    }
-    else if ( css::uno::TypeClass_BYTE == tc ) {
-        sal_Int8 i8;
-        a >>= i8;
-        i = ( sal_uInt64 ) i8;
-    }
-    else if ( css::uno::TypeClass_UNSIGNED_SHORT == tc ) {
-        sal_uInt16 i16;
-        a >>= i16;
-        i = ( sal_uInt64    ) i16;
-    }
-    else if ( css::uno::TypeClass_UNSIGNED_LONG == tc ) {
-        sal_uInt32 i32;
-        a >>= i32;
-        i = ( sal_uInt64 ) i32;
-    }
-    else {
-        throw css::lang::IllegalArgumentException();
+    if( !(a >>= i) ) {
+        switch( a.getValueType().getTypeClass() ) {
+        case css::uno::TypeClass_BOOLEAN:
+            i = static_cast<sal_uInt64>(a.get<bool>());
+            break;
+        case css::uno::TypeClass_CHAR:
+            {
+                sal_Unicode c;
+                c = *static_cast<sal_Unicode const *>(a.getValue());
+                i = ( sal_uInt64 ) c;
+                break;
+            }
+        default:
+            throw css::lang::IllegalArgumentException();
+        }
     }
 }
 
-// the basic types
-// sal_Int32
 inline void SAL_CALL convertPropertyValue( sal_Int32 & i  , const css::uno::Any & a )
 {
-    const enum css::uno::TypeClass tc = a.getValueType().getTypeClass();
-
-    if( css::uno::TypeClass_LONG == tc ) {
-        a >>= i;
-    }
-    else if ( css::uno::TypeClass_CHAR  == tc ) {
-        sal_Unicode c;
-        c = *static_cast<sal_Unicode const *>(a.getValue());
-        i = ( sal_Int32 ) c;
-    }
-    else if ( css::uno::TypeClass_SHORT == tc ) {
-        sal_Int16 i16 = 0;
-        a >>= i16;
-        i = ( sal_Int32 ) i16;
-    }
-    else if ( css::uno::TypeClass_BOOLEAN == tc ) {
-        bool b;
-        a >>= b;
-        i = ( sal_Int32 ) b;
-    }
-    else if ( css::uno::TypeClass_BYTE == tc ) {
-        sal_Int8 i8 = 0;
-        a >>= i8;
-        i = ( sal_Int32 ) i8;
-    }
-    else if ( css::uno::TypeClass_UNSIGNED_SHORT == tc ) {
-        sal_uInt16 i16 = 0;
-        a >>= i16;
-        i = ( sal_Int32 ) i16;
-    }
-    else if ( css::uno::TypeClass_UNSIGNED_LONG == tc ) {
-        sal_uInt32 i32 = 0;
-        a >>= i32;
-        i = ( sal_Int32 ) i32;
-    }
-    else {
-        throw css::lang::IllegalArgumentException();
+    if( !(a >>= i) ) {
+        switch( a.getValueType().getTypeClass() ) {
+        case css::uno::TypeClass_BOOLEAN:
+            i = static_cast<sal_Int32>(a.get<bool>());
+            break;
+        case css::uno::TypeClass_CHAR:
+            {
+                sal_Unicode c;
+                c = *static_cast<sal_Unicode const *>(a.getValue());
+                i = ( sal_Int32 ) c;
+                break;
+            }
+        default:
+            throw css::lang::IllegalArgumentException();
+        }
     }
 }
 
 inline void SAL_CALL convertPropertyValue( sal_uInt32 & i  , const css::uno::Any & a )
 {
-    const enum css::uno::TypeClass tc = a.getValueType().getTypeClass();
-
-    if ( css::uno::TypeClass_UNSIGNED_LONG == tc ) {
-        a >>= i;
-    }
-    else if( css::uno::TypeClass_LONG == tc ) {
-        sal_Int32 i32;
-        a >>= i32;
-        i = (sal_uInt32 ) i32;
-    }
-    else if ( css::uno::TypeClass_CHAR  == tc ) {
-        sal_Unicode c;
-        c = *static_cast<sal_Unicode const *>(a.getValue());
-        i = ( sal_uInt32 ) c;
-    }
-    else if ( css::uno::TypeClass_SHORT == tc ) {
-        sal_Int16 i16;
-        a >>= i16;
-        i = ( sal_uInt32 ) i16;
-    }
-    else if ( css::uno::TypeClass_BOOLEAN == tc ) {
-        bool b;
-        a >>= b;
-        i = ( sal_uInt32 ) b;
-    }
-    else if ( css::uno::TypeClass_BYTE == tc ) {
-        sal_Int8 i8;
-        a >>= i8;
-        i = ( sal_uInt32 ) i8;
-    }
-    else if ( css::uno::TypeClass_UNSIGNED_SHORT == tc ) {
-        sal_uInt16 i16;
-        a >>= i16;
-        i = ( sal_uInt32    ) i16;
-    }
-    else {
-        throw css::lang::IllegalArgumentException();
+    if( !(a >>= i) ) {
+        switch( a.getValueType().getTypeClass() ) {
+        case css::uno::TypeClass_BOOLEAN:
+            i = static_cast<sal_uInt32>(a.get<bool>());
+            break;
+        case css::uno::TypeClass_CHAR:
+            {
+                sal_Unicode c;
+                c = *static_cast<sal_Unicode const *>(a.getValue());
+                i = ( sal_uInt32 ) c;
+                break;
+            }
+        default:
+            throw css::lang::IllegalArgumentException();
+        }
     }
 }
 
-
 inline void SAL_CALL convertPropertyValue( sal_Int16 & i  , const css::uno::Any & a )
 {
-    const enum css::uno::TypeClass tc = a.getValueType().getTypeClass();
-
-    if ( css::uno::TypeClass_SHORT == tc ) {
-        a >>= i;
-    }
-    else if ( css::uno::TypeClass_CHAR  == tc ) {
-        sal_Unicode c;
-        c = *static_cast<sal_Unicode const *>(a.getValue());
-        i = ( sal_Int16 ) c;
-    }
-    else if ( css::uno::TypeClass_BOOLEAN == tc ) {
-        bool b;
-        a >>= b;
-        i = ( sal_Int16 ) b;
-    }
-    else if ( css::uno::TypeClass_BYTE == tc ) {
-        sal_Int8 i8 = 0;
-        a >>= i8;
-        i = ( sal_Int16 ) i8;
-    }
-    else if ( css::uno::TypeClass_UNSIGNED_SHORT == tc ) {
-        sal_uInt16 i16 = 0;
-        a >>= i16;
-        i = ( sal_Int16 ) i16;
-    }
-    else {
-        throw css::lang::IllegalArgumentException();
+    if( !(a >>= i) ) {
+        switch( a.getValueType().getTypeClass() ) {
+        case css::uno::TypeClass_BOOLEAN:
+            i = static_cast<sal_Int16>(a.get<bool>());
+            break;
+        case css::uno::TypeClass_CHAR:
+            {
+                sal_Unicode c;
+                c = *static_cast<sal_Unicode const *>(a.getValue());
+                i = ( sal_Int16 ) c;
+                break;
+            }
+        default:
+            throw css::lang::IllegalArgumentException();
+        }
     }
 }
 
 inline void SAL_CALL convertPropertyValue( sal_uInt16 & i  , const css::uno::Any & a )
 {
-    const enum css::uno::TypeClass tc = a.getValueType().getTypeClass();
-
-    if ( css::uno::TypeClass_UNSIGNED_SHORT == tc ) {
-        a >>= i;
-    }
-    else if ( css::uno::TypeClass_CHAR  == tc ) {
-        sal_Unicode c;
-        c = *static_cast<sal_Unicode const *>(a.getValue());
-        i = ( sal_Int16 ) c;
-    }
-    else if ( css::uno::TypeClass_BOOLEAN == tc ) {
-        bool b;
-        a >>= b;
-        i = ( sal_Int16 ) b;
-    }
-    else if ( css::uno::TypeClass_BYTE == tc ) {
-        sal_Int8 i8 = 0;
-        a >>= i8;
-        i = ( sal_Int16 ) i8;
-    }
-    else if ( css::uno::TypeClass_SHORT == tc ) {
-        sal_Int16 i16 = 0;
-        a >>= i16;
-        i = ( sal_Int16 ) i16;
-    }
-    else {
-        throw css::lang::IllegalArgumentException();
+    if( !(a >>= i) ) {
+        switch( a.getValueType().getTypeClass() ) {
+        case css::uno::TypeClass_BOOLEAN:
+            i = static_cast<sal_uInt16>(a.get<bool>());
+            break;
+        case css::uno::TypeClass_CHAR:
+            {
+                sal_Unicode c;
+                c = *static_cast<sal_Unicode const *>(a.getValue());
+                i = ( sal_Int16 ) c;
+                break;
+            }
+        default:
+            throw css::lang::IllegalArgumentException();
+        }
     }
 }
 
 inline void SAL_CALL convertPropertyValue( sal_Int8 & i  , const css::uno::Any & a )
 {
-    const enum css::uno::TypeClass tc = a.getValueType().getTypeClass();
-
-    if ( css::uno::TypeClass_BYTE == tc ) {
-        a >>= i;
-    }
-    else if ( css::uno::TypeClass_BOOLEAN == tc ) {
-        bool b;
-        a >>= b;
-        i = ( sal_Int8 ) b;
-    }
-    else {
-        throw css::lang::IllegalArgumentException();
+    if( !(a >>= i) ) {
+        switch( a.getValueType().getTypeClass() ) {
+        case css::uno::TypeClass_BOOLEAN:
+            i = static_cast<sal_Int8>(a.get<bool>());
+            break;
+        default:
+            throw css::lang::IllegalArgumentException();
+        }
     }
 }
 
 inline void SAL_CALL convertPropertyValue( float &f , const css::uno::Any &a )
 {
-    const enum css::uno::TypeClass tc = a.getValueType().getTypeClass();
-
-    if ( css::uno::TypeClass_FLOAT == tc ) {
-        a >>= f;
-    }
-    else if( css::uno::TypeClass_DOUBLE == tc ) {
-         double d = 0;
-         a >>= d;
-         f = ( float ) d;
-    }
-    else if( css::uno::TypeClass_HYPER == tc ) {
-        sal_Int64 i64 = 0;
-        a >>= i64;
-        f = ( float ) 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 ) {
-        sal_Int32 i32 = 0;
-        a >>= i32;
-        f = ( float )i32;
-    }
-    else if ( css::uno::TypeClass_CHAR  == tc ) {
-        sal_Unicode c;
-        c = *static_cast<sal_Unicode const *>(a.getValue());
-        f = ( float ) c;
-    }
-    else if ( css::uno::TypeClass_SHORT == tc ) {
-        sal_Int16 i16 = 0;
-        a >>= i16;
-        f = ( float ) i16;
-    }
-    else if ( css::uno::TypeClass_BOOLEAN == tc ) {
-        bool b;
-        a >>= b;
-        f = ( float ) b;
-    }
-    else if ( css::uno::TypeClass_BYTE == tc ) {
-        sal_Int8 i8 = 0;
-        a >>= i8;
-        f = ( float ) i8;
-    }
-    else if ( css::uno::TypeClass_UNSIGNED_SHORT == tc ) {
-        sal_uInt16 i16 = 0;
-        a >>= i16;
-        f = ( float ) i16;
-    }
-    else if ( css::uno::TypeClass_UNSIGNED_LONG == tc ) {
-        sal_uInt32 i32 = 0;
-        a >>= i32;
-        f = ( float ) i32;
-    }
-    else {
-        throw css::lang::IllegalArgumentException();
+    if( !(a >>= f) ) {
+        switch( a.getValueType().getTypeClass() ) {
+        case css::uno::TypeClass_BOOLEAN:
+            f = static_cast<float>(a.get<bool>());
+            break;
+        case css::uno::TypeClass_LONG:
+            f = static_cast<float>(a.get<sal_Int32>());
+            break;
+        case css::uno::TypeClass_UNSIGNED_LONG:
+            f = static_cast<float>(a.get<sal_uInt32>());
+            break;
+        case css::uno::TypeClass_HYPER:
+            f = static_cast<float>(a.get<sal_Int64>());
+            break;
+        case css::uno::TypeClass_UNSIGNED_HYPER:
+            f = static_cast<float>(a.get<sal_uInt64>());
+            break;
+        case css::uno::TypeClass_DOUBLE:
+            f = static_cast<float>(a.get<double>());
+            break;
+        case css::uno::TypeClass_CHAR:
+            {
+                sal_Unicode c;
+                c = *static_cast<sal_Unicode const *>(a.getValue());
+                f = ( float ) c;
+                break;
+            }
+        default:
+            throw css::lang::IllegalArgumentException();
+        }
     }
 }
 
-
 inline void SAL_CALL convertPropertyValue( double &d , const css::uno::Any &a )
 {
-    const enum css::uno::TypeClass tc = a.getValueType().getTypeClass();
-
-    if( css::uno::TypeClass_DOUBLE == tc ) {
-         float f;
-         a >>= f;
-         d = ( double ) f;
-    }
-    else if ( css::uno::TypeClass_FLOAT == tc ) {
-        float f;
-        a >>= f;
-        d = (double) f;
-    }
-    else if( css::uno::TypeClass_HYPER == tc ) {
-        sal_Int64 i64;
-        a >>= i64;
-        d = (double) 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 ) {
-        sal_Int32 i32;
-        a >>= i32;
-        d = (double)i32;
-    }
-    else if ( css::uno::TypeClass_CHAR  == tc ) {
-        sal_Unicode c;
-        c = *static_cast<sal_Unicode const *>(a.getValue());
-        d = (double) c;
-    }
-    else if ( css::uno::TypeClass_SHORT == tc ) {
-        sal_Int16 i16;
-        a >>= i16;
-        d = (double) i16;
-    }
-    else if ( css::uno::TypeClass_BOOLEAN == tc ) {
-        bool b;
-        a >>= b;
-        d = (double) b;
-    }
-    else if ( css::uno::TypeClass_BYTE == tc ) {
-        sal_Int8 i8;
-        a >>= i8;
-        d = (double) i8;
-    }
-    else if ( css::uno::TypeClass_UNSIGNED_SHORT == tc ) {
-        sal_uInt16 i16;
-        a >>= i16;
-        d = (double) i16;
-    }
-    else if ( css::uno::TypeClass_UNSIGNED_LONG == tc ) {
-        sal_uInt32 i32;
-        a >>= i32;
-        d = (double) i32;
-    }
-    else {
-        throw css::lang::IllegalArgumentException();
+    if( !(a >>= d) ) {
+        switch( a.getValueType().getTypeClass() ) {
+        case css::uno::TypeClass_BOOLEAN:
+            d = static_cast<double>(a.get<bool>());
+            break;
+        case css::uno::TypeClass_HYPER:
+            d = static_cast<double>(a.get<sal_Int64>());
+            break;
+        case css::uno::TypeClass_UNSIGNED_HYPER:
+            d = static_cast<double>(a.get<sal_uInt64>());
+            break;
+        case css::uno::TypeClass_CHAR:
+            {
+                sal_Unicode c;
+                c = *static_cast<sal_Unicode const *>(a.getValue());
+                d = (double) c;
+                break;
+            }
+        default:
+            throw css::lang::IllegalArgumentException();
+        }
     }
 }
 
 inline void SAL_CALL convertPropertyValue( ::rtl::OUString &ow , const css::uno::Any &a )
 {
-    if( css::uno::TypeClass_STRING == a.getValueType().getTypeClass() ) {
-        a >>= ow;
-    }
-    else {
+    if( !(a >>= ow) ) {
         throw css::lang::IllegalArgumentException();
     }
 }
@@ -507,5 +283,4 @@ inline void SAL_CALL convertPropertyValue( ::rtl::OUString &ow , const css::uno:
 
 #endif
 
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */