diff options
17 files changed, 0 insertions, 39 deletions
diff --git a/connectivity/source/drivers/file/FPreparedStatement.cxx b/connectivity/source/drivers/file/FPreparedStatement.cxx index 2d72aa5b7330..b82a702a7c95 100644 --- a/connectivity/source/drivers/file/FPreparedStatement.cxx +++ b/connectivity/source/drivers/file/FPreparedStatement.cxx @@ -502,9 +502,6 @@ void OPreparedStatement::initializeResultSet(OResultSet* pRS) { OStatement_Base::initializeResultSet(pRS); - pRS->setParameterColumns(m_xParamColumns); - pRS->setParameterRow(m_aParameterRow); - // Substitute parameter (AssignValues and criteria): if (!m_xParamColumns->get().empty()) { diff --git a/connectivity/source/drivers/file/FResultSet.cxx b/connectivity/source/drivers/file/FResultSet.cxx index 13f6c5226018..fe8f8f4d79ba 100644 --- a/connectivity/source/drivers/file/FResultSet.cxx +++ b/connectivity/source/drivers/file/FResultSet.cxx @@ -137,7 +137,6 @@ void OResultSet::disposing() m_pParseTree = nullptr; m_xColNames.clear(); m_xColumns = nullptr; - m_xParamColumns = nullptr; m_xColsIdx.clear(); Reference<XComponent> xComp = m_pTable.get(); diff --git a/connectivity/source/drivers/file/FStatement.cxx b/connectivity/source/drivers/file/FStatement.cxx index ec74025fb945..5cd6bb8267e1 100644 --- a/connectivity/source/drivers/file/FStatement.cxx +++ b/connectivity/source/drivers/file/FStatement.cxx @@ -429,10 +429,6 @@ void OStatement_Base::construct(const OUString& sql) m_pSQLAnalyzer.reset( new OSQLAnalyzer(m_pConnection.get()) ); - Reference<XIndexesSupplier> xIndexSup(xTunnel,UNO_QUERY); - if(xIndexSup.is()) - m_pSQLAnalyzer->setIndexes(xIndexSup->getIndexes()); - anylizeSQL(); } diff --git a/connectivity/source/drivers/file/fanalyzer.cxx b/connectivity/source/drivers/file/fanalyzer.cxx index 15fe2c431b7f..93b728827d9a 100644 --- a/connectivity/source/drivers/file/fanalyzer.cxx +++ b/connectivity/source/drivers/file/fanalyzer.cxx @@ -47,11 +47,6 @@ OSQLAnalyzer::~OSQLAnalyzer() } -void OSQLAnalyzer::setIndexes(const Reference< XNameAccess>& _xIndexes) -{ - m_aCompiler->m_xIndexes = _xIndexes; -} - void OSQLAnalyzer::start(OSQLParseNode const * pSQLParseNode) { if (SQL_ISRULE(pSQLParseNode,select_statement)) diff --git a/connectivity/source/drivers/file/fcomp.cxx b/connectivity/source/drivers/file/fcomp.cxx index bdb46456fc38..63cbd0abb9b2 100644 --- a/connectivity/source/drivers/file/fcomp.cxx +++ b/connectivity/source/drivers/file/fcomp.cxx @@ -60,7 +60,6 @@ void OPredicateCompiler::dispose() { Clean(); m_orgColumns = nullptr; - m_xIndexes.clear(); } void OPredicateCompiler::start(OSQLParseNode const * pSQLParseNode) diff --git a/connectivity/source/drivers/mork/MPreparedStatement.cxx b/connectivity/source/drivers/mork/MPreparedStatement.cxx index b252a02b070b..c9a1fafd9c28 100644 --- a/connectivity/source/drivers/mork/MPreparedStatement.cxx +++ b/connectivity/source/drivers/mork/MPreparedStatement.cxx @@ -78,7 +78,6 @@ OCommonStatement::StatementType OPreparedStatement::parseSql( const OUString& sq void OPreparedStatement::initializeResultSet( OResultSet* _pResult ) { OCommonStatement::initializeResultSet( _pResult ); - _pResult->setParameterColumns( m_xParamColumns ); _pResult->setParameterRow( m_aParameterRow ); } diff --git a/connectivity/source/drivers/mork/MResultSet.cxx b/connectivity/source/drivers/mork/MResultSet.cxx index 880c035dbf6a..bd280b10b558 100644 --- a/connectivity/source/drivers/mork/MResultSet.cxx +++ b/connectivity/source/drivers/mork/MResultSet.cxx @@ -100,7 +100,6 @@ void OResultSet::disposing() m_xMetaData.clear(); m_pParseTree = nullptr; m_xColumns = nullptr; - m_xParamColumns = nullptr; m_pKeySet = nullptr; m_xTable.clear(); } diff --git a/connectivity/source/drivers/mork/MResultSet.hxx b/connectivity/source/drivers/mork/MResultSet.hxx index dd329c3af25e..0531781d7cc1 100644 --- a/connectivity/source/drivers/mork/MResultSet.hxx +++ b/connectivity/source/drivers/mork/MResultSet.hxx @@ -231,7 +231,6 @@ protected: void resetParameters() { m_nParamIndex = 0; } ::rtl::Reference<connectivity::OSQLColumns> m_xColumns; // this are the select columns - ::rtl::Reference<connectivity::OSQLColumns> m_xParamColumns; void parseParameter( const OSQLParseNode* pNode, OUString& rMatchString ); /// @throws css::sdbc::SQLException @@ -285,9 +284,6 @@ public: void setParameterRow(const OValueRow& _rParaRow) { m_aParameterRow = _rParaRow; } - void setParameterColumns(const ::rtl::Reference<connectivity::OSQLColumns>& _xParamColumns) - { m_xParamColumns = _xParamColumns; } - void setBindingRow(const OValueRow& _aRow) { m_aRow = _aRow; } diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.cxx index 4706e2c557ea..04c27cd0ed71 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.cxx +++ b/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.cxx @@ -77,9 +77,6 @@ IniParser::IniParser(OUString const & rIniName) line.copy(nIndexStart + 1,nIndexEnd - nIndexStart -1).trim(), RTL_TEXTENCODING_ASCII_US ); if (sectionName.isEmpty()) sectionName = "no name section"; - - ini_Section *aSection = &mAllSection[sectionName]; - aSection->sName = sectionName; } } } diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.hxx b/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.hxx index 95ca6d748cf5..f9cb0241b4a1 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.hxx +++ b/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.hxx @@ -38,7 +38,6 @@ typedef std::vector< struct ini_Section { - OUString sName; NameValueVector vVector; }; typedef std::map<OUString, diff --git a/connectivity/source/drivers/mysqlc/mysqlc_connection.cxx b/connectivity/source/drivers/mysqlc/mysqlc_connection.cxx index 981fe7392aa5..dfe71b4d35a6 100644 --- a/connectivity/source/drivers/mysqlc/mysqlc_connection.cxx +++ b/connectivity/source/drivers/mysqlc/mysqlc_connection.cxx @@ -189,8 +189,6 @@ void OConnection::construct(const OUString& url, const Sequence<PropertyValue>& mysqlc_sdbc_driver::throwSQLExceptionWithMsg(mysql_error(&m_mysql), mysql_errno(&m_mysql), *this, getConnectionEncoding()); - m_settings.schema = aDbName; - // Check if the server is 4.1 or above if (getMysqlVersion() < 40100) { diff --git a/connectivity/source/drivers/mysqlc/mysqlc_connection.hxx b/connectivity/source/drivers/mysqlc/mysqlc_connection.hxx index b1c8d5bda8ed..cccbb294e204 100644 --- a/connectivity/source/drivers/mysqlc/mysqlc_connection.hxx +++ b/connectivity/source/drivers/mysqlc/mysqlc_connection.hxx @@ -69,7 +69,6 @@ typedef ::cppu::WeakComponentImplHelper3<css::sdbc::XConnection, css::sdbc::XWar struct ConnectionSettings { rtl_TextEncoding encoding; - OUString schema; OUString connectionURL; bool readOnly; ConnectionSettings() diff --git a/connectivity/source/drivers/writer/WTable.cxx b/connectivity/source/drivers/writer/WTable.cxx index 1e847dfb9eb2..445ec79bc6da 100644 --- a/connectivity/source/drivers/writer/WTable.cxx +++ b/connectivity/source/drivers/writer/WTable.cxx @@ -205,10 +205,6 @@ void OWriterTable::construct() m_bHasHeaders = true; } } - - uno::Reference<util::XNumberFormatsSupplier> xSupp(xDoc, uno::UNO_QUERY); - if (xSupp.is()) - m_xFormats = xSupp->getNumberFormats(); } fillColumns(); diff --git a/connectivity/source/inc/file/FResultSet.hxx b/connectivity/source/inc/file/FResultSet.hxx index d223c0909d4e..155f7a6e2413 100644 --- a/connectivity/source/inc/file/FResultSet.hxx +++ b/connectivity/source/inc/file/FResultSet.hxx @@ -76,7 +76,6 @@ namespace connectivity OValueRefRow m_aSelectRow; OValueRefRow m_aRow; OValueRefRow m_aEvaluateRow; // contains all values of a row - OValueRefRow m_aParameterRow; OValueRefRow m_aInsertRow; // needed for insert by cursor ORefAssignValues m_aAssignValues; // needed for insert,update and parameters // to compare with the restrictions @@ -88,7 +87,6 @@ namespace connectivity std::unique_ptr<OSortIndex> m_pSortIndex; ::rtl::Reference<connectivity::OSQLColumns> m_xColumns; // this are the select columns - ::rtl::Reference<connectivity::OSQLColumns> m_xParamColumns; rtl::Reference<OFileTable> m_pTable; connectivity::OSQLParseNode* m_pParseTree; @@ -262,9 +260,7 @@ namespace connectivity void doTableSpecials(const OSQLTable& _xTable); sal_Int32 getRowCountResult() const { return m_nRowCountResult; } - void setParameterRow(const OValueRefRow& _rParaRow) { m_aParameterRow = _rParaRow; } void setEvaluationRow(const OValueRefRow& _aRow) { m_aEvaluateRow = _aRow; } - void setParameterColumns(const ::rtl::Reference<connectivity::OSQLColumns>& _xParamColumns) { m_xParamColumns = _xParamColumns; } void setAssignValues(const ORefAssignValues& _aAssignValues) { m_aAssignValues = _aAssignValues; } void setBindingRow(const OValueRefRow& _aRow) { m_aRow = _aRow; } void setSelectRow(const OValueRefRow& _rRow) diff --git a/connectivity/source/inc/file/fanalyzer.hxx b/connectivity/source/inc/file/fanalyzer.hxx index bf0bf810299d..a2463870d1c9 100644 --- a/connectivity/source/inc/file/fanalyzer.hxx +++ b/connectivity/source/inc/file/fanalyzer.hxx @@ -58,8 +58,6 @@ namespace connectivity */ void bindParameterRow(OValueRefRow const & _pRow); - void setIndexes(const css::uno::Reference< css::container::XNameAccess>& _xIndexes); - void dispose(); void start(OSQLParseNode const * pSQLParseNode); bool hasRestriction() const; diff --git a/connectivity/source/inc/file/fcomp.hxx b/connectivity/source/inc/file/fcomp.hxx index 5b290c2f7212..3f1d0d9d545d 100644 --- a/connectivity/source/inc/file/fcomp.hxx +++ b/connectivity/source/inc/file/fcomp.hxx @@ -41,7 +41,6 @@ namespace connectivity OCodeList m_aCodeList; css::uno::Reference< css::container::XNameAccess> m_orgColumns; // in filecurs this are the filecolumns OSQLAnalyzer* m_pAnalyzer; - css::uno::Reference< css::container::XNameAccess> m_xIndexes; sal_Int32 m_nParamCounter; public: OPredicateCompiler(OSQLAnalyzer* pAnalyzer); diff --git a/connectivity/source/inc/writer/WTable.hxx b/connectivity/source/inc/writer/WTable.hxx index 27c77f2dbf7a..6e2c3e89e88a 100644 --- a/connectivity/source/inc/writer/WTable.hxx +++ b/connectivity/source/inc/writer/WTable.hxx @@ -65,7 +65,6 @@ private: sal_Int32 m_nStartCol; sal_Int32 m_nDataCols; bool m_bHasHeaders; - css::uno::Reference<css::util::XNumberFormats> m_xFormats; void fillColumns(); |