[Libreoffice-commits] core.git: Branch 'libreoffice-6-2-6' - sw/qa

[Stephan Bergmann (via logerrit)]

 sw/qa/extras/odfexport/odfexport.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit de30b0ea5e3228f182ec96b2618f0f2655d0f30f
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Mon Nov 19 15:15:52 2018 +0100
Commit:     Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
CommitDate: Thu Aug 8 21:28:18 2019 +0200

    More adapting to C++2a char8_t
    
    ...in test code that is unhelpfully excluded on macOS, so wasn't covered by
    c89a4996b82881988eb9cc1eeaf24e0d8f9e6dce "Adapt to C++2a char_t" which I
    happened to do on macOS.
    
    Change-Id: I215898a1c468c576d88914ee22deaaaa536d91e9
    (cherry picked from commit 221caface804a0db8773bc77f0ffbed073f69d6b)
    Reviewed-on: https://gerrit.libreoffice.org/76744
    Reviewed-by: Rico Tzschichholz <ricotz at ubuntu.com>
    Reviewed-by: Michael Stahl <Michael.Stahl at cib.de>
    Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
    Tested-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>

diff --git a/sw/qa/extras/odfexport/odfexport.cxx b/sw/qa/extras/odfexport/odfexport.cxx
index 4f13fc4dfae6..7031430efede 100644
--- a/sw/qa/extras/odfexport/odfexport.cxx
+++ b/sw/qa/extras/odfexport/odfexport.cxx
@@ -1950,7 +1950,7 @@ DECLARE_ODFEXPORT_TEST(testReferenceLanguage, "referencelanguage.odt")
     // (used from LibreOffice 6.1, and proposed for next ODF)
     const char* aFieldTexts[] = { "A 2", "Az Isten", "Az 50-esek",
         "A 2018-asok", "Az egyebek", "A fejezetek",
-        u8"Az „Őseinket...”", "a 2",
+        reinterpret_cast<char const *>(u8"Az „Őseinket...”"), "a 2",
         "Az v", "az 1", "Az e", "az 1",
         "Az (5)", "az 1", "A 2", "az 1" };
     uno::Reference<text::XTextFieldsSupplier> xTextFieldsSupplier(mxComponent, uno::UNO_QUERY);