diff options
| author | Gabor Kelemen <kelemen.gabor2@nisz.hu> | 2019-02-04 19:14:42 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2019-02-07 09:02:36 +0100 |
| commit | a944b4bb5c5a599f9aa3d25e7556e298d50efc9b (patch) | |
| tree | 762a7c0b58306ce8f025c8d3b65a61c83d0f636d /sw/source/filter/xml/xmltbli.cxx | |
| parent | e44c31d68b026ad9cd954dc572cb1460958a6327 (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/filter/xml/xmltbli.cxx')
| -rw-r--r-- | sw/source/filter/xml/xmltbli.cxx | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx index 6bd8bc3e68fe..10bdae565e64 100644 --- a/sw/source/filter/xml/xmltbli.cxx +++ b/sw/source/filter/xml/xmltbli.cxx @@ -24,7 +24,6 @@ #include <com/sun/star/text/XTextTable.hpp> #include <com/sun/star/table/XCellRange.hpp> #include <o3tl/numeric.hxx> -#include <o3tl/make_unique.hxx> #include <o3tl/safeint.hxx> #include <sal/log.hxx> #include <svl/itemset.hxx> @@ -340,7 +339,7 @@ SwXMLTableRow_Impl::SwXMLTableRow_Impl( const OUString& rStyleName, for( sal_uInt32 i=0U; i<nCells; ++i ) { - m_Cells.push_back(o3tl::make_unique<SwXMLTableCell_Impl>()); + m_Cells.push_back(std::make_unique<SwXMLTableCell_Impl>()); } } @@ -364,7 +363,7 @@ void SwXMLTableRow_Impl::Expand( sal_uInt32 nCells, bool bOneCell ) sal_uInt32 nColSpan = nCells - m_Cells.size(); for (size_t i = m_Cells.size(); i < nCells; ++i) { - m_Cells.push_back(o3tl::make_unique<SwXMLTableCell_Impl>( + m_Cells.push_back(std::make_unique<SwXMLTableCell_Impl>( 1UL, bOneCell ? nColSpan : 1UL)); nColSpan--; } @@ -1596,7 +1595,7 @@ void SwXMLTableContext::InsertCell( const OUString& rStyleName, if (m_pRows->size() < nRowsReq) { for (size_t i = m_pRows->size(); i < nRowsReq; ++i) - m_pRows->push_back(o3tl::make_unique<SwXMLTableRow_Impl>( + m_pRows->push_back(std::make_unique<SwXMLTableRow_Impl>( "", GetColumnCount())); } @@ -1657,7 +1656,7 @@ void SwXMLTableContext::InsertRow( const OUString& rStyleName, else { // add a new row - m_pRows->push_back(o3tl::make_unique<SwXMLTableRow_Impl>( + m_pRows->push_back(std::make_unique<SwXMLTableRow_Impl>( rStyleName, GetColumnCount(), &rDfltCellStyleName, i_rXmlId)); } |