diff options
| author | Matúš Kukan <matus.kukan@collabora.com> | 2014-10-13 09:54:28 +0200 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@collabora.com> | 2014-10-23 14:30:30 +0200 |
| commit | 1b3122a1895e6eff7341fda39a5f68d7a60c7aa0 (patch) | |
| tree | ba255b57efda771d9ce2376ad375836c39427e0c /package/inc/ZipPackageFolder.hxx | |
| parent | 152c4afef44d6e6456777a7cd0de4e3a3a2a9338 (diff) | |
package: Add pure virtual ZipPackageEntry::saveChild()
..and adapt what needs to be changed.
So that, we can kill at least some usages of horrible ContentInfo struct.
Change-Id: I32d41f3b8ce2dfb65f0d1df18a540a3f67dcab6d
Diffstat (limited to 'package/inc/ZipPackageFolder.hxx')
| -rw-r--r-- | package/inc/ZipPackageFolder.hxx | 24 |
1 files changed, 8 insertions, 16 deletions
diff --git a/package/inc/ZipPackageFolder.hxx b/package/inc/ZipPackageFolder.hxx index dd0ff95ba8ad..52a64e6dee02 100644 --- a/package/inc/ZipPackageFolder.hxx +++ b/package/inc/ZipPackageFolder.hxx @@ -28,20 +28,8 @@ #include <cppuhelper/implbase2.hxx> #include <vector> -namespace com { namespace sun { namespace star { -namespace beans -{ - struct PropertyValue; -} -namespace packages -{ - class ContentInfo; -} -} } } - class ZipOutputStream; struct ZipEntry; -typedef void* rtlRandomPool; class ZipPackageFolder : public cppu::ImplInheritanceHelper2 < @@ -51,14 +39,12 @@ class ZipPackageFolder : public cppu::ImplInheritanceHelper2 > { private: - css::uno::Reference< css::uno::XComponentContext> m_xContext; ContentHash maContents; - sal_Int32 m_nFormat; OUString m_sVersion; public: - ZipPackageFolder( css::uno::Reference< css::uno::XComponentContext> xContext, + ZipPackageFolder( const css::uno::Reference < css::uno::XComponentContext >& xContext, sal_Int32 nFormat, bool bAllowRemoveOnInsert ); virtual ~ZipPackageFolder(); @@ -80,7 +66,13 @@ public: static ::com::sun::star::uno::Sequence < sal_Int8 > static_getImplementationId(); void setPackageFormat_Impl( sal_Int32 nFormat ) { m_nFormat = nFormat; } - void setRemoveOnInsertMode_Impl( bool bRemove ) { this->mbAllowRemoveOnInsert = bRemove; } + void setRemoveOnInsertMode_Impl( bool bRemove ) { mbAllowRemoveOnInsert = bRemove; } + + virtual bool saveChild( const OUString &rPath, + std::vector < css::uno::Sequence < css::beans::PropertyValue > > &rManList, + ZipOutputStream & rZipOut, + const css::uno::Sequence < sal_Int8 >& rEncryptionKey, + const rtlRandomPool &rRandomPool ) SAL_OVERRIDE; // Recursive functions void saveContents( |