diff options
author | Jens-Heiner Rechtien <hr@openoffice.org> | 2008-12-30 13:32:01 +0000 |
---|---|---|
committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2008-12-30 13:32:01 +0000 |
commit | 0416c98d433be40fe2e2d0199ebaa8d029e8e338 (patch) | |
tree | 8b781a46dcb4bc28ea9405e6c8591d7b1f9b21ea /connectivity/source/drivers/file/FStatement.cxx | |
parent | 1de383819e70ec2816447d6b621695d178eeb9ee (diff) |
CWS-TOOLING: integrate CWS sb102
2008-12-11 16:18:12 +0100 sb r265332 : #i95065# cleanup, to make Windows linking work
2008-12-11 16:16:03 +0100 sb r265331 : #i95065# missing SAL_DLLPUBLIC_EXPORT
2008-12-09 17:40:28 +0100 sb r265122 : #i94469# move CJK specific configuration data to brand layer
2008-12-09 16:09:08 +0100 sb r265112 : #i96959# use PTHREAD_MUTEX_RECURSIVE on all platforms
2008-12-09 15:54:31 +0100 sb r265110 : #i95065# do not derive apphelper::LifeTimeGuard from osl::ResettableMutexGuard to avoid problems with VISIBILITY_HIDDEN=TRUE on MSC
2008-12-09 15:40:51 +0100 sb r265104 : #i95065# add VISIBILITY_HIDDEN=TRUE to connectivity/source/drivers/mozab
2008-12-09 15:36:21 +0100 sb r265102 : #i95501# updated SDK_HOME
2008-12-09 15:31:46 +0100 sb r265099 : typo (temppath vs. tmppath)
2008-12-08 11:48:08 +0100 sb r264979 : #i95065# removed spurious ExplicitCategoriesProvider.obj (ExplicitCategoriesProvider.cxx is not in this directory)
2008-12-07 19:41:07 +0100 sb r264960 : #i96994# erroneously doubled backslash caused visibility feature to be disabled for all GCC versions on Mac OS X
2008-12-06 23:54:49 +0100 sb r264948 : changes from trunk that CWS-TOOLING's rebase to DEV300:m37 (r264891) had missed, as files had been moved around on this CWS
2008-12-05 20:29:23 +0100 sb r264919 : #i85508# versions of flex apparently differ in whether input() resp. yyinput() returns zero or EOF upon end of file
2008-12-05 15:37:23 +0100 sb r264908 : #i95315# removed obsolete jut
2008-12-05 15:34:59 +0100 sb r264907 : #i95531# removed empty obsolete directories
2008-12-05 10:09:23 +0100 sb r264891 : CWS-TOOLING: rebase CWS sb102 to trunk@264807 (milestone: DEV300:m37)
2008-12-04 14:50:20 +0100 sb r264845 : #i95065# introduced VISIBILITY_HIDDEN makefile flag to reduce duplications; made additional libraries use VISIBILITY_HIDDEN=TRUE to avoid warnings with recent GCC 4 versions (had to split certain code directories to make changes that would otherwise erroneously affect multiple libraries built in the same makefile); changed connectivity::ORefVector to no longer derive from std::vector, as that caused problems with the MSC implementation of VISIBILITY_HIDDEN=TRUE; replaced uses of JNIEXPORT with SAL_DLLPUBLIC_EXPORT, as the former does not expand to visibility attributes on some platforms where the latter does
2008-12-03 11:29:38 +0100 sb r264759 : #i94583# remove unnecessary (and wrong) assertion check for rtl_getAppCommandArg return value (which is guaranteed to return osl_Process_E_None or not return at all)
2008-12-02 17:18:31 +0100 sb r264724 : #i96809# silenced GCC 4.3.2 warning
2008-12-02 13:29:34 +0100 sb r264695 : #i96797# make get_tmp_dir fail less often
2008-11-28 17:19:24 +0100 sb r264566 : #i95691# inadvertently missing from -c 264564
2008-11-28 17:07:50 +0100 sb r264564 : #i95691# only structs of exactly 1, 2, 4, or 8 bytes are returned through registers
2008-11-25 13:28:08 +0100 sb r264291 : #i96427# support for SAL_EXCEPTION_DLLPUBLIC_EXPORT (patch by np)
2008-11-21 14:45:22 +0100 sb r264140 : #i95428# added SAL_EXCEPTION_DLLPUBLIC_EXPORT and SAL_EXCEPTION_DLLPRIVATE
2008-11-19 13:19:37 +0100 sb r263984 : #i95525# removed erroneous application/octet-stream svn:mime-type properties
Diffstat (limited to 'connectivity/source/drivers/file/FStatement.cxx')
-rw-r--r-- | connectivity/source/drivers/file/FStatement.cxx | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/connectivity/source/drivers/file/FStatement.cxx b/connectivity/source/drivers/file/FStatement.cxx index f8608c2e4d7b..42828dcb75e7 100644 --- a/connectivity/source/drivers/file/FStatement.cxx +++ b/connectivity/source/drivers/file/FStatement.cxx @@ -136,7 +136,7 @@ void OStatement_BASE2::disposing() if(m_aRow.isValid()) { - m_aRow->clear(); + m_aRow->get().clear(); m_aRow = NULL; } @@ -352,7 +352,7 @@ void SAL_CALL OStatement_Base::disposing(void) { if(m_aEvaluateRow.isValid()) { - m_aEvaluateRow->clear(); + m_aEvaluateRow->get().clear(); m_aEvaluateRow = NULL; } delete m_pEvaluationKeySet; @@ -443,10 +443,10 @@ void OStatement_Base::setOrderbyColumn( OSQLParseNode* pColumnRef, { ::vos::ORef<OSQLColumns> aSelectColumns = m_aSQLIterator.getSelectColumns(); ::comphelper::UStringMixEqual aCase; - OSQLColumns::const_iterator aFind = ::connectivity::find(aSelectColumns->begin(),aSelectColumns->end(),aColumnName,aCase); - if ( aFind == aSelectColumns->end() ) + OSQLColumns::Vector::const_iterator aFind = ::connectivity::find(aSelectColumns->get().begin(),aSelectColumns->get().end(),aColumnName,aCase); + if ( aFind == aSelectColumns->get().end() ) throw SQLException(); - m_aOrderbyColumnNumber.push_back((aFind - aSelectColumns->begin()) + 1); + m_aOrderbyColumnNumber.push_back((aFind - aSelectColumns->get().begin()) + 1); } // Ascending or Descending? @@ -473,7 +473,7 @@ void OStatement_Base::construct(const ::rtl::OUString& sql) throw(SQLException, // more than one table -> can't operate on them -> error m_pConnection->throwGenericSQLException(STR_QUERY_MORE_TABLES,*this); - if ( (m_aSQLIterator.getStatementType() == SQL_STATEMENT_SELECT) && m_aSQLIterator.getSelectColumns()->empty() ) + if ( (m_aSQLIterator.getStatementType() == SQL_STATEMENT_SELECT) && m_aSQLIterator.getSelectColumns()->get().empty() ) // SELECT statement without columns -> error m_pConnection->throwGenericSQLException(STR_QUERY_NO_COLUMN,*this); @@ -501,18 +501,18 @@ void OStatement_Base::construct(const ::rtl::OUString& sql) throw(SQLException, Reference<XIndexAccess> xNames(m_xColNames,UNO_QUERY); // set the binding of the resultrow m_aRow = new OValueRefVector(xNames->getCount()); - (*m_aRow)[0]->setBound(sal_True); - ::std::for_each(m_aRow->begin()+1,m_aRow->end(),TSetRefBound(sal_False)); + (m_aRow->get())[0]->setBound(sal_True); + ::std::for_each(m_aRow->get().begin()+1,m_aRow->get().end(),TSetRefBound(sal_False)); // set the binding of the resultrow m_aEvaluateRow = new OValueRefVector(xNames->getCount()); - (*m_aEvaluateRow)[0]->setBound(sal_True); - ::std::for_each(m_aEvaluateRow->begin()+1,m_aEvaluateRow->end(),TSetRefBound(sal_False)); + (m_aEvaluateRow->get())[0]->setBound(sal_True); + ::std::for_each(m_aEvaluateRow->get().begin()+1,m_aEvaluateRow->get().end(),TSetRefBound(sal_False)); // set the select row - m_aSelectRow = new OValueRefVector(m_aSQLIterator.getSelectColumns()->size()); - ::std::for_each(m_aSelectRow->begin(),m_aSelectRow->end(),TSetRefBound(sal_True)); + m_aSelectRow = new OValueRefVector(m_aSQLIterator.getSelectColumns()->get().size()); + ::std::for_each(m_aSelectRow->get().begin(),m_aSelectRow->get().end(),TSetRefBound(sal_True)); // create the column mapping createColumnMapping(); @@ -533,7 +533,7 @@ void OStatement_Base::createColumnMapping() { // initialize the column index map (mapping select columns to table columns) ::vos::ORef<connectivity::OSQLColumns> xColumns = m_aSQLIterator.getSelectColumns(); - m_aColMapping.resize(xColumns->size() + 1); + m_aColMapping.resize(xColumns->get().size() + 1); for (sal_Int32 i=0; i<(sal_Int32)m_aColMapping.size(); ++i) m_aColMapping[i] = i; @@ -575,11 +575,11 @@ void OStatement_Base::GetAssignValues() { // Row fuer die zu setzenden Werte anlegen (Referenz durch new) if(m_aAssignValues.isValid()) - m_aAssignValues->clear(); + m_aAssignValues->get().clear(); sal_Int32 nCount = Reference<XIndexAccess>(m_xColNames,UNO_QUERY)->getCount(); m_aAssignValues = new OAssignValues(nCount); // unbound all - ::std::for_each(m_aAssignValues->begin()+1,m_aAssignValues->end(),TSetRefBound(sal_False)); + ::std::for_each(m_aAssignValues->get().begin()+1,m_aAssignValues->get().end(),TSetRefBound(sal_False)); m_aParameterIndexes.resize(nCount+1,SQL_NO_PARAMETER); @@ -682,11 +682,11 @@ void OStatement_Base::GetAssignValues() else if (SQL_ISRULE(m_pParseTree,update_statement_searched)) { if(m_aAssignValues.isValid()) - m_aAssignValues->clear(); + m_aAssignValues->get().clear(); sal_Int32 nCount = Reference<XIndexAccess>(m_xColNames,UNO_QUERY)->getCount(); m_aAssignValues = new OAssignValues(nCount); // unbound all - ::std::for_each(m_aAssignValues->begin()+1,m_aAssignValues->end(),TSetRefBound(sal_False)); + ::std::for_each(m_aAssignValues->get().begin()+1,m_aAssignValues->get().end(),TSetRefBound(sal_False)); m_aParameterIndexes.resize(nCount+1,SQL_NO_PARAMETER); @@ -781,7 +781,7 @@ void OStatement_Base::SetAssignValue(const String& aColumnName, // Alles geprueft und wir haben den Namen der Column. // Jetzt eine Value allozieren, den Wert setzen und die Value an die Row binden. if (bSetNull) - (*m_aAssignValues)[nId]->setNull(); + (m_aAssignValues->get())[nId]->setNull(); else { switch (::comphelper::getINT32(xCol->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE)))) @@ -789,16 +789,16 @@ void OStatement_Base::SetAssignValue(const String& aColumnName, // Kriterium je nach Typ als String oder double in die Variable packen ... case DataType::CHAR: case DataType::VARCHAR: - *(*m_aAssignValues)[nId] = ORowSetValue(aValue); + *(m_aAssignValues->get())[nId] = ORowSetValue(aValue); // Zeichensatz ist bereits konvertiert, da ja das gesamte Statement konvertiert wurde break; case DataType::BIT: { if (aValue.EqualsIgnoreCaseAscii("TRUE") || aValue.GetChar(0) == '1') - *(*m_aAssignValues)[nId] = sal_True; + *(m_aAssignValues->get())[nId] = sal_True; else if (aValue.EqualsIgnoreCaseAscii("FALSE") || aValue.GetChar(0) == '0') - *(*m_aAssignValues)[nId] = sal_False; + *(m_aAssignValues->get())[nId] = sal_False; else { // aStatus.Set(SQL_STAT_ERROR); // nyi: genauer! @@ -817,7 +817,7 @@ void OStatement_Base::SetAssignValue(const String& aColumnName, case DataType::TIME: case DataType::TIMESTAMP: { - *(*m_aAssignValues)[nId] = ORowSetValue(aValue); // .ToDouble + *(m_aAssignValues->get())[nId] = ORowSetValue(aValue); // .ToDouble // try // { // double n = xValue->toDouble(); |