include/package/InflateZstd.hxx | 3 +--
package/inc/InflaterBytesZstd.hxx | 1 -
package/inc/ZipFile.hxx | 1 -
package/source/zipapi/InflateZstd.cxx | 1 -
package/source/zipapi/InflaterBytesZstd.cxx | 3 ---
package/source/zipapi/ZipFile.cxx | 1 -
6 files changed, 1 insertion(+), 9 deletions(-)
New commits:
commit 0caf06c8fa97bd66c74ea55a551bafff31ce6b77
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Fri May 16 13:22:05 2025 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Fri May 16 15:45:41 2025 +0200
remove some dead stuff in package
ever since
commit b410749d30ed167f5bf0da6491d72e55f596cd41
Author: Akshay Kumar Dubey <akshaymani...@gmail.com>
Date: Wed Apr 16 02:05:16 2025 +0530
tdf#137308 - Add zstd build support and decompression classes
Change-Id: Ib67a2ef523ce6596b562633b0da081ba56d3ff6f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/185411
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/include/package/InflateZstd.hxx b/include/package/InflateZstd.hxx
index 36cb0b15405c..ea627565b9b5 100644
--- a/include/package/InflateZstd.hxx
+++ b/include/package/InflateZstd.hxx
@@ -20,7 +20,6 @@ class DLLPUBLIC_PACKAGE InflateZstd : public Inflater
{
private:
bool bFinished;
- bool bNeedDict;
sal_Int32 nLastInflateError;
css::uno::Sequence<sal_Int8> sInBuffer;
ZSTD_DCtx* pDCtx;
@@ -35,7 +34,7 @@ public:
virtual ~InflateZstd() override;
virtual void setInput(const css::uno::Sequence<sal_Int8>& rBuffer)
override;
- virtual bool needsDictionary() const override { return bNeedDict; }
+ virtual bool needsDictionary() const override { return false; }
virtual bool finished() const override { return bFinished; }
virtual sal_Int32 doInflateSegment(css::uno::Sequence<sal_Int8>& rBuffer,
sal_Int32 nNewOffset,
sal_Int32 nNewLength) override;
diff --git a/package/inc/InflaterBytesZstd.hxx
b/package/inc/InflaterBytesZstd.hxx
index 96cf73baf5fe..2b28faa27f24 100644
--- a/package/inc/InflaterBytesZstd.hxx
+++ b/package/inc/InflaterBytesZstd.hxx
@@ -21,7 +21,6 @@ private:
bool bFinished;
const sal_Int8* sInBuffer;
ZSTD_DCtx* pDCtx;
- sal_Int32 nLastInflateError;
ZSTD_inBuffer inBuffer;
bool bStreamInitialized;
diff --git a/package/inc/ZipFile.hxx b/package/inc/ZipFile.hxx
index 1252ae325df5..ae25f9d99615 100644
--- a/package/inc/ZipFile.hxx
+++ b/package/inc/ZipFile.hxx
@@ -62,7 +62,6 @@ private:
EntryHash aEntries;
ByteGrabber aGrabber;
- std::unique_ptr<ZipUtils::Inflater> aInflater;
css::uno::Reference < css::io::XInputStream > xStream;
const css::uno::Reference < css::uno::XComponentContext > m_xContext;
diff --git a/package/source/zipapi/InflateZstd.cxx
b/package/source/zipapi/InflateZstd.cxx
index 16638417c569..9016a39ea7fa 100644
--- a/package/source/zipapi/InflateZstd.cxx
+++ b/package/source/zipapi/InflateZstd.cxx
@@ -15,7 +15,6 @@ using namespace ZipUtils;
InflateZstd::InflateZstd(bool)
: bFinished(false)
- , bNeedDict(false)
, nLastInflateError(0)
, pDCtx(ZSTD_createDCtx())
, bStreamInitialized(false)
diff --git a/package/source/zipapi/InflaterBytesZstd.cxx
b/package/source/zipapi/InflaterBytesZstd.cxx
index 4236a58207df..c0d4a8ba1f5f 100644
--- a/package/source/zipapi/InflaterBytesZstd.cxx
+++ b/package/source/zipapi/InflaterBytesZstd.cxx
@@ -16,7 +16,6 @@ InflaterBytesZstd::InflaterBytesZstd()
: bFinished(false)
, sInBuffer(nullptr)
, pDCtx(ZSTD_createDCtx())
- , nLastInflateError(0)
, bStreamInitialized(false)
{
inBuffer = { nullptr, 0, 0 };
@@ -63,7 +62,6 @@ sal_Int32 InflaterBytesZstd::doInflateBytes(sal_Int8*
pOutBuffer, sal_Int32 nNew
size_t ret = ZSTD_decompressStream(pDCtx, &outBuffer, &inBuffer);
if (ZSTD_isError(ret))
{
- nLastInflateError = static_cast<sal_Int32>(ret);
ZSTD_DCtx_reset(pDCtx, ZSTD_reset_session_only);
return 0;
}
@@ -74,7 +72,6 @@ sal_Int32 InflaterBytesZstd::doInflateBytes(sal_Int8*
pOutBuffer, sal_Int32 nNew
}
if (ret == 0)
bFinished = true;
- nLastInflateError = 0;
return static_cast<sal_Int32>(outBuffer.pos);
}
diff --git a/package/source/zipapi/ZipFile.cxx
b/package/source/zipapi/ZipFile.cxx
index fb304b8beaae..ec749c86314a 100644
--- a/package/source/zipapi/ZipFile.cxx
+++ b/package/source/zipapi/ZipFile.cxx
@@ -90,7 +90,6 @@ ZipFile::ZipFile( rtl::Reference< comphelper::RefCountedMutex
> aMutexHolder,
: m_aMutexHolder(std::move( aMutexHolder ))
, m_Checks(checks)
, aGrabber( xInput )
-, aInflater( std::make_unique<ZipUtils::InflateZlib>(true) )
, xStream(xInput)
, m_xContext (std::move( xContext ))
, bRecoveryMode( bForceRecovery )
