strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

package: m_nMagicalHackSize appears superfluous

Browse source 
Change-Id: Idc32af25b7835b04b777a2a0767e1982d074f6d4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/173322
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
This commit is contained in:
Michael Stahl 2024-09-12 18:54:00 +02:00
parent fcb7bb06bd
commit 15e238757a
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
package/inc/ZipPackageStream.hxx
View file

@ -61,7 +61,6 @@ private:
sal_uInt8 m_nStreamMode;
sal_uInt32 m_nMagicalHackPos;
sal_uInt32 m_nMagicalHackSize;
sal_Int64 m_nOwnStreamOrigSize;
bool m_bHasSeekable;

9
package/source/zippackage/ZipPackageStream.cxx
View file

@ -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