diff options
| author | Tamás Bunth <btomi96@gmail.com> | 2017-01-29 16:20:57 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2017-02-02 12:53:05 +0000 |
| commit | fb72da075f20403008207fba0a6c36e808ffa3b1 (patch) | |
| tree | 42d34d153d61e9a40208001c0b35a363b1c7f198 /connectivity | |
| parent | 75c305ad1cff7f4a4cae97e02297e7f1fbddab44 (diff) | |
tdf#105142 set default charset to UTF8
Change-Id: I47dd18a141949f94903297f6e011e7956587b400
Reviewed-on: https://gerrit.libreoffice.org/33663
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Lionel Elie Mamane <lionel@mamane.lu>
(cherry picked from commit 1db423338899c71ba70e361af339d7b7e4aff61f)
Reviewed-on: https://gerrit.libreoffice.org/33809
Reviewed-by: Tamás Bunth <btomi96@gmail.com>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'connectivity')
| -rw-r--r-- | connectivity/source/drivers/firebird/Connection.cxx | 11 |
1 files changed, 10 insertions, 1 deletions
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) |