diff options
| author | Matúš Kukan <matus.kukan@collabora.com> | 2014-10-07 13:56:26 +0200 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@collabora.com> | 2014-10-10 13:50:03 +0200 |
| commit | 3d8f059802c209dbd0cfddc454198fce24c876b5 (patch) | |
| tree | c4abf5228abbc164ea741c0d3e2a8d7ab205154b /package/inc | |
| parent | 9a25d12534f91c13400a63e265fb5aa14c6aca66 (diff) | |
package: Add some 'const' and prefix members
Change-Id: Id177c99ba8b91586cf61457ab2ef084af9c7f490
Diffstat (limited to 'package/inc')
| -rw-r--r-- | package/inc/ZipPackageEntry.hxx | 12 | ||||
| -rw-r--r-- | package/inc/ZipPackageFolder.hxx | 6 |
2 files changed, 9 insertions, 9 deletions
diff --git a/package/inc/ZipPackageEntry.hxx b/package/inc/ZipPackageEntry.hxx index c8cf1fa0a732..cfe1895f2804 100644 --- a/package/inc/ZipPackageEntry.hxx +++ b/package/inc/ZipPackageEntry.hxx @@ -44,24 +44,24 @@ protected: bool mbIsFolder:1; bool mbAllowRemoveOnInsert:1; // com::sun::star::uno::Reference < com::sun::star::container::XNameContainer > xParent; - OUString sMediaType; - ZipPackageFolder * pParent; + OUString msMediaType; + ZipPackageFolder* mpParent; public: ZipEntry aEntry; ZipPackageEntry ( bool bNewFolder = false ); virtual ~ZipPackageEntry( void ); - OUString & GetMediaType () { return sMediaType; } - void SetMediaType ( const OUString & sNewType) { sMediaType = sNewType; } + const OUString& GetMediaType () const { return msMediaType; } + void SetMediaType ( const OUString & sNewType) { msMediaType = sNewType; } void doSetParent ( ZipPackageFolder * pNewParent, bool bInsert ); bool IsFolder ( ) { return mbIsFolder; } - ZipPackageFolder* GetParent ( ) { return pParent; } + const ZipPackageFolder* GetParent () const { return mpParent; } void SetFolder ( bool bSetFolder ) { mbIsFolder = bSetFolder; } void clearParent ( void ) { // xParent.clear(); - pParent = NULL; + mpParent = NULL; } // XNamed virtual OUString SAL_CALL getName( ) diff --git a/package/inc/ZipPackageFolder.hxx b/package/inc/ZipPackageFolder.hxx index b885e3bf6339..81eddd7b069c 100644 --- a/package/inc/ZipPackageFolder.hxx +++ b/package/inc/ZipPackageFolder.hxx @@ -60,7 +60,7 @@ public: bool bAllowRemoveOnInsert ); virtual ~ZipPackageFolder(); - OUString& GetVersion() { return m_sVersion; } + const OUString& GetVersion() const { return m_sVersion; } void SetVersion( const OUString& aVersion ) { m_sVersion = aVersion; } bool LookForUnexpectedODF12Streams( const OUString& aPath ); @@ -79,10 +79,10 @@ public: void setPackageFormat_Impl( sal_Int32 nFormat ) { m_nFormat = nFormat; } void setRemoveOnInsertMode_Impl( bool bRemove ) { this->mbAllowRemoveOnInsert = bRemove; } - bool saveChild(const OUString &rShortName, const com::sun::star::packages::ContentInfo &rInfo, OUString &rPath, std::vector < com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue > > &rManList, ZipOutputStream & rZipOut, const com::sun::star::uno::Sequence < sal_Int8 >& rEncryptionKey, rtlRandomPool & rRandomPool); + bool saveChild(const OUString &rShortName, const com::sun::star::packages::ContentInfo &rInfo, OUString &rPath, std::vector < com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue > > &rManList, ZipOutputStream & rZipOut, const com::sun::star::uno::Sequence < sal_Int8 >& rEncryptionKey, rtlRandomPool & rRandomPool) const; // Recursive functions - void saveContents(OUString &rPath, std::vector < com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue > > &rManList, ZipOutputStream & rZipOut, const com::sun::star::uno::Sequence< sal_Int8 > &rEncryptionKey, rtlRandomPool & rRandomPool) + void saveContents(OUString &rPath, std::vector < com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue > > &rManList, ZipOutputStream & rZipOut, const com::sun::star::uno::Sequence< sal_Int8 > &rEncryptionKey, rtlRandomPool & rRandomPool) const throw(::com::sun::star::uno::RuntimeException); void releaseUpwardRef(); |