diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-09-30 15:11:25 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-10-01 10:51:39 +0200 |
| commit | b74c4b7c675883e23bea9fd52682ae89d36539f6 (patch) | |
| tree | 6d2a521470e37ae99a7977aaa129700151c7f43b /package/source | |
| parent | 46c2a3688c9ee7f558f75cbe856c26c4b8849b7e (diff) | |
loplugin:stringadd in package..sax
Change-Id: I1f8b626ae99bca6e31e7c4aa9c8a1fc016b76e5c
Reviewed-on: https://gerrit.libreoffice.org/79890
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'package/source')
| -rw-r--r-- | package/source/manifest/ManifestImport.cxx | 3 | ||||
| -rw-r--r-- | package/source/xstor/owriteablestream.cxx | 7 | ||||
| -rw-r--r-- | package/source/xstor/xstorage.cxx | 6 |
3 files changed, 5 insertions, 11 deletions
diff --git a/package/source/manifest/ManifestImport.cxx b/package/source/manifest/ManifestImport.cxx index b333cf5c9831..4014bf3d0a4d 100644 --- a/package/source/manifest/ManifestImport.cxx +++ b/package/source/manifest/ManifestImport.cxx @@ -581,8 +581,7 @@ OUString ManifestImport::ConvertNameWithNamespace( const OUString& aName, const if ( aIter != aNamespaces.end() && ( aIter->second == MANIFEST_NAMESPACE || aIter->second == MANIFEST_OASIS_NAMESPACE ) ) { // no check for manifest.xml consistency currently since the old versions have supported inconsistent documents as well - aResult = MANIFEST_NSPREFIX; - aResult += aPureName; + aResult = MANIFEST_NSPREFIX + aPureName; } return aResult; diff --git a/package/source/xstor/owriteablestream.cxx b/package/source/xstor/owriteablestream.cxx index e4935b94c81d..a781dc4bdac9 100644 --- a/package/source/xstor/owriteablestream.cxx +++ b/package/source/xstor/owriteablestream.cxx @@ -1510,11 +1510,8 @@ void OWriteStream_Impl::CommitStreamRelInfo( const uno::Reference< embed::XStora if ( m_nRelInfoStatus == RELINFO_BROKEN || m_nRelInfoStatus == RELINFO_CHANGED_BROKEN ) throw io::IOException(); // TODO: - OUString aOrigRelStreamName = aOrigStreamName; - aOrigRelStreamName += ".rels"; - - OUString aNewRelStreamName = aNewStreamName; - aNewRelStreamName += ".rels"; + OUString aOrigRelStreamName = aOrigStreamName + ".rels"; + OUString aNewRelStreamName = aNewStreamName + ".rels"; bool bRenamed = aOrigRelStreamName != aNewRelStreamName; if ( m_nRelInfoStatus == RELINFO_CHANGED diff --git a/package/source/xstor/xstorage.cxx b/package/source/xstor/xstorage.cxx index 5a375e4bfcfa..6a5b62a6edd2 100644 --- a/package/source/xstor/xstorage.cxx +++ b/package/source/xstor/xstorage.cxx @@ -1591,8 +1591,7 @@ void OStorage_Impl::RemoveStreamRelInfo( const OUString& aOriginalName ) if ( m_nStorageType == embed::StorageFormats::OFOPXML && m_xRelStorage.is() ) { - OUString aRelStreamName = aOriginalName; - aRelStreamName += ".rels"; + OUString aRelStreamName = aOriginalName + ".rels"; if ( m_xRelStorage->hasByName( aRelStreamName ) ) m_xRelStorage->removeElement( aRelStreamName ); @@ -1654,8 +1653,7 @@ uno::Reference< io::XInputStream > OStorage_Impl::GetRelInfoStreamForName( const ReadContents(); if ( m_xRelStorage.is() ) { - OUString aRelStreamName = aName; - aRelStreamName += ".rels"; + OUString aRelStreamName = aName + ".rels"; if ( m_xRelStorage->hasByName( aRelStreamName ) ) { uno::Reference< io::XStream > xStream = m_xRelStorage->openStreamElement( aRelStreamName, embed::ElementModes::READ ); |