[Libreoffice-commits] core.git: sd/source

[Stephan Bergmann]

 sd/source/ui/docshell/docshel4.cxx |   13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

New commits:
commit 03c0a7fe18a60d2bd5c7e650ccb7dc1a687c8a2c
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Jan 25 16:38:32 2017 +0100

    Fall back on o3tl::make_unique for now
    
    Change-Id: I58f688004804aed8b749b72caaa53afc06387ec7

diff --git a/sd/source/ui/docshell/docshel4.cxx b/sd/source/ui/docshell/docshel4.cxx
index 2541358..2a000c5 100644
--- a/sd/source/ui/docshell/docshel4.cxx
+++ b/sd/source/ui/docshell/docshel4.cxx
@@ -23,6 +23,7 @@
 
 #include "DrawDocShell.hxx"
 #include <com/sun/star/document/PrinterIndependentLayout.hpp>
+#include <o3tl/make_unique.hxx>
 #include <tools/urlobj.hxx>
 #include <sfx2/progress.hxx>
 #include <vcl/waitobj.hxx>
@@ -611,30 +612,30 @@ bool DrawDocShell::ConvertTo( SfxMedium& rMedium )
 
         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 )
         {
-            xFilter = std::make_unique<SdPPTFilter>(rMedium, *this);
+            xFilter = o3tl::make_unique<SdPPTFilter>(rMedium, *this);
             static_cast<SdPPTFilter*>(xFilter.get())->PreSaveBasic();
         }
         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 ||
                  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 ||
                  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
         {
-            xFilter = std::make_unique<SdGRFFilter>(rMedium, *this);
+            xFilter = o3tl::make_unique<SdGRFFilter>(rMedium, *this);
         }
 
         if (xFilter)