diff options
| author | Oliver Bolte <obo@openoffice.org> | 2007-06-13 06:58:46 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2007-06-13 06:58:46 +0000 |
| commit | 6b2553f2fc28daebf3ca60889453becf98cf6a73 (patch) | |
| tree | 1be7225680470258a72ba5c1614468e7e580e35a /jvmfwk/source | |
| parent | ce33a153119fe2cff85fa0f5cce77f0291293b4e (diff) | |
INTEGRATION: CWS jl64 (1.5.24); FILE MERGED
2007/06/07 07:52:58 jl 1.5.24.1: #i76390# support of new bootstrap variable UNO_JAVA_JFW_INSTALL_DATA and UNO_JAVA_JFW_INSTALL_EXPIRE
Diffstat (limited to 'jvmfwk/source')
| -rw-r--r-- | jvmfwk/source/libxmlutil.cxx | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/jvmfwk/source/libxmlutil.cxx b/jvmfwk/source/libxmlutil.cxx index 54e468186824..6d3d5c810c50 100644 --- a/jvmfwk/source/libxmlutil.cxx +++ b/jvmfwk/source/libxmlutil.cxx @@ -4,9 +4,9 @@ * * $RCSfile: libxmlutil.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: obo $ $Date: 2006-09-16 17:48:32 $ + * last change: $Author: obo $ $Date: 2007-06-13 07:58:46 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -142,6 +142,12 @@ CXmlCharPtr::CXmlCharPtr(xmlChar * aChar) { } +CXmlCharPtr::CXmlCharPtr(const ::rtl::OUString & s): + _object(NULL) +{ + ::rtl::OString o = ::rtl::OUStringToOString(s, RTL_TEXTENCODING_UTF8); + _object = xmlCharStrdup(o.getStr()); +} CXmlCharPtr::CXmlCharPtr():_object(NULL) { } @@ -165,20 +171,20 @@ CXmlCharPtr::operator xmlChar*() return _object; } -CXmlCharPtr::operator rtl::OUString() +CXmlCharPtr::operator ::rtl::OUString() { - rtl::OUString ret; + ::rtl::OUString ret; if (_object != NULL) { - rtl::OString aOStr((sal_Char*)_object); - ret = rtl::OStringToOUString(aOStr, RTL_TEXTENCODING_UTF8); + ::rtl::OString aOStr((sal_Char*)_object); + ret = ::rtl::OStringToOUString(aOStr, RTL_TEXTENCODING_UTF8); } return ret; } -CXmlCharPtr::operator rtl::OString() +CXmlCharPtr::operator ::rtl::OString() { - return rtl::OString((sal_Char*) _object); + return ::rtl::OString((sal_Char*) _object); } |