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

[Ashod Nakashian (via logerrit)]

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

New commits:
commit 0ec0ba24f0f28deef7993e430682bf4a5d9f3271
Author:     Ashod Nakashian <ashod.nakashian at collabora.co.uk>
AuthorDate: Mon Mar 25 10:29:38 2019 -0400
Commit:     Ashod Nakashian <ashnakash at gmail.com>
CommitDate: Thu Aug 22 15:33:15 2019 +0200

    oox: typos, comments, formatting
    
    Change-Id: I6bb138be2a8da91a85248e85d408f54a9b885f9b
    Reviewed-on: https://gerrit.libreoffice.org/77686
    Tested-by: Jenkins
    Reviewed-by: Ashod Nakashian <ashnakash at gmail.com>

diff --git a/package/source/zippackage/ZipPackage.cxx b/package/source/zippackage/ZipPackage.cxx
index f5d8ca351ba9..574b7a434f5c 100644
--- a/package/source/zippackage/ZipPackage.cxx
+++ b/package/source/zippackage/ZipPackage.cxx
@@ -713,9 +713,9 @@ void SAL_CALL ZipPackage::initialize( const uno::Sequence< Any >& aArguments )
                     }
                     else if ( aNamedValue.Value >>= nFormatID )
                     {
-                        if ( nFormatID != embed::StorageFormats::PACKAGE
-                          && nFormatID != embed::StorageFormats::ZIP
-                          && nFormatID != embed::StorageFormats::OFOPXML )
+                        if (nFormatID != embed::StorageFormats::PACKAGE
+                            && nFormatID != embed::StorageFormats::ZIP
+                            && nFormatID != embed::StorageFormats::OFOPXML)
                             throw lang::IllegalArgumentException(THROW_WHERE, uno::Reference< uno::XInterface >(), 1 );
 
                         m_nFormat = nFormatID;
@@ -1088,8 +1088,7 @@ void ZipPackage::WriteContentTypes( ZipOutputStream& aZipOut, const vector< uno:
     pEntry->nSize = pEntry->nCompressedSize = -1;
     pEntry->nTime = ZipOutputStream::getCurrentDosTime();
 
-    // Convert vector into a uno::Sequence
-    // TODO/LATER: use Default entries in future
+    // Add default entries, the count must be updated manually when appending.
     uno::Sequence< beans::StringPair > aDefaultsSequence(4);
     // Add at least the standard default entries.
     aDefaultsSequence[0].First = "xml";