INTEGRATION: CWS jsc3 (1.3.222); FILE MERGED

2006/02/28 09:18:21 jsc 1.3.222.1: #i60691# replace getCppuType with UnoType

odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSet.cxx

@@ -2,9 +2,9 @@
  *
  *  $RCSfile: SResultSet.cxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: hr $ $Date: 2003-06-30 15:20:35 $
+ *  last change: $Author: vg $ $Date: 2006-03-15 09:25:36 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  the BSD license.
@@ -133,9 +133,10 @@ Any SAL_CALL OResultSet::queryInterface( const Type & rType ) throw(RuntimeExcep
 // -------------------------------------------------------------------------
  Sequence<  Type > SAL_CALL OResultSet::getTypes(  ) throw( RuntimeException)
 {
-    OTypeCollection aTypes( ::getCppuType( (const  Reference< ::com::sun::star::beans::XMultiPropertySet > *)0 ),
-                                                ::getCppuType( (const  Reference< ::com::sun::star::beans::XFastPropertySet > *)0 ),
-                                                ::getCppuType( (const  Reference< ::com::sun::star::beans::XPropertySet > *)0 ));
+    OTypeCollection aTypes(
+        ::cppu::UnoType< Reference< ::com::sun::star::beans::XMultiPropertySet > >::get(),
+        ::cppu::UnoType< Reference< ::com::sun::star::beans::XFastPropertySet > >::get(),
+        ::cppu::UnoType< Reference< ::com::sun::star::beans::XPropertySet > >::get());
 
     return concatSequences(aTypes.getTypes(),OResultSet_BASE::getTypes());
 }

odk/examples/DevelopersGuide/Database/DriverSkeleton/SStatement.cxx

@@ -2,9 +2,9 @@
  *
  *  $RCSfile: SStatement.cxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: hr $ $Date: 2003-06-30 15:21:31 $
+ *  last change: $Author: vg $ $Date: 2006-03-15 09:25:55 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  the BSD license.
@@ -131,9 +131,10 @@ Any SAL_CALL OStatement_Base::queryInterface( const Type & rType ) throw(Runtime
 // -------------------------------------------------------------------------
 Sequence< Type > SAL_CALL OStatement_Base::getTypes(  ) throw(RuntimeException)
 {
-    ::cppu::OTypeCollection aTypes( ::getCppuType( (const Reference< XMultiPropertySet > *)0 ),
-                                    ::getCppuType( (const Reference< XFastPropertySet > *)0 ),
-                                    ::getCppuType( (const Reference< XPropertySet > *)0 ));
+    ::cppu::OTypeCollection aTypes(
+        ::cppu::UnoType< Reference< XMultiPropertySet > >::get(),
+        ::cppu::UnoType< Reference< XFastPropertySet > >::get(),
+        ::cppu::UnoType< Reference< XPropertySet > >::get());
 
     return concatSequences(aTypes.getTypes(),OStatement_BASE::getTypes());
 }

odk/examples/DevelopersGuide/Database/DriverSkeleton/propertyids.hxx

@@ -2,9 +2,9 @@
  *
  *  $RCSfile: propertyids.hxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: hr $ $Date: 2003-06-30 15:22:04 $
+ *  last change: $Author: vg $ $Date: 2006-03-15 09:26:12 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  the BSD license.
@@ -94,7 +94,7 @@ namespace skeleton
 
 //------------------------------------------------------------------------------
 #define DECL_PROP1IMPL(varname, type) \
-pProperties[nPos++] = ::com::sun::star::beans::Property(OPropertyMap::getPropMap().getNameByIndex(PROPERTY_ID_##varname), PROPERTY_ID_##varname, ::getCppuType(reinterpret_cast< type*>(NULL)),
+pProperties[nPos++] = ::com::sun::star::beans::Property(OPropertyMap::getPropMap().getNameByIndex(PROPERTY_ID_##varname), PROPERTY_ID_##varname, ::cppu::UnoType< type >::get(),
 //------------------------------------------------------------------------------
 #define DECL_PROP0(varname, type)   \
     DECL_PROP1IMPL(varname, type) 0)