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

[Caolán McNamara]

 package/source/zippackage/ZipPackage.cxx |    8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

New commits:
commit 1c53061bb93afffc07dee6781064021aea1d8911
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sat Dec 2 14:46:17 2017 +0000

    improve scoping
    
    Change-Id: I4b42d1357e951acda8e7cdba416dc298f260a541
    Reviewed-on: https://gerrit.libreoffice.org/45713
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/package/source/zippackage/ZipPackage.cxx b/package/source/zippackage/ZipPackage.cxx
index 3823ed07ffb8..27e578d51bda 100644
--- a/package/source/zippackage/ZipPackage.cxx
+++ b/package/source/zippackage/ZipPackage.cxx
@@ -472,8 +472,6 @@ void ZipPackage::parseContentType()
 void ZipPackage::getZipFileContents()
 {
     std::unique_ptr<ZipEnumeration> xEnum = m_pZipFile->entries();
-    ZipPackageStream *pPkgStream;
-    ZipPackageFolder *pPkgFolder, *pCurrent;
     OUString sTemp, sDirName;
     sal_Int32 nOldIndex, nStreamIndex;
     FolderHash::iterator aIter;
@@ -481,7 +479,7 @@ void ZipPackage::getZipFileContents()
     while (xEnum->hasMoreElements())
     {
         nOldIndex = 0;
-        pCurrent = m_xRootFolder.get();
+        ZipPackageFolder* pCurrent = m_xRootFolder.get();
         const ZipEntry & rEntry = *xEnum->nextElement();
         OUString rName = rEntry.sPath;
 
@@ -511,7 +509,7 @@ void ZipPackage::getZipFileContents()
                     break;
                 if ( !pCurrent->hasByName( sTemp ) )
                 {
-                    pPkgFolder = new ZipPackageFolder( m_xContext, m_nFormat, m_bAllowRemoveOnInsert );
+                    ZipPackageFolder* pPkgFolder = new ZipPackageFolder(m_xContext, m_nFormat, m_bAllowRemoveOnInsert);
                     pPkgFolder->setName( sTemp );
                     pPkgFolder->doSetParent( pCurrent );
                     pCurrent = pPkgFolder;
@@ -532,7 +530,7 @@ void ZipPackage::getZipFileContents()
         {
             nStreamIndex++;
             sTemp = rName.copy( nStreamIndex );
-            pPkgStream = new ZipPackageStream( *this, m_xContext, m_nFormat, m_bAllowRemoveOnInsert );
+            ZipPackageStream *pPkgStream = new ZipPackageStream(*this, m_xContext, m_nFormat, m_bAllowRemoveOnInsert);
             pPkgStream->SetPackageMember( true );
             pPkgStream->setZipEntryOnLoading( rEntry );
             pPkgStream->setName( sTemp );