Kaydet (Commit) 33a805eb authored tarafından Santiago Martinez's avatar Santiago Martinez Kaydeden (comit) Caolán McNamara

Remove unused code as listed in unusedcode.easy

üst c2dc50c3
...@@ -147,13 +147,6 @@ namespace connectivity ...@@ -147,13 +147,6 @@ namespace connectivity
} }
guint
getFieldCount()
{
initFields();
return nFields;
}
const ColumnProperty * const ColumnProperty *
getField(guint n) getField(guint n)
{ {
......
...@@ -64,7 +64,6 @@ namespace connectivity ...@@ -64,7 +64,6 @@ namespace connectivity
const SplitEvoColumns* get_evo_addr(); const SplitEvoColumns* get_evo_addr();
const ColumnProperty *getField(guint n); const ColumnProperty *getField(guint n);
guint getFieldCount() ;
GType getGFieldType(guint nCol) ; GType getGFieldType(guint nCol) ;
sal_Int32 getFieldType(guint nCol) ; sal_Int32 getFieldType(guint nCol) ;
rtl::OUString getFieldTypeName(guint nCol) ; rtl::OUString getFieldTypeName(guint nCol) ;
......
...@@ -163,18 +163,6 @@ void SAL_CALL OCommonStatement::close( ) throw(SQLException, RuntimeException) ...@@ -163,18 +163,6 @@ void SAL_CALL OCommonStatement::close( ) throw(SQLException, RuntimeException)
} }
// ------------------------------------------------------------------------- // -------------------------------------------------------------------------
void OCommonStatement::reset() throw (SQLException)
{
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(OCommonStatement_IBase::rBHelper.bDisposed);
clearWarnings ();
if (m_xResultSet.get().is())
clearMyResultSet();
}
void OCommonStatement::clearMyResultSet () throw (SQLException) void OCommonStatement::clearMyResultSet () throw (SQLException)
{ {
::osl::MutexGuard aGuard( m_aMutex ); ::osl::MutexGuard aGuard( m_aMutex );
......
...@@ -190,7 +190,6 @@ namespace connectivity ...@@ -190,7 +190,6 @@ namespace connectivity
virtual ~OCommonStatement(); virtual ~OCommonStatement();
protected: protected:
void reset () throw( ::com::sun::star::sdbc::SQLException);
void clearMyResultSet () throw( ::com::sun::star::sdbc::SQLException); void clearMyResultSet () throw( ::com::sun::star::sdbc::SQLException);
void parseSql( const ::rtl::OUString& sql, QueryData& _out_rQueryData ); void parseSql( const ::rtl::OUString& sql, QueryData& _out_rQueryData );
EBookQuery *whereAnalysis( const OSQLParseNode* parseTree ); EBookQuery *whereAnalysis( const OSQLParseNode* parseTree );
......
...@@ -66,11 +66,6 @@ void OPredicateCompiler::Clean() ...@@ -66,11 +66,6 @@ void OPredicateCompiler::Clean()
m_aCodeList.clear(); m_aCodeList.clear();
} }
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
void OSQLAnalyzer::clean()
{
m_aCompiler->Clean();
}
// -----------------------------------------------------------------------------
void OSQLAnalyzer::bindParameterRow(OValueRefRow& _pRow) void OSQLAnalyzer::bindParameterRow(OValueRefRow& _pRow)
{ {
OCodeList& rCodeList = m_aCompiler->m_aCodeList; OCodeList& rCodeList = m_aCompiler->m_aCodeList;
......
...@@ -212,67 +212,6 @@ void OSQLAnalyzer::bindSelectRow(const OValueRefRow& _pRow) ...@@ -212,67 +212,6 @@ void OSQLAnalyzer::bindSelectRow(const OValueRefRow& _pRow)
return pKeySet; return pKeySet;
} }
//------------------------------------------------------------------
void OSQLAnalyzer::describeParam(::rtl::Reference<OSQLColumns> rParameterColumns)
{
OCodeList& rCodeList = m_aCompiler->m_aCodeList;
OCodeStack aCodeStack;
if (!rCodeList.size())
return; // no predicate
if (!rParameterColumns->get().size())
return; // no parameters
// Create columns, that have a more precise description for the included
::rtl::Reference<OSQLColumns> aNewParamColumns = new OSQLColumns(*rParameterColumns);
// Create a Test-row, is needed to describe the parameters
OValueRefRow aParameterRow = new OValueRefVector(rParameterColumns->get().size());
bindParameterRow(aParameterRow);
OValueRefRow aTestRow = new OValueRefVector(Reference< XIndexAccess>(m_aCompiler->getOrigColumns(),UNO_QUERY)->getCount());
delete bindEvaluationRow(aTestRow); // Bind the attributes to the values
for(OCodeList::iterator aIter = rCodeList.begin(); aIter != rCodeList.end(); ++aIter)
{
OOperand* pOperand = PTR_CAST(OOperand,(*aIter));
OOperator* pOperator = PTR_CAST(OOperator,(*aIter));
if (pOperand)
aCodeStack.push(pOperand);
else
{
if (pOperator->getRequestedOperands() == 2) // with two Operands it is possible
{ // to specify one parameter better
OOperandParam *pParam = PTR_CAST(OOperandParam,aCodeStack.top());
if (pParam) // adjust the Parameter-types, if the left Operand is an attribute
{
OOperandAttr *pLeft = PTR_CAST(OOperandAttr,*(rCodeList.end() - 2));
if (pLeft)
{
Reference< XPropertySet> xCol;
Reference< XIndexAccess>(m_aCompiler->getOrigColumns(),UNO_QUERY)->getByIndex(pLeft->getRowPos()) >>= xCol;
OSL_ENSURE(xCol.is(), "Ungueltige Struktur");
pParam->describe(xCol, aNewParamColumns);
}
}
}
pOperator->Exec(aCodeStack);
}
}
OOperand* pOperand = aCodeStack.top();
aCodeStack.pop();
OSL_ENSURE(aCodeStack.empty(), "StackFehler");
OSL_ENSURE(pOperand, "StackFehler");
if (IS_TYPE(OOperandResult,pOperand))
delete pOperand;
else
OSL_FAIL("Illegal here!");
rParameterColumns = aNewParamColumns;
}
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
OOperandAttr* OSQLAnalyzer::createOperandAttr(sal_Int32 _nPos, OOperandAttr* OSQLAnalyzer::createOperandAttr(sal_Int32 _nPos,
const Reference< XPropertySet>& _xCol, const Reference< XPropertySet>& _xCol,
......
...@@ -65,7 +65,6 @@ namespace connectivity ...@@ -65,7 +65,6 @@ namespace connectivity
{ } { }
OConnection* getConnection() const { return m_pConnection; } OConnection* getConnection() const { return m_pConnection; }
void describeParam(::rtl::Reference<OSQLColumns> rParameterColumns); // More detailed description of parameters
::std::vector<sal_Int32>* bindEvaluationRow(OValueRefRow& _pRow); // Bind an evaluation row to the restriction ::std::vector<sal_Int32>* bindEvaluationRow(OValueRefRow& _pRow); // Bind an evaluation row to the restriction
/** bind the select columns if they contain a function which needs a row value /** bind the select columns if they contain a function which needs a row value
@param _pRow the result row @param _pRow the result row
...@@ -81,7 +80,6 @@ namespace connectivity ...@@ -81,7 +80,6 @@ namespace connectivity
void dispose(); void dispose();
void start(OSQLParseNode* pSQLParseNode); void start(OSQLParseNode* pSQLParseNode);
void clean();
virtual sal_Bool hasRestriction() const; virtual sal_Bool hasRestriction() const;
virtual sal_Bool hasFunctions() const; virtual sal_Bool hasFunctions() const;
inline sal_Bool evaluateRestriction() { return m_aInterpreter->start(); } inline sal_Bool evaluateRestriction() { return m_aInterpreter->start(); }
......
...@@ -809,10 +809,6 @@ connectivity::OSQLParseNodesContainer::empty() const ...@@ -809,10 +809,6 @@ connectivity::OSQLParseNodesContainer::empty() const
connectivity::OSQLScanner::GetCurrentRule() const connectivity::OSQLScanner::GetCurrentRule() const
connectivity::OSortIndex::GetValue(int) const connectivity::OSortIndex::GetValue(int) const
connectivity::SQLError::getSQLState(int) const connectivity::SQLError::getSQLState(int) const
connectivity::evoab::OCommonStatement::reset()
connectivity::evoab::getFieldCount()
connectivity::file::OSQLAnalyzer::clean()
connectivity::file::OSQLAnalyzer::describeParam(rtl::Reference<connectivity::ORefVector<com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet> > >)
connectivity::file::OStatement_Base::reset() connectivity::file::OStatement_Base::reset()
connectivity::file::OStatement_Base::setWarning(com::sun::star::sdbc::SQLWarning const&) connectivity::file::OStatement_Base::setWarning(com::sun::star::sdbc::SQLWarning const&)
connectivity::mozab::MQuery::getAddressbook() const connectivity::mozab::MQuery::getAddressbook() const
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment