mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

These SAL_CALL can go as well...

Browse Source 
Change-Id: I79aa4374126faaf9f782fb7ff0c12c171e7041b1
This commit is contained in:
Kohei Yoshida
2017-01-11 21:54:34 -05:00
parent f7c9ecaac9
commit 14e65f7d2d
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
package/inc/ZipFile.hxx
View File

@@ -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<SotMutexHolder>& 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<SotMutexHolder>& 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,

6
package/source/zipapi/ZipFile.cxx
View File

@@ -522,7 +522,7 @@ std::unique_ptr<ZipEnumeration> ZipFile::entries()
return o3tl::make_unique<ZipEnumeration>(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<SotMutexHolder>& 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<SotMutexHolder>& 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<SotMutexHolder>& aMutexHolder )