use rtl_(u)string_alloc where the contents clearly don't need to be cleared

Change-Id: I3e8d8f123aaa43ee3721fae6f220a8c5f959a0ea

4 files changed, 16 insertions, 22 deletions

diff --git a/sal/inc/rtl/strbuf.hxx b/sal/inc/rtl/strbuf.hxx
index 90204f0fca18..86f89efbf86f 100644
--- a/sal/inc/rtl/strbuf.hxx
+++ b/sal/inc/rtl/strbuf.hxx
@@ -233,13 +233,11 @@ public:
     OStringBuffer( const OStringConcat< T1, T2 >& c )
     {
         const sal_Int32 l = c.length();
-        rtl_String* buffer = NULL;
         nCapacity = l + 16;
-        rtl_string_new_WithLength( &buffer, nCapacity );
-        char* end = c.addData( buffer->buffer );
+        pData = rtl_string_alloc( nCapacity );
+        char* end = c.addData( pData->buffer );
         *end = '\0';
-        buffer->length = end - buffer->buffer;
-        pData = buffer;
+        pData->length = end - pData->buffer;
     }
 #endif
 
diff --git a/sal/inc/rtl/string.hxx b/sal/inc/rtl/string.hxx
index 1ef086025f85..8e33973729d7 100644
--- a/sal/inc/rtl/string.hxx
+++ b/sal/inc/rtl/string.hxx
@@ -265,14 +265,13 @@ public:
     OString( const OStringConcat< T1, T2 >& c )
     {
         const sal_Int32 l = c.length();
-        rtl_String* buffer = NULL;
-        rtl_string_new_WithLength( &buffer, l );
+        pData = rtl_string_alloc( l );
         if (l != 0)
         {
-            char* end = c.addData( buffer->buffer );
-            buffer->length = end - buffer->buffer;
+            char* end = c.addData( pData->buffer );
+            pData->length = end - pData->buffer;
+            *end = '\0';
         }
-        pData = buffer;
     }
 #endif
 
diff --git a/sal/inc/rtl/ustrbuf.hxx b/sal/inc/rtl/ustrbuf.hxx
index 9549414d44d4..c5c6f5d54337 100644
--- a/sal/inc/rtl/ustrbuf.hxx
+++ b/sal/inc/rtl/ustrbuf.hxx
@@ -225,14 +225,12 @@ public:
     OUStringBuffer( const OUStringConcat< T1, T2 >& c )
     {
         const sal_Int32 l = c.length();
-        rtl_uString* buffer = NULL;
         nCapacity = l + 16;
-        rtl_uString_new_WithLength( &buffer, nCapacity ); // TODO this clears, not necessary
-        sal_Unicode* end = c.addData( buffer->buffer );
+        pData = rtl_uString_alloc( nCapacity );
+        sal_Unicode* end = c.addData( pData->buffer );
         *end = '\0';
-        buffer->length = end - buffer->buffer;
-        // TODO realloc in case buffer->length is noticeably smaller than l ?
-        pData = buffer;
+        pData->length = end - pData->buffer;
+        // TODO realloc in case pData->>length is noticeably smaller than l ?
     }
 #endif
     /** Assign to this a copy of value.
diff --git a/sal/inc/rtl/ustring.hxx b/sal/inc/rtl/ustring.hxx
index 07294f47fa3e..bd1b9cb9f37e 100644
--- a/sal/inc/rtl/ustring.hxx
+++ b/sal/inc/rtl/ustring.hxx
@@ -333,15 +333,14 @@ public:
     OUString( const OUStringConcat< T1, T2 >& c )
     {
         const sal_Int32 l = c.length();
-        rtl_uString* buffer = NULL;
-        rtl_uString_new_WithLength( &buffer, l ); // TODO this clears, not necessary
+        pData = rtl_uString_alloc( l );
         if (l != 0)
         {
-            sal_Unicode* end = c.addData( buffer->buffer );
-            buffer->length = end - buffer->buffer;
-            // TODO realloc in case buffer->length is noticeably smaller than l?
+            sal_Unicode* end = c.addData( pData->buffer );
+            pData->length = end - pData->buffer;
+            *end = '\0';
+            // TODO realloc in case pData->length is noticeably smaller than l?
         }
-        pData = buffer;
     }
 #endif