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

[Caolán McNamara]

 lotuswordpro/source/filter/lwplayout.cxx |   16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

New commits:
commit 64d51760cc41bf033a6b69258f6f4a376878d17a
Author: Caolán McNamara <caol...@redhat.com>
Date:   Sat Mar 3 16:20:56 2018 +0000

    ofz#6674 Direct-leak
    
    Change-Id: Ia396d11cca424da1507bd470c04642bdb7482f72
    Reviewed-on: https://gerrit.libreoffice.org/50681
    Tested-by: Jenkins <c...@libreoffice.org>
    Reviewed-by: Caolán McNamara <caol...@redhat.com>
    Tested-by: Caolán McNamara <caol...@redhat.com>

diff --git a/lotuswordpro/source/filter/lwplayout.cxx 
b/lotuswordpro/source/filter/lwplayout.cxx
index 014ff5563d16..235a4515c6fa 100644
--- a/lotuswordpro/source/filter/lwplayout.cxx
+++ b/lotuswordpro/source/filter/lwplayout.cxx
@@ -1370,42 +1370,42 @@ XFBGImage* LwpMiddleLayout::GetXFBGImage()
         LwpGraphicObject* pGrfObj = 
dynamic_cast<LwpGraphicObject*>(pLay->GetContent().obj().get());
         if(pGrfObj)
         {
-            XFBGImage* pXFBGImage = new XFBGImage();
+            std::unique_ptr<XFBGImage> xXFBGImage(new XFBGImage);
 
             if(pGrfObj->IsLinked())
             {
                 //set file link
                 OUString linkedfilepath = pGrfObj->GetLinkedFilePath();
                 OUString fileURL = 
LwpTools::convertToFileUrl(OUStringToOString(linkedfilepath, 
osl_getThreadTextEncoding()));
-                pXFBGImage->SetFileLink(fileURL);
+                xXFBGImage->SetFileLink(fileURL);
             }
             else
             {
                 std::vector<sal_uInt8> aGrafData = pGrfObj->GetRawGrafData();
-                pXFBGImage->SetImageData(aGrafData.data(), aGrafData.size());
+                xXFBGImage->SetImageData(aGrafData.data(), aGrafData.size());
             }
 
             //automatic, top left
-            pXFBGImage->SetPosition(enumXFAlignStart,enumXFAlignTop);
+            xXFBGImage->SetPosition(enumXFAlignStart,enumXFAlignTop);
             if(pLay->GetScaleCenter())
             {
                 //center
-                pXFBGImage->SetPosition();
+                xXFBGImage->SetPosition();
             }
             else if(pLay->GetScaleTile())
             {
                 //tile
-                pXFBGImage->SetRepeate();
+                xXFBGImage->SetRepeate();
             }
             //fit type, area type
             if((pLay->GetScaleMode()& LwpLayoutScale::FIT_IN_FRAME)!=0)
             {
                 if((pLay->GetScaleMode()& 
LwpLayoutScale::MAINTAIN_ASPECT_RATIO)==0)
                 {
-                    pXFBGImage->SetStretch();
+                    xXFBGImage->SetStretch();
                 }
             }
-            return pXFBGImage;
+            return xXFBGImage.release();
         }
     }
     return nullptr;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits