summaryrefslogtreecommitdiff
path: root/sw/source/core/text/porfld.cxx
diff options
context:
space:
mode:
authorGabor Kelemen <kelemen.gabor2@nisz.hu>2019-02-04 19:14:42 +0100
committerMiklos Vajna <vmiklos@collabora.com>2019-02-07 09:02:36 +0100
commita944b4bb5c5a599f9aa3d25e7556e298d50efc9b (patch)
tree762a7c0b58306ce8f025c8d3b65a61c83d0f636d /sw/source/core/text/porfld.cxx
parente44c31d68b026ad9cd954dc572cb1460958a6327 (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/text/porfld.cxx')
-rw-r--r--sw/source/core/text/porfld.cxx3
1 files changed, 1 insertions, 2 deletions
diff --git a/sw/source/core/text/porfld.cxx b/sw/source/core/text/porfld.cxx
index 95bba3bbc791..1a9ad99b908c 100644
--- a/sw/source/core/text/porfld.cxx
+++ b/sw/source/core/text/porfld.cxx
@@ -22,7 +22,6 @@
#include <com/sun/star/i18n/ScriptType.hpp>
#include <com/sun/star/i18n/XBreakIterator.hpp>
#include <vcl/graph.hxx>
-#include <o3tl/make_unique.hxx>
#include <editeng/brushitem.hxx>
#include <vcl/metric.hxx>
#include <vcl/outdev.hxx>
@@ -404,7 +403,7 @@ bool SwFieldPortion::Format( SwTextFormatInfo &rInf )
SwFieldPortion *pField = Clone( aNew );
if( !aNew.isEmpty() && !pField->GetFont() )
{
- pField->SetFont( o3tl::make_unique<SwFont>( *rInf.GetFont() ) );
+ pField->SetFont( std::make_unique<SwFont>( *rInf.GetFont() ) );
}
pField->SetFollow( true );
SetHasFollow( true );