diff options
author | Luboš Luňák <l.lunak@suse.cz> | 2012-12-05 00:37:01 +0100 |
---|---|---|
committer | Luboš Luňák <l.lunak@suse.cz> | 2012-12-06 13:35:18 +0100 |
commit | 81e16cea9a11185c209894973db8d1990fa9cce6 (patch) | |
tree | 6b784ddae1e873ba282ca1a961a8dc4a32f83e16 /comphelper | |
parent | acquire on the shared empty string does nothing (diff) | |
download | core-81e16cea9a11185c209894973db8d1990fa9cce6.tar.gz core-81e16cea9a11185c209894973db8d1990fa9cce6.zip |
mvoe rtl_(u)string_alloc to sal
No point in hidding something useful like this in some helper lib.
Change-Id: I7332d7f6bd428378cd19e7e95ad130771a541140
Diffstat (limited to 'comphelper')
-rw-r--r-- | comphelper/inc/comphelper/string.hxx | 45 | ||||
-rw-r--r-- | comphelper/source/misc/string.cxx | 37 |
2 files changed, 0 insertions, 82 deletions
diff --git a/comphelper/inc/comphelper/string.hxx b/comphelper/inc/comphelper/string.hxx index 693703d5ca3c..cfa9ddd474f6 100644 --- a/comphelper/inc/comphelper/string.hxx +++ b/comphelper/inc/comphelper/string.hxx @@ -37,51 +37,6 @@ // go into the stable URE API: namespace comphelper { namespace string { -/** Allocate a new string containing space for a given number of characters. - - The reference count of the new string will be 1. The length of the string - will be nLen. This function throws std::bad_alloc on out-of-memory - conditions. - - The characters of the capacity are not cleared, and the length is set to - nLen, unlike the similar method of rtl_uString_new_WithLength which - zeros out the buffer, and sets the length to 0. So should be somewhat - more efficient for allocating a new string. - - call rtl_uString_release to release the string - alternatively pass ownership to an OUString with - rtl::OUString(newStr, SAL_NO_ACQUIRE); - - @param newStr - pointer to the new string. - - @param len - the number of characters. - */ -COMPHELPER_DLLPUBLIC rtl_uString * SAL_CALL rtl_uString_alloc(sal_Int32 nLen); - -/** Allocate a new string containing space for a given number of characters. - - The reference count of the new string will be 1. The length of the string - will be nLen. This function does not handle out-of-memory conditions. - - The characters of the capacity are not cleared, and the length is set to - nLen, unlike the similar method of rtl_String_new_WithLength which - zeros out the buffer, and sets the length to 0. So should be somewhat - more efficient for allocating a new string. - - call rtl_String_release to release the string - alternatively pass ownership to an OUString with - rtl::OUString(newStr, SAL_NO_ACQUIRE); - - @param newStr - pointer to the new string. - - @param len - the number of characters. - */ -COMPHELPER_DLLPUBLIC rtl_String * SAL_CALL rtl_string_alloc(sal_Int32 nLen); - /** Compare an OString to a single char @param rIn The input OString diff --git a/comphelper/source/misc/string.cxx b/comphelper/source/misc/string.cxx index 1dae9e8c203f..0674f9a7b065 100644 --- a/comphelper/source/misc/string.cxx +++ b/comphelper/source/misc/string.cxx @@ -377,43 +377,6 @@ bool isdigitAsciiString(const rtl::OUString &rString) namespace { - template <typename T, typename U> T* string_alloc(sal_Int32 nLen) - { - //Clearly this is somewhat cosy with the sal implmentation - - //rtl_[u]String contains U buffer[1], so an input of nLen - //allocates a buffer of nLen + 1 and we'll ensure a null termination - - T* newStr = - (sal::static_int_cast< sal_uInt32 >(nLen) - <= ((SAL_MAX_UINT32 - sizeof (T)) - / sizeof (U))) - ? (T*) rtl_allocateMemory( - sizeof (T) + nLen * sizeof (U)) - : NULL; - - if (!newStr) - throw std::bad_alloc(); - - newStr->refCount = 1; - newStr->length = nLen; - newStr->buffer[nLen] = 0; - return newStr; - } -} - -rtl_uString * SAL_CALL rtl_uString_alloc(sal_Int32 nLen) -{ - return string_alloc<rtl_uString, sal_Unicode>(nLen); -} - -rtl_String * SAL_CALL rtl_string_alloc(sal_Int32 nLen) -{ - return string_alloc<rtl_String, sal_Char>(nLen); -} - -namespace -{ template <typename T, typename O> T tmpl_reverseString(const T &rIn) { if (rIn.isEmpty()) |