diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2019-12-03 11:56:33 +0100 |
|---|---|---|
| committer | Thorsten Behrens <thorsten.behrens@allotropia.de> | 2021-04-20 22:59:57 +0200 |
| commit | 505be3d773a8d4d8e9d67a51d8dc1db1adb07dbf (patch) | |
| tree | ca14b5d1604be60b45e2225dc5abd929e1a1c40f | |
| parent | a16a22023bf570184b499f01097f73d5ee29049d (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)
| -rw-r--r-- | basegfx/source/polygon/b2dsvgpolypolygon.cxx | 2 | ||||
| -rw-r--r-- | starmath/source/ooxmlimport.cxx | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/basegfx/source/polygon/b2dsvgpolypolygon.cxx b/basegfx/source/polygon/b2dsvgpolypolygon.cxx index 7906704e76e3..ac3e93627632 100644 --- a/basegfx/source/polygon/b2dsvgpolypolygon.cxx +++ b/basegfx/source/polygon/b2dsvgpolypolygon.cxx @@ -654,7 +654,7 @@ namespace basegfx default: { SAL_WARN("basegfx", "importFromSvgD(): skipping tags in svg:d element (unknown: \"" - << aCurrChar + << OUString(aCurrChar) << "\")!"); ++nPos; break; diff --git a/starmath/source/ooxmlimport.cxx b/starmath/source/ooxmlimport.cxx index ca636f9138e6..4d27f663f6f4 100644 --- a/starmath/source/ooxmlimport.cxx +++ b/starmath/source/ooxmlimport.cxx @@ -221,7 +221,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 )); @@ -552,7 +552,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 ) |