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/core/frmedt/fetab.cxx | |
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/core/frmedt/fetab.cxx')
-rw-r--r-- | sw/source/core/frmedt/fetab.cxx | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sw/source/core/frmedt/fetab.cxx b/sw/source/core/frmedt/fetab.cxx index 31ecad6276e3..61a995381a52 100644 --- a/sw/source/core/frmedt/fetab.cxx +++ b/sw/source/core/frmedt/fetab.cxx @@ -20,7 +20,6 @@ #include <memory> #include <hintids.hxx> -#include <o3tl/make_unique.hxx> #include <vcl/errinf.hxx> #include <vcl/svapp.hxx> #include <basegfx/vector/b2dvector.hxx> @@ -83,7 +82,7 @@ class TableWait { return our_kLineLimit < nCnt || our_kLineLimit < nCnt2 || (pFrame && our_kLineLimit < pFrame->ImplFindTabFrame()->GetTable()->GetTabLines().size()); } public: TableWait(size_t nCnt, SwFrame *pFrame, SwDocShell &rDocShell, size_t nCnt2 = 0) - : m_pWait( ShouldWait(nCnt, pFrame, nCnt2) ? o3tl::make_unique<SwWait>( rDocShell, true ) : nullptr ) + : m_pWait( ShouldWait(nCnt, pFrame, nCnt2) ? std::make_unique<SwWait>( rDocShell, true ) : nullptr ) { } }; |