use unique_ptr in GraphicHelper::getFormatStrFromGDI_Impl

Change-Id: I54d0f2138763acf5addae53051ca842b878f5680
Reviewed-on: https://gerrit.libreoffice.org/65334
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

sfx2/source/doc/graphhelp.cxx

@@ -56,17 +56,15 @@
 
 using namespace css;
 
-SvMemoryStream* GraphicHelper::getFormatStrFromGDI_Impl( const GDIMetaFile* pGDIMeta, ConvertDataFormat nFormat )
+std::unique_ptr<SvMemoryStream> GraphicHelper::getFormatStrFromGDI_Impl( const GDIMetaFile* pGDIMeta, ConvertDataFormat nFormat )
 {
-    SvMemoryStream* pResult = nullptr;
+    std::unique_ptr<SvMemoryStream> pResult;
     if ( pGDIMeta )
     {
-        SvMemoryStream* pStream = new SvMemoryStream( 65535, 65535 );
+        std::unique_ptr<SvMemoryStream> pStream(new SvMemoryStream( 65535, 65535 ));
         Graphic aGraph( *pGDIMeta );
         if ( GraphicConverter::Export( *pStream, aGraph, nFormat ) == ERRCODE_NONE )
-            pResult = pStream;
-        else
-            delete pStream;
+            pResult = std::move(pStream);
     }
 
     return pResult;

sfx2/source/doc/graphhelp.hxx

@@ -33,7 +33,7 @@ class GraphicHelper
 {
 public:
 
-    static SvMemoryStream* getFormatStrFromGDI_Impl( const GDIMetaFile* pGDIMeta, ConvertDataFormat nFormat );
+    static std::unique_ptr<SvMemoryStream> getFormatStrFromGDI_Impl( const GDIMetaFile* pGDIMeta, ConvertDataFormat nFormat );
 
     static void* getEnhMetaFileFromGDI_Impl( const GDIMetaFile* pGDIMeta );
 

sfx2/source/doc/sfxbasemodel.cxx

@@ -2009,7 +2009,7 @@ Any SAL_CALL SfxBaseModel::getTransferData( const datatransfer::DataFlavor& aFla
 
                 if (xMetaFile)
                 {
-                    std::shared_ptr<SvMemoryStream> xStream(
+                    std::unique_ptr<SvMemoryStream> xStream(
                         GraphicHelper::getFormatStrFromGDI_Impl(
                             xMetaFile.get(), ConvertDataFormat::EMF ) );
                     if (xStream)
@@ -2044,7 +2044,7 @@ Any SAL_CALL SfxBaseModel::getTransferData( const datatransfer::DataFlavor& aFla
 
                 if (xMetaFile)
                 {
-                    std::shared_ptr<SvMemoryStream> xStream(
+                    std::unique_ptr<SvMemoryStream> xStream(
                         GraphicHelper::getFormatStrFromGDI_Impl(
                             xMetaFile.get(), ConvertDataFormat::WMF ) );
 
@@ -2085,7 +2085,7 @@ Any SAL_CALL SfxBaseModel::getTransferData( const datatransfer::DataFlavor& aFla
 
             if (xMetaFile)
             {
-                std::shared_ptr<SvMemoryStream> xStream(
+                std::unique_ptr<SvMemoryStream> xStream(
                     GraphicHelper::getFormatStrFromGDI_Impl(
                         xMetaFile.get(), ConvertDataFormat::BMP ) );
 
@@ -2107,7 +2107,7 @@ Any SAL_CALL SfxBaseModel::getTransferData( const datatransfer::DataFlavor& aFla
 
             if (xMetaFile)
             {
-                std::shared_ptr<SvMemoryStream> xStream(
+                std::unique_ptr<SvMemoryStream> xStream(
                     GraphicHelper::getFormatStrFromGDI_Impl(
                         xMetaFile.get(), ConvertDataFormat::PNG ) );