diff options
| author | Ashod Nakashian <ashod.nakashian@collabora.co.uk> | 2018-02-06 17:23:58 -0500 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2018-03-25 19:58:21 +0200 |
| commit | e49b343c11883ac1f75238087698e7f6a9e6abcb (patch) | |
| tree | 89b0d9daf9934a6b6318b62ecb4f7c3a391d16e7 /package | |
| parent | 75d222c9bc1ffecf38dece206be5fdb7f51766e0 (diff) | |
oox: cosmetic cleanup
Change-Id: Ifafd7338ddfec8b707b5ddf4acb39512faf186da
Reviewed-on: https://gerrit.libreoffice.org/49325
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
(cherry picked from commit 97a73d2772a86e26369fc32e25a59c0d5a274c01)
Diffstat (limited to 'package')
| -rw-r--r-- | package/inc/ZipPackageEntry.hxx | 10 | ||||
| -rw-r--r-- | package/source/zippackage/ZipPackage.cxx | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/package/inc/ZipPackageEntry.hxx b/package/inc/ZipPackageEntry.hxx index 5e0064f9bf7e..0fa479cb8465 100644 --- a/package/inc/ZipPackageEntry.hxx +++ b/package/inc/ZipPackageEntry.hxx @@ -59,11 +59,11 @@ public: ZipPackageEntry(); virtual ~ZipPackageEntry() override; - const OUString& GetMediaType () const { return msMediaType; } - void SetMediaType ( const OUString & sNewType) { msMediaType = sNewType; } - void doSetParent ( ZipPackageFolder * pNewParent ); - bool IsFolder ( ) { return mbIsFolder; } - void SetFolder ( bool bSetFolder ) { mbIsFolder = bSetFolder; } + const OUString& GetMediaType() const { return msMediaType; } + void SetMediaType(const OUString & sNewType) { msMediaType = sNewType; } + void doSetParent(ZipPackageFolder * pNewParent); + bool IsFolder() const { return mbIsFolder; } + void SetFolder(const bool bSetFolder) { mbIsFolder = bSetFolder; } virtual bool saveChild( const OUString &rPath, std::vector < css::uno::Sequence < css::beans::PropertyValue > > &rManList, diff --git a/package/source/zippackage/ZipPackage.cxx b/package/source/zippackage/ZipPackage.cxx index 2649c1189d22..3d2c0ff00e4a 100644 --- a/package/source/zippackage/ZipPackage.cxx +++ b/package/source/zippackage/ZipPackage.cxx @@ -1224,7 +1224,7 @@ uno::Reference< io::XInputStream > ZipPackage::writeTempFile() // Remove the old manifest.xml file as the // manifest will be re-generated and the // META-INF directory implicitly created if does not exist - const OUString sMeta ("META-INF"); + static const OUString sMeta ("META-INF"); if ( m_xRootFolder->hasByName( sMeta ) ) { @@ -1246,7 +1246,7 @@ uno::Reference< io::XInputStream > ZipPackage::writeTempFile() // Remove the old [Content_Types].xml file as the // file will be re-generated - const OUString aContentTypes("[Content_Types].xml"); + static const OUString aContentTypes("[Content_Types].xml"); if ( m_xRootFolder->hasByName( aContentTypes ) ) m_xRootFolder->removeByName( aContentTypes ); @@ -1255,9 +1255,9 @@ uno::Reference< io::XInputStream > ZipPackage::writeTempFile() // Create a vector to store data for the manifest.xml file vector < uno::Sequence < PropertyValue > > aManList; - const OUString sMediaType ("MediaType"); - const OUString sVersion ("Version"); - const OUString sFullPath ("FullPath"); + static const OUString sMediaType("MediaType"); + static const OUString sVersion("Version"); + static const OUString sFullPath("FullPath"); const bool bIsGpgEncrypt = m_aGpgProps.hasElements(); if ( m_nFormat == embed::StorageFormats::PACKAGE ) |