summaryrefslogtreecommitdiff
path: root/connectivity/source/inc/file
diff options
context:
space:
mode:
Diffstat (limited to 'connectivity/source/inc/file')
-rw-r--r--connectivity/source/inc/file/FColumns.hxx2
-rw-r--r--connectivity/source/inc/file/FPreparedStatement.hxx2
-rw-r--r--connectivity/source/inc/file/FResultSet.hxx14
-rw-r--r--connectivity/source/inc/file/FStatement.hxx4
-rw-r--r--connectivity/source/inc/file/FTable.hxx6
-rw-r--r--connectivity/source/inc/file/FTables.hxx2
-rw-r--r--connectivity/source/inc/file/fanalyzer.hxx6
7 files changed, 18 insertions, 18 deletions
diff --git a/connectivity/source/inc/file/FColumns.hxx b/connectivity/source/inc/file/FColumns.hxx
index 119ad228ad55..81214fbe603a 100644
--- a/connectivity/source/inc/file/FColumns.hxx
+++ b/connectivity/source/inc/file/FColumns.hxx
@@ -49,7 +49,7 @@ namespace connectivity
OColumns( OFileTable* _pTable,
::osl::Mutex& _rMutex,
const TStringVector &_rVector
- ) : sdbcx::OCollection(*_pTable,_pTable->getConnection()->getMetaData()->storesMixedCaseQuotedIdentifiers(),_rMutex,_rVector)
+ ) : sdbcx::OCollection(*_pTable,_pTable->getConnection()->getMetaData()->supportsMixedCaseQuotedIdentifiers(),_rMutex,_rVector)
,m_pTable(_pTable)
{}
};
diff --git a/connectivity/source/inc/file/FPreparedStatement.hxx b/connectivity/source/inc/file/FPreparedStatement.hxx
index 9528ca16a508..d5bbd21b191a 100644
--- a/connectivity/source/inc/file/FPreparedStatement.hxx
+++ b/connectivity/source/inc/file/FPreparedStatement.hxx
@@ -68,7 +68,7 @@ namespace connectivity
void checkAndResizeParameters(sal_Int32 parameterIndex);
void setParameter(sal_Int32 parameterIndex, const ORowSetValue& x);
- UINT32 AddParameter(connectivity::OSQLParseNode * pParameter,
+ sal_uInt32 AddParameter(connectivity::OSQLParseNode * pParameter,
const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xCol);
void scanParameter(OSQLParseNode* pParseNode,::std::vector< OSQLParseNode*>& _rParaNodes);
void describeColumn(OSQLParseNode* _pParameter,OSQLParseNode* _pNode,const OSQLTable& _xTable);
diff --git a/connectivity/source/inc/file/FResultSet.hxx b/connectivity/source/inc/file/FResultSet.hxx
index 530387ceef4a..ca774b53e341 100644
--- a/connectivity/source/inc/file/FResultSet.hxx
+++ b/connectivity/source/inc/file/FResultSet.hxx
@@ -166,13 +166,13 @@ namespace connectivity
void construct();
sal_Bool evaluate();
- BOOL ExecuteRow(IResultSetHelper::Movement eFirstCursorPosition,
- INT32 nOffset = 1,
- BOOL bEvaluate = TRUE,
- BOOL bRetrieveData = TRUE);
+ sal_Bool ExecuteRow(IResultSetHelper::Movement eFirstCursorPosition,
+ sal_Int32 nOffset = 1,
+ sal_Bool bEvaluate = sal_True,
+ sal_Bool bRetrieveData = sal_True);
OKeyValue* GetOrderbyKeyValue(OValueRefRow& _rRow);
- BOOL IsSorted() const { return !m_aOrderbyColumnNumber.empty() && m_aOrderbyColumnNumber[0] != SQL_COLUMN_NOTFOUND;}
+ sal_Bool IsSorted() const { return !m_aOrderbyColumnNumber.empty() && m_aOrderbyColumnNumber[0] != SQL_COLUMN_NOTFOUND;}
// return true when the select statement is "select count(*) from table"
inline sal_Bool isCount() const { return m_bIsCount; }
@@ -187,7 +187,7 @@ namespace connectivity
using OResultSet_BASE::rBHelper;
- BOOL Move(IResultSetHelper::Movement eCursorPosition, INT32 nOffset, BOOL bRetrieveData);
+ sal_Bool Move(IResultSetHelper::Movement eCursorPosition, sal_Int32 nOffset, sal_Bool bRetrieveData);
virtual sal_Bool fillIndexValues(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XColumnsSupplier> &_xIndex);
// OPropertyArrayUsageHelper
@@ -300,7 +300,7 @@ namespace connectivity
// special methods
inline sal_Int32 mapColumn(sal_Int32 column);
- virtual BOOL OpenImpl();
+ virtual sal_Bool OpenImpl();
virtual void doTableSpecials(const OSQLTable& _xTable);
inline sal_Int32 getRowCountResult() const { return m_nRowCountResult; }
diff --git a/connectivity/source/inc/file/FStatement.hxx b/connectivity/source/inc/file/FStatement.hxx
index 0983811b9bd2..4c6fbcd426af 100644
--- a/connectivity/source/inc/file/FStatement.hxx
+++ b/connectivity/source/inc/file/FStatement.hxx
@@ -134,8 +134,8 @@ namespace connectivity
void GetAssignValues();
void SetAssignValue(const String& aColumnName,
const String& aValue,
- BOOL bSetNull = FALSE,
- UINT32 nParameter=SQL_NO_PARAMETER);
+ sal_Bool bSetNull = sal_False,
+ sal_uInt32 nParameter=SQL_NO_PARAMETER);
void ParseAssignValues( const ::std::vector< String>& aColumnNameList,
connectivity::OSQLParseNode* pRow_Value_Constructor_Elem,xub_StrLen nIndex);
diff --git a/connectivity/source/inc/file/FTable.hxx b/connectivity/source/inc/file/FTable.hxx
index bc4cd450f931..f21a89ea0aef 100644
--- a/connectivity/source/inc/file/FTable.hxx
+++ b/connectivity/source/inc/file/FTable.hxx
@@ -87,9 +87,9 @@ namespace connectivity
virtual sal_Bool fetchRow(OValueRefRow& _rRow,const OSQLColumns& _rCols, sal_Bool _bUseTableDefs,sal_Bool bRetrieveData) = 0;
::vos::ORef<OSQLColumns> getTableColumns() const {return m_aColumns;}
- virtual BOOL InsertRow(OValueRefVector& rRow, BOOL bFlush,const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess>& _xCols);
- virtual BOOL DeleteRow(const OSQLColumns& _rCols);
- virtual BOOL UpdateRow(OValueRefVector& rRow, OValueRefRow& pOrgRow,const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess>& _xCols);
+ virtual sal_Bool InsertRow(OValueRefVector& rRow, sal_Bool bFlush,const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess>& _xCols);
+ virtual sal_Bool DeleteRow(const OSQLColumns& _rCols);
+ virtual sal_Bool UpdateRow(OValueRefVector& rRow, OValueRefRow& pOrgRow,const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess>& _xCols);
virtual void addColumn(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& descriptor);
virtual void dropColumn(sal_Int32 _nPos);
// refresh the header of file based tables to see changes done by someone
diff --git a/connectivity/source/inc/file/FTables.hxx b/connectivity/source/inc/file/FTables.hxx
index 4a15985c248b..e5247652e895 100644
--- a/connectivity/source/inc/file/FTables.hxx
+++ b/connectivity/source/inc/file/FTables.hxx
@@ -46,7 +46,7 @@ namespace connectivity
virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException);
public:
OTables(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData >& _rMetaData,::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex,
- const TStringVector &_rVector) : sdbcx::OCollection(_rParent,_rMetaData->storesMixedCaseQuotedIdentifiers(),_rMutex,_rVector)
+ const TStringVector &_rVector) : sdbcx::OCollection(_rParent,_rMetaData->supportsMixedCaseQuotedIdentifiers(),_rMutex,_rVector)
,m_xMetaData(_rMetaData)
{}
diff --git a/connectivity/source/inc/file/fanalyzer.hxx b/connectivity/source/inc/file/fanalyzer.hxx
index c882b760765a..96f815a5cc0d 100644
--- a/connectivity/source/inc/file/fanalyzer.hxx
+++ b/connectivity/source/inc/file/fanalyzer.hxx
@@ -81,9 +81,9 @@ namespace connectivity
void dispose();
void start(OSQLParseNode* pSQLParseNode);
void clean();
- virtual BOOL hasRestriction() const;
- virtual BOOL hasFunctions() const;
- inline BOOL evaluateRestriction() { return m_aInterpreter->start(); }
+ virtual sal_Bool hasRestriction() const;
+ virtual sal_Bool hasFunctions() const;
+ inline sal_Bool evaluateRestriction() { return m_aInterpreter->start(); }
void setSelectionEvaluationResult(OValueRefRow& _pRow,const ::std::vector<sal_Int32>& _rColumnMapping);
void setOrigColumns(const OFileColumns& rCols);
virtual OOperandAttr* createOperandAttr(sal_Int32 _nPos,