diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2022-10-11 10:23:28 +0300 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2022-10-11 12:46:01 +0200 |
| commit | 3d236177be255b2027a997bfc12fe0833ca9a2f7 (patch) | |
| tree | d67582e355bccb43cf133c1857f5dd6136be2f35 /xmlsecurity | |
| parent | 6c65c62c26a8aa4d04466545f8f04ec86b797012 (diff) | |
Deduplicate O(U)StringConcatenation
And use an overloaded helper function with a better (?) unified name
to show that the result is not an O(U)String.
Change-Id: I8956338b05d02bf46a6185828130ea8ef145d46b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141203
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'xmlsecurity')
| -rw-r--r-- | xmlsecurity/source/helper/documentsignaturehelper.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/xmlsecurity/source/helper/documentsignaturehelper.cxx b/xmlsecurity/source/helper/documentsignaturehelper.cxx index e1cf34ca5521..8d5c0670c218 100644 --- a/xmlsecurity/source/helper/documentsignaturehelper.cxx +++ b/xmlsecurity/source/helper/documentsignaturehelper.cxx @@ -201,7 +201,7 @@ DocumentSignatureHelper::CreateElementList( { Reference < css::embed::XStorage > xSubStore = rxStore->openStorageElement( aSubStorageName, css::embed::ElementModes::READ ); ImplFillElementList( - aElements, xSubStore, OUStringConcatenation(aSubStorageName+aSep), true, mode); + aElements, xSubStore, Concat2View(aSubStorageName+aSep), true, mode); } catch(css::io::IOException& ) { @@ -213,7 +213,7 @@ DocumentSignatureHelper::CreateElementList( { Reference < css::embed::XStorage > xSubStore = rxStore->openStorageElement( aSubStorageName, css::embed::ElementModes::READ ); ImplFillElementList( - aElements, xSubStore, OUStringConcatenation(aSubStorageName+aSep), true, mode); + aElements, xSubStore, Concat2View(aSubStorageName+aSep), true, mode); xSubStore.clear(); // Object folders... @@ -224,7 +224,7 @@ DocumentSignatureHelper::CreateElementList( { Reference < css::embed::XStorage > xTmpSubStore = rxStore->openStorageElement( rName, css::embed::ElementModes::READ ); ImplFillElementList( - aElements, xTmpSubStore, OUStringConcatenation(rName+aSep), true, mode); + aElements, xTmpSubStore, Concat2View(rName+aSep), true, mode); } } } @@ -248,7 +248,7 @@ DocumentSignatureHelper::CreateElementList( { Reference < css::embed::XStorage > xSubStore = rxStore->openStorageElement( aSubStorageName, css::embed::ElementModes::READ ); ImplFillElementList( - aElements, xSubStore, OUStringConcatenation(aSubStorageName+aSep), true, mode); + aElements, xSubStore, Concat2View(aSubStorageName+aSep), true, mode); } catch( css::io::IOException& ) { @@ -261,7 +261,7 @@ DocumentSignatureHelper::CreateElementList( { Reference < css::embed::XStorage > xSubStore = rxStore->openStorageElement( aSubStorageName, css::embed::ElementModes::READ ); ImplFillElementList( - aElements, xSubStore, OUStringConcatenation(aSubStorageName+aSep), true, mode); + aElements, xSubStore, Concat2View(aSubStorageName+aSep), true, mode); } catch( css::io::IOException& ) { @@ -273,7 +273,7 @@ DocumentSignatureHelper::CreateElementList( { Reference < css::embed::XStorage > xSubStore = rxStore->openStorageElement( aSubStorageName, css::embed::ElementModes::READ ); ImplFillElementList( - aElements, xSubStore, OUStringConcatenation(aSubStorageName+aSep), true, mode); + aElements, xSubStore, Concat2View(aSubStorageName+aSep), true, mode); } catch( css::io::IOException& ) { @@ -312,7 +312,7 @@ void DocumentSignatureHelper::AppendContentTypes(const uno::Reference<embed::XSt { auto it = std::find_if(rOverrides.begin(), rOverrides.end(), [&](const beans::StringPair& rPair) { - return rPair.First == OUStringConcatenation("/" + rElement); + return rPair.First == Concat2View("/" + rElement); }); if (it != rOverrides.end()) @@ -323,7 +323,7 @@ void DocumentSignatureHelper::AppendContentTypes(const uno::Reference<embed::XSt it = std::find_if(rDefaults.begin(), rDefaults.end(), [&](const beans::StringPair& rPair) { - return rElement.endsWith(OUStringConcatenation("." + rPair.First)); + return rElement.endsWith(Concat2View("." + rPair.First)); }); if (it != rDefaults.end()) |