summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkrishna keshav <princy.krishnakeshav@gmail.com>2016-05-29 21:20:37 +0530
committerStephan Bergmann <sbergman@redhat.com>2016-05-31 11:37:29 +0000
commit9eb08b9534567801988c4137281ff153117edd32 (patch)
tree6f7be6d0b279f3d218de0fd3a55a9f39c25a0806
parentf51656c5b29ee317daa92aa9937fc65b66ab3e83 (diff)
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 <sbergman@redhat.com> Tested-by: Stephan Bergmann <sbergman@redhat.com>
-rw-r--r--sw/source/uibase/dbui/dbmgr.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx
index ea26ebcf74d4..97a0d92cc285 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);