2 files changed, 3 insertions, 5 deletions
diff --git a/connectivity/source/drivers/evoab2/NResultSet.cxx b/connectivity/source/drivers/evoab2/NResultSet.cxx
index 23fb3ece4f4f..965072f70537 100644
--- a/connectivity/source/drivers/evoab2/NResultSet.cxx
+++ b/connectivity/source/drivers/evoab2/NResultSet.cxx
@@ -435,7 +435,7 @@ public:
         m_pContacts = nullptr;
     }
 
-    virtual void executeQuery (EBook* pBook, EBookQuery* pQuery, OString &/*rPassword*/) override
+    virtual void executeQuery (EBook* pBook, EBookQuery* pQuery) override
     {
         freeContacts();
         char *sexp = e_book_query_to_string( pQuery );
@@ -570,9 +570,7 @@ void OEvoabResultSet::construct( const QueryData& _rData )
     }
     if ( bExecuteQuery )
     {
-        OString aPassword = m_pConnection->getPassword();
-        m_pVersionHelper->executeQuery(pBook, _rData.getQuery(), aPassword);
-        m_pConnection->setPassword( aPassword );
+        m_pVersionHelper->executeQuery(pBook, _rData.getQuery());
 
         if ( m_pVersionHelper->hasContacts() && !_rData.aSortOrder.empty() )
         {
diff --git a/connectivity/source/drivers/evoab2/NResultSet.hxx b/connectivity/source/drivers/evoab2/NResultSet.hxx
index 74a5e40dda1f..3eeeab244ab3 100644
--- a/connectivity/source/drivers/evoab2/NResultSet.hxx
+++ b/connectivity/source/drivers/evoab2/NResultSet.hxx
@@ -49,7 +49,7 @@ namespace connectivity::evoab
         {
         public:
             virtual EBook* openBook(const char *abname) = 0;
-            virtual void executeQuery (EBook* pBook, EBookQuery* pQuery, OString &rPassword) = 0;
+            virtual void executeQuery (EBook* pBook, EBookQuery* pQuery) = 0;
             virtual void freeContacts() = 0;
             virtual bool isLDAP( EBook *pBook ) = 0;
             virtual bool isLocal( EBook *pBook ) = 0;