package/inc/ZipPackageStream.hxx | 1 -
package/source/zippackage/ZipPackageStream.cxx | 9 +++++----
2 files changed, 5 insertions(+), 5 deletions(-)
New commits:
commit 15e238757a5f0bd0076eda7046ceddfc5d4db284
Author: Michael Stahl <michael.st...@allotropia.de>
AuthorDate: Thu Sep 12 18:54:00 2024 +0200
Commit: Michael Stahl <michael.st...@allotropia.de>
CommitDate: Fri Sep 13 16:46:45 2024 +0200
package: m_nMagicalHackSize appears superfluous
Change-Id: Idc32af25b7835b04b777a2a0767e1982d074f6d4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/173322
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.st...@allotropia.de>
diff --git a/package/inc/ZipPackageStream.hxx b/package/inc/ZipPackageStream.hxx
index a6f874b0d4d7..7c6431b19961 100644
--- a/package/inc/ZipPackageStream.hxx
+++ b/package/inc/ZipPackageStream.hxx
@@ -61,7 +61,6 @@ private:
sal_uInt8 m_nStreamMode;
sal_uInt32 m_nMagicalHackPos;
- sal_uInt32 m_nMagicalHackSize;
sal_Int64 m_nOwnStreamOrigSize;
bool m_bHasSeekable;
diff --git a/package/source/zippackage/ZipPackageStream.cxx
b/package/source/zippackage/ZipPackageStream.cxx
index 4d6888c1cd27..f18e0b26532f 100644
--- a/package/source/zippackage/ZipPackageStream.cxx
+++ b/package/source/zippackage/ZipPackageStream.cxx
@@ -89,7 +89,6 @@ ZipPackageStream::ZipPackageStream ( ZipPackage & rNewPackage,
, m_nImportedDerivedKeySize( 0 )
, m_nStreamMode( PACKAGE_STREAM_NOTSET )
, m_nMagicalHackPos( 0 )
-, m_nMagicalHackSize( 0 )
, m_nOwnStreamOrigSize( 0 )
, m_bHasSeekable( false )
, m_bCompressedIsSetFromOutside( false )
@@ -407,7 +406,7 @@ bool ZipPackageStream::ParsePackageRawStream()
}
m_nImportedDerivedKeySize = nDerivedKeySize;
m_nImportedStartKeyAlgorithm = nStartKeyGenID;
- m_nMagicalHackSize = nMagHackSize;
+ m_nOwnStreamOrigSize = nMagHackSize;
msMediaType = aMediaType;
bOk = true;
@@ -495,7 +494,10 @@ bool ZipPackageStream::saveChild(
bool bTransportOwnEncrStreamAsRaw = false;
// During the storing the original size of the stream can be changed
// TODO/LATER: get rid of this hack
- m_nOwnStreamOrigSize = m_bRawStream ? m_nMagicalHackSize : aEntry.nSize;
+ if (!m_bRawStream)
+ {
+ m_nOwnStreamOrigSize = aEntry.nSize;
+ }
bool bUseNonSeekableAccess = false;
uno::Reference < io::XInputStream > xStream;
@@ -903,7 +905,6 @@ void ZipPackageStream::SetPackageMember( bool bNewValue )
{
m_nStreamMode = PACKAGE_STREAM_PACKAGEMEMBER;
m_nMagicalHackPos = 0;
- m_nMagicalHackSize = 0;
}
else if ( m_nStreamMode == PACKAGE_STREAM_PACKAGEMEMBER )
m_nStreamMode = PACKAGE_STREAM_NOTSET; // must be reset
