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 /starmath | |
| 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 'starmath')
| -rw-r--r-- | starmath/source/ooxmlexport.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/starmath/source/ooxmlexport.cxx b/starmath/source/ooxmlexport.cxx index a915596b67a2..d7698e2c5aba 100644 --- a/starmath/source/ooxmlexport.cxx +++ b/starmath/source/ooxmlexport.cxx @@ -217,7 +217,7 @@ void SmOoxmlExport::HandleAttribute( const SmAttributNode* pNode, int nLevel ) m_pSerializer->startElementNS(XML_m, XML_acc); m_pSerializer->startElementNS(XML_m, XML_accPr); OString value = OUStringToOString( - OUString( pNode->Attribute()->GetToken().cMathChar ), RTL_TEXTENCODING_UTF8 ); + OUStringChar( pNode->Attribute()->GetToken().cMathChar ), RTL_TEXTENCODING_UTF8 ); m_pSerializer->singleElementNS(XML_m, XML_chr, FSNS(XML_m, XML_val), value); m_pSerializer->endElementNS( XML_m, XML_accPr ); m_pSerializer->startElementNS(XML_m, XML_e); @@ -286,7 +286,7 @@ static OString mathSymbolToString( const SmNode* node ) const SmTextNode* txtnode = static_cast< const SmTextNode* >( node ); assert( txtnode->GetText().getLength() == 1 ); sal_Unicode chr = SmTextNode::ConvertSymbolToUnicode( txtnode->GetText()[0] ); - return OUStringToOString( OUString( chr ), RTL_TEXTENCODING_UTF8 ); + return OUStringToOString( OUStringChar( chr ), RTL_TEXTENCODING_UTF8 ); } void SmOoxmlExport::HandleOperator( const SmOperNode* pNode, int nLevel ) |