diff options
| author | Gabor Kelemen <kelemen.gabor2@nisz.hu> | 2019-01-17 18:35:37 +0100 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-01-21 07:36:04 +0100 |
| commit | 979aed6b38f4963ea37c39de090d4487a12ba2ba (patch) | |
| tree | a5cf6cfe464f00f8654140a514e0f418210b6f69 /extensions | |
| parent | 3b16e997f69efe2e3f6cdf64fe8fb2727b6ebaa7 (diff) | |
o3tl::make_unique -> std::make_unique in dbaccess...framework
Since it is now possible to use C++14, it's time to replace
the temporary solution with the standard one
Change-Id: Iad5a422bc5a7da43d905edc91d1c46793332ec5e
Reviewed-on: https://gerrit.libreoffice.org/66545
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'extensions')
4 files changed, 5 insertions, 9 deletions
diff --git a/extensions/source/bibliography/bibconfig.cxx b/extensions/source/bibliography/bibconfig.cxx index 22a558ac83d8..262d0cd8c763 100644 --- a/extensions/source/bibliography/bibconfig.cxx +++ b/extensions/source/bibliography/bibconfig.cxx @@ -27,7 +27,6 @@ #include <com/sun/star/sdb/DatabaseContext.hpp> #include <comphelper/processfactory.hxx> #include <o3tl/any.hxx> -#include <o3tl/make_unique.hxx> using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; @@ -287,7 +286,7 @@ void BibConfig::SetMapping(const BibDBDescriptor& rDesc, const Mapping* pSetMapp break; } } - mvMappings.push_back(o3tl::make_unique<Mapping>(*pSetMapping)); + mvMappings.push_back(std::make_unique<Mapping>(*pSetMapping)); SetModified(); } diff --git a/extensions/source/bibliography/framectr.cxx b/extensions/source/bibliography/framectr.cxx index 5ec9d92005b3..8ac29d500d07 100644 --- a/extensions/source/bibliography/framectr.cxx +++ b/extensions/source/bibliography/framectr.cxx @@ -50,7 +50,6 @@ #include <sot/formats.hxx> #include <vcl/edit.hxx> #include <osl/mutex.hxx> -#include <o3tl/make_unique.hxx> #include <unordered_map> @@ -602,7 +601,7 @@ void BibFrameController_Impl::addStatusListener( { BibConfig* pConfig = BibModul::GetConfig(); // create a new Reference and insert into listener array - aStatusListeners.push_back( o3tl::make_unique<BibStatusDispatch>( aURL, aListener ) ); + aStatusListeners.push_back( std::make_unique<BibStatusDispatch>( aURL, aListener ) ); // send first status synchronously FeatureStateEvent aEvent; diff --git a/extensions/source/config/WinUserInfo/WinUserInfoBe.cxx b/extensions/source/config/WinUserInfo/WinUserInfoBe.cxx index 188df1c1cce6..8fcc5dfcf5ca 100644 --- a/extensions/source/config/WinUserInfo/WinUserInfoBe.cxx +++ b/extensions/source/config/WinUserInfo/WinUserInfoBe.cxx @@ -17,7 +17,6 @@ #include <com/sun/star/util/XChangesBatch.hpp> #include <cppuhelper/supportsservice.hxx> #include <map> -#include <o3tl/make_unique.hxx> #include <o3tl/char16_t2wchar_t.hxx> #include <sal/log.hxx> @@ -324,7 +323,7 @@ public: GetUserNameExW(NameDisplay, nullptr, &nSize); if (GetLastError() != ERROR_MORE_DATA) throw css::uno::RuntimeException(); - auto pNameBuf(o3tl::make_unique<wchar_t[]>(nSize)); + auto pNameBuf(std::make_unique<wchar_t[]>(nSize)); if (!GetUserNameExW(NameDisplay, pNameBuf.get(), &nSize)) throw css::uno::RuntimeException(); m_sName = o3tl::toU(pNameBuf.get()); @@ -335,7 +334,7 @@ public: // administrator account on non-DC systems), where GetUserName will // still give a name. DWORD nSize = UNLEN + 1; - auto pNameBuf(o3tl::make_unique<wchar_t[]>(nSize)); + auto pNameBuf(std::make_unique<wchar_t[]>(nSize)); if (!GetUserNameW(pNameBuf.get(), &nSize)) throw css::uno::RuntimeException(); m_sName = o3tl::toU(pNameBuf.get()); diff --git a/extensions/source/propctrlr/controlfontdialog.cxx b/extensions/source/propctrlr/controlfontdialog.cxx index d170f7637c48..9d0516f37683 100644 --- a/extensions/source/propctrlr/controlfontdialog.cxx +++ b/extensions/source/propctrlr/controlfontdialog.cxx @@ -20,7 +20,6 @@ #include "controlfontdialog.hxx" #include <cppuhelper/typeprovider.hxx> -#include <o3tl/make_unique.hxx> #include "fontdialog.hxx" #include "formstrings.hxx" #include "pcrcommon.hxx" @@ -149,7 +148,7 @@ namespace pcr // sets a new introspectee and re-executes us. In this case, the dialog returned here (upon the first // execute) will be re-used upon the second execute, and thus it won't be initialized correctly. - return svt::OGenericUnoDialog::Dialog(o3tl::make_unique<ControlCharacterDialog>(Application::GetFrameWeld(rParent), *m_pFontItems)); + return svt::OGenericUnoDialog::Dialog(std::make_unique<ControlCharacterDialog>(Application::GetFrameWeld(rParent), *m_pFontItems)); } void OControlFontDialog::executedDialog(sal_Int16 _nExecutionResult) |