diff options
-rw-r--r-- | include/ucbhelper/macros.hxx | 4 | ||||
-rw-r--r-- | ucbhelper/source/provider/propertyvalueset.cxx | 4 | ||||
-rw-r--r-- | ucbhelper/source/provider/resultset.cxx | 2 | ||||
-rw-r--r-- | ucbhelper/source/provider/resultsetmetadata.cxx | 6 |
4 files changed, 8 insertions, 8 deletions
diff --git a/include/ucbhelper/macros.hxx b/include/ucbhelper/macros.hxx index f97d2e3f0051..8bdd20df0a15 100644 --- a/include/ucbhelper/macros.hxx +++ b/include/ucbhelper/macros.hxx @@ -32,8 +32,8 @@ -#define CPPU_TYPE( T ) getCppuType( static_cast< T * >( 0 ) ) -#define CPPU_TYPE_REF( T ) CPPU_TYPE( com::sun::star::uno::Reference< T > ) +#define CPPU_TYPE( T ) cppu::UnoType<T>::get() +#define CPPU_TYPE_REF( T ) CPPU_TYPE( T ) // XTypeProvider impl. internals diff --git a/ucbhelper/source/provider/propertyvalueset.cxx b/ucbhelper/source/provider/propertyvalueset.cxx index d962af6052d3..1732e7085564 100644 --- a/ucbhelper/source/provider/propertyvalueset.cxx +++ b/ucbhelper/source/provider/propertyvalueset.cxx @@ -226,7 +226,7 @@ class PropertyValues : public PropertyValuesVector {}; GETVALUE_IMPL_TYPE( _type_, \ _type_name_, \ _member_name_, \ - getCppuType( static_cast< const _type_ * >( 0 ) ) ) + cppu::UnoType<_type_>::get() ) #define SETVALUE_IMPL( _prop_name_, _type_name_, _member_name_, _value_ ) \ \ @@ -333,7 +333,7 @@ sal_Bool SAL_CALL PropertyValueSet::getBoolean( sal_Int32 columnIndex ) throw( SQLException, RuntimeException, std::exception ) { GETVALUE_IMPL_TYPE( - bool, BOOLEAN_VALUE_SET, bBoolean, getCppuBooleanType() ); + bool, BOOLEAN_VALUE_SET, bBoolean, cppu::UnoType<bool>::get() ); } diff --git a/ucbhelper/source/provider/resultset.cxx b/ucbhelper/source/provider/resultset.cxx index 3a94891b26ff..231585c92793 100644 --- a/ucbhelper/source/provider/resultset.cxx +++ b/ucbhelper/source/provider/resultset.cxx @@ -51,7 +51,7 @@ static const uno::Type& sal_Int32_getCppuType() static const uno::Type& sal_Bool_getCppuType() { - return getCppuBooleanType(); + return cppu::UnoType<bool>::get(); } static const PropertyInfo aPropertyTable[] = diff --git a/ucbhelper/source/provider/resultsetmetadata.cxx b/ucbhelper/source/provider/resultsetmetadata.cxx index 0b389eb4d4ac..30a142203207 100644 --- a/ucbhelper/source/provider/resultsetmetadata.cxx +++ b/ucbhelper/source/provider/resultsetmetadata.cxx @@ -405,7 +405,7 @@ sal_Int32 SAL_CALL ResultSetMetaData::getColumnType( sal_Int32 column ) return DataType::SQLNULL; if ( m_aProps.getConstArray()[ column - 1 ].Type - == getCppuVoidType() ) + == cppu::UnoType<cppu::UnoVoidType>::get() ) { // No type given. Try UCB's Properties Manager... @@ -458,7 +458,7 @@ sal_Int32 SAL_CALL ResultSetMetaData::getColumnType( sal_Int32 column ) if ( rType == cppu::UnoType<OUString>::get() ) nType = DataType::VARCHAR; // XRow::getString - else if ( rType == getCppuBooleanType() ) + else if ( rType == cppu::UnoType<bool>::get() ) nType = DataType::BIT; // XRow::getBoolean else if ( rType == cppu::UnoType<sal_Int32>::get() ) nType = DataType::INTEGER; // XRow::getInt @@ -472,7 +472,7 @@ sal_Int32 SAL_CALL ResultSetMetaData::getColumnType( sal_Int32 column ) nType = DataType::REAL; // XRow::getFloat else if ( rType == cppu::UnoType<double>::get() ) nType = DataType::DOUBLE; // XRow::getDouble - else if ( rType == getCppuType( static_cast< const Sequence< sal_Int8 > * >( 0 ) ) ) + else if ( rType == cppu::UnoType<Sequence<sal_Int8>>::get() ) nType = DataType::VARBINARY;// XRow::getBytes else if ( rType == cppu::UnoType<Date>::get() ) nType = DataType::DATE; // XRow::getDate |