Skip to content

C
core
Kaydet (Commit) 7dd5042f authored tarafından Vladimir Glazounov's avatar Vladimir Glazounov
Dosyalara gözat
Seçenekler

INTEGRATION: CWS os2port01 (1.7.20); FILE MERGED 

2006/12/28 15:02:20 ydario 1.7.20.1: OS/2 initial import.
üst 14244312
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 3 deletions
pyuno/source/module/pyuno_util.cxx
Dosyayı görüntüle @ 7dd5042f
...@@ -4,9 +4,9 @@ ...@@ -4,9 +4,9 @@
* *
* $RCSfile: pyuno_util.cxx,v $ * $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 Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1. * the terms of GNU Lesser General Public License Version 2.1.
...@@ -74,7 +74,8 @@ PyRef ustring2PyUnicode( const OUString & str ) ...@@ -74,7 +74,8 @@ PyRef ustring2PyUnicode( const OUString & str )
{ {
PyRef ret; PyRef ret;
#if Py_UNICODE_SIZE == 2 #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 #else
OString sUtf8(OUStringToOString(str, RTL_TEXTENCODING_UTF8)); OString sUtf8(OUStringToOString(str, RTL_TEXTENCODING_UTF8));
ret = PyRef( PyUnicode_DecodeUTF8( sUtf8.getStr(), sUtf8.getLength(), NULL) , SAL_NO_ACQUIRE ); ret = PyRef( PyUnicode_DecodeUTF8( sUtf8.getStr(), sUtf8.getLength(), NULL) , SAL_NO_ACQUIRE );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment