diff options
| author | Frank Schönheit <fs@openoffice.org> | 2001-06-08 07:38:21 +0000 |
|---|---|---|
| committer | Frank Schönheit <fs@openoffice.org> | 2001-06-08 07:38:21 +0000 |
| commit | 8c9626c8a1ab92377fa38575f3f34ea859b6e282 (patch) | |
| tree | 4203e5777bc16da14b620ff59851d25c3b4afdf3 /dbaccess/source/inc/constasciistring.hxx | |
| parent | #87934# removed a wrong assertion (diff) | |
| download | core-8c9626c8a1ab92377fa38575f3f34ea859b6e282.tar.gz core-8c9626c8a1ab92377fa38575f3f34ea859b6e282.zip | |
#87909# hold an ::rtl::OUString*, not an rtl_uString (cheapens the access to an ::rtl::OUString) constasciistring.hxx
Diffstat (limited to 'dbaccess/source/inc/constasciistring.hxx')
| -rw-r--r-- | dbaccess/source/inc/constasciistring.hxx | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/dbaccess/source/inc/constasciistring.hxx b/dbaccess/source/inc/constasciistring.hxx index 8a2e8950a871..07861a054a47 100644 --- a/dbaccess/source/inc/constasciistring.hxx +++ b/dbaccess/source/inc/constasciistring.hxx @@ -16,14 +16,14 @@ struct ConstAsciiString const sal_Char* ascii; sal_Int32 length; - inline operator ::rtl::OUString () const; + inline operator const ::rtl::OUString& () const; inline operator const sal_Char* () const { return ascii; } inline ConstAsciiString(const sal_Char* _pAsciiZeroTerminated, const sal_Int32 _nLength); inline ~ConstAsciiString(); private: - mutable rtl_uString* ustring; + mutable ::rtl::OUString* ustring; }; //------------------------------------------------------------ @@ -37,19 +37,16 @@ inline ConstAsciiString::ConstAsciiString(const sal_Char* _pAsciiZeroTerminated, //------------------------------------------------------------ inline ConstAsciiString::~ConstAsciiString() { - if (ustring) - { - rtl_uString_release(ustring); - ustring = NULL; - } + delete ustring; + ustring = NULL; } //------------------------------------------------------------ -inline ConstAsciiString::operator ::rtl::OUString () const +inline ConstAsciiString::operator const ::rtl::OUString& () const { if (!ustring) - rtl_uString_newFromAscii( &ustring, ascii ); - return ::rtl::OUString(ustring); + ustring = new ::rtl::OUString(ascii, length, RTL_TEXTENCODING_ASCII_US); + return *ustring; } //============================================================ |