Kaydet (Commit) 38b7d3a0 authored tarafından Oliver Bolte's avatar Oliver Bolte

INTEGRATION: CWS visibility03 (1.21.68); FILE MERGED

2005/03/24 21:40:54 mhu 1.21.68.3: RESYNC: (1.21-1.22); FILE MERGED
2005/03/03 17:40:11 mhu 1.21.68.2: #i40092# Added ctor from single (unicode) character.
2005/03/02 12:51:14 mhu 1.21.68.1: #i40092# Removed circular dependency to module tools (class String).
üst d11f6561
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
* *
* $RCSfile: ustring.hxx,v $ * $RCSfile: ustring.hxx,v $
* *
* $Revision: 1.22 $ * $Revision: 1.23 $
* *
* last change: $Author: kz $ $Date: 2005-03-18 18:45:10 $ * last change: $Author: obo $ $Date: 2005-04-13 08:43:08 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
...@@ -81,8 +81,6 @@ ...@@ -81,8 +81,6 @@
#include <new> #include <new>
#endif #endif
class String;
namespace rtl namespace rtl
{ {
/* ======================================================================= */ /* ======================================================================= */
...@@ -113,8 +111,6 @@ namespace rtl ...@@ -113,8 +111,6 @@ namespace rtl
class OUString class OUString
{ {
friend class ::String;
public: public:
/** @internal */ /** @internal */
rtl_uString * pData; rtl_uString * pData;
...@@ -170,6 +166,18 @@ public: ...@@ -170,6 +166,18 @@ public:
inline OUString( rtl_uString * str, __sal_NoAcquire ) SAL_THROW( () ) inline OUString( rtl_uString * str, __sal_NoAcquire ) SAL_THROW( () )
{ pData = str; } { pData = str; }
/**
New string from a single Unicode character.
@param value a Unicode character.
*/
explicit OUString( sal_Unicode value ) SAL_THROW(())
: pData (0)
{
rtl_uString_newFromStr_WithLength( &pData, &value, 1 );
}
/** /**
New string from a Unicode character buffer array. New string from a Unicode character buffer array.
...@@ -224,13 +232,6 @@ public: ...@@ -224,13 +232,6 @@ public:
#endif #endif
} }
/** Convert a String (from the tools module) into an OUString.
Since both String and OUString internally use the same data structure,
this is a very cheap operation.
*/
OUString( const String & value ) SAL_THROW(());
/** /**
Release the string data. Release the string data.
*/ */
......
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