Blame 0001-Adapt-SAL_WARN-to-C-20-deleted-ostream-for-sal_Unico.patch

77ce29d
From b8bb7fd853db5d0d7cc4ea9120efb1a707e46c22 Mon Sep 17 00:00:00 2001
77ce29d
From: Stephan Bergmann <sbergman@redhat.com>
77ce29d
Date: Tue, 3 Dec 2019 11:56:33 +0100
77ce29d
Subject: [PATCH] Adapt SAL_WARN to C++20 deleted ostream << for sal_Unicode
77ce29d
 (aka char16_t)
77ce29d
77ce29d
<http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2019/p1423r3.html> "char8_t
77ce29d
backward compatibility remediation", as implemented now by 
77ce29d
git/?p=gcc.git;a=commit;h=0c5b35933e5b150df0ab487efb2f11ef5685f713> "libstdc++:
77ce29d
P1423R3 char8_t remediation (2/4)" for -std=c++2a, deletes operator << overloads
77ce29d
that would print an integer rather than a (presumably expected) character.
77ce29d
77ce29d
Change-Id: Ic70d3e90e4b990d297e35f07379fe4952e138820
77ce29d
Reviewed-on: https://gerrit.libreoffice.org/84321
77ce29d
Tested-by: Jenkins
77ce29d
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
77ce29d
---
77ce29d
 basegfx/source/polygon/b2dsvgpolypolygon.cxx | 2 +-
77ce29d
 starmath/source/ooxmlimport.cxx              | 4 ++--
77ce29d
 2 files changed, 3 insertions(+), 3 deletions(-)
77ce29d
77ce29d
diff --git a/basegfx/source/polygon/b2dsvgpolypolygon.cxx b/basegfx/source/polygon/b2dsvgpolypolygon.cxx
77ce29d
index 2fdacad3653f..490bcd69c9a6 100644
77ce29d
--- a/basegfx/source/polygon/b2dsvgpolypolygon.cxx
77ce29d
+++ b/basegfx/source/polygon/b2dsvgpolypolygon.cxx
77ce29d
@@ -648,7 +648,7 @@ namespace basegfx
77ce29d
                     default:
77ce29d
                     {
77ce29d
                         SAL_WARN("basegfx", "importFromSvgD(): skipping tags in svg:d element (unknown: \""
77ce29d
-                                << aCurrChar
77ce29d
+                                << OUString(aCurrChar)
77ce29d
                                 << "\")!");
77ce29d
                         ++nPos;
77ce29d
                         break;
77ce29d
diff --git a/starmath/source/ooxmlimport.cxx b/starmath/source/ooxmlimport.cxx
77ce29d
index f0913f157078..731daa054120 100644
77ce29d
--- a/starmath/source/ooxmlimport.cxx
77ce29d
+++ b/starmath/source/ooxmlimport.cxx
77ce29d
@@ -223,7 +223,7 @@ OUString SmOoxmlImport::handleAcc()
77ce29d
             break;
77ce29d
         default:
77ce29d
             acc = "acute";
77ce29d
-            SAL_WARN( "starmath.ooxml", "Unknown m:chr in m:acc \'" << accChr << "\'" );
77ce29d
+            SAL_WARN( "starmath.ooxml", "Unknown m:chr in m:acc \'" << OUString(accChr) << "\'" );
77ce29d
             break;
77ce29d
     }
77ce29d
     OUString e = readOMathArgInElement( M_TOKEN( e ));
77ce29d
@@ -554,7 +554,7 @@ OUString SmOoxmlImport::handleNary()
77ce29d
             ret = "sum";
77ce29d
             break;
77ce29d
         default:
77ce29d
-            SAL_WARN( "starmath.ooxml", "Unknown m:nary chr \'" << chr << "\'" );
77ce29d
+            SAL_WARN( "starmath.ooxml", "Unknown m:nary chr \'" << OUString(chr) << "\'" );
77ce29d
             break;
77ce29d
     }
77ce29d
     if( !subHide )
77ce29d
-- 
77ce29d
2.24.1
77ce29d