diff options
| author | Gabor Kelemen <kelemen.gabor2@nisz.hu> | 2019-02-04 19:14:42 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2019-02-07 09:02:36 +0100 |
| commit | a944b4bb5c5a599f9aa3d25e7556e298d50efc9b (patch) | |
| tree | 762a7c0b58306ce8f025c8d3b65a61c83d0f636d /sw/source/uibase/dbui | |
| parent | e44c31d68b026ad9cd954dc572cb1460958a6327 (diff) | |
o3tl::make_unique -> std::make_unique in sw
Since it is now possible to use C++14, it's time to replace
the temporary solution with the standard one
Change-Id: I871312c1077439377c67b76112f38b7019fa6fb1
Reviewed-on: https://gerrit.libreoffice.org/67376
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Diffstat (limited to 'sw/source/uibase/dbui')
| -rw-r--r-- | sw/source/uibase/dbui/dbmgr.cxx | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx index 6a2d272824e9..85fd5707c582 100644 --- a/sw/source/uibase/dbui/dbmgr.cxx +++ b/sw/source/uibase/dbui/dbmgr.cxx @@ -112,7 +112,6 @@ #include <svl/numuno.hxx> #include <connectivity/dbtools.hxx> #include <connectivity/dbconversion.hxx> -#include <o3tl/make_unique.hxx> #include <unotools/charclass.hxx> #include <unomailmerge.hxx> @@ -499,7 +498,7 @@ bool SwDBManager::Merge( const SwMergeDescriptor& rMergeDesc ) *pTemp = *pImpl->pMergeData; else { - m_DataSourceParams.push_back(o3tl::make_unique<SwDSParam>(*pImpl->pMergeData)); + m_DataSourceParams.push_back(std::make_unique<SwDSParam>(*pImpl->pMergeData)); try { uno::Reference<lang::XComponent> xComponent(m_DataSourceParams.back()->xConnection, uno::UNO_QUERY); @@ -904,7 +903,7 @@ static void lcl_SaveDebugDoc( SfxObjectShell *xTargetDocShell, // aTempFile is not deleted, but that seems to be intentional utl::TempFile aTempFile( basename, true, &sExt, &sTempDirURL ); INetURLObject aTempFileURL( aTempFile.GetURL() ); - auto pDstMed = o3tl::make_unique<SfxMedium>( + auto pDstMed = std::make_unique<SfxMedium>( aTempFileURL.GetMainURL( INetURLObject::DecodeMechanism::NONE ), StreamMode::STD_READWRITE ); bool bAnyError = !xTargetDocShell->DoSaveAs( *pDstMed ); |