diff options
Diffstat (limited to 'sal/inc')
| -rw-r--r-- | sal/inc/rtl/string.h | 23 | ||||
| -rw-r--r-- | sal/inc/rtl/string.hxx | 22 | ||||
| -rw-r--r-- | sal/inc/rtl/ustring.h | 23 | ||||
| -rw-r--r-- | sal/inc/rtl/ustring.hxx | 22 |
4 files changed, 0 insertions, 90 deletions
diff --git a/sal/inc/rtl/string.h b/sal/inc/rtl/string.h index a95e399d737a..f9c895dd852b 100644 --- a/sal/inc/rtl/string.h +++ b/sal/inc/rtl/string.h @@ -73,29 +73,6 @@ sal_Int32 SAL_CALL rtl_str_getLength( const sal_Char * str ) SAL_THROW_EXTERN_C( */ sal_Int32 SAL_CALL rtl_str_compare( const sal_Char * first, const sal_Char * second ) SAL_THROW_EXTERN_C(); -/** Compare two strings using natural order. - - For non digit characters, the comparison use the same algorithm as - rtl_str_compare. When a number is encountered during the comparison, - natural order is used. Thus, Heading 10 will be considered as greater - than Heading 2. Numerical comparison is done using decimal representation. - - Beware that "MyString 001" and "MyString 1" will be considered as equal - since leading 0 are meaningless. - - @param first - the first null-terminated string to be compared. - - @param second - the second null-terminated string which is compared with the first one. - - @return - 0 if both strings are equal, a value less than 0 if the first string is - less than the second string, and a value greater than 0 if the first - string is greater than the second string. - */ -sal_Int32 SAL_CALL rtl_str_compare_Numeric( const sal_Char * first, const sal_Char * second ) SAL_THROW_EXTERN_C(); - /** Compare two strings. The comparison is based on the numeric value of each character in the diff --git a/sal/inc/rtl/string.hxx b/sal/inc/rtl/string.hxx index e83fc0658b51..daf95802a489 100644 --- a/sal/inc/rtl/string.hxx +++ b/sal/inc/rtl/string.hxx @@ -283,28 +283,6 @@ public: } /** - Compares two strings using natural order. - - For non digit characters, the comparison use the same algorithm as - rtl_str_compare. When a number is encountered during the comparison, - natural order is used. Thus, Heading 10 will be considered as greater - than Heading 2. Numerical comparison is done using decimal representation. - - Beware that "MyString 001" and "MyString 1" will be considered as equal - since leading 0 are meaningless. - - @param str the object to be compared. - @return 0 - if both strings are equal - < 0 - if this string is less than the string argument - > 0 - if this string is greater than the string argument - */ - sal_Int32 compareToNumeric( const OString & str ) const SAL_THROW(()) - { - return rtl_str_compare_Numeric( pData->buffer, - str.pData->buffer ); - } - - /** Compares two strings with an maximum count of characters. The comparison is based on the numeric value of each character in diff --git a/sal/inc/rtl/ustring.h b/sal/inc/rtl/ustring.h index 1d15b4fbdb2b..426a672db841 100644 --- a/sal/inc/rtl/ustring.h +++ b/sal/inc/rtl/ustring.h @@ -74,29 +74,6 @@ sal_Int32 SAL_CALL rtl_ustr_getLength( const sal_Unicode * str ) SAL_THROW_EXTER */ sal_Int32 SAL_CALL rtl_ustr_compare( const sal_Unicode * first, const sal_Unicode * second ) SAL_THROW_EXTERN_C(); -/** Compare two strings using natural order. - - For non digit characters, the comparison use the same algorithm as - rtl_str_compare. When a number is encountered during the comparison, - natural order is used. Thus, Heading 10 will be considered as greater - than Heading 2. Numerical comparison is done using decimal representation. - - Beware that "MyString 001" and "MyString 1" will be considered as equal - since leading 0 are meaningless. - - @param first - the first null-terminated string to be compared. - - @param second - the second null-terminated string which is compared with the first one. - - @return - 0 if both strings are equal, a value less than 0 if the first string is - less than the second string, and a value greater than 0 if the first - string is greater than the second string. - */ -sal_Int32 SAL_CALL rtl_ustr_compare_Numeric( const sal_Unicode * first, const sal_Unicode * second ) SAL_THROW_EXTERN_C(); - /** Compare two strings. The comparison is based on the numeric value of each character in the diff --git a/sal/inc/rtl/ustring.hxx b/sal/inc/rtl/ustring.hxx index 76bbe2668b6c..b56413d8bfbe 100644 --- a/sal/inc/rtl/ustring.hxx +++ b/sal/inc/rtl/ustring.hxx @@ -330,28 +330,6 @@ public: } /** - Compares two strings using natural order. - - For non digit characters, the comparison use the same algorithm as - rtl_str_compare. When a number is encountered during the comparison, - natural order is used. Thus, Heading 10 will be considered as greater - than Heading 2. Numerical comparison is done using decimal representation. - - Beware that "MyString 001" and "MyString 1" will be considered as equal - since leading 0 are meaningless. - - @param str the object to be compared. - @return 0 - if both strings are equal - < 0 - if this string is less than the string argument - > 0 - if this string is greater than the string argument - */ - sal_Int32 compareToNumeric( const OUString & str ) const SAL_THROW(()) - { - return rtl_ustr_compare_Numeric( pData->buffer, - str.pData->buffer ); - } - - /** Compares two strings with an maximum count of characters. The comparison is based on the numeric value of each character in |