diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2020-12-11 17:44:34 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2020-12-11 21:25:10 +0100 |
| commit | 35e471bb4d1388cf5afcdcee214cf5111edf44e3 (patch) | |
| tree | bb78f4f13f131f0cb206a9707cc3cfc495a3876a /package | |
| parent | 0c06e77c122f10a1842bc908bd6e25b1110ddbd2 (diff) | |
Adapt the remaining OUString functions to std string_view
...for LIBO_INTERNAL_ONLY. These had been missed by
1b43cceaea2084a0489db68cd0113508f34b6643 "Make many OUString functions take
std::u16string_view parameters" because they did not match the multi-overload
pattern that was addressed there, but they nevertheless benefit from being
changed just as well (witness e.g. the various resulting changes from copy() to
subView()).
This showed a conversion from OStringChar to std::string_view to be missing
(while the corresponding conversion form OUStringChar to std::u16string_view was
already present).
The improvement to loplugin:stringadd became necessary to fix
> [CPT] compilerplugins/clang/test/stringadd.cxx
> error: 'error' diagnostics expected but not seen:
> File ~/lo/core/compilerplugins/clang/test/stringadd.cxx Line 43 (directive at ~/lo/core/compilerplugins/clang/test/stringadd.cxx:42): simplify by merging with the preceding assignment [loplugin:stringadd]
> File ~/lo/core/compilerplugins/clang/test/stringadd.cxx Line 61 (directive at ~/lo/core/compilerplugins/clang/test/stringadd.cxx:60): simplify by merging with the preceding assignment [loplugin:stringadd]
> 2 errors generated.
Change-Id: Ie40de0616a66e60e289c1af0ca60aed6f9ecc279
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107602
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'package')
| -rw-r--r-- | package/source/manifest/ManifestExport.cxx | 4 | ||||
| -rw-r--r-- | package/source/zippackage/ZipPackage.cxx | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/package/source/manifest/ManifestExport.cxx b/package/source/manifest/ManifestExport.cxx index 1546b7dbb3c7..2f6f1ea0d913 100644 --- a/package/source/manifest/ManifestExport.cxx +++ b/package/source/manifest/ManifestExport.cxx @@ -187,7 +187,7 @@ ManifestExport::ManifestExport( uno::Reference< xml::sax::XDocumentHandler > con sCdataAttribute, MANIFEST_OASIS_NAMESPACE ); bAcceptNonemptyVersion = true; - if ( aDocVersion.compareTo( ODFVER_012_TEXT ) >= 0 ) + if ( aDocVersion.compareTo( u"" ODFVER_012_TEXT ) >= 0 ) { // this is ODF12 or later generation, let encrypted // streams contain start-key-generation entry @@ -241,7 +241,7 @@ ManifestExport::ManifestExport( uno::Reference< xml::sax::XDocumentHandler > con xHandler->ignorableWhitespace ( sWhiteSpace ); // ==== manifest:keyinfo & children - bool const isODF13(aDocVersion.compareTo(ODFVER_013_TEXT) >= 0); + bool const isODF13(aDocVersion.compareTo(u"" ODFVER_013_TEXT) >= 0); if (!isODF13) { xHandler->startElement(sManifestKeyInfoElement, nullptr); diff --git a/package/source/zippackage/ZipPackage.cxx b/package/source/zippackage/ZipPackage.cxx index 34a55fcea869..d2b76ef12098 100644 --- a/package/source/zippackage/ZipPackage.cxx +++ b/package/source/zippackage/ZipPackage.cxx @@ -429,7 +429,7 @@ void ZipPackage::parseManifest() m_bInconsistent = m_xRootFolder->LookForUnexpectedODF12Streams( OUString() ); - bool bODF12AndNewer = ( m_xRootFolder->GetVersion().compareTo( ODFVER_012_TEXT ) >= 0 ); + bool bODF12AndNewer = ( m_xRootFolder->GetVersion().compareTo( u"" ODFVER_012_TEXT ) >= 0 ); if ( !m_bForceRecovery && bODF12AndNewer ) { if ( m_bInconsistent ) |