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 /editeng/source/editeng/impedit3.cxx | |
| 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 'editeng/source/editeng/impedit3.cxx')
| -rw-r--r-- | editeng/source/editeng/impedit3.cxx | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx index 959d10618fdf..e4a37a0f696e 100644 --- a/editeng/source/editeng/impedit3.cxx +++ b/editeng/source/editeng/impedit3.cxx @@ -68,7 +68,6 @@ #include <com/sun/star/text/CharacterCompressionType.hpp> #include <vcl/pdfextoutdevdata.hxx> #include <i18nlangtag/mslangid.hxx> -#include <o3tl/make_unique.hxx> #include <comphelper/processfactory.hxx> #include <rtl/ustrbuf.hxx> @@ -3889,7 +3888,7 @@ void ImpEditEngine::InsertContent( ContentNode* pNode, sal_Int32 nPos ) { DBG_ASSERT( pNode, "NULL-Pointer in InsertContent! " ); DBG_ASSERT( IsInUndo(), "InsertContent only for Undo()!" ); - GetParaPortions().Insert(nPos, o3tl::make_unique<ParaPortion>( pNode )); + GetParaPortions().Insert(nPos, std::make_unique<ParaPortion>( pNode )); aEditDoc.Insert(nPos, pNode); if ( IsCallParaInsertedOrDeleted() ) GetEditEnginePtr()->ParagraphInserted( nPos ); @@ -3942,7 +3941,7 @@ void ImpEditEngine::ShowParagraph( sal_Int32 nParagraph, bool bShow ) { // Mark as deleted, so that no selection will end or begin at // this paragraph... - aDeletedNodes.push_back(o3tl::make_unique<DeletedNodeInfo>( pPPortion->GetNode(), nParagraph )); + aDeletedNodes.push_back(std::make_unique<DeletedNodeInfo>( pPPortion->GetNode(), nParagraph )); UpdateSelections(); // The region below will not be invalidated if UpdateMode = sal_False! // If anyway, then save as sal_False before SetVisible ! |