diff options
author | José Guilherme Vanz <guilherme.sft@gmail.com> | 2012-11-14 02:15:53 -0200 |
---|---|---|
committer | Tor Lillqvist <tml@iki.fi> | 2012-11-14 08:03:18 +0000 |
commit | dc157e8a31fda636a933fa8e0f1662abfea73ec7 (patch) | |
tree | 987ffdc18b0b93ead261219fa24ebf0f06cd6552 /connectivity | |
parent | 661d5a479c7c7340a4b33d7d01ee0c5d03a6e6b3 (diff) |
Cleanup unusedcode.easy
This commit removes some unused code from unusedcode.easy
Change-Id: I204edb6a29e23af244e7997622c5a9b3f596cb2f
Signed-off-by: José Guilherme Vanz <guilherme.sft@gmail.com>
Reviewed-on: https://gerrit.libreoffice.org/1052
Reviewed-by: Tor Lillqvist <tml@iki.fi>
Tested-by: Tor Lillqvist <tml@iki.fi>
Diffstat (limited to 'connectivity')
-rw-r--r-- | connectivity/inc/connectivity/dbtools.hxx | 6 | ||||
-rw-r--r-- | connectivity/source/commontools/dbtools.cxx | 22 | ||||
-rw-r--r-- | connectivity/source/drivers/mork/MQueryHelper.cxx | 25 | ||||
-rw-r--r-- | connectivity/source/drivers/mork/MQueryHelper.hxx | 2 |
4 files changed, 0 insertions, 55 deletions
diff --git a/connectivity/inc/connectivity/dbtools.hxx b/connectivity/inc/connectivity/dbtools.hxx index 7f48e14a68c1..854e4e932422 100644 --- a/connectivity/inc/connectivity/dbtools.hxx +++ b/connectivity/inc/connectivity/dbtools.hxx @@ -191,12 +191,6 @@ namespace dbtools /** returns the connection the RowSet is currently working with (which is the ActiveConnection property) */ OOO_DLLPUBLIC_DBTOOLS ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> getConnection(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet>& _rxRowSet) throw (::com::sun::star::uno::RuntimeException); - OOO_DLLPUBLIC_DBTOOLS ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> getConnection( - const ::rtl::OUString& _rsTitleOrPath, - const ::rtl::OUString& _rsUser, - const ::rtl::OUString& _rsPwd, - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory>& _rxFactory); - OOO_DLLPUBLIC_DBTOOLS ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> getConnection_withFeedback( const ::rtl::OUString& _rDataSourceName, const ::rtl::OUString& _rUser, diff --git a/connectivity/source/commontools/dbtools.cxx b/connectivity/source/commontools/dbtools.cxx index 6c758f88ebdd..183ad8d39fa6 100644 --- a/connectivity/source/commontools/dbtools.cxx +++ b/connectivity/source/commontools/dbtools.cxx @@ -344,28 +344,6 @@ Reference< XConnection> getConnection_withFeedback(const ::rtl::OUString& _rData } //------------------------------------------------------------------------------ -Reference< XConnection> getConnection( - const ::rtl::OUString& _rsTitleOrPath, - const ::rtl::OUString& _rsUser, - const ::rtl::OUString& _rsPwd, - const Reference< XComponentContext>& _rxContext) -{ - Reference< XConnection > xReturn; - try - { - xReturn = getConnection_allowException(_rsTitleOrPath, _rsUser, _rsPwd, _rxContext); - } - catch(Exception&) - { - } - - // TODO: if there were not dozens of places which rely on getConnection not throwing an exception .... - // I would change this ... - - return xReturn; -} - -//------------------------------------------------------------------------------ Reference< XConnection> getConnection(const Reference< XRowSet>& _rxRowSet) throw (RuntimeException) { Reference< XConnection> xReturn; diff --git a/connectivity/source/drivers/mork/MQueryHelper.cxx b/connectivity/source/drivers/mork/MQueryHelper.cxx index efd56f42b49a..e02db93393d5 100644 --- a/connectivity/source/drivers/mork/MQueryHelper.cxx +++ b/connectivity/source/drivers/mork/MQueryHelper.cxx @@ -53,11 +53,6 @@ MQueryHelperResultEntry::~MQueryHelperResultEntry() { } -void MQueryHelperResultEntry::insert( const rtl::OString &key, rtl::OUString &value ) -{ - m_Fields[ key ] = value; -} - rtl::OUString MQueryHelperResultEntry::getValue( const rtl::OString &key ) const { FieldMap::const_iterator iter = m_Fields.find( key ); @@ -149,26 +144,6 @@ void MQueryHelper::reset() m_aError.reset(); } -MQueryHelperResultEntry* MQueryHelper::next() -{ - MQueryHelperResultEntry* result; - sal_uInt32 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) { diff --git a/connectivity/source/drivers/mork/MQueryHelper.hxx b/connectivity/source/drivers/mork/MQueryHelper.hxx index de1fff09d8cf..9ba91cac1108 100644 --- a/connectivity/source/drivers/mork/MQueryHelper.hxx +++ b/connectivity/source/drivers/mork/MQueryHelper.hxx @@ -155,7 +155,6 @@ namespace connectivity MQueryHelperResultEntry(); ~MQueryHelperResultEntry(); - void insert( const rtl::OString &key, rtl::OUString &value ); rtl::OUString getValue( const rtl::OString &key ) const; void setValue( const rtl::OString &key, const rtl::OUString & rValue); }; @@ -193,7 +192,6 @@ namespace connectivity virtual ~MQueryHelper(); void reset(); - MQueryHelperResultEntry* next(); MQueryHelperResultEntry* getByIndex( sal_uInt32 nRow ); sal_Bool isError() const; sal_Bool queryComplete() const; |