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

[Libreoffice Gerrit user]

 sw/source/core/layout/atrfrm.cxx |    7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

New commits:
commit cf6df180efe821beb094eca5bf050e80eecc2d1b
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Wed Jan 9 15:14:46 2019 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Thu Jan 10 08:28:19 2019 +0100

    fix leak in SwDrawFrameFormat::GetDescription
    
    and simplify.
    
    ever since original code was committed in
        commit da12dc5adf9086d418ff0d09abee23fdd8f68cda
        Date:   Wed Sep 8 14:20:23 2004 +0000
        INTEGRATION: CWS swundo03 (1.48.34); FILE MERGED
    
    Change-Id: I9aae40eade34051219f1fe838b373e0f3317d2c6
    Reviewed-on: https://gerrit.libreoffice.org/66026
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx
index 2603eb7fb400..8e087c038b28 100644
--- a/sw/source/core/layout/atrfrm.cxx
+++ b/sw/source/core/layout/atrfrm.cxx
@@ -3393,12 +3393,7 @@ OUString SwDrawFrameFormat::GetDescription() const
     {
         if (pSdrObj != m_pSdrObjectCached)
         {
-            SdrObject * pSdrObjCopy(pSdrObj->CloneSdrObject(pSdrObj->getSdrModelFromSdrObject()));
-            SdrUndoNewObj * pSdrUndo = new SdrUndoNewObj(*pSdrObjCopy);
-            m_sSdrObjectCachedComment = pSdrUndo->GetComment();
-
-            delete pSdrUndo;
-
+            m_sSdrObjectCachedComment = SdrUndoNewObj::GetComment(*pSdrObj);
             m_pSdrObjectCached = pSdrObj;
         }