[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-1+backports' - sd/source

[Noel Grandin (via logerrit)]

 sd/source/filter/ppt/pptin.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit aac97943fd78a1251755628abf419b41c3d4ff9b
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Thu Jun 6 13:31:52 2019 +0200
Commit:     Thorsten Behrens <Thorsten.Behrens at CIB.de>
CommitDate: Sun Jul 28 00:24:16 2019 +0200

    tdf#125556 URL fragment leaked from one object..
    
    to another when importing Powerpoint ppt file
    
    regression from
        commit 4245454d0c3d6df2d0e0a75aed6f22f0a26ce3e2
        Date:   Wed Feb 28 15:50:29 2018 +0200
        loplugin:useuniqueptr in SdrPowerPointImport
    
    Change-Id: I5f415dfa1f6125629b9f3be1d799cb596c64c605
    Reviewed-on: https://gerrit.libreoffice.org/73607
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
    (cherry picked from commit 3309893de4e99a7d89fb1e9b4616631b1f040df0)
    Reviewed-on: https://gerrit.libreoffice.org/76309
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
    Tested-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>

diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx
index cb0e17d450b5..9b45a7b84416 100644
--- a/sd/source/filter/ppt/pptin.cxx
+++ b/sd/source/filter/ppt/pptin.cxx
@@ -392,9 +392,9 @@ bool ImplSdPPTImport::Import()
 
                                     nPropCount /= 6;    // 6 properties per hyperlink
 
-                                    SdHyperlinkEntry aHyperlink;
                                     for ( i = 0; i < nPropCount; i++ )
                                     {
+                                        SdHyperlinkEntry aHyperlink;
                                         aHyperlink.nIndex = 0;
                                         aPropItem.ReadUInt32( nType );
                                         if ( nType != VT_I4 )