diff options
| author | Luboš Luňák <l.lunak@collabora.com> | 2019-09-13 15:13:55 +0200 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@collabora.com> | 2019-09-24 12:58:14 +0200 |
| commit | 2f5f45921b05904a4be1ff633be09c62cb44ff08 (patch) | |
| tree | ddd0cd5ef0349706f935d8360db88343347639a3 /connectivity/source | |
| parent | a7d40f575463467698df76f041e558cb3bea7c85 (diff) | |
support O(U)String::number() for fast string concatenation
When I did the fast string concatenation, I didn't add any support
for number(), which simply returned a O(U)String, and so it did
the extra allocation/deallocation, although that could be avoided.
In order to support this, number() now returns a special temporary
return type, similarly to O(U)StringConcat, which allows delaying
the concatenation the same way.
Also similarly, the change of the return type in some cases requires
explicit cast to the actual string type. Usage of OString::getStr()
is so extensive in the codebase that I actually added it to the helper
class, after that it's only relatively few cases.
Change-Id: Iba6e158010e1e458089698c426803052b6f46031
Reviewed-on: https://gerrit.libreoffice.org/78873
Tested-by: Jenkins
Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
Diffstat (limited to 'connectivity/source')
| -rw-r--r-- | connectivity/source/drivers/file/FStringFunctions.cxx | 2 | ||||
| -rw-r--r-- | connectivity/source/drivers/flat/ETable.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/connectivity/source/drivers/file/FStringFunctions.cxx b/connectivity/source/drivers/file/FStringFunctions.cxx index c8d9977472a6..06e62a1a4cc2 100644 --- a/connectivity/source/drivers/file/FStringFunctions.cxx +++ b/connectivity/source/drivers/file/FStringFunctions.cxx @@ -103,7 +103,7 @@ ORowSetValue OOp_Locate::operate(const std::vector<ORowSetValue>& lhs) const return ORowSetValue(); if ( lhs.size() == 2 ) - return OUString::number(lhs[0].getString().indexOf(lhs[1].getString())+1); + return OUString(OUString::number(lhs[0].getString().indexOf(lhs[1].getString())+1)); else if ( lhs.size() != 3 ) return ORowSetValue(); diff --git a/connectivity/source/drivers/flat/ETable.cxx b/connectivity/source/drivers/flat/ETable.cxx index bc978bcc3599..0e2290dddc91 100644 --- a/connectivity/source/drivers/flat/ETable.cxx +++ b/connectivity/source/drivers/flat/ETable.cxx @@ -681,7 +681,7 @@ bool OFlatTable::fetchRow(OValueRefRow& _rRow, const OSQLColumns & _rCols, bool // #99178# OJ if ( DataType::DECIMAL == nType || DataType::NUMERIC == nType ) - *(_rRow->get())[i] = OUString::number(nVal); + *(_rRow->get())[i] = OUString(OUString::number(nVal)); else *(_rRow->get())[i] = nVal; } break; |