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/layout/calcmove.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/layout/calcmove.cxx')
| -rw-r--r-- | sw/source/core/layout/calcmove.cxx | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sw/source/core/layout/calcmove.cxx b/sw/source/core/layout/calcmove.cxx index 96fa282153dc..c8541459aeda 100644 --- a/sw/source/core/layout/calcmove.cxx +++ b/sw/source/core/layout/calcmove.cxx @@ -44,7 +44,6 @@ #include <DocumentSettingManager.hxx> #include <IDocumentLayoutAccess.hxx> -#include <o3tl/make_unique.hxx> // Move methods @@ -775,7 +774,7 @@ void SwPageFrame::MakeAll(vcl::RenderContext* pRenderContext) { if (!pAccess) { - pAccess = o3tl::make_unique<SwBorderAttrAccess>(SwFrame::GetCache(), this); + pAccess = std::make_unique<SwBorderAttrAccess>(SwFrame::GetCache(), this); pAttrs = pAccess->Get(); } assert(pAttrs); @@ -964,7 +963,7 @@ void SwLayoutFrame::MakeAll(vcl::RenderContext* /*pRenderContext*/) { if ( !pAccess ) { - pAccess = o3tl::make_unique<SwBorderAttrAccess>(SwFrame::GetCache(), this); + pAccess = std::make_unique<SwBorderAttrAccess>(SwFrame::GetCache(), this); pAttrs = pAccess->Get(); } Format( getRootFrame()->GetCurrShell()->GetOut(), pAttrs ); @@ -1172,7 +1171,7 @@ void SwContentFrame::MakeAll(vcl::RenderContext* /*pRenderContext*/) return; } - auto xDeleteGuard = o3tl::make_unique<SwFrameDeleteGuard>(this); + auto xDeleteGuard = std::make_unique<SwFrameDeleteGuard>(this); LockJoin(); long nFormatCount = 0; // - loop prevention |