mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fall back on o3tl::make_unique for now

Browse Source 
Change-Id: I58f688004804aed8b749b72caaa53afc06387ec7
This commit is contained in:
Stephan Bergmann 2017-01-25 16:38:32 +01:00
parent 337dc62535
commit 03c0a7fe18
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sd/source/ui/docshell/docshel4.cxx
View File

@ -23,6 +23,7 @@
#include "DrawDocShell.hxx" #include "DrawDocShell.hxx"
#include <com/sun/star/document/PrinterIndependentLayout.hpp> #include <com/sun/star/document/PrinterIndependentLayout.hpp>
#include <o3tl/make_unique.hxx>
#include <tools/urlobj.hxx> #include <tools/urlobj.hxx>
#include <sfx2/progress.hxx> #include <sfx2/progress.hxx>
#include <vcl/waitobj.hxx> #include <vcl/waitobj.hxx>
@ -611,30 +612,30 @@ bool DrawDocShell::ConvertTo( SfxMedium& rMedium )
if( aTypeName.indexOf( "graphic_HTML" ) >= 0 ) if( aTypeName.indexOf( "graphic_HTML" ) >= 0 )
{ {
xFilter = std::make_unique<SdHTMLFilter>(rMedium, *this); xFilter = o3tl::make_unique<SdHTMLFilter>(rMedium, *this);
} }
else if( aTypeName.indexOf( "MS_PowerPoint_97" ) >= 0 ) else if( aTypeName.indexOf( "MS_PowerPoint_97" ) >= 0 )
{ {
xFilter = std::make_unique<SdPPTFilter>(rMedium, *this); xFilter = o3tl::make_unique<SdPPTFilter>(rMedium, *this);
static_cast<SdPPTFilter*>(xFilter.get())->PreSaveBasic(); static_cast<SdPPTFilter*>(xFilter.get())->PreSaveBasic();
} }
else if ( aTypeName.indexOf( "CGM_Computer_Graphics_Metafile" ) >= 0 ) else if ( aTypeName.indexOf( "CGM_Computer_Graphics_Metafile" ) >= 0 )
{ {
xFilter = std::make_unique<SdCGMFilter>(rMedium, *this); xFilter = o3tl::make_unique<SdCGMFilter>(rMedium, *this);
} }
else if( aTypeName.indexOf( "draw8" ) >= 0 || else if( aTypeName.indexOf( "draw8" ) >= 0 ||
aTypeName.indexOf( "impress8" ) >= 0 ) aTypeName.indexOf( "impress8" ) >= 0 )
{ {
xFilter = std::make_unique<SdXMLFilter>(rMedium, *this); xFilter = o3tl::make_unique<SdXMLFilter>(rMedium, *this);
} }
else if( aTypeName.indexOf( "StarOffice_XML_Impress" ) >= 0 || else if( aTypeName.indexOf( "StarOffice_XML_Impress" ) >= 0 ||
aTypeName.indexOf( "StarOffice_XML_Draw" ) >= 0 ) aTypeName.indexOf( "StarOffice_XML_Draw" ) >= 0 )
{ {
xFilter = std::make_unique<SdXMLFilter>(rMedium, *this, SDXMLMODE_Normal, SOFFICE_FILEFORMAT_60); xFilter = o3tl::make_unique<SdXMLFilter>(rMedium, *this, SDXMLMODE_Normal, SOFFICE_FILEFORMAT_60);
} }
else else
{ {
xFilter = std::make_unique<SdGRFFilter>(rMedium, *this); xFilter = o3tl::make_unique<SdGRFFilter>(rMedium, *this);
} }
if (xFilter) if (xFilter)