diff options
Diffstat (limited to 'package/inc')
| -rw-r--r-- | package/inc/ZipEntry.hxx | 4 | ||||
| -rw-r--r-- | package/inc/ZipFile.hxx | 1 | ||||
| -rw-r--r-- | package/inc/ZipPackage.hxx | 33 | ||||
| -rw-r--r-- | package/inc/ZipPackageFolder.hxx | 2 |
4 files changed, 21 insertions, 19 deletions
diff --git a/package/inc/ZipEntry.hxx b/package/inc/ZipEntry.hxx index aa311cc14ae9..eed7a7a7cff5 100644 --- a/package/inc/ZipEntry.hxx +++ b/package/inc/ZipEntry.hxx @@ -42,8 +42,8 @@ struct ZipEntry sal_Int32 nCompressedSize; sal_Int32 nSize; sal_Int32 nOffset; - sal_Int16 nNameLen; + sal_Int16 nPathLen; sal_Int16 nExtraLen; - ::rtl::OUString sName; + ::rtl::OUString sPath; }; #endif diff --git a/package/inc/ZipFile.hxx b/package/inc/ZipFile.hxx index aaabda3181f0..a954a1691c4b 100644 --- a/package/inc/ZipFile.hxx +++ b/package/inc/ZipFile.hxx @@ -65,7 +65,6 @@ class EncryptionData; class ZipFile { protected: - ::rtl::OUString sName; /* zip file name */ ::rtl::OUString sComment; /* zip file comment */ EntryHash aEntries; ByteGrabber aGrabber; diff --git a/package/inc/ZipPackage.hxx b/package/inc/ZipPackage.hxx index b733171edc4b..0549c06b6bb7 100644 --- a/package/inc/ZipPackage.hxx +++ b/package/inc/ZipPackage.hxx @@ -86,27 +86,28 @@ class ZipPackage : public cppu::WeakImplHelper7 protected: SotMutexHolderRef m_aMutexHolder; - ::com::sun::star::uno::Sequence < sal_Int8 > aEncryptionKey; - FolderHash aRecent; - ::rtl::OUString sURL; - sal_Bool bHasEncryptedEntries; - sal_Bool bUseManifest; - sal_Bool bForceRecovery; + ::com::sun::star::uno::Sequence < sal_Int8 > m_aEncryptionKey; + FolderHash m_aRecent; + ::rtl::OUString m_aURL; + sal_Bool m_bHasEncryptedEntries; + sal_Bool m_bHasNonEncryptedEntries; + sal_Bool m_bUseManifest; + sal_Bool m_bForceRecovery; sal_Bool m_bMediaTypeFallbackUsed; sal_Int16 m_nFormat; sal_Bool m_bAllowRemoveOnInsert; - InitialisationMode eMode; + InitialisationMode m_eMode; - ::com::sun::star::uno::Reference < com::sun::star::container::XNameContainer > xRootFolder; - ::com::sun::star::uno::Reference < com::sun::star::io::XStream > xStream; - ::com::sun::star::uno::Reference < com::sun::star::io::XInputStream > xContentStream; - ::com::sun::star::uno::Reference < com::sun::star::io::XSeekable > xContentSeek; - const ::com::sun::star::uno::Reference < com::sun::star::lang::XMultiServiceFactory > xFactory; + ::com::sun::star::uno::Reference < com::sun::star::container::XNameContainer > m_xRootFolder; + ::com::sun::star::uno::Reference < com::sun::star::io::XStream > m_xStream; + ::com::sun::star::uno::Reference < com::sun::star::io::XInputStream > m_xContentStream; + ::com::sun::star::uno::Reference < com::sun::star::io::XSeekable > m_xContentSeek; + const ::com::sun::star::uno::Reference < com::sun::star::lang::XMultiServiceFactory > m_xFactory; - ZipPackageFolder *pRootFolder; - ZipFile *pZipFile; + ZipPackageFolder *m_pRootFolder; + ZipFile *m_pZipFile; void parseManifest(); void parseContentType(); @@ -124,8 +125,8 @@ protected: public: ZipPackage (const ::com::sun::star::uno::Reference < com::sun::star::lang::XMultiServiceFactory > &xNewFactory); virtual ~ZipPackage( void ); - ZipFile& getZipFile() { return *pZipFile;} - const com::sun::star::uno::Sequence < sal_Int8 > & getEncryptionKey ( ) {return aEncryptionKey;} + ZipFile& getZipFile() { return *m_pZipFile;} + const com::sun::star::uno::Sequence < sal_Int8 > & getEncryptionKey ( ) {return m_aEncryptionKey;} sal_Int16 getFormat() const { return m_nFormat; } SotMutexHolderRef GetSharedMutexRef() { return m_aMutexHolder; } diff --git a/package/inc/ZipPackageFolder.hxx b/package/inc/ZipPackageFolder.hxx index dfe72a6975b9..1edbae7f5d3d 100644 --- a/package/inc/ZipPackageFolder.hxx +++ b/package/inc/ZipPackageFolder.hxx @@ -74,6 +74,8 @@ public: ::rtl::OUString& GetVersion() { return m_sVersion; } void SetVersion( const ::rtl::OUString& aVersion ) { m_sVersion = aVersion; } + sal_Bool LookForUnexpectedODF12Streams( const ::rtl::OUString& aPath ); + void setChildStreamsTypeByExtension( const ::com::sun::star::beans::StringPair& aPair ); void doInsertByName ( ZipPackageEntry *pEntry, sal_Bool bSetParent ) |