summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Kaganski <mike.kaganski@collabora.com>2023-05-05 20:54:37 +0200
committerMike Kaganski <mike.kaganski@collabora.com>2023-05-06 07:24:52 +0200
commit1db728a70cd2378bfd31c5ea76facd223175f823 (patch)
tree6c42cfc1cdaacb65a1f5147ce9c0e0af3f9a3ee0
parente15e809e331e9fdb7a7ed46937f2ad5f83e27dc5 (diff)
Simplify a bit
No need to use different temporary objects here Change-Id: I1b47cae8b80adea5426c780003bddf68310a0060 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151380 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
-rw-r--r--sal/rtl/strtmpl.hxx12
1 files changed, 1 insertions, 11 deletions
diff --git a/sal/rtl/strtmpl.hxx b/sal/rtl/strtmpl.hxx
index aa126faac1e8..ba182f87817e 100644
--- a/sal/rtl/strtmpl.hxx
+++ b/sal/rtl/strtmpl.hxx
@@ -724,16 +724,6 @@ template <typename T, class S> T toInt(S str, sal_Int16 nRadix)
/* ======================================================================= */
template <class rtl_tString> using Char_T = std::remove_extent_t<decltype(rtl_tString::buffer)>;
-template <typename C> struct STRINGDATA_;
-template <> struct STRINGDATA_<char>
-{
- using T = rtl_String;
-};
-template <> struct STRINGDATA_<sal_Unicode>
-{
- using T = rtl_uString;
-};
-template <typename C> using STRINGDATA = typename STRINGDATA_<C>::T;
template <typename rtl_tString> rtl_tString* Alloc(sal_Int32 nLen)
{
@@ -1756,7 +1746,7 @@ void doubleToString(rtl_tString** pResult, sal_Int32* pResultCapacity, sal_Int32
template <sal_Int32 maxLen, typename C, typename T> sal_Int32 SAL_CALL valueOfFP(C* pStr, T f)
{
assert(pStr);
- STRINGDATA<C>* pResult = nullptr;
+ rtl_String* pResult = nullptr;
doubleToString(&pResult, nullptr, 0, f, rtl_math_StringFormat_G,
maxLen - std::size("-x.E-xxx") + 1, '.', nullptr, 0, true);
const sal_Int32 nLen = pResult->length;