diff options
| author | Gabor Kelemen <kelemen.gabor2@nisz.hu> | 2019-01-21 23:47:35 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2019-01-28 09:52:28 +0100 |
| commit | 4e8a15ca224760e8f36952528b2b47def78fd865 (patch) | |
| tree | 963bbbe22d03a82fa3a82bc3fa74d4ebf848a1fe /svtools | |
| parent | 5238ff887849b0d94c6da00a07b57984a86b6ee6 (diff) | |
o3tl::make_unique -> std::make_unique in sax...svtools (except sc)
Since it is now possible to use C++14, it's time to replace
the temporary solution with the standard one
Change-Id: I6eea0877eaa1886b64c0cce06a43b8088cbccd8e
Reviewed-on: https://gerrit.libreoffice.org/66751
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Diffstat (limited to 'svtools')
| -rw-r--r-- | svtools/inc/pch/precompiled_svt.hxx | 1 | ||||
| -rw-r--r-- | svtools/source/control/toolbarmenu.cxx | 8 | ||||
| -rw-r--r-- | svtools/source/uno/treecontrolpeer.cxx | 4 |
3 files changed, 5 insertions, 8 deletions
diff --git a/svtools/inc/pch/precompiled_svt.hxx b/svtools/inc/pch/precompiled_svt.hxx index ac1a0349fe51..6d222d6a219b 100644 --- a/svtools/inc/pch/precompiled_svt.hxx +++ b/svtools/inc/pch/precompiled_svt.hxx @@ -348,7 +348,6 @@ #include <i18nutil/transliteration.hxx> #include <o3tl/any.hxx> #include <o3tl/cow_wrapper.hxx> -#include <o3tl/make_unique.hxx> #include <o3tl/strong_int.hxx> #include <o3tl/typed_flags_set.hxx> #include <sot/exchange.hxx> diff --git a/svtools/source/control/toolbarmenu.cxx b/svtools/source/control/toolbarmenu.cxx index 197f4db2e4e8..e64162c6f0d0 100644 --- a/svtools/source/control/toolbarmenu.cxx +++ b/svtools/source/control/toolbarmenu.cxx @@ -23,8 +23,6 @@ #include <com/sun/star/lang/IndexOutOfBoundsException.hpp> #include <comphelper/processfactory.hxx> -#include <o3tl/make_unique.hxx> - #include <vcl/dockwin.hxx> #include <vcl/decoview.hxx> #include <vcl/image.hxx> @@ -692,19 +690,19 @@ void ToolbarMenu::LoseFocus() void ToolbarMenu::appendEntry( int nEntryId, const OUString& rStr, MenuItemBits nItemBits ) { - appendEntry( o3tl::make_unique<ToolbarMenuEntry>( *this, nEntryId, rStr, nItemBits ) ); + appendEntry( std::make_unique<ToolbarMenuEntry>( *this, nEntryId, rStr, nItemBits ) ); } void ToolbarMenu::appendEntry( int nEntryId, const OUString& rStr, const Image& rImage ) { - appendEntry( o3tl::make_unique<ToolbarMenuEntry>( *this, nEntryId, rImage, rStr, MenuItemBits::NONE ) ); + appendEntry( std::make_unique<ToolbarMenuEntry>( *this, nEntryId, rImage, rStr, MenuItemBits::NONE ) ); } void ToolbarMenu::appendEntry( int nEntryId, Control* pControl ) { - appendEntry( o3tl::make_unique<ToolbarMenuEntry>( *this, nEntryId, pControl, MenuItemBits::NONE ) ); + appendEntry( std::make_unique<ToolbarMenuEntry>( *this, nEntryId, pControl, MenuItemBits::NONE ) ); } diff --git a/svtools/source/uno/treecontrolpeer.cxx b/svtools/source/uno/treecontrolpeer.cxx index 506cfd84801a..8462d912535b 100644 --- a/svtools/source/uno/treecontrolpeer.cxx +++ b/svtools/source/uno/treecontrolpeer.cxx @@ -42,7 +42,7 @@ #include <vcl/svlbitm.hxx> #include <map> -#include <o3tl/make_unique.hxx> + using namespace ::com::sun::star; using namespace css::uno; using namespace css::lang; @@ -217,7 +217,7 @@ UnoTreeListEntry* TreeControlPeer::createEntry( const Reference< XTreeNode >& xN { Image aImage; pEntry = new UnoTreeListEntry( xNode, this ); - pEntry->AddItem(o3tl::make_unique<ImplContextGraphicItem>(aImage, aImage, true)); + pEntry->AddItem(std::make_unique<ImplContextGraphicItem>(aImage, aImage, true)); std::unique_ptr<UnoTreeListItem> pUnoItem(new UnoTreeListItem); |