diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2019-12-03 11:56:33 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2020-01-22 21:45:08 +0100 |
| commit | 22eb95cf39030cdf170aee4614393a77febb28d1 (patch) | |
| tree | b23d401137fa102cfeaf933bc63278ab60511a6c /starmath | |
| parent | a70f4724af04c8bf2d366bcaeb6aeffacc95b344 (diff) | |
Adapt SAL_WARN to C++20 deleted ostream << for sal_Unicode (aka char16_t)
<http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2019/p1423r3.html> "char8_t
backward compatibility remediation", as implemented now by <https://gcc.gnu.org/
git/?p=gcc.git;a=commit;h=0c5b35933e5b150df0ab487efb2f11ef5685f713> "libstdc++:
P1423R3 char8_t remediation (2/4)" for -std=c++2a, deletes operator << overloads
that would print an integer rather than a (presumably expected) character.
Change-Id: Ic70d3e90e4b990d297e35f07379fe4952e138820
Reviewed-on: https://gerrit.libreoffice.org/84321
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
(cherry picked from commit b8bb7fd853db5d0d7cc4ea9120efb1a707e46c22)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87211
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'starmath')
| -rw-r--r-- | starmath/source/ooxmlimport.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/starmath/source/ooxmlimport.cxx b/starmath/source/ooxmlimport.cxx index f0913f157078..731daa054120 100644 --- a/starmath/source/ooxmlimport.cxx +++ b/starmath/source/ooxmlimport.cxx @@ -223,7 +223,7 @@ OUString SmOoxmlImport::handleAcc() break; default: acc = "acute"; - SAL_WARN( "starmath.ooxml", "Unknown m:chr in m:acc \'" << accChr << "\'" ); + SAL_WARN( "starmath.ooxml", "Unknown m:chr in m:acc \'" << OUString(accChr) << "\'" ); break; } OUString e = readOMathArgInElement( M_TOKEN( e )); @@ -554,7 +554,7 @@ OUString SmOoxmlImport::handleNary() ret = "sum"; break; default: - SAL_WARN( "starmath.ooxml", "Unknown m:nary chr \'" << chr << "\'" ); + SAL_WARN( "starmath.ooxml", "Unknown m:nary chr \'" << OUString(chr) << "\'" ); break; } if( !subHide ) |