From 7dd5042f4c4611578a6eb9b605d9aa4bd8d5e7f9 Mon Sep 17 00:00:00 2001 From: Vladimir Glazounov Date: Thu, 20 Sep 2007 14:57:41 +0000 Subject: INTEGRATION: CWS os2port01 (1.7.20); FILE MERGED 2006/12/28 15:02:20 ydario 1.7.20.1: OS/2 initial import. --- pyuno/source/module/pyuno_util.cxx | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'pyuno/source/module') diff --git a/pyuno/source/module/pyuno_util.cxx b/pyuno/source/module/pyuno_util.cxx index baafad996609..6b08ff9b1c42 100644 --- a/pyuno/source/module/pyuno_util.cxx +++ b/pyuno/source/module/pyuno_util.cxx @@ -4,9 +4,9 @@ * * $RCSfile: pyuno_util.cxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: kz $ $Date: 2006-07-19 16:42:39 $ + * last change: $Author: vg $ $Date: 2007-09-20 15:57:41 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -74,7 +74,8 @@ PyRef ustring2PyUnicode( const OUString & str ) { PyRef ret; #if Py_UNICODE_SIZE == 2 - ret = PyRef( PyUnicode_FromUnicode( str.getStr(), str.getLength() ), SAL_NO_ACQUIRE ); + // YD force conversion since python/2 uses wchar_t + ret = PyRef( PyUnicode_FromUnicode( (const Py_UNICODE*)str.getStr(), str.getLength() ), SAL_NO_ACQUIRE ); #else OString sUtf8(OUStringToOString(str, RTL_TEXTENCODING_UTF8)); ret = PyRef( PyUnicode_DecodeUTF8( sUtf8.getStr(), sUtf8.getLength(), NULL) , SAL_NO_ACQUIRE ); -- cgit libreoffice-5-3'>distro/cib/libreoffice-5-3 LibreOffice 核心代码仓库文档基金会
summaryrefslogtreecommitdiff
path: root/hsqldb
AgeCommit message (Expand)Author
2012-11-03these have been converted; use _tarball variablesMatúš Kukan
2012-10-15tweak some build.lsts for the group photo...Michael Stahl
2012-10-10more icerun annotation to stop parallel java builds from explodingMichael Meeks
2012-10-03do not overcomplicate thisDavid Tardon
2012-09-24rhbz#836827: SQLFeatureNotSupportedException only in Java 6Stephan Bergmann
2012-09-10hsqldb: quote $(ANT) to make paths with spaces workMichael Stahl
2012-08-27include can be first statement nowDavid Tardon
2012-08-26fix conditional inclusion of jdbc patch in hsqldbDavid Tardon
2012-08-24gbuildize hsqldbDavid Tardon
2012-07-12fix hsqldb java version detectionLionel Elie Mamane
2012-07-10quote $ANT in makefiles so path with spaces worksMichael Stahl
2012-07-03fdo#36824 hsqldb properly escape automatically built namesLionel Elie Mamane
2012-06-22.mk files don't need executable bitsMichael Stahl