diff options
| author | Gabor Kelemen <kelemen.gabor2@nisz.hu> | 2019-01-26 19:58:39 +0100 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-01-29 07:15:17 +0100 |
| commit | 6d5af783bfd899253908c926853233a99df6f4e0 (patch) | |
| tree | fa55756e111c599c3147b161212967e63e278ccc /sc/source/filter/excel/xilink.cxx | |
| parent | 7a576383308edec3d6538986310264bfc0f1c213 (diff) | |
o3tl::make_unique -> std::make_unique in sc
Since it is now possible to use C++14, it's time to replace
the temporary solution with the standard one
Change-Id: Ib69a4a2a08b1edbc0f40beac00f7f68075b479a1
Reviewed-on: https://gerrit.libreoffice.org/66967
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sc/source/filter/excel/xilink.cxx')
| -rw-r--r-- | sc/source/filter/excel/xilink.cxx | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/sc/source/filter/excel/xilink.cxx b/sc/source/filter/excel/xilink.cxx index d1b353f39795..5c2337310ab5 100644 --- a/sc/source/filter/excel/xilink.cxx +++ b/sc/source/filter/excel/xilink.cxx @@ -29,7 +29,6 @@ #include <externalrefmgr.hxx> #include <scmatrix.hxx> #include <svl/sharedstringpool.hxx> -#include <o3tl/make_unique.hxx> #include <sal/log.hxx> #include <vector> @@ -638,7 +637,7 @@ XclImpSupbook::XclImpSupbook( XclImpStream& rStrm ) : if( maXclUrl.equalsIgnoreAsciiCase( "\010EUROTOOL.XLA" ) ) { meType = XclSupbookType::Eurotool; - maSupbTabList.push_back( o3tl::make_unique<XclImpSupbookTab>( maXclUrl ) ); + maSupbTabList.push_back( std::make_unique<XclImpSupbookTab>( maXclUrl ) ); } else if( nSBTabCnt ) { @@ -657,14 +656,14 @@ XclImpSupbook::XclImpSupbook( XclImpStream& rStrm ) : for( sal_uInt16 nSBTab = 0; nSBTab < nSBTabCnt; ++nSBTab ) { OUString aTabName( rStrm.ReadUniString() ); - maSupbTabList.push_back( o3tl::make_unique<XclImpSupbookTab>( aTabName ) ); + maSupbTabList.push_back( std::make_unique<XclImpSupbookTab>( aTabName ) ); } } else { meType = XclSupbookType::Special; // create dummy list entry - maSupbTabList.push_back( o3tl::make_unique<XclImpSupbookTab>( maXclUrl ) ); + maSupbTabList.push_back( std::make_unique<XclImpSupbookTab>( maXclUrl ) ); } } @@ -691,7 +690,7 @@ void XclImpSupbook::ReadCrn( XclImpStream& rStrm ) void XclImpSupbook::ReadExternname( XclImpStream& rStrm, ExcelToSc* pFormulaConv ) { - maExtNameList.push_back( o3tl::make_unique<XclImpExtName>( *this, rStrm, meType, pFormulaConv ) ); + maExtNameList.push_back( std::make_unique<XclImpExtName>( *this, rStrm, meType, pFormulaConv ) ); } const XclImpExtName* XclImpSupbook::GetExternName( sal_uInt16 nXclIndex ) const @@ -782,7 +781,7 @@ void XclImpLinkManagerImpl::ReadExternsheet( XclImpStream& rStrm ) void XclImpLinkManagerImpl::ReadSupbook( XclImpStream& rStrm ) { - maSupbookList.push_back( o3tl::make_unique<XclImpSupbook>( rStrm ) ); + maSupbookList.push_back( std::make_unique<XclImpSupbook>( rStrm ) ); } void XclImpLinkManagerImpl::ReadXct( XclImpStream& rStrm ) |