diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-05-17 15:17:13 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-05-18 12:58:55 +0200 |
| commit | 7462343cb9c7a61cd28c7eae245f21b6bfc56b40 (patch) | |
| tree | fef10a16712d4bc070dd0905ebd8ae437d2f947c /sal | |
| parent | 5c5b058c83e31e798a63a96d0e16b35927ce519f (diff) | |
update "add OString::getTokenView"
update
commit 3669d4ec43a6aa2d410d8351d631548db45a5302
Date: Fri May 14 15:51:38 2021 +0200
add OString::getTokenView (tdf#42374 related)
with suggested changes from gerrit review
Change-Id: I861d960deaa010740a4aa964e402c4c76a85cbc7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115706
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sal')
| -rw-r--r-- | sal/rtl/string.cxx | 5 | ||||
| -rw-r--r-- | sal/rtl/strtmpl.hxx | 9 | ||||
| -rw-r--r-- | sal/util/sal.map | 3 |
3 files changed, 1 insertions, 16 deletions
diff --git a/sal/rtl/string.cxx b/sal/rtl/string.cxx index 2eb4654caeb4..ec6b95718b3c 100644 --- a/sal/rtl/string.cxx +++ b/sal/rtl/string.cxx @@ -559,11 +559,6 @@ sal_Int32 SAL_CALL rtl_str_toInt32(const char* pStr, sal_Int16 nRadix) SAL_THROW return rtl::str::toInt32(pStr, nRadix); } -sal_Int32 SAL_CALL rtl_str_toInt32_WithLength(const char* pStr, sal_Int16 nRadix, sal_Int32 nStrLength) SAL_THROW_EXTERN_C() -{ - return rtl::str::toInt32_WithLength(pStr, nRadix, nStrLength); -} - sal_Int64 SAL_CALL rtl_str_toInt64(const char* pStr, sal_Int16 nRadix) SAL_THROW_EXTERN_C() { return rtl::str::toInt64(pStr, nRadix); diff --git a/sal/rtl/strtmpl.hxx b/sal/rtl/strtmpl.hxx index a25e8216d154..855516cec1d4 100644 --- a/sal/rtl/strtmpl.hxx +++ b/sal/rtl/strtmpl.hxx @@ -914,15 +914,6 @@ sal_Int32 toInt32 ( const IMPL_RTL_STRCODE* pStr, } template <typename IMPL_RTL_STRCODE> -sal_Int32 toInt32_WithLength ( const IMPL_RTL_STRCODE* pStr, - sal_Int16 nRadix, - sal_Int32 nStrLength ) -{ - assert(pStr); - return toInt_WithLength<sal_Int32, sal_uInt32>(pStr, nRadix, nStrLength); -} - -template <typename IMPL_RTL_STRCODE> sal_Int64 toInt64 ( const IMPL_RTL_STRCODE* pStr, sal_Int16 nRadix ) { diff --git a/sal/util/sal.map b/sal/util/sal.map index 2f74ceb9150e..bc6e90ec488e 100644 --- a/sal/util/sal.map +++ b/sal/util/sal.map @@ -753,12 +753,11 @@ PRIVATE_1.6 { # LibreOffice 6.4 PRIVATE_1.7 { # LibreOffice 7.1 global: rtl_uString_newReplaceAllFromIndexUtf16LUtf16L; -} PRIVATE_1.6; +} PRIVATE_1.5; PRIVATE_1.8 { # LibreOffice 7.2 global: rtl_string_getTokenView; - rtl_str_toInt32_WithLength; } PRIVATE_1.7; PRIVATE_textenc.1 { # LibreOffice 3.6 |