[Libreoffice-commits] core.git: sw/qa

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Mon Nov 19 14:17:55 UTC 2018


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

New commits:
commit 221caface804a0db8773bc77f0ffbed073f69d6b
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Mon Nov 19 15:15:52 2018 +0100
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Mon Nov 19 15:15:52 2018 +0100

    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

diff --git a/sw/qa/extras/odfexport/odfexport.cxx b/sw/qa/extras/odfexport/odfexport.cxx
index 3527541a0177..2ef4e2cd4400 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 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);


More information about the Libreoffice-commits mailing list