INTEGRATION: CWS mingwport03 (1.10.168); FILE MERGED

2006/10/25 12:11:37 vg 1.10.168.2: #i53572# MinGW port
2006/09/07 10:22:10 vg 1.10.168.1: #i53572# MinGW port

connectivity/source/inc/ado/ATable.hxx

@@ -4,9 +4,9 @@
  *
  *  $RCSfile: ATable.hxx,v $
  *
- *  $Revision: 1.10 $
+ *  $Revision: 1.11 $
  *
- *  last change: $Author: rt $ $Date: 2005-09-08 06:54:00 $
+ *  last change: $Author: vg $ $Date: 2007-03-26 14:01:39 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -51,6 +51,7 @@ namespace connectivity
     namespace ado
     {
         typedef connectivity::sdbcx::OTable OTable_TYPEDEF;
+        typedef connectivity::sdbcx::OTableDescriptor_BASE OTableDescriptor_BASE_TYPEDEF;
 
         class OAdoTable :   public OTable_TYPEDEF
         {
@@ -74,7 +75,7 @@ namespace connectivity
             OAdoTable(sdbcx::OCollection* _pTables,sal_Bool _bCase,OCatalog* _pCatalog);
 
 
-            ::rtl::OUString SAL_CALL getName() { return m_Name; }
+            virtual ::rtl::OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException);
             ::rtl::OUString getSchema() const { return m_SchemaName; }
             virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData> getMetaData() const;
             // com::sun::star::lang::XUnoTunnel

connectivity/source/inc/ado/Aolewrap.hxx

@@ -4,9 +4,9 @@
  *
  *  $RCSfile: Aolewrap.hxx,v $
  *
- *  $Revision: 1.10 $
+ *  $Revision: 1.11 $
  *
- *  last change: $Author: rt $ $Date: 2005-09-08 06:55:54 $
+ *  last change: $Author: vg $ $Date: 2007-03-26 14:02:26 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -157,6 +157,7 @@ namespace connectivity
         template<class Ts, class T, class WrapT> class WpOLECollection : public WpOLEBase<Ts>
         {
         public:
+            using WpOLEBase<Ts>::pInterface;
             // Konstruktoren, operator=
             // diese rufen nur die Oberklasse
             WpOLECollection(Ts* pInt=NULL):WpOLEBase<Ts>(pInt){}
@@ -211,7 +212,7 @@ namespace connectivity
             }
             inline void fillElementNames(TStringVector& _rVector)
             {
-                if(IsValid())
+                if(WpOLEBase<Ts>::IsValid())
                 {
                     Refresh();
                     sal_Int32 nCount = GetItemCount();
@@ -233,6 +234,7 @@ namespace connectivity
         public:
             // Konstruktoren, operator=
             // diese rufen nur die Oberklasse
+            using WpOLEBase<Ts>::pInterface;
             WpOLEAppendCollection(Ts* pInt=NULL):WpOLECollection<Ts,T,WrapT>(pInt){}
             WpOLEAppendCollection(const WpOLEAppendCollection& rhs){ operator=(rhs); }
             inline WpOLEAppendCollection& operator=(const WpOLEAppendCollection& rhs)