summaryrefslogtreecommitdiff
path: root/connectivity/source/drivers/file
diff options
context:
space:
mode:
authorPhilipp Lohmann [pl] <Philipp.Lohmann@Oracle.COM>2011-02-14 16:17:22 +0100
committerPhilipp Lohmann [pl] <Philipp.Lohmann@Oracle.COM>2011-02-14 16:17:22 +0100
commit1fb042333fe6287756ff1fac11d18cd7c150730d (patch)
tree595de5d187177832ce656d7832af9dce9dce2d99 /connectivity/source/drivers/file
parent5b3e910e926c7dd1e8dcfe8e0a5c6cb5bd17480a (diff)
parentcd0d6a5a6775f197fdb7e78b54c8133074a7a236 (diff)
rebase to DEV300_m100
Diffstat (limited to 'connectivity/source/drivers/file')
-rw-r--r--connectivity/source/drivers/file/FColumns.cxx2
-rw-r--r--connectivity/source/drivers/file/FNoException.cxx6
-rw-r--r--connectivity/source/drivers/file/FPreparedStatement.cxx12
-rw-r--r--connectivity/source/drivers/file/FResultSet.cxx82
-rw-r--r--connectivity/source/drivers/file/FStatement.cxx6
-rw-r--r--connectivity/source/drivers/file/FTable.cxx10
-rw-r--r--connectivity/source/drivers/file/fanalyzer.cxx4
-rw-r--r--connectivity/source/drivers/file/fcode.cxx2
-rw-r--r--connectivity/source/drivers/file/fcomp.cxx2
-rw-r--r--connectivity/source/drivers/file/quotedstring.cxx16
10 files changed, 71 insertions, 71 deletions
diff --git a/connectivity/source/drivers/file/FColumns.cxx b/connectivity/source/drivers/file/FColumns.cxx
index 3c3929a80c50..e92855db23fa 100644
--- a/connectivity/source/drivers/file/FColumns.cxx
+++ b/connectivity/source/drivers/file/FColumns.cxx
@@ -72,7 +72,7 @@ sdbcx::ObjectType OColumns::createObject(const ::rtl::OUString& _rName)
sal_False,
sal_False,
sal_False,
- m_pTable->getConnection()->getMetaData()->storesMixedCaseQuotedIdentifiers());
+ m_pTable->getConnection()->getMetaData()->supportsMixedCaseQuotedIdentifiers());
xRet = pRet;
break;
}
diff --git a/connectivity/source/drivers/file/FNoException.cxx b/connectivity/source/drivers/file/FNoException.cxx
index 4bf0a2e37a1b..ac04fc9dff86 100644
--- a/connectivity/source/drivers/file/FNoException.cxx
+++ b/connectivity/source/drivers/file/FNoException.cxx
@@ -100,16 +100,16 @@ void OPreparedStatement::scanParameter(OSQLParseNode* pParseNode,::std::vector<
}
// Weiter absteigen im Parse Tree
- for (UINT32 i = 0; i < pParseNode->count(); i++)
+ for (sal_uInt32 i = 0; i < pParseNode->count(); i++)
scanParameter(pParseNode->getChild(i),_rParaNodes);
}
// -----------------------------------------------------------------------------
OKeyValue* OResultSet::GetOrderbyKeyValue(OValueRefRow& _rRow)
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OResultSet::GetOrderbyKeyValue" );
- UINT32 nBookmarkValue = Abs((sal_Int32)(_rRow->get())[0]->getValue());
+ sal_uInt32 nBookmarkValue = Abs((sal_Int32)(_rRow->get())[0]->getValue());
- OKeyValue* pKeyValue = OKeyValue::createKeyValue((UINT32)nBookmarkValue);
+ OKeyValue* pKeyValue = OKeyValue::createKeyValue((sal_uInt32)nBookmarkValue);
::std::vector<sal_Int32>::iterator aIter = m_aOrderbyColumnNumber.begin();
for (;aIter != m_aOrderbyColumnNumber.end(); ++aIter)
diff --git a/connectivity/source/drivers/file/FPreparedStatement.cxx b/connectivity/source/drivers/file/FPreparedStatement.cxx
index 68e23360331b..386a601a3b7c 100644
--- a/connectivity/source/drivers/file/FPreparedStatement.cxx
+++ b/connectivity/source/drivers/file/FPreparedStatement.cxx
@@ -478,7 +478,7 @@ void OPreparedStatement::setParameter(sal_Int32 parameterIndex, const ORowSetVal
*((m_aParameterRow->get())[parameterIndex]) = x;
}
// -----------------------------------------------------------------------------
-UINT32 OPreparedStatement::AddParameter(OSQLParseNode * pParameter, const Reference<XPropertySet>& _xCol)
+sal_uInt32 OPreparedStatement::AddParameter(OSQLParseNode * pParameter, const Reference<XPropertySet>& _xCol)
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OPreparedStatement::AddParameter" );
OSL_UNUSED( pParameter );
@@ -492,7 +492,7 @@ UINT32 OPreparedStatement::AddParameter(OSQLParseNode * pParameter, const Refere
::rtl::OUString sParameterName;
// Parameter-Column aufsetzen:
sal_Int32 eType = DataType::VARCHAR;
- UINT32 nPrecision = 255;
+ sal_uInt32 nPrecision = 255;
sal_Int32 nScale = 0;
sal_Int32 nNullable = ColumnValue::NULLABLE;
@@ -576,20 +576,20 @@ void OPreparedStatement::initializeResultSet(OResultSet* _pResult)
if (!m_xParamColumns->get().empty())
{
// Zunaechst AssignValues
- USHORT nParaCount=0; // gibt die aktuelle Anzahl der bisher gesetzen Parameter an
+ sal_uInt16 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
for (size_t j = 1; j < nCount; j++)
{
- UINT32 nParameter = (*m_aAssignValues).getParameterIndex(j);
+ sal_uInt32 nParameter = (*m_aAssignValues).getParameterIndex(j);
if (nParameter == SQL_NO_PARAMETER)
continue; // dieser AssignValue ist kein Parameter
++nParaCount; // ab hier ist der Parameter gueltig
// Parameter ersetzen. Wenn Parameter nicht verfuegbar,
// Value auf NULL setzen.
- // (*m_aAssignValues)[j] = (*m_aParameterRow)[(UINT16)nParameter];
+ // (*m_aAssignValues)[j] = (*m_aParameterRow)[(sal_uInt16)nParameter];
}
if (m_aParameterRow.isValid() && (m_xParamColumns->get().size()+1) != m_aParameterRow->get().size() )
@@ -627,7 +627,7 @@ void OPreparedStatement::parseParamterElem(const String& _sColumnName,OSQLParseN
if(nParameter == -1)
nParameter = AddParameter(pRow_Value_Constructor_Elem,xCol);
// Nr. des Parameters in der Variablen merken:
- SetAssignValue(_sColumnName, String(), TRUE, nParameter);
+ SetAssignValue(_sColumnName, String(), sal_True, nParameter);
}
// -----------------------------------------------------------------------------
diff --git a/connectivity/source/drivers/file/FResultSet.cxx b/connectivity/source/drivers/file/FResultSet.cxx
index c516b325ad9a..b9b7180eb65e 100644
--- a/connectivity/source/drivers/file/FResultSet.cxx
+++ b/connectivity/source/drivers/file/FResultSet.cxx
@@ -138,7 +138,7 @@ OResultSet::OResultSet(OStatement_Base* pStmt,OSQLParseTreeIterator& _aSQLIte
m_nResultSetConcurrency = isCount() ? ResultSetConcurrency::READ_ONLY : ResultSetConcurrency::UPDATABLE;
construct();
- m_aSkipDeletedSet.SetDeleted(m_bShowDeleted);
+ m_aSkipDeletedSet.SetDeletedVisible(m_bShowDeleted);
osl_decrementInterlockedCount( &m_refCount );
}
@@ -645,7 +645,7 @@ 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);
+ m_bRowInserted = m_pTable->InsertRow(m_aInsertRow.getBody(), sal_True,m_xColsIdx);
if(m_bRowInserted && m_pFileSet.isValid())
{
sal_Int32 nPos = (m_aInsertRow->get())[0]->getValue();
@@ -901,20 +901,20 @@ IPropertyArrayHelper & OResultSet::getInfoHelper()
}
//------------------------------------------------------------------
-BOOL OResultSet::ExecuteRow(IResultSetHelper::Movement eFirstCursorPosition,
- INT32 nFirstOffset,
- BOOL bEvaluate,
- BOOL bRetrieveData)
+sal_Bool OResultSet::ExecuteRow(IResultSetHelper::Movement eFirstCursorPosition,
+ sal_Int32 nFirstOffset,
+ sal_Bool bEvaluate,
+ sal_Bool bRetrieveData)
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OResultSet::ExecuteRow" );
OSL_ENSURE(m_pSQLAnalyzer,"OResultSet::ExecuteRow: Analyzer isn't set!");
// Fuer weitere Fetch-Operationen werden diese Angaben ggf. veraendert ...
IResultSetHelper::Movement eCursorPosition = eFirstCursorPosition;
- INT32 nOffset = nFirstOffset;
+ sal_Int32 nOffset = nFirstOffset;
const OSQLColumns & rTableCols = m_pTable->getTableColumns().getBody();
- BOOL bHasRestriction = m_pSQLAnalyzer->hasRestriction();
+ sal_Bool bHasRestriction = m_pSQLAnalyzer->hasRestriction();
again:
// protect from reading over the end when someboby is inserting while we are reading
@@ -1015,7 +1015,7 @@ 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().getBody(), sal_True,sal_True);
}
if (bOK)
@@ -1030,7 +1030,7 @@ 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().getBody(), sal_True,sal_True);
}
if (bOK)
{
@@ -1042,13 +1042,13 @@ again:
}
//-------------------------------------------------------------------
-BOOL OResultSet::Move(IResultSetHelper::Movement eCursorPosition, INT32 nOffset, BOOL bRetrieveData)
+sal_Bool OResultSet::Move(IResultSetHelper::Movement eCursorPosition, sal_Int32 nOffset, sal_Bool bRetrieveData)
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OResultSet::Move" );
//IgnoreDeletedRows:
//
- INT32 nTempPos = m_nRowPos;
+ sal_Int32 nTempPos = m_nRowPos;
// exclusiver zugriff auf die Tabelle
// vos::OGuard* pGuard = m_pTable->Lock();
@@ -1058,7 +1058,7 @@ BOOL OResultSet::Move(IResultSetHelper::Movement eCursorPosition, INT32 nOffset,
if (!m_pFileSet.isValid()) // kein Index verfuegbar
{
// Normales FETCH
- ExecuteRow(eCursorPosition,nOffset,FALSE,bRetrieveData);
+ ExecuteRow(eCursorPosition,nOffset,sal_False,bRetrieveData);
// now set the bookmark for outside this is the logical pos and not the file pos
*(*m_aRow->get().begin()) = sal_Int32(m_nRowPos + 1);
@@ -1096,17 +1096,17 @@ BOOL OResultSet::Move(IResultSetHelper::Movement eCursorPosition, INT32 nOffset,
// Der FileCursor ist ausserhalb des gueltigen Bereichs, wenn
// a.) m_nRowPos < 1
// b.) Ein KeySet besteht und m_nRowPos > m_pFileSet->size()
- if (m_nRowPos < 0 || (m_pFileSet->isFrozen() && eCursorPosition != IResultSetHelper::BOOKMARK && m_nRowPos >= (INT32)m_pFileSet->get().size() )) // && m_pFileSet->IsFrozen()
+ if (m_nRowPos < 0 || (m_pFileSet->isFrozen() && eCursorPosition != IResultSetHelper::BOOKMARK && m_nRowPos >= (sal_Int32)m_pFileSet->get().size() )) // && m_pFileSet->IsFrozen()
{
// aStatus.Set(SQL_STAT_NO_DATA_FOUND);
goto Error;
}
else
{
- if (m_nRowPos < (INT32)m_pFileSet->get().size())
+ if (m_nRowPos < (sal_Int32)m_pFileSet->get().size())
{
// Fetch ueber Index
- ExecuteRow(IResultSetHelper::BOOKMARK,(m_pFileSet->get())[m_nRowPos],FALSE,bRetrieveData);
+ ExecuteRow(IResultSetHelper::BOOKMARK,(m_pFileSet->get())[m_nRowPos],sal_False,bRetrieveData);
// now set the bookmark for outside
*(*m_aRow->get().begin()) = sal_Int32(m_nRowPos + 1);
@@ -1126,26 +1126,26 @@ BOOL OResultSet::Move(IResultSetHelper::Movement eCursorPosition, INT32 nOffset,
}
sal_Bool bOK = sal_True;
// Ermitteln der Anzahl weiterer Fetches
- while (bOK && m_nRowPos >= (INT32)m_pFileSet->get().size())
+ while (bOK && m_nRowPos >= (sal_Int32)m_pFileSet->get().size())
{
if (m_pEvaluationKeySet)
{
- if (m_nRowPos >= (INT32)m_pEvaluationKeySet->size())
+ if (m_nRowPos >= (sal_Int32)m_pEvaluationKeySet->size())
return sal_False;
// aStatus.Set(SQL_STAT_NO_DATA_FOUND);
else if (m_nRowPos == 0)
{
m_aEvaluateIter = m_pEvaluationKeySet->begin();
- bOK = ExecuteRow(IResultSetHelper::BOOKMARK,*m_aEvaluateIter,TRUE, bRetrieveData);
+ bOK = ExecuteRow(IResultSetHelper::BOOKMARK,*m_aEvaluateIter,sal_True, bRetrieveData);
}
else
{
++m_aEvaluateIter;
- bOK = ExecuteRow(IResultSetHelper::BOOKMARK,*m_aEvaluateIter,TRUE, bRetrieveData);
+ bOK = ExecuteRow(IResultSetHelper::BOOKMARK,*m_aEvaluateIter,sal_True, bRetrieveData);
}
}
else
- bOK = ExecuteRow(IResultSetHelper::NEXT,1,TRUE, FALSE);//bRetrieveData);
+ bOK = ExecuteRow(IResultSetHelper::NEXT,1,sal_True, sal_False);//bRetrieveData);
}
if (bOK)
@@ -1324,7 +1324,7 @@ void OResultSet::sortRows()
eKeyType[i] = SQL_ORDERBYKEY_DOUBLE;
break;
- // Andere Typen sind nicht implementiert (und damit immer FALSE)
+ // Andere Typen sind nicht implementiert (und damit immer sal_False)
default:
eKeyType[i] = SQL_ORDERBYKEY_NONE;
OSL_ASSERT("OFILECursor::Execute: Datentyp nicht implementiert");
@@ -1341,19 +1341,19 @@ void OResultSet::sortRows()
while (m_aEvaluateIter != m_pEvaluationKeySet->end())
{
- ExecuteRow(IResultSetHelper::BOOKMARK,(*m_aEvaluateIter),TRUE);
+ ExecuteRow(IResultSetHelper::BOOKMARK,(*m_aEvaluateIter),sal_True);
++m_aEvaluateIter;
}
}
else
{
- while ( ExecuteRow( IResultSetHelper::NEXT, 1, FALSE, TRUE ) )
+ while ( ExecuteRow( IResultSetHelper::NEXT, 1, sal_False, sal_True ) )
{
m_aSelectRow->get()[0]->setValue( m_aRow->get()[0]->getValue() );
if ( m_pSQLAnalyzer->hasFunctions() )
m_pSQLAnalyzer->setSelectionEvaluationResult( m_aSelectRow, m_aColMapping );
const sal_Int32 nBookmark = (*m_aRow->get().begin())->getValue();
- ExecuteRow( IResultSetHelper::BOOKMARK, nBookmark, TRUE, FALSE );
+ ExecuteRow( IResultSetHelper::BOOKMARK, nBookmark, sal_True, sal_False );
}
}
@@ -1370,7 +1370,7 @@ void OResultSet::sortRows()
// -------------------------------------------------------------------------
-BOOL OResultSet::OpenImpl()
+sal_Bool OResultSet::OpenImpl()
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OResultSet::OpenImpl" );
OSL_ENSURE(m_pSQLAnalyzer,"No analyzer set with setSqlAnalyzer!");
@@ -1441,9 +1441,9 @@ BOOL OResultSet::OpenImpl()
while (bOK)
{
if (m_pEvaluationKeySet)
- ExecuteRow(IResultSetHelper::BOOKMARK,(*m_aEvaluateIter),TRUE);
+ ExecuteRow(IResultSetHelper::BOOKMARK,(*m_aEvaluateIter),sal_True);
else
- bOK = ExecuteRow(IResultSetHelper::NEXT,1,TRUE);
+ bOK = ExecuteRow(IResultSetHelper::NEXT,1,sal_True);
if (bOK)
{
@@ -1465,8 +1465,8 @@ BOOL OResultSet::OpenImpl()
}
else
{
- BOOL bDistinct = FALSE;
- BOOL bWasSorted = FALSE;
+ sal_Bool bDistinct = sal_False;
+ sal_Bool bWasSorted = sal_False;
OSQLParseNode *pDistinct = m_pParseTree->getChild(1);
::std::vector<sal_Int32> aOrderbyColumnNumberSave;
::std::vector<TAscendingOrder> aOrderbyAscendingSave;
@@ -1479,7 +1479,7 @@ BOOL OResultSet::OpenImpl()
aOrderbyColumnNumberSave = m_aOrderbyColumnNumber;// .assign(m_aOrderbyColumnNumber.begin(), m_aOrderbyColumnNumber.end());
m_aOrderbyColumnNumber.clear();
aOrderbyAscendingSave.assign(m_aOrderbyAscending.begin(), m_aOrderbyAscending.end());
- bWasSorted = TRUE;
+ bWasSorted = sal_True;
}
// the first column is the bookmark column
@@ -1487,7 +1487,7 @@ BOOL OResultSet::OpenImpl()
::std::copy(aColStart, m_aColMapping.end(),::std::back_inserter(m_aOrderbyColumnNumber));
// m_aOrderbyColumnNumber.assign(aColStart, m_aColMapping.end());
m_aOrderbyAscending.assign(m_aColMapping.size()-1, SQL_ASC);
- bDistinct = TRUE;
+ bDistinct = sal_True;
}
if (IsSorted())
@@ -1525,15 +1525,15 @@ BOOL OResultSet::OpenImpl()
if (nMaxRow)
{
#if OSL_DEBUG_LEVEL > 1
- INT32 nFound=0;
+ sal_Int32 nFound=0;
#endif
- INT32 nPos;
- INT32 nKey;
+ sal_Int32 nPos;
+ sal_Int32 nKey;
for( size_t j = nMaxRow-1; j > 0; --j)
{
nPos = (m_pFileSet->get())[j];
- ExecuteRow(IResultSetHelper::BOOKMARK,nPos,FALSE);
+ ExecuteRow(IResultSetHelper::BOOKMARK,nPos,sal_False);
m_pSQLAnalyzer->setSelectionEvaluationResult(m_aSelectRow,m_aColMapping);
{ // copy row values
OValueRefVector::Vector::iterator copyFrom = m_aSelectRow->get().begin();
@@ -1547,7 +1547,7 @@ BOOL OResultSet::OpenImpl()
// compare with next row
nKey = (m_pFileSet->get())[j-1];
- ExecuteRow(IResultSetHelper::BOOKMARK,nKey,FALSE);
+ ExecuteRow(IResultSetHelper::BOOKMARK,nKey,sal_False);
m_pSQLAnalyzer->setSelectionEvaluationResult(m_aSelectRow,m_aColMapping);
OValueRefVector::Vector::iterator loopInRow = m_aSelectRow->get().begin();
OValueVector::Vector::iterator existentInSearchRow = aSearchRow->get().begin();
@@ -1611,9 +1611,9 @@ BOOL OResultSet::OpenImpl()
while (bOK)
{
if (m_pEvaluationKeySet)
- ExecuteRow(IResultSetHelper::BOOKMARK,(*m_aEvaluateIter),TRUE);
+ ExecuteRow(IResultSetHelper::BOOKMARK,(*m_aEvaluateIter),sal_True);
else
- bOK = ExecuteRow(IResultSetHelper::NEXT,1,TRUE);
+ bOK = ExecuteRow(IResultSetHelper::NEXT,1,sal_True);
if (bOK)
{
@@ -1638,7 +1638,7 @@ BOOL OResultSet::OpenImpl()
m_nRowCountResult = 0;
OSL_ENSURE(m_aAssignValues.isValid(),"No assign values set!");
- if(!m_pTable->InsertRow(m_aAssignValues.getBody(), TRUE,m_xColsIdx))
+ if(!m_pTable->InsertRow(m_aAssignValues.getBody(), sal_True,m_xColsIdx))
{
m_nFilePos = 0;
return sal_False;
@@ -1692,7 +1692,7 @@ void OResultSet::setBoundedColumns(const OValueRefRow& _rRow,
::std::vector<sal_Int32>& _rColMapping)
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OResultSet::setBoundedColumns" );
- ::comphelper::UStringMixEqual aCase(_xMetaData->storesMixedCaseQuotedIdentifiers());
+ ::comphelper::UStringMixEqual aCase(_xMetaData->supportsMixedCaseQuotedIdentifiers());
Reference<XPropertySet> xTableColumn;
::rtl::OUString sTableColumnName, sSelectColumnRealName;
diff --git a/connectivity/source/drivers/file/FStatement.cxx b/connectivity/source/drivers/file/FStatement.cxx
index 52200553d042..929fc1524337 100644
--- a/connectivity/source/drivers/file/FStatement.cxx
+++ b/connectivity/source/drivers/file/FStatement.cxx
@@ -743,7 +743,7 @@ void OStatement_Base::ParseAssignValues(const ::std::vector< String>& aColumnNam
else if (SQL_ISTOKEN(pRow_Value_Constructor_Elem,NULL))
{
// NULL setzen
- SetAssignValue(aColumnName, String(), TRUE);
+ SetAssignValue(aColumnName, String(), sal_True);
}
else if (SQL_ISRULE(pRow_Value_Constructor_Elem,parameter))
parseParamterElem(aColumnName,pRow_Value_Constructor_Elem);
@@ -756,8 +756,8 @@ void OStatement_Base::ParseAssignValues(const ::std::vector< String>& aColumnNam
//------------------------------------------------------------------
void OStatement_Base::SetAssignValue(const String& aColumnName,
const String& aValue,
- BOOL bSetNull,
- UINT32 nParameter)
+ sal_Bool bSetNull,
+ sal_uInt32 nParameter)
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OStatement_Base::SetAssignValue" );
Reference<XPropertySet> xCol;
diff --git a/connectivity/source/drivers/file/FTable.cxx b/connectivity/source/drivers/file/FTable.cxx
index 7bc28fd35b64..4d10d97b24b5 100644
--- a/connectivity/source/drivers/file/FTable.cxx
+++ b/connectivity/source/drivers/file/FTable.cxx
@@ -50,7 +50,7 @@ using namespace ::com::sun::star::container;
DBG_NAME( file_OFileTable )
OFileTable::OFileTable(sdbcx::OCollection* _pTables,OConnection* _pConnection)
-: OTable_TYPEDEF(_pTables,_pConnection->getMetaData()->storesMixedCaseQuotedIdentifiers())
+: OTable_TYPEDEF(_pTables,_pConnection->getMetaData()->supportsMixedCaseQuotedIdentifiers())
,m_pConnection(_pConnection)
,m_pFileStream(NULL)
,m_nFilePos(0)
@@ -72,7 +72,7 @@ OFileTable::OFileTable( sdbcx::OCollection* _pTables,OConnection* _pConnection,
const ::rtl::OUString& _Description ,
const ::rtl::OUString& _SchemaName,
const ::rtl::OUString& _CatalogName
- ) : OTable_TYPEDEF(_pTables,_pConnection->getMetaData()->storesMixedCaseQuotedIdentifiers(),
+ ) : OTable_TYPEDEF(_pTables,_pConnection->getMetaData()->supportsMixedCaseQuotedIdentifiers(),
_Name,
_Type,
_Description,
@@ -204,19 +204,19 @@ void SAL_CALL OFileTable::release() throw()
OTable_TYPEDEF::release();
}
// -----------------------------------------------------------------------------
-BOOL OFileTable::InsertRow(OValueRefVector& /*rRow*/, BOOL /*bFlush*/,const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess>& /*_xCols*/)
+sal_Bool OFileTable::InsertRow(OValueRefVector& /*rRow*/, sal_Bool /*bFlush*/,const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess>& /*_xCols*/)
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OFileTable::InsertRow" );
return sal_False;
}
// -----------------------------------------------------------------------------
-BOOL OFileTable::DeleteRow(const OSQLColumns& /*_rCols*/)
+sal_Bool OFileTable::DeleteRow(const OSQLColumns& /*_rCols*/)
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OFileTable::DeleteRow" );
return sal_False;
}
// -----------------------------------------------------------------------------
-BOOL OFileTable::UpdateRow(OValueRefVector& /*rRow*/, OValueRefRow& /*pOrgRow*/,const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess>& /*_xCols*/)
+sal_Bool OFileTable::UpdateRow(OValueRefVector& /*rRow*/, OValueRefRow& /*pOrgRow*/,const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess>& /*_xCols*/)
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OFileTable::UpdateRow" );
return sal_False;
diff --git a/connectivity/source/drivers/file/fanalyzer.cxx b/connectivity/source/drivers/file/fanalyzer.cxx
index 8211e954a49f..04df24ab379e 100644
--- a/connectivity/source/drivers/file/fanalyzer.cxx
+++ b/connectivity/source/drivers/file/fanalyzer.cxx
@@ -284,12 +284,12 @@ OOperandAttr* OSQLAnalyzer::createOperandAttr(sal_Int32 _nPos,
return new OOperandAttr(static_cast<sal_uInt16>(_nPos),_xCol);
}
// -----------------------------------------------------------------------------
-BOOL OSQLAnalyzer::hasRestriction() const
+sal_Bool OSQLAnalyzer::hasRestriction() const
{
return m_aCompiler->hasCode();
}
// -----------------------------------------------------------------------------
-BOOL OSQLAnalyzer::hasFunctions() const
+sal_Bool OSQLAnalyzer::hasFunctions() const
{
if ( m_bSelectionFirstTime )
{
diff --git a/connectivity/source/drivers/file/fcode.cxx b/connectivity/source/drivers/file/fcode.cxx
index 9d4e1644d370..57b562664026 100644
--- a/connectivity/source/drivers/file/fcode.cxx
+++ b/connectivity/source/drivers/file/fcode.cxx
@@ -355,7 +355,7 @@ sal_Bool OOp_COMPARE::operate(const OOperand* pLeft, const OOperand* pRight) con
case DataType::LONGVARCHAR:
{
rtl::OUString sLH = aLH, sRH = aRH;
- INT32 nRes = rtl_ustr_compareIgnoreAsciiCase_WithLength
+ sal_Int32 nRes = rtl_ustr_compareIgnoreAsciiCase_WithLength
(
sLH.pData->buffer,
sLH.pData->length,
diff --git a/connectivity/source/drivers/file/fcomp.cxx b/connectivity/source/drivers/file/fcomp.cxx
index eeaec1ff40f1..4ea918ef3e27 100644
--- a/connectivity/source/drivers/file/fcomp.cxx
+++ b/connectivity/source/drivers/file/fcomp.cxx
@@ -60,7 +60,7 @@ OPredicateCompiler::OPredicateCompiler(OSQLAnalyzer* pAnalyzer)//,OCursor& rCurs
// : m_rCursor(rCurs)
: m_pAnalyzer(pAnalyzer)
, m_nParamCounter(0)
- , m_bORCondition(FALSE)
+ , m_bORCondition(sal_False)
{
DBG_CTOR(OPredicateCompiler,NULL);
}
diff --git a/connectivity/source/drivers/file/quotedstring.cxx b/connectivity/source/drivers/file/quotedstring.cxx
index 9b315f8cce85..6abfa8a02e01 100644
--- a/connectivity/source/drivers/file/quotedstring.cxx
+++ b/connectivity/source/drivers/file/quotedstring.cxx
@@ -44,8 +44,8 @@ namespace connectivity
return 0;
xub_StrLen nTokCount = 1;
- BOOL bStart = TRUE; // Stehen wir auf dem ersten Zeichen im Token?
- BOOL bInString = FALSE; // Befinden wir uns INNERHALB eines (cStrDel delimited) String?
+ sal_Bool bStart = sal_True; // Stehen wir auf dem ersten Zeichen im Token?
+ sal_Bool bInString = sal_False; // Befinden wir uns INNERHALB eines (cStrDel delimited) String?
// Suche bis Stringende nach dem ersten nicht uebereinstimmenden Zeichen
for( xub_StrLen i = 0; i < nLen; ++i )
@@ -53,11 +53,11 @@ namespace connectivity
const sal_Unicode cChar = m_sString.GetChar(i);
if (bStart)
{
- bStart = FALSE;
+ bStart = sal_False;
// Erstes Zeichen ein String-Delimiter?
if ( cChar == cStrDel )
{
- bInString = TRUE; // dann sind wir jetzt INNERHALB des Strings!
+ bInString = sal_True; // dann sind wir jetzt INNERHALB des Strings!
continue; // dieses Zeichen ueberlesen!
}
}
@@ -75,7 +75,7 @@ namespace connectivity
else
{
// String-Ende
- bInString = FALSE;
+ bInString = sal_False;
}
}
} // if (bInString)
@@ -85,7 +85,7 @@ namespace connectivity
if ( cChar == cTok )
{
++nTokCount;
- bStart = TRUE;
+ bStart = sal_True;
}
}
}
@@ -102,7 +102,7 @@ namespace connectivity
const xub_StrLen nLen = m_sString.Len();
if ( nLen )
{
- BOOL bInString = (nStartPos < nLen) && (m_sString.GetChar(nStartPos) == cStrDel); // Befinden wir uns INNERHALB eines (cStrDel delimited) String?
+ sal_Bool bInString = (nStartPos < nLen) && (m_sString.GetChar(nStartPos) == cStrDel); // Befinden wir uns INNERHALB eines (cStrDel delimited) String?
// Erstes Zeichen ein String-Delimiter?
if (bInString )
@@ -131,7 +131,7 @@ namespace connectivity
else
{
// String-Ende
- bInString = FALSE;
+ bInString = sal_False;
*pData = 0;
}
}
generated by cgit (git 2.34.1) at 2025-03-23 02:09:18 +0000