Compiler error fixed. Linux platform

2 files changed, 13 insertions, 8 deletions

diff --git a/connectivity/source/drivers/dbase/DTable.cxx b/connectivity/source/drivers/dbase/DTable.cxx
index 635676075ef8..82429b36ad47 100644
--- a/connectivity/source/drivers/dbase/DTable.cxx
+++ b/connectivity/source/drivers/dbase/DTable.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: DTable.cxx,v $
  *
- *  $Revision: 1.35 $
+ *  $Revision: 1.36 $
  *
- *  last change: $Author: oj $ $Date: 2001-03-28 11:31:44 $
+ *  last change: $Author: avy $ $Date: 2001-03-30 10:16:15 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -304,6 +304,7 @@ ODbaseTable::ODbaseTable(ODbaseConnection* _pConnection)
         :ODbaseTable_BASE(_pConnection)
         ,m_pMemoStream(NULL)
         ,m_bWriteableMemo(sal_False)
+        ,rBHelper(cppu::OPropertySetHelper::rBHelper)
 {
     // initialize the header
     m_aHeader.db_typ    = dBaseIII;
@@ -325,6 +326,7 @@ ODbaseTable::ODbaseTable(ODbaseConnection* _pConnection,
                                   _CatalogName)
                 ,m_pMemoStream(NULL)
                 ,m_bWriteableMemo(sal_False)
+                ,rBHelper(cppu::OPropertySetHelper::rBHelper)
 {
 }
 // -----------------------------------------------------------------------------
@@ -1912,7 +1914,7 @@ BOOL ODbaseTable::WriteBuffer()
 void SAL_CALL ODbaseTable::alterColumnByName( const ::rtl::OUString& colName, const Reference< XPropertySet >& descriptor ) throw(SQLException, NoSuchElementException, RuntimeException)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
-    if (ODbaseTable_BASE::rBHelper.bDisposed)
+    if (rBHelper.bDisposed)
         throw DisposedException();
 
     Reference<XDataDescriptorFactory> xOldColumn;
@@ -1924,7 +1926,7 @@ void SAL_CALL ODbaseTable::alterColumnByName( const ::rtl::OUString& colName, co
 void SAL_CALL ODbaseTable::alterColumnByIndex( sal_Int32 index, const Reference< XPropertySet >& descriptor ) throw(SQLException, ::com::sun::star::lang::IndexOutOfBoundsException, RuntimeException)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
-    if (ODbaseTable_BASE::rBHelper.bDisposed)
+    if (rBHelper.bDisposed)
         throw DisposedException();
     if(index < 0 || index >= m_pColumns->getCount())
         throw IndexOutOfBoundsException();
@@ -2026,7 +2028,7 @@ void ODbaseTable::alterColumn(sal_Int32 index,
 void SAL_CALL ODbaseTable::rename( const ::rtl::OUString& newName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
-    if (ODbaseTable_BASE::rBHelper.bDisposed)
+    if (rBHelper.bDisposed)
         throw DisposedException();
 
     FileClose();
@@ -2107,7 +2109,8 @@ String ODbaseTable::createTempFile()
     sExt.AssignAscii(".");
     sExt += m_pConnection->getExtension();
 
-    TempFile aTempFile(String(m_Name),&sExt,&sTempName);
+    String sName(m_Name);
+    TempFile aTempFile(sName,&sExt,&sTempName);
     if(!aTempFile.IsValid())
         throw SQLException(::rtl::OUString::createFromAscii("Error while alter table!"),NULL,::rtl::OUString::createFromAscii("HY0000"),1000,Any());
 
diff --git a/connectivity/source/inc/dbase/DTable.hxx b/connectivity/source/inc/dbase/DTable.hxx
index cc055282f078..76eb2d88f9a2 100644
--- a/connectivity/source/inc/dbase/DTable.hxx
+++ b/connectivity/source/inc/dbase/DTable.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: DTable.hxx,v $
  *
- *  $Revision: 1.19 $
+ *  $Revision: 1.20 $
  *
- *  last change: $Author: oj $ $Date: 2001-03-28 11:28:46 $
+ *  last change: $Author: avy $ $Date: 2001-03-30 10:16:42 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -159,6 +159,8 @@ namespace connectivity
 
         protected:
             virtual void FileClose();
+//          using ::connectivity::sdbcx::OTableDescriptor_BASE::rBHelper;
+            ::cppu::OBroadcastHelper& rBHelper;
         public:
             virtual void refreshColumns();
             virtual void refreshIndexes();