diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2023-05-25 14:24:11 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2023-05-25 18:43:52 +0200 |
commit | e810bd2b99777e192fb464572fa64a34bc0768fe (patch) | |
tree | 22e209b88814242c1914931dff28112cbf8c0e6f /stoc/source | |
parent | 578758835e700b38b167753ccda9527f3a8cc43b (diff) |
merge some stringadds
found with a lightly tweaked version of the loplugin:stringadd
and some hand-holding.
Change-Id: I146aadcaf665e98fea89a9cad2df4dc3935622f4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152275
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'stoc/source')
-rw-r--r-- | stoc/source/implementationregistration/implreg.cxx | 6 | ||||
-rw-r--r-- | stoc/source/uriproc/UriReferenceFactory.cxx | 36 | ||||
-rw-r--r-- | stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx | 3 |
3 files changed, 16 insertions, 29 deletions
diff --git a/stoc/source/implementationregistration/implreg.cxx b/stoc/source/implementationregistration/implreg.cxx index 9efdc32850dd..0f711b7dcf63 100644 --- a/stoc/source/implementationregistration/implreg.cxx +++ b/stoc/source/implementationregistration/implreg.cxx @@ -517,9 +517,9 @@ void prepareUserKeys(const Reference < XSimpleRegistry >& xDest, hasSubKeys = true; OUString linkTarget = xKey->getLinkTarget(relativKey); - OUString linkName(xKey->getKeyName().copy(xUnoKey->getKeyName().getLength())); - - linkName += "/" + relativKey; + OUString linkName( + OUString::Concat(xKey->getKeyName().subView(xUnoKey->getKeyName().getLength())) + + "/" + relativKey); if (bRegister) { diff --git a/stoc/source/uriproc/UriReferenceFactory.cxx b/stoc/source/uriproc/UriReferenceFactory.cxx index 39b9229633ca..6b78fa079d15 100644 --- a/stoc/source/uriproc/UriReferenceFactory.cxx +++ b/stoc/source/uriproc/UriReferenceFactory.cxx @@ -424,8 +424,7 @@ css::uno::Reference< css::uri::XUriReference > Factory::makeAbsolute( auto const path = uriReference->getPath(); auto [segments, proc] = processSegments(path, {}, true); if (proc) { - OUStringBuffer abs(uriReference->getScheme()); - abs.append(':'); + OUStringBuffer abs(uriReference->getScheme() + ":"); if (uriReference->hasAuthority()) { abs.append("//" + uriReference->getAuthority()); } @@ -454,12 +453,10 @@ css::uno::Reference< css::uri::XUriReference > Factory::makeAbsolute( abs.append(i.segment); } if (uriReference->hasQuery()) { - abs.append('?'); - abs.append(uriReference->getQuery()); + abs.append("?" + uriReference->getQuery()); } if (uriReference->hasFragment()) { - abs.append('#'); - abs.append(uriReference->getFragment()); + abs.append("#" + uriReference->getFragment()); } return parse(abs.makeStringAndClear()); } @@ -467,28 +464,23 @@ css::uno::Reference< css::uri::XUriReference > Factory::makeAbsolute( return clone(uriReference); } else if (!uriReference->hasAuthority() && uriReference->getPath().isEmpty()) { - OUStringBuffer abs(baseUriReference->getScheme()); - abs.append(':'); + OUStringBuffer abs(baseUriReference->getScheme() + ":"); if (baseUriReference->hasAuthority()) { abs.append("//" + baseUriReference->getAuthority()); } abs.append(baseUriReference->getPath()); if (uriReference->hasQuery()) { - abs.append('?'); - abs.append(uriReference->getQuery()); + abs.append("?" + uriReference->getQuery()); } else if (baseUriReference->hasQuery()) { - abs.append('?'); - abs.append(baseUriReference->getQuery()); + abs.append("?" + baseUriReference->getQuery()); } if (uriReference->hasFragment()) { - abs.append('#'); - abs.append(uriReference->getFragment()); + abs.append("#" + uriReference->getFragment()); } return parse(abs.makeStringAndClear()); } else { OUStringBuffer abs(128); - abs.append(baseUriReference->getScheme()); - abs.append(':'); + abs.append(baseUriReference->getScheme() + ":"); if (uriReference->hasAuthority()) { abs.append("//" + uriReference->getAuthority()); } else if (baseUriReference->hasAuthority()) { @@ -568,12 +560,10 @@ css::uno::Reference< css::uri::XUriReference > Factory::makeAbsolute( } } if (uriReference->hasQuery()) { - abs.append('?'); - abs.append(uriReference->getQuery()); + abs.append("?" + uriReference->getQuery()); } if (uriReference->hasFragment()) { - abs.append('#'); - abs.append(uriReference->getFragment()); + abs.append("#" + uriReference->getFragment()); } return parse(abs.makeStringAndClear()); } @@ -690,12 +680,10 @@ css::uno::Reference< css::uri::XUriReference > Factory::makeRelative( } } if (!omitQuery && uriReference->hasQuery()) { - rel.append('?'); - rel.append(uriReference->getQuery()); + rel.append("?" + uriReference->getQuery()); } if (uriReference->hasFragment()) { - rel.append('#'); - rel.append(uriReference->getFragment()); + rel.append("#" + uriReference->getFragment()); } return parse(rel.makeStringAndClear()); } diff --git a/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx b/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx index a8203a811ce0..1f533516935b 100644 --- a/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx +++ b/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx @@ -293,8 +293,7 @@ void UrlReference::setParameter(OUString const & key, OUString const & value) newPath.append(m_base.m_path.subView(0, i)); if (!bExistent) { newPath.append( m_base.m_path.indexOf('?') < 0 ? '?' : '&' ); - newPath.append(encodeNameOrParamFragment(key)); - newPath.append('='); + newPath.append(encodeNameOrParamFragment(key) + "="); } newPath.append(encodeNameOrParamFragment(value)); if (bExistent) { |