diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2010-10-15 12:18:51 -0500 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2010-10-25 19:55:29 -0500 |
| commit | d3d553e1ef00b1ae5ac4d65e53e8ea08b24085f3 (patch) | |
| tree | f7b7ca85c311d220142f93ee4ebf0af9721feb71 /package/source/zipapi/ZipOutputStream.cxx | |
| parent | b10b21b999a36a6925790284c44e7b45283bd104 (diff) | |
merge vosremoval-reference.diff
Diffstat (limited to 'package/source/zipapi/ZipOutputStream.cxx')
| -rw-r--r-- | package/source/zipapi/ZipOutputStream.cxx | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/package/source/zipapi/ZipOutputStream.cxx b/package/source/zipapi/ZipOutputStream.cxx index d06bcc4e0885..02b66bad182b 100644 --- a/package/source/zipapi/ZipOutputStream.cxx +++ b/package/source/zipapi/ZipOutputStream.cxx @@ -35,12 +35,11 @@ #include <PackageConstants.hxx> #include <ZipEntry.hxx> #include <ZipFile.hxx> -#include <vos/ref.hxx> +#include <rtl/ref.hxx> #include <com/sun/star/io/XOutputStream.hpp> #include <comphelper/storagehelper.hxx> -using namespace rtl; using namespace com::sun::star::io; using namespace com::sun::star::uno; using namespace com::sun::star::packages; @@ -81,7 +80,7 @@ void SAL_CALL ZipOutputStream::setLevel( sal_Int32 nNewLevel ) } void SAL_CALL ZipOutputStream::putNextEntry( ZipEntry& rEntry, - vos::ORef < EncryptionData > &xEncryptData, + rtl::Reference < EncryptionData > &xEncryptData, sal_Bool bEncrypt) throw(IOException, RuntimeException) { @@ -106,7 +105,7 @@ void SAL_CALL ZipOutputStream::putNextEntry( ZipEntry& rEntry, aDigest = rtl_digest_createSHA1(); mnDigested = 0; rEntry.nFlag |= 1 << 4; - pCurrentEncryptData = xEncryptData.getBodyPtr(); + pCurrentEncryptData = xEncryptData.get(); } sal_Int32 nLOCLength = writeLOC(rEntry); rEntry.nOffset = static_cast < sal_Int32 > (aChucker.GetPosition()) - nLOCLength; |