INTEGRATION: CWS visibility03 (1.17.68); FILE MERGED

2005/03/03 17:40:09 mhu 1.17.68.2: #i40092# Added ctor from single (unicode) character.
2005/03/02 12:50:44 mhu 1.17.68.1: #i40092# Removed circular dependency to module tools (class ByteString).

1 files changed, 13 insertions, 13 deletions

diff --git a/sal/inc/rtl/string.hxx b/sal/inc/rtl/string.hxx
index d8d082c22d78..df07d4490db8 100644
--- a/sal/inc/rtl/string.hxx
+++ b/sal/inc/rtl/string.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: string.hxx,v $
  *
- *  $Revision: 1.17 $
+ *  $Revision: 1.18 $
  *
- *  last change: $Author: rt $ $Date: 2004-09-20 08:42:33 $
+ *  last change: $Author: obo $ $Date: 2005-04-13 08:42:42 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -82,8 +82,6 @@
 #include <new>
 #endif
 
-class ByteString;
-
 namespace rtl
 {
 
@@ -115,8 +113,6 @@ namespace rtl
 
 class OString
 {
-    friend class ::ByteString;
-
 public:
     /** @internal */
     rtl_String * pData;
@@ -164,6 +160,17 @@ public:
     }
 
     /**
+      New string from a single character.
+
+      @param    value       a character.
+    */
+    explicit OString( sal_Char value ) SAL_THROW(())
+        : pData (0)
+    {
+        rtl_string_newFromStr_WithLength( &pData, &value, 1 );
+    }
+
+    /**
       New string from a character buffer array.
 
       @param    value       a NULL-terminated character array.
@@ -217,13 +224,6 @@ public:
 #endif
     }
 
-    /** Convert a ByteString (from the tools module) into an OString.
-
-        Since both ByteString and OString internally use the same data
-        structure, this is a very cheap operation.
-     */
-    OString( const ByteString & value ) SAL_THROW(());
-
     /**
       Release the string data.
     */