summaryrefslogtreecommitdiff
path: root/connectivity
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-08-04 16:28:49 +0200
committerNoel Grandin <noelgrandin@gmail.com>2015-08-05 09:39:22 +0000
commit403c13487c36f4200adf0986c5d11398f719cd7a (patch)
tree21a4acf87dce1e6c8772f5cbcff3c2a3de21f4ba /connectivity
parent10560949f90e08fe4a04dd91c7d388c4998100e8 (diff)
loplugin:unusedmethods
Change-Id: I6801618efb5a66d24156fa429e026acb6ca03aba Reviewed-on: https://gerrit.libreoffice.org/17506 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'connectivity')
-rw-r--r--connectivity/source/drivers/file/fcode.cxx25
-rw-r--r--connectivity/source/drivers/firebird/Connection.hxx3
-rw-r--r--connectivity/source/drivers/mork/MCatalog.hxx2
-rw-r--r--connectivity/source/drivers/mork/MColumnAlias.hxx4
-rw-r--r--connectivity/source/drivers/mork/MConnection.hxx3
-rw-r--r--connectivity/source/drivers/mork/MDatabaseMetaData.hxx4
-rw-r--r--connectivity/source/drivers/mork/MErrorResource.hxx6
-rw-r--r--connectivity/source/drivers/mork/MNSProfileDiscover.hxx4
-rw-r--r--connectivity/source/drivers/mork/MQueryHelper.hxx12
-rw-r--r--connectivity/source/drivers/mork/MorkParser.cxx5
-rw-r--r--connectivity/source/drivers/mork/MorkParser.hxx4
-rw-r--r--connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.hxx4
-rw-r--r--connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.hxx4
-rw-r--r--connectivity/source/drivers/odbc/OTools.cxx12
-rw-r--r--connectivity/source/drivers/postgresql/pq_baseresultset.hxx3
-rw-r--r--connectivity/source/drivers/postgresql/pq_xtable.hxx23
-rw-r--r--connectivity/source/drivers/postgresql/pq_xuser.hxx13
-rw-r--r--connectivity/source/drivers/postgresql/pq_xview.hxx14
-rw-r--r--connectivity/source/inc/OTypeInfo.hxx2
-rw-r--r--connectivity/source/inc/dbase/DIndex.hxx3
-rw-r--r--connectivity/source/inc/dbase/DIndexIter.hxx5
-rw-r--r--connectivity/source/inc/dbase/dindexnode.hxx35
-rw-r--r--connectivity/source/inc/file/FConnection.hxx3
-rw-r--r--connectivity/source/inc/file/FStatement.hxx1
-rw-r--r--connectivity/source/inc/file/fcode.hxx8
-rw-r--r--connectivity/source/inc/file/fcomp.hxx1
-rw-r--r--connectivity/source/inc/flat/ETable.hxx1
-rw-r--r--connectivity/source/inc/hsqldb/HTables.hxx14
-rw-r--r--connectivity/source/inc/java/ContextClassLoader.hxx2
-rw-r--r--connectivity/source/inc/java/lang/Object.hxx1
-rw-r--r--connectivity/source/inc/mysql/YTables.hxx14
-rw-r--r--connectivity/source/inc/odbc/OBoundParam.hxx48
-rw-r--r--connectivity/source/inc/odbc/OConnection.hxx6
-rw-r--r--connectivity/source/inc/odbc/ODatabaseMetaData.hxx10
-rw-r--r--connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx2
-rw-r--r--connectivity/source/inc/odbc/OPreparedStatement.hxx1
-rw-r--r--connectivity/source/inc/odbc/OTools.hxx6
-rw-r--r--connectivity/source/sdbcx/VCollection.cxx6
38 files changed, 24 insertions, 290 deletions
diff --git a/connectivity/source/drivers/file/fcode.cxx b/connectivity/source/drivers/file/fcode.cxx
index e4c14261fa2d..95eeffdd987c 100644
--- a/connectivity/source/drivers/file/fcode.cxx
+++ b/connectivity/source/drivers/file/fcode.cxx
@@ -66,11 +66,6 @@ OCode::~OCode()
}
-OEvaluateSet* OOperand::preProcess(OBoolOperator* /*pOp*/, OOperand* /*pRight*/)
-{
- return NULL;
-}
-
OOperandRow::OOperandRow(sal_uInt16 _nPos, sal_Int32 _rType)
: OOperand(_rType)
, m_nRowPos(_nPos)
@@ -178,8 +173,6 @@ OOperandConst::OOperandConst(const OSQLParseNode& rColumnRef, const OUString& aS
// Implementation of the operators
-sal_uInt16 OOperator::getRequestedOperands() const {return 2;}
-
bool OBoolOperator::operate(const OOperand*, const OOperand*) const
{
@@ -217,12 +210,6 @@ void OOp_NOT::Exec(OCodeStack& rCodeStack)
delete pOperand;
}
-sal_uInt16 OOp_NOT::getRequestedOperands() const
-{
- return 1;
-}
-
-
bool OOp_AND::operate(const OOperand* pLeft, const OOperand* pRight) const
{
return pLeft->isValid() && pRight->isValid();
@@ -235,12 +222,6 @@ bool OOp_OR::operate(const OOperand* pLeft, const OOperand* pRight) const
}
-sal_uInt16 OOp_ISNULL::getRequestedOperands() const
-{
- return 1;
-}
-
-
void OOp_ISNULL::Exec(OCodeStack& rCodeStack)
{
OOperand* pOperand = rCodeStack.top();
@@ -388,11 +369,6 @@ double OOp_DIV::operate(const double& fLeft,const double& fRight) const
return fLeft / fRight;
}
-OEvaluateSet* OOperandAttr::preProcess(OBoolOperator* /*pOp*/, OOperand* /*pRight*/)
-{
- return NULL;
-}
-
void ONthOperator::Exec(OCodeStack& rCodeStack)
{
::std::vector<ORowSetValue> aValues;
@@ -449,7 +425,6 @@ void OUnaryOperator::Exec(OCodeStack& rCodeStack)
delete pOperand;
}
-sal_uInt16 OUnaryOperator::getRequestedOperands() const {return 1;}
diff --git a/connectivity/source/drivers/firebird/Connection.hxx b/connectivity/source/drivers/firebird/Connection.hxx
index 47f0ad7bf026..42ce0109a424 100644
--- a/connectivity/source/drivers/firebird/Connection.hxx
+++ b/connectivity/source/drivers/firebird/Connection.hxx
@@ -181,8 +181,7 @@ namespace connectivity
std::exception);
::rtl::OUString getConnectionURL() const {return m_sConnectionURL;}
- bool isEmbedded() const {return m_bIsEmbedded;}
- ::rtl::OUString getUserName() const {return m_sUser;}
+ bool isEmbedded() const {return m_bIsEmbedded;}
isc_db_handle& getDBHandle() {return m_aDBHandle;}
isc_tr_handle& getTransaction()
throw(::com::sun::star::sdbc::SQLException);
diff --git a/connectivity/source/drivers/mork/MCatalog.hxx b/connectivity/source/drivers/mork/MCatalog.hxx
index 4c0f9d0973e8..2001941d977e 100644
--- a/connectivity/source/drivers/mork/MCatalog.hxx
+++ b/connectivity/source/drivers/mork/MCatalog.hxx
@@ -44,8 +44,6 @@ namespace connectivity
explicit OCatalog(OConnection* _pCon);
OConnection* getConnection() const { return m_pConnection; }
- sdbcx::OCollection* getPrivateTables() const { return m_pTables;}
- sdbcx::OCollection* getPrivateViews() const { return m_pViews; }
};
}
diff --git a/connectivity/source/drivers/mork/MColumnAlias.hxx b/connectivity/source/drivers/mork/MColumnAlias.hxx
index 742451dd191d..3c6d39531e9f 100644
--- a/connectivity/source/drivers/mork/MColumnAlias.hxx
+++ b/connectivity/source/drivers/mork/MColumnAlias.hxx
@@ -58,10 +58,6 @@ namespace connectivity
public:
explicit OColumnAlias( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & );
- inline bool hasAlias( const OUString& _rAlias ) const
- {
- return m_aAliasMap.find( _rAlias ) != m_aAliasMap.end();
- }
OString getProgrammaticNameOrFallbackToUTF8Alias( const OUString& _rAlias ) const;
inline AliasMap::const_iterator begin() const { return m_aAliasMap.begin(); }
diff --git a/connectivity/source/drivers/mork/MConnection.hxx b/connectivity/source/drivers/mork/MConnection.hxx
index ac4616be9785..41bbd84b3dbd 100644
--- a/connectivity/source/drivers/mork/MConnection.hxx
+++ b/connectivity/source/drivers/mork/MConnection.hxx
@@ -64,7 +64,6 @@ namespace connectivity
MorkDriver* getDriver() {return m_pDriver;};
MorkParser* getMorkParser(const OString& t) {return t == "CollectedAddressBook" ? m_pHistory : m_pBook;};
- void closeAllStatements () throw( ::com::sun::star::sdbc::SQLException);
// OComponentHelper
virtual void SAL_CALL disposing() SAL_OVERRIDE;
@@ -100,8 +99,6 @@ namespace connectivity
const OColumnAlias & getColumnAlias() const { return m_aColumnAlias; }
- static OUString getDriverImplementationName();
-
static bool getForceLoadTables() {return true;}
// Added to enable me to use SQLInterpreter which requires an
diff --git a/connectivity/source/drivers/mork/MDatabaseMetaData.hxx b/connectivity/source/drivers/mork/MDatabaseMetaData.hxx
index d67b177dc1b8..556eee32fcf6 100644
--- a/connectivity/source/drivers/mork/MDatabaseMetaData.hxx
+++ b/connectivity/source/drivers/mork/MDatabaseMetaData.hxx
@@ -41,10 +41,8 @@ namespace connectivity
protected:
virtual ~ODatabaseMetaData();
- public:
-
- inline OConnection* getOwnConnection() const { return m_pConnection; }
+ public:
explicit ODatabaseMetaData(OConnection* _pCon);
private:
diff --git a/connectivity/source/drivers/mork/MErrorResource.hxx b/connectivity/source/drivers/mork/MErrorResource.hxx
index 4459293daf49..6b142ece3a62 100644
--- a/connectivity/source/drivers/mork/MErrorResource.hxx
+++ b/connectivity/source/drivers/mork/MErrorResource.hxx
@@ -41,12 +41,6 @@ namespace connectivity
{
}
- inline void set( const sal_uInt16 _nErrorResourceId, const sal_Int32 _nErrorCondition, const OUString& _rParam )
- {
- m_nErrorResourceId = _nErrorResourceId;
- m_nErrorCondition = _nErrorCondition;
- m_sParameter = _rParam;
- }
inline void setResId( const sal_uInt16 _nErrorResourceId )
{
m_nErrorResourceId = _nErrorResourceId;
diff --git a/connectivity/source/drivers/mork/MNSProfileDiscover.hxx b/connectivity/source/drivers/mork/MNSProfileDiscover.hxx
index 8f011315a7dd..a7aae562a254 100644
--- a/connectivity/source/drivers/mork/MNSProfileDiscover.hxx
+++ b/connectivity/source/drivers/mork/MNSProfileDiscover.hxx
@@ -45,7 +45,6 @@ namespace connectivity
ProfileStruct(MozillaProductType aProduct = MozillaProductType_Default, const OUString& aProfileName = OUString(),
const OUString &aProfilePath = OUString()
);
- MozillaProductType getProductType() { return product;}
OUString getProfileName(){ return profileName;}
OUString getProfilePath() { return profilePath; }
protected:
@@ -59,10 +58,7 @@ namespace connectivity
class ProductStruct
{
public:
- void setCurrentProfile(const OUString& aProfileName){mCurrentProfileName = aProfileName;}
-
OUString mCurrentProfileName;
-
ProfileList mProfileList;
};
diff --git a/connectivity/source/drivers/mork/MQueryHelper.hxx b/connectivity/source/drivers/mork/MQueryHelper.hxx
index 23cffe295140..03d702808346 100644
--- a/connectivity/source/drivers/mork/MQueryHelper.hxx
+++ b/connectivity/source/drivers/mork/MQueryHelper.hxx
@@ -69,7 +69,6 @@ namespace connectivity
public:
virtual ~MQueryExpressionBase() {}
- bool isUnknown( ) const { return m_eNodeType == Unknown; }
bool isStringExpr( ) const { return m_eNodeType == StringExpr; }
bool isExpr( ) const { return m_eNodeType == Expr; }
};
@@ -182,23 +181,12 @@ namespace connectivity
ErrorDescriptor m_aError;
OUString m_aAddressbook;
-/*
- void clearResultOrComplete();
- void notifyResultOrComplete();
- sal_Bool waitForResultOrComplete( );
- void getCardValues(nsIAbCard *card,sal_uInt32 rowIndex=0);
-*/
-
- sal_Int32 doQueryDefaultTable(OConnection* xConnection);
- sal_Int32 doQueryListTable(OConnection* xConnection, OString& ouStringTable);
-
public:
explicit MQueryHelper(const OColumnAlias& _ca);
virtual ~MQueryHelper();
void reset();
MQueryHelperResultEntry* getByIndex( sal_uInt32 nRow );
- bool isError() const;
static bool queryComplete() { return true; }
sal_Int32 getResultCount() const;
bool checkRowAvailable( sal_Int32 nDBRow );
diff --git a/connectivity/source/drivers/mork/MorkParser.cxx b/connectivity/source/drivers/mork/MorkParser.cxx
index 040ad950b1c1..bcdda99e104e 100644
--- a/connectivity/source/drivers/mork/MorkParser.cxx
+++ b/connectivity/source/drivers/mork/MorkParser.cxx
@@ -88,11 +88,6 @@ bool MorkParser::open( const std::string &path )
return parse();
}
-inline MorkErrors MorkParser::error()
-{
- return error_;
-}
-
void MorkParser::initVars()
{
error_ = NoError;
diff --git a/connectivity/source/drivers/mork/MorkParser.hxx b/connectivity/source/drivers/mork/MorkParser.hxx
index ddb5f4ba0f20..411c7544e978 100644
--- a/connectivity/source/drivers/mork/MorkParser.hxx
+++ b/connectivity/source/drivers/mork/MorkParser.hxx
@@ -89,10 +89,6 @@ public:
bool open( const std::string &path );
- /// Return error status
-
- MorkErrors error();
-
/// Returns all tables of specified scope
MorkTableMap *getTables( int tableScope );
diff --git a/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.hxx b/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.hxx
index 6df693a7229f..95c816d0159a 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.hxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.hxx
@@ -81,10 +81,6 @@ namespace connectivity
// XProxyRunner
virtual ::sal_Int32 SAL_CALL Run( const ::com::sun::star::uno::Reference< ::com::sun::star::mozilla::XCodeProxy >& aCode ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-
- const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >
- & getMSFactory() const { return m_xMSFactory; }
-
};
}
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.hxx b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.hxx
index a897453380eb..6883c5615acf 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.hxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.hxx
@@ -58,7 +58,6 @@ namespace connectivity
nsILocalFile * aProfilePath
#endif
);
- MozillaProductType getProductType() { return product;}
OUString getProfileName(){ return profileName;}
OUString getProfilePath() ;
#ifndef MINIMAL_PROFILEDISCOVER
@@ -77,10 +76,7 @@ namespace connectivity
class ProductStruct
{
public:
- void setCurrentProfile(const OUString& aProfileName){mCurrentProfileName = aProfileName;}
-
OUString mCurrentProfileName;
-
ProfileList mProfileList;
};
diff --git a/connectivity/source/drivers/odbc/OTools.cxx b/connectivity/source/drivers/odbc/OTools.cxx
index f92f3df1b79d..f08b767ff915 100644
--- a/connectivity/source/drivers/odbc/OTools.cxx
+++ b/connectivity/source/drivers/odbc/OTools.cxx
@@ -564,18 +564,6 @@ void OTools::GetInfo(OConnection* _pConnection,
_aConnectionHandle,SQL_HANDLE_DBC,_xInterface);
}
-void OTools::GetInfo(OConnection* _pConnection,
- SQLHANDLE _aConnectionHandle,
- SQLUSMALLINT _nInfo,
- bool &_rValue,
- const Reference< XInterface >& _xInterface) throw(SQLException, RuntimeException)
-{
- SQLSMALLINT nValueLen;
- OTools::ThrowException(_pConnection,
- (*reinterpret_cast<T3SQLGetInfo>(_pConnection->getOdbcFunction(ODBC3SQLFunctionId::GetInfo)))(_aConnectionHandle,_nInfo,&_rValue,sizeof _rValue,&nValueLen),
- _aConnectionHandle,SQL_HANDLE_DBC,_xInterface);
-}
-
sal_Int32 OTools::MapOdbcType2Jdbc(SQLSMALLINT _nType)
{
sal_Int32 nValue = DataType::VARCHAR;
diff --git a/connectivity/source/drivers/postgresql/pq_baseresultset.hxx b/connectivity/source/drivers/postgresql/pq_baseresultset.hxx
index 5f3296aa6feb..ed269f867204 100644
--- a/connectivity/source/drivers/postgresql/pq_baseresultset.hxx
+++ b/connectivity/source/drivers/postgresql/pq_baseresultset.hxx
@@ -77,9 +77,6 @@ protected:
sal_Int32 m_fieldCount;
bool m_wasNull;
-public:
- inline cppu::OBroadcastHelper & getRBHelper() { return OComponentHelper::rBHelper;}
-
protected:
/** mutex should be locked before called
*/
diff --git a/connectivity/source/drivers/postgresql/pq_xtable.hxx b/connectivity/source/drivers/postgresql/pq_xtable.hxx
index fa2e1f00aba4..cbef55eeca2c 100644
--- a/connectivity/source/drivers/postgresql/pq_xtable.hxx
+++ b/connectivity/source/drivers/postgresql/pq_xtable.hxx
@@ -73,46 +73,43 @@ public:
Table( const ::rtl::Reference< RefCountedMutex > & refMutex,
const ::com::sun::star::uno::Reference< com::sun::star::sdbc::XConnection > & connection,
ConnectionSettings *pSettings);
-public:
- void refetch();
-public: // XInterface
+ // XInterface
virtual void SAL_CALL acquire() throw() SAL_OVERRIDE { OComponentHelper::acquire(); }
virtual void SAL_CALL release() throw() SAL_OVERRIDE { OComponentHelper::release(); }
virtual com::sun::star::uno::Any SAL_CALL queryInterface(
const com::sun::star::uno::Type & reqType )
throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-public: // XTypeProvider, first implemented by OPropertySetHelper
+ // XTypeProvider, first implemented by OPropertySetHelper
virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes()
throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual com::sun::star::uno::Sequence< sal_Int8> SAL_CALL getImplementationId()
throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
-public: // XDataDescriptorFactory
+ // XDataDescriptorFactory
virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL
createDataDescriptor( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-public: // XColumnsSupplier
+ // XColumnsSupplier
virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL
getColumns( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-public: // XIndexesSupplier
+ // XIndexesSupplier
virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL
getIndexes( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-public: // XKeysSupplier
+ // XKeysSupplier
virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > SAL_CALL
getKeys( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-public: // XRename
+ // XRename
virtual void SAL_CALL rename( const OUString& newName )
throw (::com::sun::star::sdbc::SQLException,
::com::sun::star::container::ElementExistException,
::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-public: // XAlterTable
- // Methods
+ // XAlterTable
virtual void SAL_CALL alterColumnByName(
const OUString& colName,
const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor )
@@ -127,11 +124,11 @@ public: // XAlterTable
::com::sun::star::lang::IndexOutOfBoundsException,
::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-public: // TODO: remove again
+ // TODO: remove again
virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue(const OUString& aPropertyName)
throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-public: // XNamed
+ // XNamed
virtual OUString SAL_CALL getName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL setName( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
};
diff --git a/connectivity/source/drivers/postgresql/pq_xuser.hxx b/connectivity/source/drivers/postgresql/pq_xuser.hxx
index 4272aecfee79..9358f2bcc867 100644
--- a/connectivity/source/drivers/postgresql/pq_xuser.hxx
+++ b/connectivity/source/drivers/postgresql/pq_xuser.hxx
@@ -57,35 +57,30 @@ public:
User( const ::rtl::Reference< RefCountedMutex > & refMutex,
const ::com::sun::star::uno::Reference< com::sun::star::sdbc::XConnection > & connection,
ConnectionSettings *pSettings);
-public:
- void refetch();
-public: // XInterface
+ // XInterface
virtual void SAL_CALL acquire() throw() SAL_OVERRIDE { OComponentHelper::acquire(); }
virtual void SAL_CALL release() throw() SAL_OVERRIDE { OComponentHelper::release(); }
virtual com::sun::star::uno::Any SAL_CALL queryInterface(
const com::sun::star::uno::Type & reqType )
throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-public: // XTypeProvider, first implemented by OPropertySetHelper
+ // XTypeProvider, first implemented by OPropertySetHelper
virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes()
throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual com::sun::star::uno::Sequence< sal_Int8> SAL_CALL getImplementationId()
throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
-public: // XDataDescriptorFactory
+ // XDataDescriptorFactory
virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL
createDataDescriptor( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-public: // XUser : XAuthorizable
- // Methods
+ // XUser : XAuthorizable
virtual sal_Int32 SAL_CALL getPrivileges( const OUString& objName, sal_Int32 objType ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual sal_Int32 SAL_CALL getGrantablePrivileges( const OUString& objName, sal_Int32 objType ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL grantPrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL revokePrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL changePassword( const OUString& oldPassword, const OUString& newPassword ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-
-
};
class UserDescriptor : public ReflectionBase
diff --git a/connectivity/source/drivers/postgresql/pq_xview.hxx b/connectivity/source/drivers/postgresql/pq_xview.hxx
index 35ab54bf0a00..e93d34766488 100644
--- a/connectivity/source/drivers/postgresql/pq_xview.hxx
+++ b/connectivity/source/drivers/postgresql/pq_xview.hxx
@@ -56,33 +56,31 @@ public:
View( const ::rtl::Reference< RefCountedMutex > & refMutex,
const ::com::sun::star::uno::Reference< com::sun::star::sdbc::XConnection > & connection,
ConnectionSettings *pSettings);
-public:
- void refetch();
-public: // XInterface
+ // XInterface
virtual void SAL_CALL acquire() throw() SAL_OVERRIDE { OComponentHelper::acquire(); }
virtual void SAL_CALL release() throw() SAL_OVERRIDE { OComponentHelper::release(); }
virtual com::sun::star::uno::Any SAL_CALL queryInterface(
const com::sun::star::uno::Type & reqType )
throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-public: // XTypeProvider, first implemented by OPropertySetHelper
+ // XTypeProvider, first implemented by OPropertySetHelper
virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes()
throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual com::sun::star::uno::Sequence< sal_Int8> SAL_CALL getImplementationId()
throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
-public: // XDataDescriptorFactory
+ // XDataDescriptorFactory
virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL
createDataDescriptor( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-public: // XRename
+ // XRename
virtual void SAL_CALL rename( const OUString& newName )
throw (::com::sun::star::sdbc::SQLException,
::com::sun::star::container::ElementExistException,
::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-public: // XNamed
+ // XNamed
virtual OUString SAL_CALL getName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL setName( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
@@ -96,7 +94,7 @@ public:
const ::com::sun::star::uno::Reference< com::sun::star::sdbc::XConnection > & connection,
ConnectionSettings *pSettings);
-public: // XDataDescriptorFactory
+ // XDataDescriptorFactory
virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL
createDataDescriptor( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
};
diff --git a/connectivity/source/inc/OTypeInfo.hxx b/connectivity/source/inc/OTypeInfo.hxx
index 12a96580ca43..5294c8e5ac36 100644
--- a/connectivity/source/inc/OTypeInfo.hxx
+++ b/connectivity/source/inc/OTypeInfo.hxx
@@ -74,8 +74,6 @@ namespace connectivity
bool operator == (const OTypeInfo& lh) const { return lh.nType == nType; }
bool operator != (const OTypeInfo& lh) const { return lh.nType != nType; }
-
- inline OUString getDBName() const { return aTypeName; }
};
}
diff --git a/connectivity/source/inc/dbase/DIndex.hxx b/connectivity/source/inc/dbase/DIndex.hxx
index ed424641373c..b40aaa1d4fff 100644
--- a/connectivity/source/inc/dbase/DIndex.hxx
+++ b/connectivity/source/inc/dbase/DIndex.hxx
@@ -111,10 +111,8 @@ namespace connectivity
void SetRootPos(sal_uInt32 nPos) {m_nRootPage = nPos;}
void SetPageCount(sal_uInt32 nCount) {m_nPageCount = nCount;}
- sal_uInt32 GetRootPos() {return m_nRootPage;}
sal_uInt32 GetPageCount() {return m_nPageCount;}
- bool IsText() const {return m_aHeader.db_keytype == 0;}
sal_uInt16 GetMaxNodes() const {return m_aHeader.db_maxkeys;}
bool Insert(sal_uInt32 nRec, const ORowSetValue& rValue);
@@ -136,7 +134,6 @@ namespace connectivity
bool isUnique() const { return m_IsUnique; }
bool UseCollector() const {return m_bUseCollector;}
// Tree operations
- void Insert(ONDXPagePtr aCurPage, ONDXNode& rNode);
void Release(bool bSave = true);
bool ConvertToKey(ONDXKey* rKey, sal_uInt32 nRec, const ORowSetValue& rValue);
};
diff --git a/connectivity/source/inc/dbase/DIndexIter.hxx b/connectivity/source/inc/dbase/DIndexIter.hxx
index 772bfb93de99..7d3dd2fb5b56 100644
--- a/connectivity/source/inc/dbase/DIndexIter.hxx
+++ b/connectivity/source/inc/dbase/DIndexIter.hxx
@@ -39,9 +39,8 @@ namespace connectivity
ODbaseIndex* m_pIndex;
ONDXPagePtr m_aRoot,
m_aCurLeaf;
- sal_uInt16 m_nCurNode;
+ sal_uInt16 m_nCurNode;
- protected:
sal_uIntPtr Find(bool bFirst);
sal_uIntPtr GetCompare(bool bFirst);
sal_uIntPtr GetLike(bool bFirst);
@@ -51,8 +50,6 @@ namespace connectivity
ONDXKey* GetFirstKey(ONDXPage* pPage,
const file::OOperand& rKey);
ONDXKey* GetNextKey();
- ODbaseIndex* GetIndex() const {return m_pIndex;}
-
public:
OIndexIterator(ODbaseIndex* pInd,
diff --git a/connectivity/source/inc/dbase/dindexnode.hxx b/connectivity/source/inc/dbase/dindexnode.hxx
index b32163511e6a..17cb9b769f43 100644
--- a/connectivity/source/inc/dbase/dindexnode.hxx
+++ b/connectivity/source/inc/dbase/dindexnode.hxx
@@ -70,9 +70,6 @@ namespace connectivity
bool operator > (const ONDXKey& rKey) const;
bool operator >= (const ONDXKey& rKey) const;
- bool Load (SvFileStream& rStream, bool bText);
- bool Write(SvFileStream& rStream, bool bText);
-
static bool IsText(sal_Int32 eType);
private:
@@ -157,7 +154,6 @@ namespace connectivity
bool IsLeaf() const;
bool IsModified() const;
bool HasParent();
- bool HasChild() const;
bool IsFull() const;
@@ -224,7 +220,6 @@ namespace connectivity
inline bool ONDXPage::IsLeaf() const {return !aChild.HasPage();}
inline bool ONDXPage::IsModified() const {return bModified;}
inline bool ONDXPage::HasParent() {return aParent.Is();}
- inline bool ONDXPage::HasChild() const {return aChild.HasPage();}
inline ONDXPagePtr ONDXPage::GetParent() {return aParent;}
inline void ONDXPage::SetParent(ONDXPagePtr aPa = ONDXPagePtr())
@@ -269,41 +264,11 @@ namespace connectivity
// Setting the child, via reference to retain the PagePos
void SetChild(ONDXPagePtr aCh = ONDXPagePtr(), ONDXPage* = NULL);
- void SetKey(ONDXKey& rKey) {aKey = rKey;}
void Write(SvStream &rStream, const ONDXPage& rPage) const;
void Read(SvStream &rStream, ODbaseIndex&);
};
- // inline implementation
-
-// inline ONDXKey::ONDXKey(const ORowSetValue& rVal, sal_Int32 eType, sal_uInt32 nRec)
-// : ONDXKey_BASE(eType)
-// , nRecord(nRec),xValue(rVal)
-// {
-// }
-
-
-// inline ONDXKey::ONDXKey(const OUString& aStr, sal_uInt32 nRec)
-// : ONDXKey_BASE(::com::sun::star::sdbc::DataType::VARCHAR)
-// ,nRecord(nRec)
-// {
-// if (aStr.len())
-// xValue = aStr;
-// }
-
-// inline ONDXKey::ONDXKey(double aVal, sal_uInt32 nRec)
-// : ONDXKey_BASE(::com::sun::star::sdbc::DataType::DOUBLE)
-// ,nRecord(nRec)
-// ,xValue(aVal)
-// {
-// }
-
-// inline ONDXKey::ONDXKey(sal_uInt32 nRec)
-// :nRecord(nRec)
-// {
-// }
-
inline ONDXKey::ONDXKey(const ONDXKey& rKey)
: ONDXKey_BASE(rKey.getDBType())
,nRecord(rKey.nRecord)
diff --git a/connectivity/source/inc/file/FConnection.hxx b/connectivity/source/inc/file/FConnection.hxx
index 2b6bc47069f6..eaede692c871 100644
--- a/connectivity/source/inc/file/FConnection.hxx
+++ b/connectivity/source/inc/file/FConnection.hxx
@@ -83,9 +83,6 @@ namespace connectivity
css::uno::RuntimeException,
css::uno::DeploymentException);
-
- void closeAllStatements () throw( ::com::sun::star::sdbc::SQLException);
-
// OComponentHelper
virtual void SAL_CALL disposing() SAL_OVERRIDE;
// XInterface
diff --git a/connectivity/source/inc/file/FStatement.hxx b/connectivity/source/inc/file/FStatement.hxx
index 356a40e997b1..fc481ed47813 100644
--- a/connectivity/source/inc/file/FStatement.hxx
+++ b/connectivity/source/inc/file/FStatement.hxx
@@ -112,7 +112,6 @@ namespace connectivity
OSQLAnalyzer* createAnalyzer();
void closeResultSet() throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception);
- sal_Int32 getPrecision ( sal_Int32 sqlType);
void disposeResultSet();
void GetAssignValues();
diff --git a/connectivity/source/inc/file/fcode.hxx b/connectivity/source/inc/file/fcode.hxx
index 2c59dfd9f44b..725e0f28ccdb 100644
--- a/connectivity/source/inc/file/fcode.hxx
+++ b/connectivity/source/inc/file/fcode.hxx
@@ -76,7 +76,6 @@ namespace connectivity
virtual void setValue(const ORowSetValue& _rVal) = 0;
sal_Int32 getDBType() const {return m_eDBType;}
- virtual OEvaluateSet* preProcess(OBoolOperator* pOp, OOperand* pRight = 0);
inline bool isValid() const;
TYPEINFO_OVERRIDE();
@@ -90,7 +89,6 @@ namespace connectivity
OOperandRow(sal_uInt16 _nPos, sal_Int32 _rType);
public:
- sal_uInt16 getRowPos() const {return m_nRowPos;}
virtual const ORowSetValue& getValue() const SAL_OVERRIDE;
virtual void setValue(const ORowSetValue& _rVal) SAL_OVERRIDE;
void bindValue(const OValueRefRow& _pRow); // Bind to the value that the operand represents
@@ -108,7 +106,6 @@ namespace connectivity
OOperandAttr(sal_uInt16 _nPos,
const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xColumn);
- virtual OEvaluateSet* preProcess(OBoolOperator* pOp, OOperand* pRight = 0) SAL_OVERRIDE;
TYPEINFO_OVERRIDE();
};
@@ -202,8 +199,6 @@ namespace connectivity
{
public:
virtual void Exec(OCodeStack&) = 0;
- virtual sal_uInt16 getRequestedOperands() const; // Count of requested operands
- // Defaults to 2
TYPEINFO_OVERRIDE();
};
@@ -225,7 +220,6 @@ namespace connectivity
protected:
virtual void Exec(OCodeStack&) SAL_OVERRIDE;
virtual bool operate(const OOperand*, const OOperand* = NULL) const SAL_OVERRIDE;
- virtual sal_uInt16 getRequestedOperands() const SAL_OVERRIDE;
};
class OOp_AND : public OBoolOperator
@@ -251,7 +245,6 @@ namespace connectivity
TYPEINFO_OVERRIDE();
public:
virtual void Exec(OCodeStack&) SAL_OVERRIDE;
- virtual sal_uInt16 getRequestedOperands() const SAL_OVERRIDE;
virtual bool operate(const OOperand*, const OOperand* = NULL) const SAL_OVERRIDE;
};
@@ -366,7 +359,6 @@ namespace connectivity
{
public:
virtual void Exec(OCodeStack&) SAL_OVERRIDE;
- virtual sal_uInt16 getRequestedOperands() const SAL_OVERRIDE;
virtual ORowSetValue operate(const ORowSetValue& lhs) const = 0;
TYPEINFO_OVERRIDE();
diff --git a/connectivity/source/inc/file/fcomp.hxx b/connectivity/source/inc/file/fcomp.hxx
index 7f09023ae4b6..5b0d52c8b644 100644
--- a/connectivity/source/inc/file/fcomp.hxx
+++ b/connectivity/source/inc/file/fcomp.hxx
@@ -65,7 +65,6 @@ namespace connectivity
void Clean();
bool isClean() const {return m_aCodeList.empty();}
bool hasCode() const {return !isClean();}
- bool hasORCondition() const {return m_bORCondition;}
void setOrigColumns(const OFileColumns& rCols) { m_orgColumns = rCols; }
const OFileColumns getOrigColumns() const { return m_orgColumns; }
protected:
diff --git a/connectivity/source/inc/flat/ETable.hxx b/connectivity/source/inc/flat/ETable.hxx
index f45fe0fd5ba3..ecd982ef0c62 100644
--- a/connectivity/source/inc/flat/ETable.hxx
+++ b/connectivity/source/inc/flat/ETable.hxx
@@ -57,7 +57,6 @@ namespace connectivity
bool m_bNeedToReadLine;
private:
void fillColumns(const ::com::sun::star::lang::Locale& _aLocale);
- bool CreateFile(const INetURLObject& aFile, bool& bCreateMemo);
bool readLine(sal_Int32 *pEndPos = NULL, sal_Int32 *pStartPos = NULL, bool nonEmpty = false);
void setRowPos(::std::vector<TRowPositionInFile>::size_type rowNum, const TRowPositionInFile &rowPos);
void impl_fillColumnInfo_nothrow(QuotedTokenizedString& aFirstLine, sal_Int32& nStartPosFirstLine, sal_Int32& nStartPosFirstLine2,
diff --git a/connectivity/source/inc/hsqldb/HTables.hxx b/connectivity/source/inc/hsqldb/HTables.hxx
index 75c95e013a37..26e5c3965460 100644
--- a/connectivity/source/inc/hsqldb/HTables.hxx
+++ b/connectivity/source/inc/hsqldb/HTables.hxx
@@ -49,20 +49,6 @@ namespace connectivity
// XDrop
void appendNew(const OUString& _rsNewTable);
- // some helper functions
- /**
- returns a sql string which contains the column definition part for create or alter statements
- */
- static OUString getColumnSqlType(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxColProp);
- /**
- returns the "not null" part or the default part of the table statement
- */
- static OUString getColumnSqlNotNullDefault(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxColProp);
- /**
- returns the corresponding typename
- can contain () which have to filled with values
- */
- static OUString getTypeString(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxColProp);
};
}
}
diff --git a/connectivity/source/inc/java/ContextClassLoader.hxx b/connectivity/source/inc/java/ContextClassLoader.hxx
index fa04e0a9ae1c..6d96a48e3e72 100644
--- a/connectivity/source/inc/java/ContextClassLoader.hxx
+++ b/connectivity/source/inc/java/ContextClassLoader.hxx
@@ -57,8 +57,6 @@ namespace connectivity { namespace jdbc
~ContextClassLoaderScope() { pop(true); }
- void pop() { pop(false); }
-
bool isActive() const
{
return ( m_currentThread.is() )
diff --git a/connectivity/source/inc/java/lang/Object.hxx b/connectivity/source/inc/java/lang/Object.hxx
index adaa7a87a7ad..2200bdf1b661 100644
--- a/connectivity/source/inc/java/lang/Object.hxx
+++ b/connectivity/source/inc/java/lang/Object.hxx
@@ -92,7 +92,6 @@ namespace connectivity
void saveRef( JNIEnv * pEnv, jobject myObj );
jobject getJavaObject() const { return object; }
- java_lang_Object * GetWrapper() { return this; }
void clearObject(JNIEnv& rEnv);
void clearObject();
diff --git a/connectivity/source/inc/mysql/YTables.hxx b/connectivity/source/inc/mysql/YTables.hxx
index e3bb892c8ed5..5783c06ca334 100644
--- a/connectivity/source/inc/mysql/YTables.hxx
+++ b/connectivity/source/inc/mysql/YTables.hxx
@@ -51,20 +51,6 @@ namespace connectivity
// XDrop
void appendNew(const OUString& _rsNewTable);
- // some helper functions
- /**
- returns a sql string which contains the column definition part for create or alter statements
- */
- static OUString getColumnSqlType(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxColProp);
- /**
- returns the "not null" part or the default part of the table statement
- */
- static OUString getColumnSqlNotNullDefault(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxColProp);
- /**
- returns the corresponding typename
- can contain () which have to filled with values
- */
- static OUString getTypeString(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxColProp);
/** convert the sql statement to fit MySQL notation
@param _sSql in/out
diff --git a/connectivity/source/inc/odbc/OBoundParam.hxx b/connectivity/source/inc/odbc/OBoundParam.hxx
index d851e2a2740e..e07baf5ba000 100644
--- a/connectivity/source/inc/odbc/OBoundParam.hxx
+++ b/connectivity/source/inc/odbc/OBoundParam.hxx
@@ -61,15 +61,6 @@ namespace connectivity
}
- // getBindDataBuffer
- // Returns the data buffer to be used when binding to a parameter
-
- void* getBindDataBuffer ()
- {
- return binaryData;
- }
-
-
// getBindLengthBuffer
// Returns the length buffer to be used when binding to a parameter
@@ -113,45 +104,6 @@ namespace connectivity
}
- // setSqlType
- // Sets the Java sql type used to register an OUT parameter
-
-
- void setSqlType(sal_Int32 type)
- {
- sqlType = type;
- }
-
-
- // getSqlType
- // Gets the Java sql type used to register an OUT parameter
-
-
- sal_Int32 getSqlType ()
- {
- return sqlType;
- }
-
-
- // setOutputParameter
- // Sets the flag indicating if this is an OUTPUT parameter
-
-
- void setOutputParameter (bool output)
- {
- outputParameter = output;
- }
-
-
- // isOutputParameter
- // Gets the OUTPUT parameter flag
-
-
- bool isOutputParameter ()
- {
- return outputParameter;
- }
-
protected:
// Data attributes
diff --git a/connectivity/source/inc/odbc/OConnection.hxx b/connectivity/source/inc/odbc/OConnection.hxx
index 8dfb0627efc8..6598addf60a5 100644
--- a/connectivity/source/inc/odbc/OConnection.hxx
+++ b/connectivity/source/inc/odbc/OConnection.hxx
@@ -91,8 +91,6 @@ namespace connectivity
// OConnection(const SQLHANDLE _pConnectionHandle);
virtual ~OConnection();
- void closeAllStatements () throw( ::com::sun::star::sdbc::SQLException);
-
// OComponentHelper
virtual void SAL_CALL disposing() SAL_OVERRIDE;
// XInterface
@@ -133,15 +131,11 @@ namespace connectivity
inline bool isIgnoreDriverPrivilegesEnabled() const { return m_bIgnoreDriverPrivileges; }
inline bool preventGetVersionColumns() const { return m_bPreventGetVersionColumns; }
inline bool useOldDateFormat() const { return m_bUseOldDateFormat; }
- inline SQLHANDLE getDriverHandle() const { return m_pDriverHandleCopy;}
inline ODBCDriver* getDriver() const { return m_pDriver;}
- inline OUString getUserName() const { return m_sUser; }
SQLHANDLE createStatementHandle();
// close and free the handle and set it to SQL_NULLHANDLE
void freeStatementHandle(SQLHANDLE& _pHandle);
-
- const TTypeInfoVector& getTypeInfo() const { return m_aTypeInfo; }
};
}
}
diff --git a/connectivity/source/inc/odbc/ODatabaseMetaData.hxx b/connectivity/source/inc/odbc/ODatabaseMetaData.hxx
index 2a63bb7187f1..38beb19b7d33 100644
--- a/connectivity/source/inc/odbc/ODatabaseMetaData.hxx
+++ b/connectivity/source/inc/odbc/ODatabaseMetaData.hxx
@@ -58,18 +58,10 @@ namespace connectivity
OUString getURLImpl();
virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > impl_getTypeInfo_throw() SAL_OVERRIDE;
virtual ~ODatabaseMetaData();
- public:
-
- inline OConnection* getOwnConnection() const { return m_pConnection; }
- inline oslGenericFunction getOdbcFunction(ODBC3SQLFunctionId _nIndex) const
- {
- return m_pConnection->getOdbcFunction(_nIndex);
- }
+ public:
ODatabaseMetaData(const SQLHANDLE _pHandle,OConnection* _pCon);
-
-
// XDatabaseMetaData
virtual sal_Bool SAL_CALL allProceduresAreCallable( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL allTablesAreSelectable( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
diff --git a/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx b/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx
index 1685c248b031..16a7213e2086 100644
--- a/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx
+++ b/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx
@@ -192,8 +192,6 @@ namespace connectivity
// XColumnLocate
virtual sal_Int32 SAL_CALL findColumn( const OUString& columnName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- 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);
diff --git a/connectivity/source/inc/odbc/OPreparedStatement.hxx b/connectivity/source/inc/odbc/OPreparedStatement.hxx
index 59968836c6d3..1aab573aa498 100644
--- a/connectivity/source/inc/odbc/OPreparedStatement.hxx
+++ b/connectivity/source/inc/odbc/OPreparedStatement.hxx
@@ -82,7 +82,6 @@ namespace connectivity
void setParameterPre(sal_Int32 parameterIndex);
template <typename T> void setScalarParameter(sal_Int32 parameterIndex, sal_Int32 _nType, SQLULEN _nColumnSize, const T i_Value);
void setParameter(sal_Int32 parameterIndex, sal_Int32 _nType, SQLULEN _nColumnSize, sal_Int32 _nScale, const void* _pData, SQLULEN _nDataLen, SQLLEN _nDataAllocLen);
- void setParameter(sal_Int32 parameterIndex, sal_Int32 _nType, sal_Int32 _nColumnSize, sal_Int32 _nByteSize, void* _pData);
// Wrappers for special cases
void setParameter(sal_Int32 parameterIndex, sal_Int32 _nType, sal_Int16 _nScale, const OUString &_sData);
void setParameter(sal_Int32 parameterIndex, sal_Int32 _nType, const com::sun::star::uno::Sequence< sal_Int8 > &_Data);
diff --git a/connectivity/source/inc/odbc/OTools.hxx b/connectivity/source/inc/odbc/OTools.hxx
index c971548e59f3..ff544c9fb047 100644
--- a/connectivity/source/inc/odbc/OTools.hxx
+++ b/connectivity/source/inc/odbc/OTools.hxx
@@ -134,12 +134,6 @@ namespace connectivity
SQLUINTEGER &_rValue,
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xInterface) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
- static void GetInfo(OConnection* _pConnection,
- SQLHANDLE _aConnectionHandle,
- SQLUSMALLINT _nInfo,
- bool &_rValue,
- const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xInterface) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-
static sal_Int32 MapOdbcType2Jdbc(SQLSMALLINT _nType);
static SQLSMALLINT jdbcTypeToOdbc(sal_Int32 jdbcType);
diff --git a/connectivity/source/sdbcx/VCollection.cxx b/connectivity/source/sdbcx/VCollection.cxx
index b92b17131986..4cead412a0f4 100644
--- a/connectivity/source/sdbcx/VCollection.cxx
+++ b/connectivity/source/sdbcx/VCollection.cxx
@@ -186,12 +186,6 @@ namespace
return m_aElements.size() - (m_aElements.end() - ::std::find(m_aElements.begin(),m_aElements.end(),aIter));
}
- virtual OUString findColumnAtIndex( sal_Int32 _nIndex) SAL_OVERRIDE
- {
- OSL_ENSURE(_nIndex >= 0 && _nIndex < static_cast<sal_Int32>(m_aElements.size()),"Illegal argument!");
- return m_aElements[_nIndex]->first;
- }
-
virtual ObjectType getObject(sal_Int32 _nIndex) SAL_OVERRIDE
{
OSL_ENSURE(_nIndex >= 0 && _nIndex < static_cast<sal_Int32>(m_aElements.size()),"Illegal argument!");