sw/source/uibase/dbui/dbmgr.cxx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 9eb08b9534567801988c4137281ff153117edd32
Author: krishna keshav <princy.krishnakes...@gmail.com>
Date: Sun May 29 21:20:37 2016 +0530
tdf#94205 Use o3tl::make_unique instead of new + std::move
removed std::unique_ptr and std::move to make_unique in
sw/source/uibase/dbui/dbmgr.cxx
removed 'pInsert' as fixed in 9d8184b34e9e4c53f93e4d44ac53590e9231c520
Change-Id: Ief5e66f9691f81d294f6393c25d98f5301876928
Reviewed-on: https://gerrit.libreoffice.org/25621
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
Tested-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx
index ea26ebc..97a0d92 100644
--- a/sw/source/uibase/dbui/dbmgr.cxx
+++ b/sw/source/uibase/dbui/dbmgr.cxx
@@ -109,6 +109,7 @@
#include <svl/numuno.hxx>
#include <connectivity/dbtools.hxx>
#include <connectivity/dbconversion.hxx>
+#include <o3tl/make_unique.hxx>
#include <unomailmerge.hxx>
#include <sfx2/event.hxx>
@@ -493,8 +494,7 @@ bool SwDBManager::Merge( const SwMergeDescriptor&
rMergeDesc, vcl::Window* pPare
*pTemp = *pImpl->pMergeData;
else
{
- std::unique_ptr<SwDSParam> pInsert(new
SwDSParam(*pImpl->pMergeData));
- m_DataSourceParams.push_back(std::move(pInsert));
+
m_DataSourceParams.push_back(o3tl::make_unique<SwDSParam>(*pImpl->pMergeData));
try
{
uno::Reference<lang::XComponent>
xComponent(m_DataSourceParams.back()->xConnection, uno::UNO_QUERY);
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
