Hi! I removed all of the unused functions of module connectivity
connectivity::OKeyValue::OKeyValue()
connectivity::ORowSetValue::setFromDouble(double const&, int)
connectivity::OSQLInternalNode::OSQLInternalNode(unsigned short const*, connectivity::SQLNodeType,
unsigned int)
connectivity::OSQLParseNode::remove(connectivity::OSQLParseNode*)
connectivity::OSQLParseNode::replaceAt(unsigned int, connectivity::OSQLParseNode*)
connectivity::OSQLParseNodesContainer::empty() const
connectivity::OSQLScanner::GetCurrentRule() const
connectivity::OSortIndex::GetValue(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::setWarning(com::sun::star::sdbc::SQLWarning const&)
connectivity::mozab::MQuery::getAddressbook() const
connectivity::mozab::MQuery::getMaxNrOfReturns() const
connectivity::mozab::MQuery::getQuerySubDirs() const
connectivity::mozab::MQuery::setQuerySubDirs(unsigned char&)
connectivity::mozab::MQueryHelper::atEnd() const
connectivity::mozab::MQueryHelper::hasMore() const
connectivity::mozab::MQueryHelper::next()
connectivity::mozab::MQueryHelper::rewind()
connectivity::mozab::MTypeConverter::asciiOUStringToNsACString(rtl::OUString const&,
nsACString_internal&)
connectivity::mozab::MTypeConverter::nsACStringToOUString(nsACString_internal const&)
connectivity::mozab::MTypeConverter::nsStringToCCharStringAscii(nsString const&)
connectivity::mozab::MTypeConverter::ouStringToCCharStringUtf8(rtl::OUString const&)
connectivity::mozab::MTypeConverter::ouStringToStlString(rtl::OUString const&)
connectivity::mozab::OCatalog::getDot()
connectivity::mozab::OPreparedStatement::checkParameterIndex(int)
connectivity::mozab::OResultSet::initializeRow(rtl::Reference<connectivity::ODeleteVector<connectivity::ORowSetValue>
&, int)
connectivity::mozab::OTable::OTable(connectivity::sdbcx::OCollection*,
connectivity::mozab::OConnection*)
connectivity::odbc::ODatabaseMetaDataResultSet::openTablesTypes()
connectivity::odbc::OPreparedStatement::getDataBuf(int)
connectivity::odbc::OPreparedStatement::getParamLength(int)
connectivity::odbc::OPreparedStatement::getPrecision(int)
connectivity::sdbcx::OGroup::OGroup(rtl::OUString const&, unsigned char)
connectivity::sdbcx::OGroup::OGroup(unsigned char)
connectivity::toString(com::sun::star::uno::Any const&)
Szabolcs
From 393a0e247f0fd292cef08226d690bc1ed7a47adf Mon Sep 17 00:00:00 2001
From: Szabolcs Dezsi <dezsiszabi@hotmail.com>
Date: Fri, 17 Feb 2012 15:41:22 +0100
Subject: [PATCH] Removed all of the unused method of module connectivity
---
connectivity/inc/connectivity/CommonTools.hxx | 1 -
connectivity/inc/connectivity/FValue.hxx | 2 -
connectivity/inc/connectivity/sdbcx/VGroup.hxx | 2 -
connectivity/inc/connectivity/sqlerror.hxx | 14 ---
connectivity/inc/connectivity/sqlnode.hxx | 2 -
connectivity/inc/connectivity/sqlparse.hxx | 1 -
connectivity/source/commontools/FValue.cxx | 94 --------------------
connectivity/source/commontools/TSortIndex.cxx | 17 ----
connectivity/source/commontools/sqlerror.cxx | 6 --
.../source/drivers/evoab2/NDatabaseMetaData.cxx | 7 --
.../source/drivers/evoab2/NDatabaseMetaData.hxx | 1 -
connectivity/source/drivers/evoab2/NStatement.cxx | 12 ---
connectivity/source/drivers/evoab2/NStatement.hxx | 1 -
connectivity/source/drivers/file/FNoException.cxx | 5 -
connectivity/source/drivers/file/FStatement.cxx | 27 ------
connectivity/source/drivers/file/fanalyzer.cxx | 61 -------------
connectivity/source/drivers/mozab/MCatalog.cxx | 6 --
connectivity/source/drivers/mozab/MCatalog.hxx | 2 -
.../source/drivers/mozab/MPreparedStatement.cxx | 6 --
.../source/drivers/mozab/MPreparedStatement.hxx | 3 -
connectivity/source/drivers/mozab/MResultSet.cxx | 11 ---
connectivity/source/drivers/mozab/MResultSet.hxx | 1 -
connectivity/source/drivers/mozab/MTable.cxx | 6 --
connectivity/source/drivers/mozab/MTable.hxx | 1 -
.../source/drivers/mozab/mozillasrc/MQuery.cxx | 36 --------
.../source/drivers/mozab/mozillasrc/MQuery.hxx | 5 -
.../drivers/mozab/mozillasrc/MQueryHelper.cxx | 39 --------
.../drivers/mozab/mozillasrc/MQueryHelper.hxx | 5 -
.../drivers/mozab/mozillasrc/MTypeConverter.cxx | 38 --------
.../drivers/mozab/mozillasrc/MTypeConverter.hxx | 7 +--
.../odbcbase/ODatabaseMetaDataResultSet.cxx | 17 ----
.../source/drivers/odbcbase/OPreparedStatement.cxx | 77 ----------------
connectivity/source/inc/TKeyValue.hxx | 1 -
connectivity/source/inc/TSortIndex.hxx | 5 -
connectivity/source/inc/file/FStatement.hxx | 2 -
connectivity/source/inc/file/fanalyzer.hxx | 2 -
connectivity/source/inc/internalnode.hxx | 3 -
.../source/inc/odbc/ODatabaseMetaDataResultSet.hxx | 1 -
.../source/inc/odbc/OPreparedStatement.hxx | 4 -
connectivity/source/inc/sqlscan.hxx | 1 -
connectivity/source/parse/internalnode.cxx | 10 --
connectivity/source/parse/sqlflex.l | 1 -
connectivity/source/parse/sqlnode.cxx | 41 ---------
connectivity/source/sdbcx/VGroup.cxx | 13 ---
unusedcode.easy | 39 --------
45 files changed, 1 insertions(+), 635 deletions(-)
diff --git a/connectivity/inc/connectivity/CommonTools.hxx
b/connectivity/inc/connectivity/CommonTools.hxx
index 79f666f..071a56c 100644
--- a/connectivity/inc/connectivity/CommonTools.hxx
+++ b/connectivity/inc/connectivity/CommonTools.hxx
@@ -59,7 +59,6 @@ namespace connectivity
return match(rWild.getStr(), rStr.getStr(), cEscape);
}
//------------------------------------------------------------------------------
- OOO_DLLPUBLIC_DBTOOLS rtl::OUString toString(const ::com::sun::star::uno::Any& rValue);
OOO_DLLPUBLIC_DBTOOLS rtl::OUString toDateString(const ::com::sun::star::util::Date& rDate);
OOO_DLLPUBLIC_DBTOOLS rtl::OUString toTimeString(const ::com::sun::star::util::Time& rTime);
OOO_DLLPUBLIC_DBTOOLS rtl::OUString toDateTimeString(const ::com::sun::star::util::DateTime&
rDateTime);
diff --git a/connectivity/inc/connectivity/FValue.hxx b/connectivity/inc/connectivity/FValue.hxx
index 64f44d4..db46884 100644
--- a/connectivity/inc/connectivity/FValue.hxx
+++ b/connectivity/inc/connectivity/FValue.hxx
@@ -330,8 +330,6 @@ namespace connectivity
sal_Int64 getLong() const;
double getDouble() const;
float getFloat() const;
- // convert the double to the type _nDataType
- void setFromDouble(const double& _rVal,sal_Int32 _nDatatype);
::rtl::OUString getString() const; // makes a automatic conversion if type isn't a
string
::com::sun::star::util::Date getDate() const;
diff --git a/connectivity/inc/connectivity/sdbcx/VGroup.hxx
b/connectivity/inc/connectivity/sdbcx/VGroup.hxx
index 37c50d9..b748f9e 100644
--- a/connectivity/inc/connectivity/sdbcx/VGroup.hxx
+++ b/connectivity/inc/connectivity/sdbcx/VGroup.hxx
@@ -73,8 +73,6 @@ namespace connectivity
// OPropertySetHelper
virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper();
public:
- OGroup(sal_Bool _bCase);
- OGroup( const ::rtl::OUString& _Name,sal_Bool _bCase);
virtual ~OGroup();
DECLARE_SERVICE_INFO();
diff --git a/connectivity/inc/connectivity/sqlerror.hxx b/connectivity/inc/connectivity/sqlerror.hxx
index f422bbd..9895b4a 100644
--- a/connectivity/inc/connectivity/sqlerror.hxx
+++ b/connectivity/inc/connectivity/sqlerror.hxx
@@ -137,19 +137,9 @@ namespace connectivity
const ParamValue& _rParamValue3 = ParamValue()
) const;
- /** returns the SQLState associated with a given error condition
-
- @see getErrorMessage
- @see getErrorCode
- @see ::com::sun::star::sdb::ErrorCondition
- @see ::com::sun::star::sdbc::SQLException::SQLState
- */
- ::rtl::OUString getSQLState( const ErrorCondition _eCondition ) const;
-
/** returns the error code associated with a given error condition
@see getErrorMessage
- @see getSQLState
@see ::com::sun::star::sdb::ErrorCondition
@see ::com::sun::star::sdbc::SQLException::ErrorCode
*/
@@ -198,7 +188,6 @@ namespace connectivity
@see getErrorMessage
@see getErrorCode
- @see getSQLState
*/
void raiseException(
const ErrorCondition _eCondition,
@@ -237,7 +226,6 @@ namespace connectivity
@see getErrorMessage
@see getErrorCode
- @see getSQLState
*/
void raiseException(
const ErrorCondition _eCondition,
@@ -281,7 +269,6 @@ namespace connectivity
@see getErrorMessage
@see getErrorCode
- @see getSQLState
*/
void raiseTypedException(
const ErrorCondition _eCondition,
@@ -319,7 +306,6 @@ namespace connectivity
@see getErrorMessage
@see getErrorCode
- @see getSQLState
*/
::com::sun::star::sdbc::SQLException
getSQLException(
diff --git a/connectivity/inc/connectivity/sqlnode.hxx b/connectivity/inc/connectivity/sqlnode.hxx
index 4f8385a..8874ed0 100644
--- a/connectivity/inc/connectivity/sqlnode.hxx
+++ b/connectivity/inc/connectivity/sqlnode.hxx
@@ -278,11 +278,9 @@ namespace connectivity
void append(OSQLParseNode* pNewSubTree);
void insert(sal_uInt32 nPos, OSQLParseNode* pNewSubTree);
- OSQLParseNode* replaceAt(sal_uInt32 nPos, OSQLParseNode* pNewSubTree);
OSQLParseNode* replace(OSQLParseNode* pOldSubTree, OSQLParseNode* pNewSubTree);
OSQLParseNode* removeAt(sal_uInt32 nPos);
- OSQLParseNode* remove(OSQLParseNode* pSubTree);
void replaceNodeValue(const ::rtl::OUString& rTableAlias,const ::rtl::OUString&
rColumnName);
diff --git a/connectivity/inc/connectivity/sqlparse.hxx b/connectivity/inc/connectivity/sqlparse.hxx
index b088960..a51a033 100644
--- a/connectivity/inc/connectivity/sqlparse.hxx
+++ b/connectivity/inc/connectivity/sqlparse.hxx
@@ -118,7 +118,6 @@ namespace connectivity
void push_back(OSQLParseNode* _pNode);
void erase(OSQLParseNode* _pNode);
- bool empty() const;
void clear();
void clearAndDelete();
};
diff --git a/connectivity/source/commontools/FValue.cxx b/connectivity/source/commontools/FValue.cxx
index bfa3b12..b1fad51 100644
--- a/connectivity/source/commontools/FValue.cxx
+++ b/connectivity/source/commontools/FValue.cxx
@@ -1616,100 +1616,6 @@ double ORowSetValue::getDouble() const
}
return nRet;
}
-// -------------------------------------------------------------------------
-void ORowSetValue::setFromDouble(const double& _rVal,sal_Int32 _nDatatype)
-{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbtools", "Ocke.Janssen@sun.com",
"ORowSetValue::setFromDouble" );
- free();
-
- m_bNull = sal_False;
- switch(_nDatatype)
- {
- case DataType::CHAR:
- case DataType::VARCHAR:
- case DataType::DECIMAL:
- case DataType::NUMERIC:
- case DataType::LONGVARCHAR:
- {
- ::rtl::OUString aVal = ::rtl::OUString::valueOf(_rVal);
- m_aValue.m_pString = aVal.pData;
- rtl_uString_acquire(m_aValue.m_pString);
- }
- break;
- case DataType::BIGINT:
- if ( m_bSigned )
- {
- m_aValue.m_pValue = new sal_Int64((sal_Int64)_rVal);
- TRACE_ALLOC( sal_Int64 )
- }
- else
- {
- ::rtl::OUString aVal = ::rtl::OUString::valueOf(_rVal);
- m_aValue.m_pString = aVal.pData;
- rtl_uString_acquire(m_aValue.m_pString);
- }
- break;
- case DataType::FLOAT:
- m_aValue.m_pValue = new float((float)_rVal);
- TRACE_ALLOC( float )
- break;
- case DataType::DOUBLE:
- case DataType::REAL:
- m_aValue.m_pValue = new double(_rVal);
- TRACE_ALLOC( double )
- break;
- case DataType::DATE:
- m_aValue.m_pValue = new Date(dbtools::DBTypeConversion::toDate(_rVal));
- TRACE_ALLOC( Date )
- break;
- case DataType::TIME:
- m_aValue.m_pValue = new Time(dbtools::DBTypeConversion::toTime(_rVal));
- TRACE_ALLOC( Time )
- break;
- case DataType::TIMESTAMP:
- m_aValue.m_pValue = new DateTime(dbtools::DBTypeConversion::toDateTime(_rVal));
- TRACE_ALLOC( DateTime )
- break;
- case DataType::BINARY:
- case DataType::VARBINARY:
- case DataType::LONGVARBINARY:
- case DataType::BLOB:
- case DataType::CLOB:
- OSL_ASSERT(!"setFromDouble() for this type is not allowed!");
- break;
- case DataType::BIT:
- case DataType::BOOLEAN:
- m_aValue.m_bBool = _rVal != 0.0;
- break;
- case DataType::TINYINT:
- if ( m_bSigned )
- m_aValue.m_nInt8 = sal_Int8(_rVal);
- else
- m_aValue.m_nInt16 = sal_Int16(_rVal);
- break;
- case DataType::SMALLINT:
- if ( m_bSigned )
- m_aValue.m_nInt16 = sal_Int16(_rVal);
- else
- m_aValue.m_nInt32 = sal_Int32(_rVal);
- break;
- case DataType::INTEGER:
- if ( m_bSigned )
- m_aValue.m_nInt32 = sal_Int32(_rVal);
- else
- {
- m_aValue.m_pValue = new sal_Int64((sal_Int64)_rVal);
- TRACE_ALLOC( sal_Int64 )
- }
- break;
- default:
- {
- m_aValue.m_pValue = new Any(_rVal);
- break;
- }
- }
- m_eTypeKind = _nDatatype;
-}
// -----------------------------------------------------------------------------
Sequence<sal_Int8> ORowSetValue::getSequence() const
{
diff --git a/connectivity/source/commontools/TSortIndex.cxx
b/connectivity/source/commontools/TSortIndex.cxx
index 5338648..fb4d170 100644
--- a/connectivity/source/commontools/TSortIndex.cxx
+++ b/connectivity/source/commontools/TSortIndex.cxx
@@ -143,23 +143,6 @@ void OSortIndex::Freeze()
m_bFrozen = sal_True;
}
-//------------------------------------------------------------------
-sal_Int32 OSortIndex::GetValue(sal_Int32 nPos) const
-{
- OSL_ENSURE(nPos > 0,"OSortIndex::GetValue: nPos == 0");
- OSL_ENSURE((size_t)nPos <= m_aKeyValues.size(),"OSortIndex::GetValue: Zugriff ausserhalb der
Array-Grenzen");
-
- if (!m_bFrozen && m_aKeyType[0] != SQL_ORDERBYKEY_NONE)
- {
- OSL_FAIL("OSortIndex::GetValue: Invalid use of index!");
- return 0;
- }
- return m_aKeyValues[nPos-1].first;
-}
-// -----------------------------------------------------------------------------
-OKeyValue::OKeyValue()
-{
-}
// -----------------------------------------------------------------------------
OKeyValue::OKeyValue(sal_Int32 nVal)
: m_nValue(nVal)
diff --git a/connectivity/source/commontools/sqlerror.cxx
b/connectivity/source/commontools/sqlerror.cxx
index 3072af2..685095f 100644
--- a/connectivity/source/commontools/sqlerror.cxx
+++ b/connectivity/source/commontools/sqlerror.cxx
@@ -320,12 +320,6 @@ namespace connectivity
}
//--------------------------------------------------------------------
- ::rtl::OUString SQLError::getSQLState( const ErrorCondition _eCondition ) const
- {
- return m_pImpl->getSQLState( _eCondition );
- }
-
- //--------------------------------------------------------------------
ErrorCode SQLError::getErrorCode( const ErrorCondition _eCondition )
{
return SQLError_Impl::getErrorCode( _eCondition );
diff --git a/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx
b/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx
index 929150a..0a89e58 100644
--- a/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx
@@ -147,13 +147,6 @@ namespace connectivity
}
- guint
- getFieldCount()
- {
- initFields();
- return nFields;
- }
-
const ColumnProperty *
getField(guint n)
{
diff --git a/connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx
b/connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx
index 45f93b9..2cb7207 100644
--- a/connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx
+++ b/connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx
@@ -64,7 +64,6 @@ namespace connectivity
const SplitEvoColumns* get_evo_addr();
const ColumnProperty *getField(guint n);
- guint getFieldCount() ;
GType getGFieldType(guint nCol) ;
sal_Int32 getFieldType(guint nCol) ;
rtl::OUString getFieldTypeName(guint nCol) ;
diff --git a/connectivity/source/drivers/evoab2/NStatement.cxx
b/connectivity/source/drivers/evoab2/NStatement.cxx
index 36786a4..81beb26 100644
--- a/connectivity/source/drivers/evoab2/NStatement.cxx
+++ b/connectivity/source/drivers/evoab2/NStatement.cxx
@@ -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)
{
::osl::MutexGuard aGuard( m_aMutex );
diff --git a/connectivity/source/drivers/evoab2/NStatement.hxx
b/connectivity/source/drivers/evoab2/NStatement.hxx
index d12956e..3d6d923 100644
--- a/connectivity/source/drivers/evoab2/NStatement.hxx
+++ b/connectivity/source/drivers/evoab2/NStatement.hxx
@@ -190,7 +190,6 @@ namespace connectivity
virtual ~OCommonStatement();
protected:
- void reset () throw( ::com::sun::star::sdbc::SQLException);
void clearMyResultSet () throw( ::com::sun::star::sdbc::SQLException);
void parseSql( const ::rtl::OUString& sql, QueryData& _out_rQueryData );
EBookQuery *whereAnalysis( const OSQLParseNode* parseTree );
diff --git a/connectivity/source/drivers/file/FNoException.cxx
b/connectivity/source/drivers/file/FNoException.cxx
index 8090295..67599cb 100644
--- a/connectivity/source/drivers/file/FNoException.cxx
+++ b/connectivity/source/drivers/file/FNoException.cxx
@@ -66,11 +66,6 @@ void OPredicateCompiler::Clean()
m_aCodeList.clear();
}
// -----------------------------------------------------------------------------
-void OSQLAnalyzer::clean()
-{
- m_aCompiler->Clean();
-}
-// -----------------------------------------------------------------------------
void OSQLAnalyzer::bindParameterRow(OValueRefRow& _pRow)
{
OCodeList& rCodeList = m_aCompiler->m_aCodeList;
diff --git a/connectivity/source/drivers/file/FStatement.cxx
b/connectivity/source/drivers/file/FStatement.cxx
index b6878f0..203ae0e 100644
--- a/connectivity/source/drivers/file/FStatement.cxx
+++ b/connectivity/source/drivers/file/FStatement.cxx
@@ -207,20 +207,7 @@ void SAL_CALL OStatement_Base::close( ) throw(SQLException, RuntimeException)
}
dispose();
}
-// -------------------------------------------------------------------------
-
-void OStatement_Base::reset() throw (SQLException)
-{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OStatement_Base::reset"
);
- ::osl::MutexGuard aGuard( m_aMutex );
- checkDisposed(OStatement_BASE::rBHelper.bDisposed);
-
- clearWarnings ();
-
- if (m_xResultSet.get().is())
- clearMyResultSet();
-}
//--------------------------------------------------------------------
// clearMyResultSet
// If a ResultSet was created for this Statement, close it
@@ -242,20 +229,6 @@ void OStatement_Base::clearMyResultSet () throw (SQLException)
m_xResultSet = Reference< XResultSet>();
}
-//--------------------------------------------------------------------
-// setWarning
-// Sets the warning
-//--------------------------------------------------------------------
-
-void OStatement_Base::setWarning (const SQLWarning &ex) throw( SQLException)
-{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com",
"OStatement_Base::setWarning " );
- ::osl::MutexGuard aGuard( m_aMutex );
- checkDisposed(OStatement_BASE::rBHelper.bDisposed);
-
-
- m_aLastWarning = ex;
-}
// -------------------------------------------------------------------------
Any SAL_CALL OStatement_Base::getWarnings( ) throw(SQLException, RuntimeException)
diff --git a/connectivity/source/drivers/file/fanalyzer.cxx
b/connectivity/source/drivers/file/fanalyzer.cxx
index b954b61..fcaba19 100644
--- a/connectivity/source/drivers/file/fanalyzer.cxx
+++ b/connectivity/source/drivers/file/fanalyzer.cxx
@@ -212,67 +212,6 @@ void OSQLAnalyzer::bindSelectRow(const OValueRefRow& _pRow)
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.size() == 0, "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,
const Reference< XPropertySet>& _xCol,
diff --git a/connectivity/source/drivers/mozab/MCatalog.cxx
b/connectivity/source/drivers/mozab/MCatalog.cxx
index aed2de8..d2303c8 100644
--- a/connectivity/source/drivers/mozab/MCatalog.cxx
+++ b/connectivity/source/drivers/mozab/MCatalog.cxx
@@ -91,12 +91,6 @@ void OCatalog::refreshGroups()
void OCatalog::refreshUsers()
{
}
-// -------------------------------------------------------------------------
-const ::rtl::OUString& OCatalog::getDot()
-{
- static const ::rtl::OUString sDot = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("."));
- return sDot;
-}
// -----------------------------------------------------------------------------
// XTablesSupplier
diff --git a/connectivity/source/drivers/mozab/MCatalog.hxx
b/connectivity/source/drivers/mozab/MCatalog.hxx
index d75774f..c20b068 100644
--- a/connectivity/source/drivers/mozab/MCatalog.hxx
+++ b/connectivity/source/drivers/mozab/MCatalog.hxx
@@ -55,8 +55,6 @@ namespace connectivity
OConnection* getConnection() const { return m_pConnection; }
sdbcx::OCollection* getPrivateTables() const { return m_pTables;}
sdbcx::OCollection* getPrivateViews() const { return m_pViews; }
-
- static const ::rtl::OUString& getDot();
};
}
}
diff --git a/connectivity/source/drivers/mozab/MPreparedStatement.cxx
b/connectivity/source/drivers/mozab/MPreparedStatement.cxx
index e21ec2f..1c2a9b4 100644
--- a/connectivity/source/drivers/mozab/MPreparedStatement.cxx
+++ b/connectivity/source/drivers/mozab/MPreparedStatement.cxx
@@ -383,12 +383,6 @@ void OPreparedStatement::setFastPropertyValue_NoBroadcast(sal_Int32
nHandle,cons
}
}
// -----------------------------------------------------------------------------
-void OPreparedStatement::checkParameterIndex(sal_Int32 _parameterIndex)
-{
- if( !_parameterIndex || _parameterIndex > m_nNumParams)
- ::dbtools::throwInvalidIndexException(*this);
-}
-// -----------------------------------------------------------------------------
void OPreparedStatement::checkAndResizeParameters(sal_Int32 parameterIndex)
{
::connectivity::checkDisposed(OCommonStatement_IBASE::rBHelper.bDisposed);
diff --git a/connectivity/source/drivers/mozab/MPreparedStatement.hxx
b/connectivity/source/drivers/mozab/MPreparedStatement.hxx
index 31cfa97..3aa5416 100644
--- a/connectivity/source/drivers/mozab/MPreparedStatement.hxx
+++ b/connectivity/source/drivers/mozab/MPreparedStatement.hxx
@@ -79,9 +79,6 @@ namespace connectivity
::rtl::Reference<connectivity::OSQLColumns> m_xParamColumns; // the parameter
columns
OValueRow m_aParameterRow;
-
- void checkParameterIndex(sal_Int32 _parameterIndex);
-
protected:
virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,
const
::com::sun::star::uno::Any& rValue)
diff --git a/connectivity/source/drivers/mozab/MResultSet.cxx
b/connectivity/source/drivers/mozab/MResultSet.cxx
index ed92e42..1529c1a 100644
--- a/connectivity/source/drivers/mozab/MResultSet.cxx
+++ b/connectivity/source/drivers/mozab/MResultSet.cxx
@@ -717,17 +717,6 @@ void SAL_CALL OResultSet::release() throw()
{
return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper());
}
-// -----------------------------------------------------------------------------
-void OResultSet::initializeRow(OValueRow& _rRow,sal_Int32 _nColumnCount)
-{
- if(!_rRow.is())
- {
- _rRow = new OValueVector(_nColumnCount);
- (_rRow->get())[0].setBound(sal_True);
- ::std::for_each(_rRow->get().begin()+1,_rRow->get().end(),TSetBound(sal_False));
- }
-}
-
// -------------------------------------------------------------------------
void OResultSet::parseParameter( const OSQLParseNode* pNode, rtl::OUString& rMatchString )
{
diff --git a/connectivity/source/drivers/mozab/MResultSet.hxx
b/connectivity/source/drivers/mozab/MResultSet.hxx
index 47e9ad1..2559b7f 100644
--- a/connectivity/source/drivers/mozab/MResultSet.hxx
+++ b/connectivity/source/drivers/mozab/MResultSet.hxx
@@ -258,7 +258,6 @@ protected:
void parseParameter( const OSQLParseNode* pNode, rtl::OUString& rMatchString );
void fillRowData() throw( ::com::sun::star::sdbc::SQLException );
- void initializeRow(OValueRow& _rRow,sal_Int32 _nColumnCount);
void analyseWhereClause( const OSQLParseNode* parseTree,
MQueryExpression &queryExpression);
diff --git a/connectivity/source/drivers/mozab/MTable.cxx
b/connectivity/source/drivers/mozab/MTable.cxx
index 755e4bd..47f7107 100644
--- a/connectivity/source/drivers/mozab/MTable.cxx
+++ b/connectivity/source/drivers/mozab/MTable.cxx
@@ -55,12 +55,6 @@ using namespace ::com::sun::star::sdbc;
using namespace ::com::sun::star::container;
using namespace ::com::sun::star::lang;
-OTable::OTable( sdbcx::OCollection* _pTables, OConnection* _pConnection)
- :OTable_Base( _pTables, _pConnection, sal_True )
- ,m_pConnection( _pConnection )
-{
- construct();
-}
// -------------------------------------------------------------------------
OTable::OTable( sdbcx::OCollection* _pTables, OConnection* _pConnection,
const ::rtl::OUString& _Name, const ::rtl::OUString& _Type, const ::rtl::OUString&
_Description )
diff --git a/connectivity/source/drivers/mozab/MTable.hxx
b/connectivity/source/drivers/mozab/MTable.hxx
index 3cc6728..a47725f5 100644
--- a/connectivity/source/drivers/mozab/MTable.hxx
+++ b/connectivity/source/drivers/mozab/MTable.hxx
@@ -44,7 +44,6 @@ namespace connectivity
OConnection* m_pConnection;
public:
- OTable( sdbcx::OCollection* _pTables, OConnection* _pConnection);
OTable( sdbcx::OCollection* _pTables,
OConnection* _pConnection,
const ::rtl::OUString& _Name,
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MQuery.cxx
b/connectivity/source/drivers/mozab/mozillasrc/MQuery.cxx
index 81b087c..9433e26 100644
--- a/connectivity/source/drivers/mozab/mozillasrc/MQuery.cxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MQuery.cxx
@@ -146,15 +146,6 @@ void MQuery::setAddressbook(::rtl::OUString &ab)
OSL_TRACE("\tOUT MQuery::setAddressbook()");
}
// -------------------------------------------------------------------------
-::rtl::OUString MQuery::getAddressbook() const
-{
- OSL_TRACE("IN MQuery::getAddressbook()");
-
- OSL_TRACE("\tOUT MQuery::getAddressbook()");
-
- return(m_aAddressbook);
-}
-// -------------------------------------------------------------------------
void MQuery::setMaxNrOfReturns(const sal_Int32 mnr)
{
OSL_TRACE( "IN MQuery::setMaxNrOfReturns()" );
@@ -164,33 +155,6 @@ void MQuery::setMaxNrOfReturns(const sal_Int32 mnr)
OSL_TRACE("\tOUT MQuery::setMaxNrOfReturns()" );
}
// -------------------------------------------------------------------------
-sal_Int32 MQuery::getMaxNrOfReturns() const
-{
- OSL_TRACE("IN MQuery::getMaxNrOfReturns()");
-
- OSL_TRACE("\tOUT MQuery::getMaxNrOfReturns()");
-
- return(m_nMaxNrOfReturns);
-}
-// -------------------------------------------------------------------------
-void MQuery::setQuerySubDirs(sal_Bool &qsd)
-{
- OSL_TRACE("IN MQuery::setQuerySubDirs()");
- ::osl::MutexGuard aGuard(m_aMutex);
-
- m_bQuerySubDirs = qsd;
- OSL_TRACE("\tOUT MQuery::setQuerySubDirs()");
-}
-// -------------------------------------------------------------------------
-sal_Bool MQuery::getQuerySubDirs() const
-{
- OSL_TRACE("IN MQuery::getQuerySubDirs()");
-
- OSL_TRACE("\tOUT MQuery::getQuerySubDirs()");
-
- return(m_bQuerySubDirs);
-}
-// -------------------------------------------------------------------------
void MQuery::setExpression( MQueryExpression &_expr )
{
OSL_TRACE("IN MQuery::setExpression()");
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MQuery.hxx
b/connectivity/source/drivers/mozab/mozillasrc/MQuery.hxx
index 2c17529..7723509 100644
--- a/connectivity/source/drivers/mozab/mozillasrc/MQuery.hxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MQuery.hxx
@@ -236,17 +236,12 @@ namespace connectivity
sal_uInt32 InsertLoginInfo(OConnection* _pCon);
void setAddressbook( ::rtl::OUString&);
- ::rtl::OUString getAddressbook(void) const;
const OColumnAlias& getColumnAlias() const { return m_rColumnAlias; }
void setExpression( MQueryExpression &_expr );
void setMaxNrOfReturns( const sal_Int32);
- sal_Int32 getMaxNrOfReturns(void) const;
-
- void setQuerySubDirs( sal_Bool&);
- sal_Bool getQuerySubDirs(void) const;
sal_Int32 getRowCount( void );
sal_uInt32 getRealRowCount( void );
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.cxx
b/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.cxx
index a8d828f..37dfc41 100644
--- a/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.cxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.cxx
@@ -136,12 +136,6 @@ MQueryHelper::clear_results()
}
void
-MQueryHelper::rewind()
-{
- m_nIndex = 0;
-}
-
-void
MQueryHelper::reset()
{
m_nIndex = 0;
@@ -198,27 +192,6 @@ MQueryHelper::waitForResultOrComplete( )
MQueryHelperResultEntry*
-MQueryHelper::next( )
-{
- MQueryHelperResultEntry* result;
- sal_Int32 index;
-
- m_aMutex.acquire();
- index = m_nIndex;
- m_aMutex.release();
-
- result = getByIndex( index + 1) ; // Add 1 as Row is numbered from 1 to N
-
- if ( result ) {
- m_aMutex.acquire();
- m_nIndex++;
- m_aMutex.release();
- }
-
- return( result );
-}
-
-MQueryHelperResultEntry*
MQueryHelper::getByIndex( sal_uInt32 nRow )
{
// Row numbers are from 1 to N, need to ensure this, and then
@@ -256,18 +229,6 @@ MQueryHelper::getByIndex( sal_uInt32 nRow )
}
sal_Bool
-MQueryHelper::hasMore() const
-{
- return m_bHasMore;
-}
-
-sal_Bool
-MQueryHelper::atEnd() const
-{
- return m_bAtEnd;
-}
-
-sal_Bool
MQueryHelper::isError() const
{
return m_bErrorCondition;
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.hxx
b/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.hxx
index 6884ddd..f7f983e 100644
--- a/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.hxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.hxx
@@ -103,17 +103,12 @@ namespace connectivity
virtual ~MQueryHelper();
void reset();
- void rewind();
-
- MQueryHelperResultEntry* next( );
MQueryHelperResultEntry* getByIndex( sal_uInt32 nRow );
const ErrorDescriptor& getError() const { return m_aError; }
sal_Bool isError() const;
- sal_Bool hasMore() const;
- sal_Bool atEnd() const;
sal_Bool queryComplete() const;
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.cxx
b/connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.cxx
index 92fba34..bc2cd69 100644
--- a/connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.cxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.cxx
@@ -47,13 +47,6 @@ void MTypeConverter::ouStringToNsString(::rtl::OUString const &ous, nsString &ns
nss = mozString; // temp.
}
// -------------------------------------------------------------------------
-::rtl::OUString MTypeConverter::nsACStringToOUString( const nsACString& _source )
-{
- const char* buffer = _source.BeginReading();
- const char* bufferEnd = _source.EndReading();
- return ::rtl::OUString( buffer, static_cast<sal_Int32>(bufferEnd - buffer),
RTL_TEXTENCODING_ASCII_US );
-}
-// -------------------------------------------------------------------------
::rtl::OString MTypeConverter::nsACStringToOString( const nsACString& _source )
{
const char* buffer = _source.BeginReading();
@@ -61,12 +54,6 @@ void MTypeConverter::ouStringToNsString(::rtl::OUString const &ous, nsString &ns
return ::rtl::OString( buffer, static_cast<sal_Int32>(bufferEnd - buffer) );
}
// -------------------------------------------------------------------------
-void MTypeConverter::asciiOUStringToNsACString( const ::rtl::OUString& _asciiString, nsACString&
_dest )
-{
- ::rtl::OString sAsciiVersion( _asciiString.getStr(), _asciiString.getLength(),
RTL_TEXTENCODING_ASCII_US );
- asciiToNsACString( sAsciiVersion.getStr(), _dest );
-}
-// -------------------------------------------------------------------------
void MTypeConverter::asciiToNsACString( const sal_Char* _asciiString, nsACString& _dest )
{
_dest.Truncate();
@@ -95,16 +82,6 @@ void MTypeConverter::prUnicharToOUString(PRUnichar const *pru, ::rtl::OUString &
ous = _ous;
}
// -------------------------------------------------------------------------
-char *MTypeConverter::ouStringToCCharStringUtf8(::rtl::OUString const &ous)
-{
- // Convert to ::rtl::OString,
- ::rtl::OString os(rtl::OUStringToOString(ous, RTL_TEXTENCODING_UTF8));
-
- const char *cs = os.getStr();
-
- return(strdup(cs));
-}
-// -------------------------------------------------------------------------
char *MTypeConverter::ouStringToCCharStringAscii(::rtl::OUString const &ous)
{
// Convert ::rtl::OUString to ::rtl::OString,
@@ -113,20 +90,5 @@ char *MTypeConverter::ouStringToCCharStringAscii(::rtl::OUString const &ous)
return(strdup(os.getStr()));
}
// -------------------------------------------------------------------------
-char *MTypeConverter::nsStringToCCharStringAscii(nsString const &nss)
-{
- char cs[1024];
- nss.ToCString(cs, 1024);
-
- return(strdup(cs));
-}
-// -------------------------------------------------------------------------
-::std::string MTypeConverter::ouStringToStlString(::rtl::OUString const &ous)
-{
- // Convert ::rtl::OUString to ::rtl::OString.
- ::rtl::OString os(rtl::OUStringToOString(ous,RTL_TEXTENCODING_ASCII_US));
- return( ::std::string(os.getStr()));
-}
-// -------------------------------------------------------------------------
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.hxx
b/connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.hxx
index df903ea..2d0d5ca 100644
--- a/connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.hxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.hxx
@@ -44,17 +44,12 @@ namespace connectivity
static void ouStringToNsString(const ::rtl::OUString&, nsString&);
static void nsStringToOUString(const nsString&, ::rtl::OUString&);
static void prUnicharToOUString(const PRUnichar*, ::rtl::OUString&);
- // Use free() for the following 3 calls.
+ // Use free() for the following call.
static char *ouStringToCCharStringAscii(const ::rtl::OUString&);
- static char *nsStringToCCharStringAscii(const nsString&);
- static char *ouStringToCCharStringUtf8(const ::rtl::OUString&);
// Convert to stl-string.
- static ::std::string ouStringToStlString(const ::rtl::OUString&);
static ::std::string nsStringToStlString(const nsString&);
- static ::rtl::OUString nsACStringToOUString( const nsACString& _source );
static ::rtl::OString nsACStringToOString( const nsACString& _source );
- static void asciiOUStringToNsACString( const ::rtl::OUString& _asciiString,
nsACString& _dest );
static void asciiToNsACString( const sal_Char* _asciiString, nsACString& _dest );
private:
diff --git a/connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx
b/connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx
index 6dd7881..2f51ec0 100644
--- a/connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx
+++ b/connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx
@@ -896,23 +896,6 @@ void ODatabaseMetaDataResultSet::openTables(const Any& catalog, const
::rtl::OUS
checkColumnCount();
}
-//-----------------------------------------------------------------------------
-void ODatabaseMetaDataResultSet::openTablesTypes( ) throw(SQLException, RuntimeException)
-{
- m_bFreeHandle = sal_True;
- SQLRETURN nRetcode = N3SQLTables(m_aStatementHandle,
- 0,0,
- 0,0,
- 0,0,
- (SDB_ODBC_CHAR *) SQL_ALL_TABLE_TYPES,SQL_NTS);
- OTools::ThrowException(m_pConnection,nRetcode,m_aStatementHandle,SQL_HANDLE_STMT,*this);
-
- m_aColMapping.clear();
- m_aColMapping.push_back(-1);
- m_aColMapping.push_back(4);
- m_xMetaData = new OResultSetMetaData(m_pConnection,m_aStatementHandle,m_aColMapping);
- checkColumnCount();
-}
// -------------------------------------------------------------------------
void ODatabaseMetaDataResultSet::openCatalogs() throw(SQLException, RuntimeException)
{
diff --git a/connectivity/source/drivers/odbcbase/OPreparedStatement.cxx
b/connectivity/source/drivers/odbcbase/OPreparedStatement.cxx
index 2dbde52..b47fe2f1 100644
--- a/connectivity/source/drivers/odbcbase/OPreparedStatement.cxx
+++ b/connectivity/source/drivers/odbcbase/OPreparedStatement.cxx
@@ -675,27 +675,6 @@ sal_Int8* OPreparedStatement::allocBindBuf( sal_Int32 index,sal_Int32 bufLen)
// -------------------------------------------------------------------------
//--------------------------------------------------------------------
-// getDataBuf
-// Gets the data buffer for the given parameter index
-//--------------------------------------------------------------------
-
-sal_Int8* OPreparedStatement::getDataBuf (sal_Int32 index)
-{
- sal_Int8* b = NULL;
-
- // Sanity check the parameter number
-
- if ((index >= 1) &&
- (index <= numParams))
- {
- b = boundParams[index - 1].getBindDataBuffer ();
- }
-
- return b;
-}
-// -------------------------------------------------------------------------
-
-//--------------------------------------------------------------------
// getLengthBuf
// Gets the length buffer for the given parameter index
//--------------------------------------------------------------------
@@ -717,34 +696,6 @@ sal_Int8* OPreparedStatement::getLengthBuf (sal_Int32 index)
// -------------------------------------------------------------------------
//--------------------------------------------------------------------
-// getParamLength
-// Returns the length of the given parameter number. When each
-// parameter was bound, a 4-sal_Int8 buffer was given to hold the
-// length (stored in native format). Get the buffer, convert the
-// buffer from native format, and return it. If the length is -1,
-// the column is considered to be NULL.
-//--------------------------------------------------------------------
-
-sal_Int32 OPreparedStatement::getParamLength ( sal_Int32 index)
-{
- sal_Int32 paramLen = SQL_NULL_DATA;
-
- // Sanity check the parameter number
-
- if ((index >= 1) &&
- (index <= numParams)) {
-
- // Now get the length of the parameter from the
- // bound param array. -1 is returned if it is NULL.
- long n = 0;
- memcpy (&n, boundParams[index -1].getBindLengthBuffer (), sizeof (n));
- paramLen = n;
- }
- return paramLen;
-}
-// -------------------------------------------------------------------------
-
-//--------------------------------------------------------------------
// putParamData
// Puts parameter data from a previously bound input stream. The
// input stream was bound using SQL_LEN_DATA_AT_EXEC.
@@ -811,34 +762,6 @@ void OPreparedStatement::putParamData (sal_Int32 index) throw(SQLException)
}
}
// -------------------------------------------------------------------------
-//--------------------------------------------------------------------
-// getPrecision
-// Given a SQL type, return the maximum precision for the column.
-// Returns -1 if not known
-//--------------------------------------------------------------------
-
-sal_Int32 OPreparedStatement::getPrecision ( sal_Int32 sqlType)
-{
- ::osl::MutexGuard aGuard( m_aMutex );
- checkDisposed(OStatement_BASE::rBHelper.bDisposed);
-
- sal_Int32 prec = -1;
- const TTypeInfoVector& rTypeInfo = m_pConnection->getTypeInfo();
- if ( !rTypeInfo.empty() )
- {
- m_pConnection->buildTypeInfo();
- }
-
- if ( !rTypeInfo.empty() )
- {
- OTypeInfo aInfo;
- aInfo.nType = (sal_Int16)sqlType;
- TTypeInfoVector::const_iterator aIter =
::std::find(rTypeInfo.begin(),rTypeInfo.end(),aInfo);
- if(aIter != rTypeInfo.end())
- prec = (*aIter).nPrecision;
- }
- return prec;
-}
//--------------------------------------------------------------------
// setStream
diff --git a/connectivity/source/inc/TKeyValue.hxx b/connectivity/source/inc/TKeyValue.hxx
index 150a8ab..3cdcf34 100644
--- a/connectivity/source/inc/TKeyValue.hxx
+++ b/connectivity/source/inc/TKeyValue.hxx
@@ -40,7 +40,6 @@ namespace connectivity
sal_Int32 m_nValue;
protected:
- OKeyValue();
OKeyValue(sal_Int32 nVal);
public:
diff --git a/connectivity/source/inc/TSortIndex.hxx b/connectivity/source/inc/TSortIndex.hxx
index 419966f..4a92d22 100644
--- a/connectivity/source/inc/TSortIndex.hxx
+++ b/connectivity/source/inc/TSortIndex.hxx
@@ -107,11 +107,6 @@ namespace connectivity
sal_Bool IsFrozen() const { return m_bFrozen; }
// returns the current size of the keyvalues
sal_Int32 Count() const { return m_aKeyValues.size(); }
- /** GetValue returns the value at position nPos (1..n) [sorted access].
- It only allowed to call this method after the sortindex has been frozen.
- */
-
- sal_Int32 GetValue(sal_Int32 nPos) const;
inline const ::std::vector<OKeyType>& getKeyType() const { return m_aKeyType; }
inline TAscendingOrder getAscending(::std::vector<TAscendingOrder>::size_type _nPos) const
{ return m_aAscending[_nPos]; }
diff --git a/connectivity/source/inc/file/FStatement.hxx
b/connectivity/source/inc/file/FStatement.hxx
index ba1dc83..df5dfe4 100644
--- a/connectivity/source/inc/file/FStatement.hxx
+++ b/connectivity/source/inc/file/FStatement.hxx
@@ -126,9 +126,7 @@ namespace connectivity
// create the analyzer
virtual OSQLAnalyzer* createAnalyzer();
- void reset () throw( ::com::sun::star::sdbc::SQLException);
void clearMyResultSet () throw( ::com::sun::star::sdbc::SQLException);
- void setWarning (const ::com::sun::star::sdbc::SQLWarning &ex) throw(
::com::sun::star::sdbc::SQLException);
sal_Int32 getPrecision ( sal_Int32 sqlType);
void disposeResultSet();
diff --git a/connectivity/source/inc/file/fanalyzer.hxx b/connectivity/source/inc/file/fanalyzer.hxx
index 03045f7..30a8508 100644
--- a/connectivity/source/inc/file/fanalyzer.hxx
+++ b/connectivity/source/inc/file/fanalyzer.hxx
@@ -65,7 +65,6 @@ namespace connectivity
{ }
OConnection* getConnection() const { return m_pConnection; }
- void describeParam(::rtl::Reference<OSQLColumns> rParameterColumns); // genauere
Beschreibung der Parameter
::std::vector<sal_Int32>* bindEvaluationRow(OValueRefRow& _pRow); //
Anbinden einer Ergebniszeile an die Restrictions
/** bind the select columns if they contain a function which needs a row value
@param _pRow the result row
@@ -81,7 +80,6 @@ namespace connectivity
void dispose();
void start(OSQLParseNode* pSQLParseNode);
- void clean();
virtual sal_Bool hasRestriction() const;
virtual sal_Bool hasFunctions() const;
inline sal_Bool evaluateRestriction() { return m_aInterpreter->start(); }
diff --git a/connectivity/source/inc/internalnode.hxx b/connectivity/source/inc/internalnode.hxx
index 08a2915..b0a0403 100644
--- a/connectivity/source/inc/internalnode.hxx
+++ b/connectivity/source/inc/internalnode.hxx
@@ -47,9 +47,6 @@ namespace connectivity
OSQLInternalNode(const ::rtl::OString& _rNewValue,
SQLNodeType eNodeType,
sal_uInt32 nNodeID = 0);
- OSQLInternalNode(const sal_Unicode* pNewValue,
- SQLNodeType eNodeType,
- sal_uInt32 nNodeID = 0);
OSQLInternalNode(const ::rtl::OUString& _rNewValue,
SQLNodeType eNodeType,
sal_uInt32 nNodeID = 0);
diff --git a/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx
b/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx
index 7a17249..56130be 100644
--- a/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx
+++ b/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx
@@ -204,7 +204,6 @@ namespace connectivity
const ::connectivity::TIntVector& getColumnMapping() { return m_aColMapping; }
- void openTablesTypes( ) throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException);
void openTypeInfo() throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException);
void openCatalogs() throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException);
void openSchemas() throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException);
diff --git a/connectivity/source/inc/odbc/OPreparedStatement.hxx
b/connectivity/source/inc/odbc/OPreparedStatement.hxx
index 8c41355..076c9e05 100644
--- a/connectivity/source/inc/odbc/OPreparedStatement.hxx
+++ b/connectivity/source/inc/odbc/OPreparedStatement.hxx
@@ -88,15 +88,11 @@ namespace connectivity
void putParamData (sal_Int32 index) throw(::com::sun::star::sdbc::SQLException);
void setStream (sal_Int32 ParameterIndex,const ::com::sun::star::uno::Reference<
::com::sun::star::io::XInputStream>& x,
SQLLEN length,sal_Int32 SQLtype)
throw(::com::sun::star::sdbc::SQLException);
- sal_Int32 getParamLength ( sal_Int32 index);
sal_Int8* getLengthBuf (sal_Int32 index);
- sal_Int8* getDataBuf (sal_Int32 index);
sal_Int8* allocBindBuf ( sal_Int32 index, sal_Int32 bufLen);
void initBoundParam () throw(::com::sun::star::sdbc::SQLException);
void setParameter(sal_Int32 parameterIndex,sal_Int32 _nType,sal_Int32 _nSize,void*
_pData);
- sal_Int32 getPrecision ( sal_Int32 sqlType);
-
sal_Bool isPrepared() const { return m_bPrepared;}
void prepareStatement();
void checkParameterIndex(sal_Int32 _parameterIndex);
diff --git a/connectivity/source/inc/sqlscan.hxx b/connectivity/source/inc/sqlscan.hxx
index 66f2b76..baf5fee 100644
--- a/connectivity/source/inc/sqlscan.hxx
+++ b/connectivity/source/inc/sqlscan.hxx
@@ -78,7 +78,6 @@ namespace connectivity
void setScanner(sal_Bool _bNull=sal_False);
// rules settings
void SetRule(sal_Int32 nRule) {m_nRule = nRule;}
- sal_Int32 GetCurrentRule() const;
sal_Int32 GetGERRule() const;
sal_Int32 GetENGRule() const;
sal_Int32 GetSQLRule() const;
diff --git a/connectivity/source/parse/internalnode.cxx b/connectivity/source/parse/internalnode.cxx
index 1a1ce70..f1a3d2e 100644
--- a/connectivity/source/parse/internalnode.cxx
+++ b/connectivity/source/parse/internalnode.cxx
@@ -54,16 +54,6 @@ OSQLInternalNode::OSQLInternalNode(const ::rtl::OString &_NewValue,
}
//-----------------------------------------------------------------------------
-OSQLInternalNode::OSQLInternalNode(const sal_Unicode* pNewValue,
- SQLNodeType eNodeType,
- sal_uInt32 nNodeID)
- :OSQLParseNode(pNewValue,eNodeType,nNodeID)
-{
- OSL_ENSURE(OSQLParser::s_pGarbageCollector, "Collector not initialized");
- (*OSQLParser::s_pGarbageCollector)->push_back(this);
-}
-
-//-----------------------------------------------------------------------------
OSQLInternalNode::OSQLInternalNode(const ::rtl::OUString &_NewValue,
SQLNodeType eNodeType,
sal_uInt32 nNodeID)
diff --git a/connectivity/source/parse/sqlflex.l b/connectivity/source/parse/sqlflex.l
index d5b2f14..d500f91 100755
--- a/connectivity/source/parse/sqlflex.l
+++ b/connectivity/source/parse/sqlflex.l
@@ -812,7 +812,6 @@ IParseContext::InternationalKeyCode OSQLScanner::getInternationalTokenID(const s
return (m_bInternational) ? m_pContext->getIntlKeyCode(::rtl::OString(sToken) ) :
IParseContext::KEY_NONE;
}
// -------------------------------------------------------------------------
-sal_Int32 OSQLScanner::GetCurrentRule() const { return m_nRule; }
sal_Int32 OSQLScanner::GetGERRule() const { return PREDICATE_GER; }
sal_Int32 OSQLScanner::GetENGRule() const { return PREDICATE_ENG; }
sal_Int32 OSQLScanner::GetSQLRule() const { return SQL; }
diff --git a/connectivity/source/parse/sqlnode.cxx b/connectivity/source/parse/sqlnode.cxx
index d076f57..c118ca7 100644
--- a/connectivity/source/parse/sqlnode.cxx
+++ b/connectivity/source/parse/sqlnode.cxx
@@ -2388,45 +2388,9 @@ OSQLParseNode* OSQLParseNode::removeAt(sal_uInt32 nPos)
m_aChildren.erase(aPos);
return pNode;
}
-//-----------------------------------------------------------------------------
-OSQLParseNode* OSQLParseNode::remove(OSQLParseNode* pSubTree)
-{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "parse", "Ocke.Janssen@sun.com", "OSQLParseNode::remove"
);
- OSL_ENSURE(pSubTree != NULL, "OSQLParseNode: ungueltiger SubTree");
- OSQLParseNodes::iterator aPos = ::std::find(m_aChildren.begin(), m_aChildren.end(), pSubTree);
- if (aPos != m_aChildren.end())
- {
- // setze den getParent des removeten auf NULL
- pSubTree->setParent( NULL );
- m_aChildren.erase(aPos);
- return pSubTree;
- }
- else
- return NULL;
-}
// Replace-Methoden
//-----------------------------------------------------------------------------
-OSQLParseNode* OSQLParseNode::replaceAt(sal_uInt32 nPos, OSQLParseNode* pNewSubNode)
-{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "parse", "Ocke.Janssen@sun.com",
"OSQLParseNode::replaceAt" );
- OSL_ENSURE(pNewSubNode != NULL, "OSQLParseNode: invalid nodes");
- OSL_ENSURE(pNewSubNode->getParent() == NULL, "OSQLParseNode: node already has getParent");
- OSL_ENSURE(nPos < m_aChildren.size(), "OSQLParseNode: invalid position");
- OSL_ENSURE(::std::find(m_aChildren.begin(), m_aChildren.end(), pNewSubNode) ==
m_aChildren.end(),
- "OSQLParseNode::Replace() Node already element of parent");
-
- OSQLParseNode* pOldSubNode = m_aChildren[nPos];
-
- // stelle Verbindung zum getParent her:
- pNewSubNode->setParent( this );
- pOldSubNode->setParent( NULL );
-
- m_aChildren[nPos] = pNewSubNode;
- return pOldSubNode;
-}
-
-//-----------------------------------------------------------------------------
OSQLParseNode* OSQLParseNode::replace (OSQLParseNode* pOldSubNode, OSQLParseNode* pNewSubNode )
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "parse", "Ocke.Janssen@sun.com", "OSQLParseNode::replace
" );
@@ -2793,11 +2757,6 @@ void OSQLParseNodesContainer::erase(OSQLParseNode* _pNode)
}
}
// -----------------------------------------------------------------------------
-bool OSQLParseNodesContainer::empty() const
-{
- return m_aNodes.empty();
-}
-// -----------------------------------------------------------------------------
void OSQLParseNodesContainer::clear()
{
::osl::MutexGuard aGuard(m_aMutex);
diff --git a/connectivity/source/sdbcx/VGroup.cxx b/connectivity/source/sdbcx/VGroup.cxx
index cdf260e..f05a58b 100644
--- a/connectivity/source/sdbcx/VGroup.cxx
+++ b/connectivity/source/sdbcx/VGroup.cxx
@@ -47,19 +47,6 @@ using namespace ::com::sun::star::beans;
IMPLEMENT_SERVICE_INFO(OGroup,"com.sun.star.sdbcx.VGroup","com.sun.star.sdbcx.Group");
// -------------------------------------------------------------------------
-OGroup::OGroup(sal_Bool _bCase) : OGroup_BASE(m_aMutex)
- , ODescriptor(OGroup_BASE::rBHelper,_bCase)
- , m_pUsers(NULL)
-{
-}
-// -------------------------------------------------------------------------
-OGroup::OGroup(const ::rtl::OUString& _Name,sal_Bool _bCase) : OGroup_BASE(m_aMutex)
- ,ODescriptor(OGroup_BASE::rBHelper,_bCase)
- ,m_pUsers(NULL)
-{
- m_Name = _Name;
-}
-// -------------------------------------------------------------------------
OGroup::~OGroup()
{
delete m_pUsers;
diff --git a/unusedcode.easy b/unusedcode.easy
index 9a40c2f..5c84531 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -1143,45 +1143,6 @@
comphelper::detail::ConfigurationWrapper::getGroupReadWrite(boost::shared_ptr<co
comphelper::detail::ConfigurationWrapper::getLocalizedPropertyValue(rtl::OUString const&) const
comphelper::detail::ConfigurationWrapper::setLocalizedPropertyValue(boost::shared_ptr<comphelper::ConfigurationChanges>
const&, rtl::OUString const&, com::sun::star::uno::Any const&) const
comphelper::findProperty(com::sun::star::beans::Property&,
com::sun::star::uno::Sequence<com::sun::star::beans::Property>&, rtl::OUString const&)
-connectivity::OKeyValue::OKeyValue()
-connectivity::ORowSetValue::setFromDouble(double const&, int)
-connectivity::OSQLInternalNode::OSQLInternalNode(unsigned short const*, connectivity::SQLNodeType,
unsigned int)
-connectivity::OSQLParseNode::remove(connectivity::OSQLParseNode*)
-connectivity::OSQLParseNode::replaceAt(unsigned int, connectivity::OSQLParseNode*)
-connectivity::OSQLParseNodesContainer::empty() const
-connectivity::OSQLScanner::GetCurrentRule() const
-connectivity::OSortIndex::GetValue(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::setWarning(com::sun::star::sdbc::SQLWarning const&)
-connectivity::mozab::MQuery::getAddressbook() const
-connectivity::mozab::MQuery::getMaxNrOfReturns() const
-connectivity::mozab::MQuery::getQuerySubDirs() const
-connectivity::mozab::MQuery::setQuerySubDirs(unsigned char&)
-connectivity::mozab::MQueryHelper::atEnd() const
-connectivity::mozab::MQueryHelper::hasMore() const
-connectivity::mozab::MQueryHelper::next()
-connectivity::mozab::MQueryHelper::rewind()
-connectivity::mozab::MTypeConverter::asciiOUStringToNsACString(rtl::OUString const&,
nsACString_internal&)
-connectivity::mozab::MTypeConverter::nsACStringToOUString(nsACString_internal const&)
-connectivity::mozab::MTypeConverter::nsStringToCCharStringAscii(nsString const&)
-connectivity::mozab::MTypeConverter::ouStringToCCharStringUtf8(rtl::OUString const&)
-connectivity::mozab::MTypeConverter::ouStringToStlString(rtl::OUString const&)
-connectivity::mozab::OCatalog::getDot()
-connectivity::mozab::OPreparedStatement::checkParameterIndex(int)
-connectivity::mozab::OResultSet::initializeRow(rtl::Reference<connectivity::ODeleteVector<connectivity::ORowSetValue>
&, int)
-connectivity::mozab::OTable::OTable(connectivity::sdbcx::OCollection*,
connectivity::mozab::OConnection*)
-connectivity::odbc::ODatabaseMetaDataResultSet::openTablesTypes()
-connectivity::odbc::OPreparedStatement::getDataBuf(int)
-connectivity::odbc::OPreparedStatement::getParamLength(int)
-connectivity::odbc::OPreparedStatement::getPrecision(int)
-connectivity::sdbcx::OGroup::OGroup(rtl::OUString const&, unsigned char)
-connectivity::sdbcx::OGroup::OGroup(unsigned char)
-connectivity::toString(com::sun::star::uno::Any const&)
cppcanvas::BaseGfxFactory::createPolyPolygon(boost::shared_ptr<cppcanvas::Canvas> const&,
basegfx::B2DPolyPolygon const&) const
cppcanvas::BaseGfxFactory::createText(boost::shared_ptr<cppcanvas::Canvas> const&, rtl::OUString
const&) const
cppcanvas::BaseGfxFactory::~BaseGfxFactory()
--
1.7.7
Context
- [PATCH] Removed all unused code from connectivity module · Dézsi Szabolcs
Privacy Policy |
Impressum (Legal Info) |
Copyright information: Unless otherwise specified, all text and images
on this website are licensed under the
Creative Commons Attribution-Share Alike 3.0 License.
This does not include the source code of LibreOffice, which is
licensed under the Mozilla Public License (
MPLv2).
"LibreOffice" and "The Document Foundation" are
registered trademarks of their corresponding registered owners or are
in actual use as trademarks in one or more countries. Their respective
logos and icons are also subject to international copyright laws. Use
thereof is explained in our
trademark policy.