From 14e65f7d2d6f48cf2012305cbda40d24f4f88c78 Mon Sep 17 00:00:00 2001 From: Kohei Yoshida Date: Wed, 11 Jan 2017 21:54:34 -0500 Subject: [PATCH] These SAL_CALL can go as well... Change-Id: I79aa4374126faaf9f782fb7ff0c12c171e7041b1 --- package/inc/ZipFile.hxx | 6 +++--- package/source/zipapi/ZipFile.cxx | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/inc/ZipFile.hxx b/package/inc/ZipFile.hxx index 962733c92aa4..eac5f0b711be 100644 --- a/package/inc/ZipFile.hxx +++ b/package/inc/ZipFile.hxx @@ -142,19 +142,19 @@ public: const css::uno::Sequence< sal_Int8 > &aReadBuffer, const ::rtl::Reference < EncryptionData > &rData ); - css::uno::Reference< css::io::XInputStream > SAL_CALL getInputStream( + css::uno::Reference< css::io::XInputStream > getInputStream( ZipEntry& rEntry, const ::rtl::Reference < EncryptionData > &rData, bool bDecrypt, const rtl::Reference& aMutexHolder ); - css::uno::Reference< css::io::XInputStream > SAL_CALL getDataStream( + css::uno::Reference< css::io::XInputStream > getDataStream( ZipEntry& rEntry, const ::rtl::Reference < EncryptionData > &rData, bool bDecrypt, const rtl::Reference& aMutexHolder ); - css::uno::Reference< css::io::XInputStream > SAL_CALL getWrappedRawStream( + css::uno::Reference< css::io::XInputStream > getWrappedRawStream( ZipEntry& rEntry, const ::rtl::Reference < EncryptionData > &rData, const OUString& aMediaType, diff --git a/package/source/zipapi/ZipFile.cxx b/package/source/zipapi/ZipFile.cxx index 6b397c677628..e27b911ad16f 100644 --- a/package/source/zipapi/ZipFile.cxx +++ b/package/source/zipapi/ZipFile.cxx @@ -522,7 +522,7 @@ std::unique_ptr ZipFile::entries() return o3tl::make_unique(aEntries); } -uno::Reference< XInputStream > SAL_CALL ZipFile::getInputStream( ZipEntry& rEntry, +uno::Reference< XInputStream > ZipFile::getInputStream( ZipEntry& rEntry, const ::rtl::Reference< EncryptionData > &rData, bool bIsEncrypted, const rtl::Reference& aMutexHolder ) @@ -549,7 +549,7 @@ uno::Reference< XInputStream > SAL_CALL ZipFile::getInputStream( ZipEntry& rEntr bIsEncrypted ); } -uno::Reference< XInputStream > SAL_CALL ZipFile::getDataStream( ZipEntry& rEntry, +uno::Reference< XInputStream > ZipFile::getDataStream( ZipEntry& rEntry, const ::rtl::Reference< EncryptionData > &rData, bool bIsEncrypted, const rtl::Reference& aMutexHolder ) @@ -585,7 +585,7 @@ uno::Reference< XInputStream > SAL_CALL ZipFile::getDataStream( ZipEntry& rEntry bIsEncrypted ); } -uno::Reference< XInputStream > SAL_CALL ZipFile::getRawData( ZipEntry& rEntry, +uno::Reference< XInputStream > ZipFile::getRawData( ZipEntry& rEntry, const ::rtl::Reference< EncryptionData >& rData, bool bIsEncrypted, const rtl::Reference& aMutexHolder )