diff options
| author | Gabor Kelemen <kelemen.gabor2@nisz.hu> | 2019-01-21 21:26:50 +0100 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-01-22 08:38:28 +0100 |
| commit | 0c64df243259f574daaa4bc03bc4ddcc791c9073 (patch) | |
| tree | 657a489d604ae2f7938369ef1789e746df0a3e69 /lotuswordpro | |
| parent | fd8a724d22c92e3ebef4a3da126baaac3d3bde79 (diff) | |
o3tl::make_unique -> std::make_unique in i18npool...reportdesign
Since it is now possible to use C++14, it's time to replace
the temporary solution with the standard one
Change-Id: I8bee1344f7df82536f31bc5e4ec4fd379cac1d04
Reviewed-on: https://gerrit.libreoffice.org/66704
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'lotuswordpro')
| -rw-r--r-- | lotuswordpro/source/filter/lwptblformula.cxx | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/lotuswordpro/source/filter/lwptblformula.cxx b/lotuswordpro/source/filter/lwptblformula.cxx index 4a1e6ecd8978..26081262ad5b 100644 --- a/lotuswordpro/source/filter/lwptblformula.cxx +++ b/lotuswordpro/source/filter/lwptblformula.cxx @@ -67,7 +67,6 @@ #include <osl/thread.h> #include <rtl/ustrbuf.hxx> #include <sal/log.hxx> -#include <o3tl/make_unique.hxx> #include <memory> LwpFormulaArg::~LwpFormulaArg() @@ -88,7 +87,7 @@ void LwpFormulaInfo::ReadConst() { double Constant = m_pObjStrm->QuickReadDouble(); - m_aStack.push_back( o3tl::make_unique<LwpFormulaConst>(Constant) ); + m_aStack.push_back( std::make_unique<LwpFormulaConst>(Constant) ); } /** @@ -107,7 +106,7 @@ void LwpFormulaInfo::ReadText() aText += OUString(aBuf.data(), nStrLen, osl_getThreadTextEncoding()); aText += "\""; - m_aStack.push_back(o3tl::make_unique<LwpFormulaText>(aText)); + m_aStack.push_back(std::make_unique<LwpFormulaText>(aText)); } void LwpFormulaInfo::ReadCellID() @@ -118,7 +117,7 @@ void LwpFormulaInfo::ReadCellID() RowSpecifier.QuickRead(m_pObjStrm.get()); ColumnSpecifier.QuickRead(m_pObjStrm.get()); - m_aStack.push_back( o3tl::make_unique<LwpFormulaCellAddr>(ColumnSpecifier.ColumnID(cColumn), + m_aStack.push_back( std::make_unique<LwpFormulaCellAddr>(ColumnSpecifier.ColumnID(cColumn), RowSpecifier.RowID(m_nFormulaRow)) ); } @@ -132,7 +131,7 @@ void LwpFormulaInfo::ReadCellRange() std::unique_ptr<LwpFormulaCellAddr> pEndCellAddr(static_cast<LwpFormulaCellAddr*>(m_aStack.back().release())); m_aStack.pop_back(); - m_aStack.push_back( o3tl::make_unique<LwpFormulaCellRangeAddr>(pStartCellAddr->GetCol(), + m_aStack.push_back( std::make_unique<LwpFormulaCellRangeAddr>(pStartCellAddr->GetCol(), pStartCellAddr->GetRow(), pEndCellAddr->GetCol(), pEndCellAddr->GetRow()) ); |