summaryrefslogtreecommitdiff
path: root/svx/source/accessibility/AccessibleShape.cxx
diff options
context:
space:
mode:
authorGabor Kelemen <kelemen.gabor2@nisz.hu>2019-02-04 19:43:45 +0100
committerMiklos Vajna <vmiklos@collabora.com>2019-02-12 14:59:17 +0100
commita2bd7470368b2a44edf25680bd250c4d2b7428cb (patch)
tree0907596b7ff56a2a892fe2c12bcbc89f8aea1995 /svx/source/accessibility/AccessibleShape.cxx
parentdb346dde6179e7414289681d91b153a6ed259d05 (diff)
o3tl::make_unique -> std::make_unique in svx/
Since it is now possible to use C++14, it's time to replace the temporary solution with the standard one Change-Id: Ic91b7170b10299001167e78ade1d24c16ce9319e Reviewed-on: https://gerrit.libreoffice.org/67475 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Diffstat (limited to 'svx/source/accessibility/AccessibleShape.cxx')
-rw-r--r--svx/source/accessibility/AccessibleShape.cxx6
1 files changed, 3 insertions, 3 deletions
diff --git a/svx/source/accessibility/AccessibleShape.cxx b/svx/source/accessibility/AccessibleShape.cxx
index 7ddb45878aaa..a2aba0e4a7c4 100644
--- a/svx/source/accessibility/AccessibleShape.cxx
+++ b/svx/source/accessibility/AccessibleShape.cxx
@@ -60,7 +60,7 @@
#include <algorithm>
#include <memory>
#include <utility>
-#include <o3tl/make_unique.hxx>
+
using namespace ::com::sun::star;
using namespace ::com::sun::star::accessibility;
using ::com::sun::star::uno::Reference;
@@ -171,12 +171,12 @@ void AccessibleShape::Init()
if( !pOutlinerParaObject )
{
// empty text -> use proxy edit source to delay creation of EditEngine
- mpText.reset( new AccessibleTextHelper( o3tl::make_unique<AccessibleEmptyEditSource >(*pSdrObject, *pView, *pWindow) ) );
+ mpText.reset( new AccessibleTextHelper( std::make_unique<AccessibleEmptyEditSource >(*pSdrObject, *pView, *pWindow) ) );
}
else
{
// non-empty text -> use full-fledged edit source right away
- mpText.reset( new AccessibleTextHelper( o3tl::make_unique<SvxTextEditSource >(*pSdrObject, nullptr, *pView, *pWindow) ) );
+ mpText.reset( new AccessibleTextHelper( std::make_unique<SvxTextEditSource >(*pSdrObject, nullptr, *pView, *pWindow) ) );
}
if( pWindow->HasFocus() )
mpText->SetFocus();