diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-08-07 17:16:26 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-08-08 08:08:35 +0200 |
| commit | a209172669e7a2de6065486e385e4e3007b74bd2 (patch) | |
| tree | 4a7e008cf700fb23ecc6e4cd44de1c6a08a9b7e7 /package | |
| parent | 2675cbf042130f24fe7ea299b85b8f5f4794a667 (diff) | |
loplugin:constantparam
Change-Id: Ib92aba17c46a4ada75c2a0630f281759d995f32e
Reviewed-on: https://gerrit.libreoffice.org/40843
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'package')
| -rw-r--r-- | package/inc/ZipPackageStream.hxx | 3 | ||||
| -rw-r--r-- | package/source/zippackage/ZipPackageStream.cxx | 8 |
2 files changed, 6 insertions, 5 deletions
diff --git a/package/inc/ZipPackageStream.hxx b/package/inc/ZipPackageStream.hxx index 228b5c08618d..c84d39ca565d 100644 --- a/package/inc/ZipPackageStream.hxx +++ b/package/inc/ZipPackageStream.hxx @@ -73,8 +73,9 @@ private: /// Check that m_xStream implements io::XSeekable and return it css::uno::Reference< css::io::XInputStream > const & GetOwnSeekStream(); + /// get raw data using unbuffered stream /// @throws css::uno::RuntimeException - css::uno::Reference< css::io::XInputStream > SAL_CALL getRawData( const bool bUseBufferedStream = true ); + css::uno::Reference< css::io::XInputStream > SAL_CALL getRawData(); public: bool IsPackageMember () const { return m_nStreamMode == PACKAGE_STREAM_PACKAGEMEMBER;} diff --git a/package/source/zippackage/ZipPackageStream.cxx b/package/source/zippackage/ZipPackageStream.cxx index e7f4e88f55c7..460e33f0e245 100644 --- a/package/source/zippackage/ZipPackageStream.cxx +++ b/package/source/zippackage/ZipPackageStream.cxx @@ -572,7 +572,7 @@ bool ZipPackageStream::saveChild( if ( !bUseNonSeekableAccess ) { - xStream = getRawData( false ); + xStream = getRawData(); if ( !xStream.is() ) { @@ -708,7 +708,7 @@ bool ZipPackageStream::saveChild( // to get a new version of it as we can't seek backwards. if ( IsPackageMember() ) { - xStream = getRawData( false ); + xStream = getRawData(); if ( !xStream.is() ) { // Make sure that we actually _got_ a new one ! @@ -937,13 +937,13 @@ void SAL_CALL ZipPackageStream::setInputStream( const uno::Reference< io::XInput m_nStreamMode = PACKAGE_STREAM_DETECT; } -uno::Reference< io::XInputStream > SAL_CALL ZipPackageStream::getRawData( const bool bUseBufferedStream ) +uno::Reference< io::XInputStream > SAL_CALL ZipPackageStream::getRawData() { try { if ( IsPackageMember() ) { - return m_rZipPackage.getZipFile().getRawData( aEntry, GetEncryptionData(), m_bIsEncrypted, m_rZipPackage.GetSharedMutexRef(), bUseBufferedStream ); + return m_rZipPackage.getZipFile().getRawData( aEntry, GetEncryptionData(), m_bIsEncrypted, m_rZipPackage.GetSharedMutexRef(), false/*bUseBufferedStream*/ ); } else if ( GetOwnSeekStream().is() ) { |