From fb72da075f20403008207fba0a6c36e808ffa3b1 Mon Sep 17 00:00:00 2001 From: Tamás Bunth Date: Sun, 29 Jan 2017 16:20:57 +0100 Subject: tdf#105142 set default charset to UTF8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I47dd18a141949f94903297f6e011e7956587b400 Reviewed-on: https://gerrit.libreoffice.org/33663 Tested-by: Jenkins Reviewed-by: Lionel Elie Mamane (cherry picked from commit 1db423338899c71ba70e361af339d7b7e4aff61f) Reviewed-on: https://gerrit.libreoffice.org/33809 Reviewed-by: Tamás Bunth Reviewed-by: Michael Stahl --- connectivity/source/drivers/firebird/Connection.cxx | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/connectivity/source/drivers/firebird/Connection.cxx b/connectivity/source/drivers/firebird/Connection.cxx index 54ee5efdd7c9..e26c8a6eeaf8 100644 --- a/connectivity/source/drivers/firebird/Connection.cxx +++ b/connectivity/source/drivers/firebird/Connection.cxx @@ -241,7 +241,7 @@ void Connection::construct(const ::rtl::OUString& url, const Sequence< PropertyV } } - char dpbBuffer[1 + 3 + 257 + 257 ]; // Expand as needed + char dpbBuffer[1 + 3 + 257 + 257 + 5 ]; // Expand as needed int dpbLength = 0; { char* dpb; @@ -254,6 +254,15 @@ void Connection::construct(const ::rtl::OUString& url, const Sequence< PropertyV *dpb++ = isc_dpb_sql_dialect; *dpb++ = 1; // 1 byte long *dpb++ = FIREBIRD_SQL_DIALECT; + + // set UTF8 as default character set + const char sCharset[] = "UTF8"; + *dpb++ = isc_dpb_set_db_charset; + int nCharsetLength = sizeof(sCharset) - 1; + *dpb++ = (char) nCharsetLength; + strcpy(dpb, sCharset); + dpb+= nCharsetLength; + // Do any more dpbBuffer additions here if (m_bIsEmbedded || m_bIsFile) -- cgit v1.2.3