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/core/doc/DocumentDeviceManager.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/core/doc/DocumentDeviceManager.cxx')
| -rw-r--r-- | sw/source/core/doc/DocumentDeviceManager.cxx | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sw/source/core/doc/DocumentDeviceManager.cxx b/sw/source/core/doc/DocumentDeviceManager.cxx index 048b53825509..e0f913357f4b 100644 --- a/sw/source/core/doc/DocumentDeviceManager.cxx +++ b/sw/source/core/doc/DocumentDeviceManager.cxx @@ -28,7 +28,6 @@ #include <IDocumentDrawModelAccess.hxx> #include <IDocumentState.hxx> #include <IDocumentLayoutAccess.hxx> -#include <o3tl/make_unique.hxx> #include <sfx2/printer.hxx> #include <vcl/virdev.hxx> #include <vcl/outdev.hxx> @@ -207,7 +206,7 @@ void DocumentDeviceManager::setJobsetup(/*[in]*/ const JobSetup &rJobSetup ) if( !mpPrt ) { //The ItemSet is deleted by Sfx! - auto pSet = o3tl::make_unique<SfxItemSet>( + auto pSet = std::make_unique<SfxItemSet>( m_rDoc.GetAttrPool(), svl::Items< SID_PRINTER_NOTFOUND_WARN, SID_PRINTER_NOTFOUND_WARN, @@ -292,7 +291,7 @@ SfxPrinter& DocumentDeviceManager::CreatePrinter_() const // We create a default SfxPrinter. // The ItemSet is deleted by Sfx! - auto pSet = o3tl::make_unique<SfxItemSet>( + auto pSet = std::make_unique<SfxItemSet>( m_rDoc.GetAttrPool(), svl::Items< SID_PRINTER_NOTFOUND_WARN, SID_PRINTER_NOTFOUND_WARN, |