[Libreoffice-commits] core.git: extensions/source

[Libreoffice Gerrit user]

 extensions/source/bibliography/loadlisteneradapter.cxx |    8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

New commits:
commit 7354da6ccfd0492a3f38ff07ce65500ec9f727b7
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Mon Oct 22 16:03:03 2018 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Mon Oct 22 21:55:55 2018 +0200

    intermediate _disposing call doesn't exist anymore
    
    Change-Id: Ifcc5142eaebae06634e1530abb1361cc123117f5
    Reviewed-on: https://gerrit.libreoffice.org/62189
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/extensions/source/bibliography/loadlisteneradapter.cxx b/extensions/source/bibliography/loadlisteneradapter.cxx
index 7b5d4d61d29e..32ae7fff3888 100644
--- a/extensions/source/bibliography/loadlisteneradapter.cxx
+++ b/extensions/source/bibliography/loadlisteneradapter.cxx
@@ -94,16 +94,14 @@ namespace bib
 
     void SAL_CALL OComponentAdapterBase::disposing( const EventObject& )
     {
-        if ( m_pListener )
+        if (m_pListener)
         {
             // disconnect the listener
-            if ( m_pListener )  // may have been reset whilest calling into _disposing
-                m_pListener->setAdapter( nullptr );
+            m_pListener->setAdapter( nullptr );
+            m_pListener = nullptr;
         }
 
-        m_pListener = nullptr;
         m_bListening = false;
-
         m_xComponent = nullptr;
     }