merge vosremoval-reference.diff

1 files changed, 15 insertions, 15 deletions

diff --git a/package/inc/ZipFile.hxx b/package/inc/ZipFile.hxx
index a50d9e202df2..81b8b4f8951a 100644
--- a/package/inc/ZipFile.hxx
+++ b/package/inc/ZipFile.hxx
@@ -41,9 +41,9 @@ namespace com { namespace sun { namespace star {
     namespace lang { class XMultiServiceFactory; }
     namespace ucb  { class XProgressHandler; }
 } } }
-namespace vos
+namespace rtl
 {
-    template < class T > class ORef;
+    template < class T > class Reference;
 }
 /*
  * We impose arbitrary but reasonable limit on ZIP files.
@@ -75,13 +75,13 @@ protected:
 
     com::sun::star::uno::Reference < com::sun::star::io::XInputStream >  createMemoryStream(
             ZipEntry & rEntry,
-            const vos::ORef < EncryptionData > &rData,
+            const rtl::Reference < EncryptionData > &rData,
             sal_Bool bRawStream,
             sal_Bool bDecrypt );
 
     com::sun::star::uno::Reference < com::sun::star::io::XInputStream >  createFileStream(
             ZipEntry & rEntry,
-            const vos::ORef < EncryptionData > &rData,
+            const rtl::Reference < EncryptionData > &rData,
             sal_Bool bRawStream,
             sal_Bool bDecrypt );
 
@@ -89,12 +89,12 @@ protected:
     com::sun::star::uno::Reference < com::sun::star::io::XInputStream >  createUnbufferedStream(
             SotMutexHolderRef aMutexHolder,
             ZipEntry & rEntry,
-            const vos::ORef < EncryptionData > &rData,
+            const rtl::Reference < EncryptionData > &rData,
             sal_Int8 nStreamMode,
             sal_Bool bDecrypt,
             ::rtl::OUString aMediaType = ::rtl::OUString() );
 
-    sal_Bool hasValidPassword ( ZipEntry & rEntry, const vos::ORef < EncryptionData > &rData );
+    sal_Bool hasValidPassword ( ZipEntry & rEntry, const rtl::Reference < EncryptionData > &rData );
 
     sal_Bool checkSizeAndCRC( const ZipEntry& aEntry );
 
@@ -125,44 +125,44 @@ public:
     void setInputStream ( com::sun::star::uno::Reference < com::sun::star::io::XInputStream > xNewStream );
     ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SAL_CALL getRawData(
             ZipEntry& rEntry,
-            const vos::ORef < EncryptionData > &rData,
+            const rtl::Reference < EncryptionData > &rData,
             sal_Bool bDecrypt,
             SotMutexHolderRef aMutexHolder )
         throw(::com::sun::star::io::IOException, ::com::sun::star::packages::zip::ZipException, ::com::sun::star::uno::RuntimeException);
 
-    static sal_Bool StaticGetCipher ( const vos::ORef < EncryptionData > & xEncryptionData, rtlCipher &rCipher, sal_Bool bDecode );
+    static sal_Bool StaticGetCipher ( const rtl::Reference < EncryptionData > & xEncryptionData, rtlCipher &rCipher, sal_Bool bDecode );
 
-    static void StaticFillHeader ( const vos::ORef < EncryptionData > & rData,
+    static void StaticFillHeader ( const rtl::Reference < EncryptionData > & rData,
                                     sal_Int32 nSize,
                                     const ::rtl::OUString& aMediaType,
                                     sal_Int8 * & pHeader );
 
-    static sal_Bool StaticFillData ( vos::ORef < EncryptionData > & rData,
+    static sal_Bool StaticFillData ( rtl::Reference < EncryptionData > & rData,
                                      sal_Int32 &rSize,
                                      ::rtl::OUString& aMediaType,
                                      ::com::sun::star::uno::Reference < com::sun::star::io::XInputStream > &rStream );
 
     static ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > StaticGetDataFromRawStream(
             const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xStream,
-            const vos::ORef < EncryptionData > &rData )
+            const rtl::Reference < EncryptionData > &rData )
         throw ( ::com::sun::star::packages::WrongPasswordException,
                 ::com::sun::star::packages::zip::ZipIOException,
                 ::com::sun::star::uno::RuntimeException );
 
     static sal_Bool StaticHasValidPassword ( const ::com::sun::star::uno::Sequence< sal_Int8 > &aReadBuffer,
-                                             const vos::ORef < EncryptionData > &rData );
+                                             const rtl::Reference < EncryptionData > &rData );
 
 
     ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SAL_CALL getInputStream(
             ZipEntry& rEntry,
-            const vos::ORef < EncryptionData > &rData,
+            const rtl::Reference < EncryptionData > &rData,
             sal_Bool bDecrypt,
             SotMutexHolderRef aMutexHolder )
         throw(::com::sun::star::io::IOException, ::com::sun::star::packages::zip::ZipException, ::com::sun::star::uno::RuntimeException);
 
     ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SAL_CALL getDataStream(
             ZipEntry& rEntry,
-            const vos::ORef < EncryptionData > &rData,
+            const rtl::Reference < EncryptionData > &rData,
             sal_Bool bDecrypt,
             SotMutexHolderRef aMutexHolder )
         throw ( ::com::sun::star::packages::WrongPasswordException,
@@ -172,7 +172,7 @@ public:
 
     ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SAL_CALL getWrappedRawStream(
             ZipEntry& rEntry,
-            const vos::ORef < EncryptionData > &rData,
+            const rtl::Reference < EncryptionData > &rData,
             const ::rtl::OUString& aMediaType,
             SotMutexHolderRef aMutexHolder )
         throw ( ::com::sun::star::packages::NoEncryptionException,