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/ui/docshell/docsh.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/ui/docshell/docsh.cxx')
| -rw-r--r-- | sc/source/ui/docshell/docsh.cxx | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx index 7dbef7be7089..06c1b6a47860 100644 --- a/sc/source/ui/docshell/docsh.cxx +++ b/sc/source/ui/docshell/docsh.cxx @@ -143,7 +143,6 @@ #include <datastream.hxx> #include <documentlinkmgr.hxx> #include <refupdatecontext.hxx> -#include <o3tl/make_unique.hxx> #include <memory> #include <vector> @@ -2351,7 +2350,7 @@ bool ScDocShell::ConvertTo( SfxMedium &rMed ) ScExtDocOptions* pExtDocOpt = m_aDocument.GetExtDocOptions(); if( !pExtDocOpt ) { - m_aDocument.SetExtDocOptions( o3tl::make_unique<ScExtDocOptions>() ); + m_aDocument.SetExtDocOptions( std::make_unique<ScExtDocOptions>() ); pExtDocOpt = m_aDocument.GetExtDocOptions(); } pViewShell->GetViewData().WriteExtOptions( *pExtDocOpt ); @@ -2736,7 +2735,7 @@ bool ScDocShell::HasAutomaticTableName( const OUString& rFilter ) std::unique_ptr<ScDocFunc> ScDocShell::CreateDocFunc() { - return o3tl::make_unique<ScDocFuncDirect>( *this ); + return std::make_unique<ScDocFuncDirect>( *this ); } ScDocument* ScDocShell::GetClipDoc() |