diff options
Diffstat (limited to 'ucbhelper')
-rw-r--r-- | ucbhelper/source/provider/contentidentifier.cxx | 6 | ||||
-rw-r--r-- | ucbhelper/source/provider/resultsetmetadata.cxx | 10 |
2 files changed, 7 insertions, 9 deletions
diff --git a/ucbhelper/source/provider/contentidentifier.cxx b/ucbhelper/source/provider/contentidentifier.cxx index 6d389af0d195..f040b3b166ec 100644 --- a/ucbhelper/source/provider/contentidentifier.cxx +++ b/ucbhelper/source/provider/contentidentifier.cxx @@ -152,10 +152,8 @@ ContentIdentifier::getTypes() if ( !pCollection ) { static cppu::OTypeCollection collection( - getCppuType( static_cast< - Reference < XTypeProvider > * >( 0 ) ), - getCppuType( static_cast< - Reference< XContentIdentifier > * >( 0 ) ) ); + cppu::UnoType<XTypeProvider>::get(), + cppu::UnoType<XContentIdentifier>::get() ); pCollection = &collection; } } diff --git a/ucbhelper/source/provider/resultsetmetadata.cxx b/ucbhelper/source/provider/resultsetmetadata.cxx index b894f74c5c63..0b389eb4d4ac 100644 --- a/ucbhelper/source/provider/resultsetmetadata.cxx +++ b/ucbhelper/source/provider/resultsetmetadata.cxx @@ -480,16 +480,16 @@ sal_Int32 SAL_CALL ResultSetMetaData::getColumnType( sal_Int32 column ) nType = DataType::TIME; // XRow::getTime else if ( rType == cppu::UnoType<DateTime>::get() ) nType = DataType::TIMESTAMP;// XRow::getTimestamp - else if ( rType == getCppuType( static_cast< Reference< XInputStream > * >( 0 ) ) ) + else if ( rType == cppu::UnoType<XInputStream>::get() ) nType = DataType::LONGVARBINARY; // XRow::getBinaryStream // nType = DataType::LONGVARCHAR; // XRow::getCharacterStream - else if ( rType == getCppuType( static_cast< Reference< XClob > * >( 0 ) ) ) + else if ( rType == cppu::UnoType<XClob>::get() ) nType = DataType::CLOB; // XRow::getClob - else if ( rType == getCppuType( static_cast< Reference< XBlob > * >( 0 ) ) ) + else if ( rType == cppu::UnoType<XBlob>::get() ) nType = DataType::BLOB; // XRow::getBlob - else if ( rType == getCppuType( static_cast< Reference< XArray > * >( 0 ) ) ) + else if ( rType == cppu::UnoType<XArray>::get() ) nType = DataType::ARRAY;// XRow::getArray - else if ( rType == getCppuType( static_cast< Reference< XRef > * >( 0 ) ) ) + else if ( rType == cppu::UnoType<XRef>::get() ) nType = DataType::REF;// XRow::getRef else nType = DataType::OBJECT;// XRow::getObject |