diff options
| author | Gabor Kelemen <kelemen.gabor2@nisz.hu> | 2019-01-21 23:47:35 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2019-01-28 09:52:28 +0100 |
| commit | 4e8a15ca224760e8f36952528b2b47def78fd865 (patch) | |
| tree | 963bbbe22d03a82fa3a82bc3fa74d4ebf848a1fe /sd/source/ui/docshell | |
| parent | 5238ff887849b0d94c6da00a07b57984a86b6ee6 (diff) | |
o3tl::make_unique -> std::make_unique in sax...svtools (except sc)
Since it is now possible to use C++14, it's time to replace
the temporary solution with the standard one
Change-Id: I6eea0877eaa1886b64c0cce06a43b8088cbccd8e
Reviewed-on: https://gerrit.libreoffice.org/66751
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Diffstat (limited to 'sd/source/ui/docshell')
| -rw-r--r-- | sd/source/ui/docshell/docshel4.cxx | 15 | ||||
| -rw-r--r-- | sd/source/ui/docshell/docshell.cxx | 1 |
2 files changed, 7 insertions, 9 deletions
diff --git a/sd/source/ui/docshell/docshel4.cxx b/sd/source/ui/docshell/docshel4.cxx index 15c76777a9b6..6f1df30e7a67 100644 --- a/sd/source/ui/docshell/docshel4.cxx +++ b/sd/source/ui/docshell/docshel4.cxx @@ -26,7 +26,6 @@ #include <DrawDocShell.hxx> #include <com/sun/star/document/PrinterIndependentLayout.hpp> #include <editeng/outlobj.hxx> -#include <o3tl/make_unique.hxx> #include <tools/urlobj.hxx> #include <sfx2/progress.hxx> #include <vcl/waitobj.hxx> @@ -103,7 +102,7 @@ SfxPrinter* DrawDocShell::GetPrinter(bool bCreate) if (bCreate && !mpPrinter) { // create ItemSet with special pool area - auto pSet = o3tl::make_unique<SfxItemSet>( GetPool(), + auto pSet = std::make_unique<SfxItemSet>( GetPool(), svl::Items<SID_PRINTER_NOTFOUND_WARN, SID_PRINTER_NOTFOUND_WARN, SID_PRINTER_CHANGESTODOC, SID_PRINTER_CHANGESTODOC, ATTR_OPTIONS_PRINT, ATTR_OPTIONS_PRINT>{} ); @@ -607,30 +606,30 @@ bool DrawDocShell::ConvertTo( SfxMedium& rMedium ) if( aTypeName.indexOf( "graphic_HTML" ) >= 0 ) { - xFilter = o3tl::make_unique<SdHTMLFilter>(rMedium, *this); + xFilter = std::make_unique<SdHTMLFilter>(rMedium, *this); } else if( aTypeName.indexOf( "MS_PowerPoint_97" ) >= 0 ) { - xFilter = o3tl::make_unique<SdPPTFilter>(rMedium, *this); + xFilter = std::make_unique<SdPPTFilter>(rMedium, *this); static_cast<SdPPTFilter*>(xFilter.get())->PreSaveBasic(); } else if ( aTypeName.indexOf( "CGM_Computer_Graphics_Metafile" ) >= 0 ) { - xFilter = o3tl::make_unique<SdCGMFilter>(rMedium, *this); + xFilter = std::make_unique<SdCGMFilter>(rMedium, *this); } else if( aTypeName.indexOf( "draw8" ) >= 0 || aTypeName.indexOf( "impress8" ) >= 0 ) { - xFilter = o3tl::make_unique<SdXMLFilter>(rMedium, *this); + xFilter = std::make_unique<SdXMLFilter>(rMedium, *this); } else if( aTypeName.indexOf( "StarOffice_XML_Impress" ) >= 0 || aTypeName.indexOf( "StarOffice_XML_Draw" ) >= 0 ) { - xFilter = o3tl::make_unique<SdXMLFilter>(rMedium, *this, SDXMLMODE_Normal, SOFFICE_FILEFORMAT_60); + xFilter = std::make_unique<SdXMLFilter>(rMedium, *this, SDXMLMODE_Normal, SOFFICE_FILEFORMAT_60); } else { - xFilter = o3tl::make_unique<SdGRFFilter>(rMedium, *this); + xFilter = std::make_unique<SdGRFFilter>(rMedium, *this); } if (xFilter) diff --git a/sd/source/ui/docshell/docshell.cxx b/sd/source/ui/docshell/docshell.cxx index 4675aeb151a6..98bbda78ffaa 100644 --- a/sd/source/ui/docshell/docshell.cxx +++ b/sd/source/ui/docshell/docshell.cxx @@ -49,7 +49,6 @@ #include <comphelper/classids.hxx> #include <svl/cjkoptions.hxx> #include <svl/visitem.hxx> -#include <o3tl/make_unique.hxx> #include <sfx2/fcontnr.hxx> |