merge vosremoval-reference.diff

8 files changed, 61 insertions, 64 deletions

diff --git a/connectivity/source/drivers/file/FDriver.cxx b/connectivity/source/drivers/file/FDriver.cxx
index 13be82514c1d..c41a839c3fef 100644
--- a/connectivity/source/drivers/file/FDriver.cxx
+++ b/connectivity/source/drivers/file/FDriver.cxx
@@ -249,7 +249,7 @@ Reference< XTablesSupplier > SAL_CALL OFileDriver::getDataDefinitionByURL( const
     return getDataDefinitionByConnection(connect(url,info));
 }
 // -----------------------------------------------------------------------------
-void OOperandParam::describe(const Reference< XPropertySet>& rColumn, ::vos::ORef<connectivity::OSQLColumns> rParameterColumns)
+void OOperandParam::describe(const Reference< XPropertySet>& rColumn, ::rtl::Reference<connectivity::OSQLColumns> rParameterColumns)
 {
     // den alten namen beibehalten
 
diff --git a/connectivity/source/drivers/file/FPreparedStatement.cxx b/connectivity/source/drivers/file/FPreparedStatement.cxx
index 6bd8d5b6bb10..cb3fb1f78445 100644
--- a/connectivity/source/drivers/file/FPreparedStatement.cxx
+++ b/connectivity/source/drivers/file/FPreparedStatement.cxx
@@ -97,7 +97,7 @@ void OPreparedStatement::disposing()
 
     m_xParamColumns = NULL;
     m_xMetaData.clear();
-    if(m_aParameterRow.isValid())
+    if(m_aParameterRow.is())
     {
         m_aParameterRow->get().clear();
         m_aParameterRow = NULL;
@@ -299,7 +299,7 @@ void SAL_CALL OPreparedStatement::setNull( sal_Int32 parameterIndex, sal_Int32 /
     ::osl::MutexGuard aGuard( m_aMutex );
     checkAndResizeParameters(parameterIndex);
 
-    if ( m_aAssignValues.isValid() )
+    if ( m_aAssignValues.is() )
         (m_aAssignValues->get())[m_aParameterIndexes[parameterIndex]]->setNull();
     else
         (m_aParameterRow->get())[parameterIndex]->setNull();
@@ -429,8 +429,8 @@ Reference<XResultSet> OPreparedStatement::initResultSet()
     Reference<XResultSet> xRs(m_pResultSet);
 
     // check if we got enough paramters
-    if ( (m_aParameterRow.isValid() && ( m_aParameterRow->get().size() -1 ) < m_xParamColumns->get().size()) ||
-         (m_xParamColumns.isValid() && !m_aParameterRow.isValid() && !m_aParameterRow->get().empty()) )
+    if ( (m_aParameterRow.is() && ( m_aParameterRow->get().size() -1 ) < m_xParamColumns->get().size()) ||
+         (m_xParamColumns.is() && !m_aParameterRow.is() && !m_aParameterRow->get().empty()) )
          m_pConnection->throwGenericSQLException(STR_INVALID_PARA_COUNT,*this);
 
     m_pResultSet->OpenImpl();
@@ -453,7 +453,7 @@ void OPreparedStatement::checkAndResizeParameters(sal_Int32 parameterIndex)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OPreparedStatement::checkAndResizeParameters" );
     ::connectivity::checkDisposed(OStatement_BASE::rBHelper.bDisposed);
-    if ( m_aAssignValues.isValid() && (parameterIndex < 1 || parameterIndex >= static_cast<sal_Int32>(m_aParameterIndexes.size())) )
+    if ( m_aAssignValues.is() && (parameterIndex < 1 || parameterIndex >= static_cast<sal_Int32>(m_aParameterIndexes.size())) )
         throwInvalidIndexException(*this);
     else if ( static_cast<sal_Int32>((m_aParameterRow->get()).size()) <= parameterIndex )
     {
@@ -461,7 +461,7 @@ void OPreparedStatement::checkAndResizeParameters(sal_Int32 parameterIndex)
         (m_aParameterRow->get()).resize(parameterIndex+1);
         for ( ;i <= parameterIndex+1; ++i )
         {
-            if ( !(m_aParameterRow->get())[i].isValid() )
+            if ( !(m_aParameterRow->get())[i].is() )
                 (m_aParameterRow->get())[i] = new ORowSetValueDecorator;
         }
     }
@@ -473,7 +473,7 @@ void OPreparedStatement::setParameter(sal_Int32 parameterIndex, const ORowSetVal
     ::osl::MutexGuard aGuard( m_aMutex );
     checkAndResizeParameters(parameterIndex);
 
-    if(m_aAssignValues.isValid())
+    if(m_aAssignValues.is())
         *(m_aAssignValues->get())[m_aParameterIndexes[parameterIndex]] = x;
     else
         *((m_aParameterRow->get())[parameterIndex]) = x;
@@ -580,7 +580,7 @@ void OPreparedStatement::initializeResultSet(OResultSet* _pResult)
         USHORT nParaCount=0; // gibt die aktuelle Anzahl der bisher gesetzen Parameter an
 
         // Nach zu substituierenden Parametern suchen:
-        size_t nCount = m_aAssignValues.isValid() ? m_aAssignValues->get().size() : 1; // 1 ist wichtig fuer die Kriterien
+        size_t nCount = m_aAssignValues.is() ? m_aAssignValues->get().size() : 1; // 1 ist wichtig fuer die Kriterien
         for (size_t j = 1; j < nCount; j++)
         {
             UINT32 nParameter = (*m_aAssignValues).getParameterIndex(j);
@@ -593,19 +593,19 @@ void OPreparedStatement::initializeResultSet(OResultSet* _pResult)
             //  (*m_aAssignValues)[j] = (*m_aParameterRow)[(UINT16)nParameter];
         }
 
-        if (m_aParameterRow.isValid() &&  (m_xParamColumns->get().size()+1) != m_aParameterRow->get().size() )
+        if (m_aParameterRow.is() &&  (m_xParamColumns->get().size()+1) != m_aParameterRow->get().size() )
         {
             sal_Int32 i = m_aParameterRow->get().size();
             sal_Int32 nParamColumns = m_xParamColumns->get().size()+1;
             m_aParameterRow->get().resize(nParamColumns);
             for ( ;i < nParamColumns; ++i )
             {
-                if ( !(m_aParameterRow->get())[i].isValid() )
+                if ( !(m_aParameterRow->get())[i].is() )
                     (m_aParameterRow->get())[i] = new ORowSetValueDecorator;
             }
             //m_aParameterRow->resize(m_xParamColumns->size()+1);
         }
-        if (m_aParameterRow.isValid() && nParaCount < m_aParameterRow->get().size() )
+        if (m_aParameterRow.is() && nParaCount < m_aParameterRow->get().size() )
         {
 
             m_pSQLAnalyzer->bindParameterRow(m_aParameterRow);
@@ -619,7 +619,7 @@ void OPreparedStatement::parseParamterElem(const String& _sColumnName,OSQLParseN
     Reference<XPropertySet> xCol;
     m_xColNames->getByName(_sColumnName) >>= xCol;
     sal_Int32 nParameter = -1;
-    if(m_xParamColumns.isValid())
+    if(m_xParamColumns.is())
     {
         OSQLColumns::Vector::const_iterator aIter = find(m_xParamColumns->get().begin(),m_xParamColumns->get().end(),_sColumnName,::comphelper::UStringMixEqual(m_pTable->isCaseSensitive()));
         if(aIter != m_xParamColumns->get().end())
diff --git a/connectivity/source/drivers/file/FResultSet.cxx b/connectivity/source/drivers/file/FResultSet.cxx
index c1f2a625e7e5..054fe31424b8 100644
--- a/connectivity/source/drivers/file/FResultSet.cxx
+++ b/connectivity/source/drivers/file/FResultSet.cxx
@@ -197,7 +197,7 @@ void OResultSet::clear()
     m_pFileSet = NULL;
     DELETEZ(m_pSortIndex);
 
-    if(m_aInsertRow.isValid())
+    if(m_aInsertRow.is())
         m_aInsertRow->get().clear();
 
     m_aSkipDeletedSet.clear();
@@ -589,12 +589,12 @@ sal_Bool OResultSet::evaluate()
         {
             if(m_pEvaluationKeySet)
             {
-                bRet = m_pTable->fetchRow(m_aEvaluateRow,m_pTable->getTableColumns().getBody(),sal_True,sal_True);
+                bRet = m_pTable->fetchRow(m_aEvaluateRow,*(m_pTable->getTableColumns()),sal_True,sal_True);
                 evaluate();
 
             }
             else
-                bRet = m_pTable->fetchRow(m_aRow,m_xColumns.getBody(),sal_False,sal_True);
+                bRet = m_pTable->fetchRow(m_aRow,*m_xColumns,sal_False,sal_True);
         }
     }
 
@@ -651,8 +651,8 @@ void SAL_CALL OResultSet::insertRow(  ) throw(SQLException, RuntimeException)
     // we know that we append new rows at the end
     // so we have to know where the end is
     m_aSkipDeletedSet.skipDeleted(IResultSetHelper::LAST,1,sal_False);
-    m_bRowInserted = m_pTable->InsertRow(m_aInsertRow.getBody(), TRUE,m_xColsIdx);
-    if(m_bRowInserted && m_pFileSet.isValid())
+    m_bRowInserted = m_pTable->InsertRow(*m_aInsertRow, TRUE, m_xColsIdx);
+    if(m_bRowInserted && m_pFileSet.is())
     {
         sal_Int32 nPos = (m_aInsertRow->get())[0]->getValue();
         m_pFileSet->get().push_back(nPos);
@@ -672,7 +672,7 @@ void SAL_CALL OResultSet::updateRow(  ) throw(SQLException, RuntimeException)
     if(!m_pTable || m_pTable->isReadOnly())
         lcl_throwError(STR_TABLE_READONLY,*this);
 
-    m_bRowUpdated = m_pTable->UpdateRow(m_aInsertRow.getBody(), m_aRow,m_xColsIdx);
+    m_bRowUpdated = m_pTable->UpdateRow(*m_aInsertRow, m_aRow,m_xColsIdx);
     *(m_aInsertRow->get())[0] = (sal_Int32)(m_aRow->get())[0]->getValue();
 
     clearInsertRow();
@@ -693,8 +693,8 @@ void SAL_CALL OResultSet::deleteRow() throw(SQLException, RuntimeException)
         lcl_throwError(STR_ROW_ALREADY_DELETED,*this);
 
     sal_Int32 nPos = (sal_Int32)(m_aRow->get())[0]->getValue();
-    m_bRowDeleted = m_pTable->DeleteRow(m_xColumns.getBody());
-    if(m_bRowDeleted && m_pFileSet.isValid())
+    m_bRowDeleted = m_pTable->DeleteRow(*m_xColumns);
+    if(m_bRowDeleted && m_pFileSet.is())
     {
         m_aRow->setDeleted(sal_True);
         // don't touch the m_pFileSet member here
@@ -714,7 +714,7 @@ void SAL_CALL OResultSet::cancelRowUpdates(  ) throw(SQLException, RuntimeExcept
     m_bRowInserted  = sal_False;
     m_bRowDeleted   = sal_False;
 
-    if(m_aInsertRow.isValid())
+    if(m_aInsertRow.is())
     {
         OValueRefVector::Vector::iterator aIter = m_aInsertRow->get().begin()+1;
         for(;aIter != m_aInsertRow->get().end();++aIter)
@@ -919,7 +919,7 @@ BOOL OResultSet::ExecuteRow(IResultSetHelper::Movement eFirstCursorPosition,
     IResultSetHelper::Movement eCursorPosition = eFirstCursorPosition;
     INT32  nOffset = nFirstOffset;
 
-    const OSQLColumns & rTableCols = m_pTable->getTableColumns().getBody();
+    const OSQLColumns & rTableCols = *(m_pTable->getTableColumns());
     BOOL bHasRestriction = m_pSQLAnalyzer->hasRestriction();
 again:
 
@@ -958,7 +958,7 @@ again:
                     return sal_False;
                 }
             }
-            else if (m_pFileSet.isValid())
+            else if (m_pFileSet.is())
             {
                 OSL_ENSURE(//!m_pFileSet->IsFrozen() &&
                             eCursorPosition == IResultSetHelper::NEXT, "Falsche CursorPosition!");
@@ -995,14 +995,14 @@ again:
     // Evaluate darf nur gesetzt sein,
     // wenn der Keyset weiter aufgebaut werden soll
     if (m_aSQLIterator.getStatementType() == SQL_STATEMENT_SELECT && !isCount() &&
-        (m_pFileSet.isValid() || m_pSortIndex) && bEvaluate)
+        (m_pFileSet.is() || m_pSortIndex) && bEvaluate)
     {
         if (m_pSortIndex)
         {
             OKeyValue* pKeyValue = GetOrderbyKeyValue(m_aEvaluateRow);
             m_pSortIndex->AddKeyValue(pKeyValue);
         }
-        else if (m_pFileSet.isValid())
+        else if (m_pFileSet.is())
         {
             //  OSL_ENSURE(!m_pFileSet->IsFrozen() , "Falsche CursorPosition!");
             sal_uInt32 nBookmarkValue = Abs((sal_Int32)(m_aEvaluateRow->get())[0]->getValue());
@@ -1015,13 +1015,13 @@ again:
         if (bEvaluate)
         {
             // jetzt die eigentliche Ergebniszeile Lesen
-            bOK = m_pTable->fetchRow(m_aEvaluateRow, m_pTable->getTableColumns().getBody(), sal_True,TRUE);
+            bOK = m_pTable->fetchRow(m_aEvaluateRow, *(m_pTable->getTableColumns()), sal_True,TRUE);
         }
 
         if (bOK)
         {
             // Nur die zu aendernden Werte uebergeben:
-            if(!m_pTable->UpdateRow(m_aAssignValues.getBody(),m_aEvaluateRow,m_xColsIdx))
+            if(!m_pTable->UpdateRow(*m_aAssignValues,m_aEvaluateRow, m_xColsIdx))
                 return sal_False;
         }
     }
@@ -1030,11 +1030,11 @@ again:
         sal_Bool bOK = sal_True;
         if (bEvaluate)
         {
-            bOK = m_pTable->fetchRow(m_aEvaluateRow, m_pTable->getTableColumns().getBody(), sal_True,TRUE);
+            bOK = m_pTable->fetchRow(m_aEvaluateRow, *(m_pTable->getTableColumns()), sal_True,TRUE);
         }
         if (bOK)
         {
-            if(!m_pTable->DeleteRow(m_xColumns.getBody()))
+            if(!m_pTable->DeleteRow(*m_xColumns))
                 return sal_False;
         }
     }
@@ -1049,13 +1049,11 @@ BOOL OResultSet::Move(IResultSetHelper::Movement eCursorPosition, INT32 nOffset,
 //IgnoreDeletedRows:
 //
     INT32 nTempPos = m_nRowPos;
-    // exclusiver zugriff auf die Tabelle
-    //  NAMESPACE_VOS(OGuard)* pGuard = m_pTable->Lock();
 
     if (m_aSQLIterator.getStatementType() == SQL_STATEMENT_SELECT &&
         !isCount())
     {
-        if (!m_pFileSet.isValid()) // kein Index verfuegbar
+        if (!m_pFileSet.is()) // kein Index verfuegbar
         {
             // Normales FETCH
             ExecuteRow(eCursorPosition,nOffset,FALSE,bRetrieveData);
@@ -1151,7 +1149,7 @@ BOOL OResultSet::Move(IResultSetHelper::Movement eCursorPosition, INT32 nOffset,
                     if (bOK)
                     {
                         // jetzt nochmal die Ergebnisse lesen
-                        m_pTable->fetchRow(m_aRow, m_pTable->getTableColumns().getBody(), sal_True,bRetrieveData);
+                        m_pTable->fetchRow(m_aRow, *(m_pTable->getTableColumns()), sal_True,bRetrieveData);
 
                         // now set the bookmark for outside
                         *(*m_aRow->get().begin()) = sal_Int32(m_nRowPos + 1);
@@ -1246,7 +1244,7 @@ Error:
             case IResultSetHelper::ABSOLUTE:
             case IResultSetHelper::RELATIVE:
                 if (nOffset > 0)
-                    m_nRowPos = m_pFileSet.isValid() ? (sal_Int32)m_pFileSet->get().size() : -1;
+                    m_nRowPos = m_pFileSet.is() ? (sal_Int32)m_pFileSet->get().size() : -1;
                 else if (nOffset < 0)
                     m_nRowPos = -1;
                 break;
@@ -1409,8 +1407,6 @@ BOOL OResultSet::OpenImpl()
     m_nFilePos  = 0;
     m_nRowCountResult = -1;
 
-    // exclusiver zugriff auf die Tabelle
-    //  NAMESPACE_VOS(OGuard)* pGuard = pTable->Lock();
     m_nLastVisitedPos = m_pTable->getCurrentLastPos();
 
     switch(m_aSQLIterator.getStatementType())
@@ -1488,7 +1484,7 @@ BOOL OResultSet::OpenImpl()
                 if (IsSorted())
                     sortRows();
 
-                if (!m_pFileSet.isValid())
+                if (!m_pFileSet.is())
                 {
                     m_pFileSet = new OKeySet();
 
@@ -1503,9 +1499,9 @@ BOOL OResultSet::OpenImpl()
                             m_pFileSet->get().push_back(i + 1);
                     }
                 }
-                OSL_ENSURE(m_pFileSet.isValid(),"Kein KeySet vorhanden! :-(");
+                OSL_ENSURE(m_pFileSet.is(),"Kein KeySet vorhanden! :-(");
 
-                if(bDistinct && m_pFileSet.isValid())   // sicher ist sicher
+                if(bDistinct && m_pFileSet.is())   // sicher ist sicher
                 {
                     OValueRow aSearchRow = new OValueVector(m_aRow->get().size());
                     OValueRefVector::Vector::iterator aRowIter = m_aRow->get().begin();
@@ -1632,8 +1628,8 @@ BOOL OResultSet::OpenImpl()
         case SQL_STATEMENT_INSERT:
             m_nRowCountResult = 0;
 
-            OSL_ENSURE(m_aAssignValues.isValid(),"No assign values set!");
-            if(!m_pTable->InsertRow(m_aAssignValues.getBody(), TRUE,m_xColsIdx))
+            OSL_ENSURE(m_aAssignValues.is(),"No assign values set!");
+            if(!m_pTable->InsertRow(*m_aAssignValues, TRUE,m_xColsIdx))
             {
                 m_nFilePos  = 0;
                 return sal_False;
@@ -1680,7 +1676,7 @@ sal_Int64 OResultSet::getSomething( const Sequence< sal_Int8 > & rId ) throw (Ru
 // -----------------------------------------------------------------------------
 void OResultSet::setBoundedColumns(const OValueRefRow& _rRow,
                                    const OValueRefRow& _rSelectRow,
-                                   const ::vos::ORef<connectivity::OSQLColumns>& _rxColumns,
+                                   const ::rtl::Reference<connectivity::OSQLColumns>& _rxColumns,
                                    const Reference<XIndexAccess>& _xNames,
                                    sal_Bool _bSetColumnMapping,
                                    const Reference<XDatabaseMetaData>& _xMetaData,
@@ -1847,7 +1843,7 @@ void OResultSet::clearInsertRow()
 void OResultSet::initializeRow(OValueRefRow& _rRow,sal_Int32 _nColumnCount)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OResultSet::initializeRow" );
-    if(!_rRow.isValid())
+    if(!_rRow.is())
     {
         _rRow   = new OValueRefVector(_nColumnCount);
         (_rRow->get())[0]->setBound(sal_True);
diff --git a/connectivity/source/drivers/file/FResultSetMetaData.cxx b/connectivity/source/drivers/file/FResultSetMetaData.cxx
index 0ae95479f2c6..6d75d6f67357 100644
--- a/connectivity/source/drivers/file/FResultSetMetaData.cxx
+++ b/connectivity/source/drivers/file/FResultSetMetaData.cxx
@@ -47,7 +47,7 @@ using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::lang;
 
 // -------------------------------------------------------------------------
-OResultSetMetaData::OResultSetMetaData(const ::vos::ORef<connectivity::OSQLColumns>& _rxColumns,const ::rtl::OUString& _aTableName,OFileTable*  _pTable)
+OResultSetMetaData::OResultSetMetaData(const ::rtl::Reference<connectivity::OSQLColumns>& _rxColumns,const ::rtl::OUString& _aTableName,OFileTable* _pTable)
     :m_aTableName(_aTableName)
     ,m_xColumns(_rxColumns)
     ,m_pTable(_pTable)
diff --git a/connectivity/source/drivers/file/FStatement.cxx b/connectivity/source/drivers/file/FStatement.cxx
index b7b9836c0221..0d504a71d2be 100644
--- a/connectivity/source/drivers/file/FStatement.cxx
+++ b/connectivity/source/drivers/file/FStatement.cxx
@@ -135,7 +135,7 @@ void OStatement_BASE2::disposing()
     if(m_pSQLAnalyzer)
         m_pSQLAnalyzer->dispose();
 
-    if(m_aRow.isValid())
+    if(m_aRow.is())
     {
         m_aRow->get().clear();
         m_aRow = NULL;
@@ -363,7 +363,7 @@ sal_Int32 SAL_CALL OStatement::executeUpdate( const ::rtl::OUString& sql ) throw
 void SAL_CALL OStatement_Base::disposing(void)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OStatement_Base::disposing" );
-    if(m_aEvaluateRow.isValid())
+    if(m_aEvaluateRow.is())
     {
         m_aEvaluateRow->get().clear();
         m_aEvaluateRow = NULL;
@@ -458,7 +458,7 @@ void OStatement_Base::setOrderbyColumn( OSQLParseNode* pColumnRef,
     }
     catch(Exception)
     {
-        ::vos::ORef<OSQLColumns> aSelectColumns = m_aSQLIterator.getSelectColumns();
+        ::rtl::Reference<OSQLColumns> aSelectColumns = m_aSQLIterator.getSelectColumns();
         ::comphelper::UStringMixEqual aCase;
         OSQLColumns::Vector::const_iterator aFind = ::connectivity::find(aSelectColumns->get().begin(),aSelectColumns->get().end(),aColumnName,aCase);
         if ( aFind == aSelectColumns->get().end() )
@@ -554,7 +554,7 @@ void OStatement_Base::createColumnMapping()
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OStatement_Base::createColumnMapping" );
     // initialize the column index map (mapping select columns to table columns)
-    ::vos::ORef<connectivity::OSQLColumns>  xColumns = m_aSQLIterator.getSelectColumns();
+    ::rtl::Reference<connectivity::OSQLColumns> xColumns = m_aSQLIterator.getSelectColumns();
     m_aColMapping.resize(xColumns->get().size() + 1);
     for (sal_Int32 i=0; i<(sal_Int32)m_aColMapping.size(); ++i)
         m_aColMapping[i] = i;
@@ -598,7 +598,7 @@ void OStatement_Base::GetAssignValues()
     else if (SQL_ISRULE(m_pParseTree,insert_statement))
     {
         // Row fuer die zu setzenden Werte anlegen (Referenz durch new)
-        if(m_aAssignValues.isValid())
+        if(m_aAssignValues.is())
             m_aAssignValues->get().clear();
         sal_Int32 nCount = Reference<XIndexAccess>(m_xColNames,UNO_QUERY)->getCount();
         m_aAssignValues = new OAssignValues(nCount);
@@ -687,7 +687,7 @@ void OStatement_Base::GetAssignValues()
     }
     else if (SQL_ISRULE(m_pParseTree,update_statement_searched))
     {
-        if(m_aAssignValues.isValid())
+        if(m_aAssignValues.is())
             m_aAssignValues->get().clear();
         sal_Int32 nCount = Reference<XIndexAccess>(m_xColNames,UNO_QUERY)->getCount();
         m_aAssignValues = new OAssignValues(nCount);
diff --git a/connectivity/source/drivers/file/fanalyzer.cxx b/connectivity/source/drivers/file/fanalyzer.cxx
index 842a943610e0..f55d609daf51 100644
--- a/connectivity/source/drivers/file/fanalyzer.cxx
+++ b/connectivity/source/drivers/file/fanalyzer.cxx
@@ -93,9 +93,9 @@ void OSQLAnalyzer::start(OSQLParseNode* pSQLParseNode)
                     ||  SQL_ISRULE(pColumnRef,factor)
                     ||  SQL_ISRULE(pColumnRef,set_fct_spec) )
                 {
-                    ::vos::ORef<OPredicateCompiler>     pCompiler = new OPredicateCompiler(this);
+                    ::rtl::Reference<OPredicateCompiler>        pCompiler = new OPredicateCompiler(this);
                     pCompiler->setOrigColumns(m_aCompiler->getOrigColumns());
-                    ::vos::ORef<OPredicateInterpreter>  pInterpreter = new OPredicateInterpreter(pCompiler);
+                    ::rtl::Reference<OPredicateInterpreter> pInterpreter = new OPredicateInterpreter(pCompiler);
                     pCompiler->execute( pColumnRef );
                     m_aSelectionEvaluations.push_back( TPredicates(pCompiler,pInterpreter) );
                 }
@@ -153,7 +153,7 @@ void OSQLAnalyzer::bindSelectRow(const OValueRefRow& _pRow)
     OEvaluateSetList    aEvaluateSetList;
     for ( ::std::vector< TPredicates >::iterator aIter = m_aSelectionEvaluations.begin(); aIter != m_aSelectionEvaluations.end();++aIter)
     {
-        if ( aIter->first.isValid() )
+        if ( aIter->first.is() )
             bindRow( aIter->first->m_aCodeList,_pRow,aEvaluateSetList);
     }
 }
@@ -197,7 +197,7 @@ void OSQLAnalyzer::bindSelectRow(const OValueRefRow& _pRow)
 }
 
 //------------------------------------------------------------------
-void OSQLAnalyzer::describeParam(::vos::ORef<OSQLColumns> rParameterColumns)
+void OSQLAnalyzer::describeParam(::rtl::Reference<OSQLColumns> rParameterColumns)
 {
     OCodeList& rCodeList    = m_aCompiler->m_aCodeList;
     OCodeStack aCodeStack;
@@ -208,7 +208,7 @@ void OSQLAnalyzer::describeParam(::vos::ORef<OSQLColumns> rParameterColumns)
         return; // keine Parameter
 
     // Anlegen von Columns, die eine genauere Beschreibung fuer die enthalten
-    ::vos::ORef<OSQLColumns> aNewParamColumns = new OSQLColumns(*rParameterColumns);
+    ::rtl::Reference<OSQLColumns> aNewParamColumns = new OSQLColumns(*rParameterColumns);
 
 
     // Anlegen einer Testzeile, wird benoetigt um die Parameter zu beschreiben
@@ -278,7 +278,7 @@ BOOL OSQLAnalyzer::hasFunctions() const
         m_bSelectionFirstTime = sal_False;
         for ( ::std::vector< TPredicates >::const_iterator aIter = m_aSelectionEvaluations.begin(); aIter != m_aSelectionEvaluations.end() && !m_bHasSelectionCode ;++aIter)
         {
-            if ( aIter->first.isValid() )
+            if ( aIter->first.is() )
                 m_bHasSelectionCode = aIter->first->hasCode();
         }
     }
@@ -290,7 +290,7 @@ void OSQLAnalyzer::setSelectionEvaluationResult(OValueRefRow& _pRow,const ::std:
     sal_Int32 nPos = 1;
     for ( ::std::vector< TPredicates >::iterator aIter = m_aSelectionEvaluations.begin(); aIter != m_aSelectionEvaluations.end();++aIter,++nPos)
     {
-        if ( aIter->second.isValid() )
+        if ( aIter->second.is() )
         {
             sal_Int32   map = nPos;
             // the first column (index 0) is for convenience only. The first real select column is no 1.
@@ -306,7 +306,7 @@ void OSQLAnalyzer::dispose()
     m_aCompiler->dispose();
     for ( ::std::vector< TPredicates >::iterator aIter = m_aSelectionEvaluations.begin(); aIter != m_aSelectionEvaluations.end();++aIter)
     {
-        if ( aIter->first.isValid() )
+        if ( aIter->first.is() )
             aIter->first->dispose();
     }
 }
@@ -316,7 +316,7 @@ void OSQLAnalyzer::setOrigColumns(const OFileColumns& rCols)
     m_aCompiler->setOrigColumns(rCols);
     for ( ::std::vector< TPredicates >::iterator aIter = m_aSelectionEvaluations.begin(); aIter != m_aSelectionEvaluations.end();++aIter)
     {
-        if ( aIter->first.isValid() )
+        if ( aIter->first.is() )
             aIter->first->setOrigColumns(rCols);
     }
 }
diff --git a/connectivity/source/drivers/file/fcode.cxx b/connectivity/source/drivers/file/fcode.cxx
index 128662b19ced..67c58ad9ca7a 100644
--- a/connectivity/source/drivers/file/fcode.cxx
+++ b/connectivity/source/drivers/file/fcode.cxx
@@ -102,23 +102,23 @@ OOperandRow::OOperandRow(sal_uInt16 _nPos, sal_Int32 _rType)
 void OOperandRow::bindValue(const OValueRefRow& _pRow)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OOperandRow::OOperandRow" );
-    OSL_ENSURE(_pRow.isValid(),"NO EMPTY row allowed!");
+    OSL_ENSURE(_pRow.is(),"NO EMPTY row allowed!");
     m_pRow = _pRow;
-    OSL_ENSURE(m_pRow.isValid() && m_nRowPos < m_pRow->get().size(),"Invalid RowPos is >= vector.size()");
+    OSL_ENSURE(m_pRow.is() && m_nRowPos < m_pRow->get().size(),"Invalid RowPos is >= vector.size()");
     (m_pRow->get())[m_nRowPos]->setBound(sal_True);
 }
 // -----------------------------------------------------------------------------
 void OOperandRow::setValue(const ORowSetValue& _rVal)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OOperandRow::setValue" );
-    OSL_ENSURE(m_pRow.isValid() && m_nRowPos < m_pRow->get().size(),"Invalid RowPos is >= vector.size()");
+    OSL_ENSURE(m_pRow.is() && m_nRowPos < m_pRow->get().size(),"Invalid RowPos is >= vector.size()");
     (*(m_pRow->get())[m_nRowPos]) = _rVal;
 }
 //------------------------------------------------------------------
 const ORowSetValue& OOperandRow::getValue() const
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OOperandRow::getValue" );
-    OSL_ENSURE(m_pRow.isValid() && m_nRowPos < m_pRow->get().size(),"Invalid RowPos is >= vector.size()");
+    OSL_ENSURE(m_pRow.is() && m_nRowPos < m_pRow->get().size(),"Invalid RowPos is >= vector.size()");
     return (m_pRow->get())[m_nRowPos]->getValue();
 }
 
diff --git a/connectivity/source/drivers/file/makefile.mk b/connectivity/source/drivers/file/makefile.mk
index bd6a29e3aef1..16e28a3062c9 100644
--- a/connectivity/source/drivers/file/makefile.mk
+++ b/connectivity/source/drivers/file/makefile.mk
@@ -80,6 +80,7 @@ SHL1STDLIBS=\
     $(TOOLSLIB)					\
     $(UCBHELPERLIB)				\
     $(SALLIB)					\
+    $(SALHELPERLIB)					\
     $(DBTOOLSLIB)				\
     $(UNOTOOLSLIB)				\
     $(COMPHELPERLIB)