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 /dbaccess/source/ui/control | |
| 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 'dbaccess/source/ui/control')
| -rw-r--r-- | dbaccess/source/ui/control/dbtreelistbox.cxx | 4 | ||||
| -rw-r--r-- | dbaccess/source/ui/control/tabletree.cxx | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/dbaccess/source/ui/control/dbtreelistbox.cxx b/dbaccess/source/ui/control/dbtreelistbox.cxx index 0f4c404c1c3b..43b6ecb1fa0e 100644 --- a/dbaccess/source/ui/control/dbtreelistbox.cxx +++ b/dbaccess/source/ui/control/dbtreelistbox.cxx @@ -43,7 +43,7 @@ #include <vcl/event.hxx> #include <memory> -#include <o3tl/make_unique.hxx> + namespace dbaui { @@ -142,7 +142,7 @@ void DBTreeListBox::InitEntry(SvTreeListEntry* _pEntry, const OUString& aStr, co { SvTreeListBox::InitEntry( _pEntry, aStr, _rCollEntryBmp,_rExpEntryBmp, eButtonKind); SvLBoxItem* pTextItem(_pEntry->GetFirstItem(SvLBoxItemType::String)); - _pEntry->ReplaceItem(o3tl::make_unique<OBoldListboxString>(aStr), _pEntry->GetPos(pTextItem)); + _pEntry->ReplaceItem(std::make_unique<OBoldListboxString>(aStr), _pEntry->GetPos(pTextItem)); } void DBTreeListBox::implStopSelectionTimer() diff --git a/dbaccess/source/ui/control/tabletree.cxx b/dbaccess/source/ui/control/tabletree.cxx index bf68b08b3c53..9e8b7de36fb5 100644 --- a/dbaccess/source/ui/control/tabletree.cxx +++ b/dbaccess/source/ui/control/tabletree.cxx @@ -43,7 +43,6 @@ #include <rtl/ustrbuf.hxx> #include <connectivity/dbmetadata.hxx> #include <vcl/treelistentry.hxx> -#include <o3tl/make_unique.hxx> #include <algorithm> @@ -389,7 +388,7 @@ void OTableTreeListBox::InitEntry(SvTreeListEntry* _pEntry, const OUString& _rSt size_t nTextPos = _pEntry->GetPos(pTextItem); OSL_ENSURE(SvTreeListEntry::ITEM_NOT_FOUND != nTextPos, "OTableTreeListBox::InitEntry: no text item pos!"); - _pEntry->ReplaceItem(o3tl::make_unique<OBoldListboxString>(_rString), nTextPos); + _pEntry->ReplaceItem(std::make_unique<OBoldListboxString>(_rString), nTextPos); } SvTreeListEntry* OTableTreeListBox::implAddEntry( |