summaryrefslogtreecommitdiff
path: root/connectivity/source/drivers/mork
diff options
context:
space:
mode:
Diffstat (limited to 'connectivity/source/drivers/mork')
-rw-r--r--connectivity/source/drivers/mork/MConnection.hxx1
-rw-r--r--connectivity/source/drivers/mork/MPreparedStatement.cxx2
-rw-r--r--connectivity/source/drivers/mork/MPreparedStatement.hxx17
-rw-r--r--connectivity/source/drivers/mork/MQueryHelper.hxx1
-rw-r--r--connectivity/source/drivers/mork/MResultSet.cxx1
-rw-r--r--connectivity/source/drivers/mork/MResultSet.hxx1
-rw-r--r--connectivity/source/drivers/mork/MStatement.cxx1
-rw-r--r--connectivity/source/drivers/mork/MStatement.hxx4
8 files changed, 0 insertions, 28 deletions
diff --git a/connectivity/source/drivers/mork/MConnection.hxx b/connectivity/source/drivers/mork/MConnection.hxx
index fd101a20e249..007302fb2053 100644
--- a/connectivity/source/drivers/mork/MConnection.hxx
+++ b/connectivity/source/drivers/mork/MConnection.hxx
@@ -43,7 +43,6 @@ namespace connectivity
// Data attributes
- ::com::sun::star::sdbc::SQLWarning m_aLastWarning;
MorkDriver* m_pDriver; // Pointer to the owning
// driver object
OColumnAlias m_aColumnAlias;
diff --git a/connectivity/source/drivers/mork/MPreparedStatement.cxx b/connectivity/source/drivers/mork/MPreparedStatement.cxx
index df22af3b012b..430c01f2d2f2 100644
--- a/connectivity/source/drivers/mork/MPreparedStatement.cxx
+++ b/connectivity/source/drivers/mork/MPreparedStatement.cxx
@@ -43,9 +43,7 @@ IMPLEMENT_SERVICE_INFO(OPreparedStatement,"com.sun.star.sdbcx.mork.PreparedState
OPreparedStatement::OPreparedStatement( OConnection* _pConnection,const OUString& sql)
:OCommonStatement(_pConnection)
- ,m_nNumParams(0)
,m_sSqlStatement(sql)
- ,m_bPrepared(false)
,m_pResultSet()
{
}
diff --git a/connectivity/source/drivers/mork/MPreparedStatement.hxx b/connectivity/source/drivers/mork/MPreparedStatement.hxx
index 186b32fce139..9e7e7f60d3a9 100644
--- a/connectivity/source/drivers/mork/MPreparedStatement.hxx
+++ b/connectivity/source/drivers/mork/MPreparedStatement.hxx
@@ -44,27 +44,10 @@ namespace connectivity
public OPreparedStatement_BASE
{
protected:
- struct Parameter
- {
- ::com::sun::star::uno::Any aValue;
- sal_Int32 nDataType;
-
- Parameter(const ::com::sun::star::uno::Any& rValue,
- sal_Int32 rDataType) : aValue(rValue),nDataType(rDataType)
- {
- }
-
- };
-
- ::std::vector< Parameter> m_aParameters;
-
// Data attributes
- sal_Int32 m_nNumParams; // Number of parameter markers for the prepared statement
-
OUString m_sSqlStatement;
::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData > m_xMetaData;
- bool m_bPrepared;
::rtl::Reference< OResultSet > m_pResultSet;
::rtl::Reference<connectivity::OSQLColumns> m_xParamColumns; // the parameter columns
OValueRow m_aParameterRow;
diff --git a/connectivity/source/drivers/mork/MQueryHelper.hxx b/connectivity/source/drivers/mork/MQueryHelper.hxx
index 03d702808346..904026dfe423 100644
--- a/connectivity/source/drivers/mork/MQueryHelper.hxx
+++ b/connectivity/source/drivers/mork/MQueryHelper.hxx
@@ -170,7 +170,6 @@ namespace connectivity
typedef std::vector< MQueryHelperResultEntry* > resultsArray;
mutable ::osl::Mutex m_aMutex;
- ::osl::Condition m_aCondition;
resultsArray m_aResults;
sal_uInt32 m_nIndex;
bool m_bHasMore;
diff --git a/connectivity/source/drivers/mork/MResultSet.cxx b/connectivity/source/drivers/mork/MResultSet.cxx
index b0e2f3e2713e..134e6839b01f 100644
--- a/connectivity/source/drivers/mork/MResultSet.cxx
+++ b/connectivity/source/drivers/mork/MResultSet.cxx
@@ -108,7 +108,6 @@ OResultSet::OResultSet(OCommonStatement* pStmt, const std::shared_ptr< connectiv
,m_pKeySet(nullptr)
,m_nNewRow(0)
,m_nUpdatedRow(0)
- ,m_RowStates(0)
,m_bIsReadOnly(TRISTATE_INDET)
{
//m_aQuery.setMaxNrOfReturns(pStmt->getOwnConnection()->getMaxResultRecords());
diff --git a/connectivity/source/drivers/mork/MResultSet.hxx b/connectivity/source/drivers/mork/MResultSet.hxx
index 7335995418d1..142c375c52de 100644
--- a/connectivity/source/drivers/mork/MResultSet.hxx
+++ b/connectivity/source/drivers/mork/MResultSet.hxx
@@ -241,7 +241,6 @@ protected:
::rtl::Reference<OKeySet> m_pKeySet;
sal_Int32 m_nNewRow; //inserted row
sal_Int32 m_nUpdatedRow; //updated row
- sal_Int32 m_RowStates;
TriState m_bIsReadOnly;
inline void resetParameters() { m_nParamIndex = 0; }
diff --git a/connectivity/source/drivers/mork/MStatement.cxx b/connectivity/source/drivers/mork/MStatement.cxx
index 5cfa0dc2425c..416b381b35a4 100644
--- a/connectivity/source/drivers/mork/MStatement.cxx
+++ b/connectivity/source/drivers/mork/MStatement.cxx
@@ -81,7 +81,6 @@ OCommonStatement::OCommonStatement(OConnection* _pConnection )
,m_pConnection(_pConnection)
,m_aParser( comphelper::getComponentContext(_pConnection->getDriver()->getFactory()) )
,m_pSQLIterator( new OSQLParseTreeIterator( _pConnection, _pConnection->createCatalog()->getTables(), m_aParser, nullptr ) )
- ,rBHelper(OCommonStatement_IBASE::rBHelper)
{
m_xDBMetaData = _pConnection->getMetaData();
m_pParseTree = nullptr;
diff --git a/connectivity/source/drivers/mork/MStatement.hxx b/connectivity/source/drivers/mork/MStatement.hxx
index 8ff6831b3723..abe436069687 100644
--- a/connectivity/source/drivers/mork/MStatement.hxx
+++ b/connectivity/source/drivers/mork/MStatement.hxx
@@ -76,8 +76,6 @@ namespace connectivity
// for this Statement
- ::std::list< OUString> m_aBatchList;
-
OTable* m_pTable;
OConnection* m_pConnection; // The owning Connection object
@@ -93,8 +91,6 @@ namespace connectivity
::std::vector<sal_Int32> m_aOrderbyColumnNumber;
::std::vector<TAscendingOrder> m_aOrderbyAscending;
- ::cppu::OBroadcastHelper& rBHelper;
-
protected:
// OPropertyArrayUsageHelper