summaryrefslogtreecommitdiff
path: root/sal
diff options
context:
space:
mode:
authorOliver Bolte <obo@openoffice.org>2005-04-13 07:43:08 +0000
committerOliver Bolte <obo@openoffice.org>2005-04-13 07:43:08 +0000
commit38b7d3a088756944b669e27f597f927d31cb56c5 (patch)
treeb2a268ea56f285a51d5c12ac189a4a2d6f6e0654 /sal
parentd11f6561db7ecda7e18bc3a68b75e834f9d68861 (diff)
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).
Diffstat (limited to 'sal')
-rw-r--r--sal/inc/rtl/ustring.hxx27
1 files changed, 14 insertions, 13 deletions
diff --git a/sal/inc/rtl/ustring.hxx b/sal/inc/rtl/ustring.hxx
index 9137a0d5ed62..69f78017fc12 100644
--- a/sal/inc/rtl/ustring.hxx
+++ b/sal/inc/rtl/ustring.hxx
@@ -2,9 +2,9 @@
*
* $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
* either of the following licenses
@@ -81,8 +81,6 @@
#include <new>
#endif
-class String;
-
namespace rtl
{
/* ======================================================================= */
@@ -113,8 +111,6 @@ namespace rtl
class OUString
{
- friend class ::String;
-
public:
/** @internal */
rtl_uString * pData;
@@ -170,6 +166,18 @@ public:
inline OUString( rtl_uString * str, __sal_NoAcquire ) SAL_THROW( () )
{ 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.
@@ -224,13 +232,6 @@ public:
#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.
*/