summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTamás Bunth <btomi96@gmail.com>2017-01-29 16:20:57 +0100
committerTamás Bunth <btomi96@gmail.com>2017-01-30 14:50:32 +0000
commit1db423338899c71ba70e361af339d7b7e4aff61f (patch)
treefc8b1d77df0fe0d076c8f3b405cd9eac22bce2ca
parentcfdfe1be91101654456bdf1f16d92461e1e5dbfa (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>
-rw-r--r--connectivity/source/drivers/firebird/Connection.cxx11
1 files changed, 10 insertions, 1 deletions
diff --git a/connectivity/source/drivers/firebird/Connection.cxx b/connectivity/source/drivers/firebird/Connection.cxx
index 7c39219943ee..7985e6184886 100644
--- a/connectivity/source/drivers/firebird/Connection.cxx
+++ b/connectivity/source/drivers/firebird/Connection.cxx
@@ -240,7 +240,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;
@@ -253,6 +253,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)