[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - sw/source

[Stephan Bergmann]

 sw/source/uibase/dbui/dbmgr.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 1290680ae6044bc8cc9e7c25f7bb62416336a0ae
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue May 31 11:24:17 2016 +0200

    Don't use pInsert after it has been moved
    
    Regression introduced with 38ea2d0ecc1d59844f9371ae6da7980c4e3a9e10 "sw: replace
    boost::ptr_vector with std::vector<std::unique_ptr>".
    
    Change-Id: I15f556319693c4728812d5ffd5002d0eba58ae82
    (cherry picked from commit 9d8184b34e9e4c53f93e4d44ac53590e9231c520)
    Reviewed-on: https://gerrit.libreoffice.org/25710
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Tested-by: Michael Stahl <mstahl at redhat.com>

diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx
index f86a5ee..df14930 100644
--- a/sw/source/uibase/dbui/dbmgr.cxx
+++ b/sw/source/uibase/dbui/dbmgr.cxx
@@ -437,7 +437,7 @@ bool SwDBManager::MergeNew( const SwMergeDescriptor& rMergeDesc, vcl::Window* pP
             m_DataSourceParams.push_back(std::move(pInsert));
             try
             {
-                uno::Reference<lang::XComponent> xComponent(pInsert->xConnection, uno::UNO_QUERY);
+                uno::Reference<lang::XComponent> xComponent(m_DataSourceParams.back()->xConnection, uno::UNO_QUERY);
                 if(xComponent.is())
                     xComponent->addEventListener(pImpl->m_xDisposeListener.get());
             }