mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improve parseDateTime tokenization and reduce OUString copies

Browse Source 
Change-Id: If84f455c235176d56d72bdc11d813f1ee1e3122e
Reviewed-on: https://gerrit.libreoffice.org/69241
Tested-by: Jenkins
Reviewed-by: Matteo Casalin <matteo.casalin@yahoo.com>
This commit is contained in:
Matteo Casalin
2019-03-04 16:44:48 +01:00
parent 86e6396acb
commit dfb2feca54
1 changed files with 6 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
forms/source/xforms/xpathlib/xpathlib.cxx
View File

@@ -294,20 +294,13 @@ static bool parseDateTime(const OUString& aString, DateTime& aDateTime)
if (aDateTimeString.getLength() < 19 || aDateTimeString.getLength() > 20) if (aDateTimeString.getLength() < 19 || aDateTimeString.getLength() > 20)
return false; return false;
sal_Int32 nDateLength = 10;
sal_Int32 const nTimeLength = 8;
OUString aDateString = aDateTimeString.copy(0, nDateLength);
OUString aTimeString = aDateTimeString.copy(nDateLength+1, nTimeLength);
sal_Int32 nIndex = 0; sal_Int32 nIndex = 0;
sal_Int32 nYear = aDateString.getToken(0, '-', nIndex).toInt32(); sal_Int32 nYear = aDateTimeString.getToken(0, '-', nIndex).toInt32();
sal_Int32 nMonth = aDateString.getToken(0, '-', nIndex).toInt32(); sal_Int32 nMonth = aDateTimeString.getToken(0, '-', nIndex).toInt32();
sal_Int32 nDay = aDateString.getToken(0, '-', nIndex).toInt32(); sal_Int32 nDay = aDateTimeString.getToken(0, 'T', nIndex).toInt32();
nIndex = 0; sal_Int32 nHour = aDateTimeString.getToken(0, ':', nIndex).toInt32();
sal_Int32 nHour = aTimeString.getToken(0, ':', nIndex).toInt32(); sal_Int32 nMinute = aDateTimeString.getToken(0, ':', nIndex).toInt32();
sal_Int32 nMinute = aTimeString.getToken(0, ':', nIndex).toInt32(); sal_Int32 nSecond = aDateTimeString.getToken(0, 'Z', nIndex).toInt32();
sal_Int32 nSecond = aTimeString.getToken(0, ':', nIndex).toInt32();
Date tmpDate(static_cast<sal_uInt16>(nDay), static_cast<sal_uInt16>(nMonth), static_cast<sal_uInt16>(nYear)); Date tmpDate(static_cast<sal_uInt16>(nDay), static_cast<sal_uInt16>(nMonth), static_cast<sal_uInt16>(nYear));
tools::Time tmpTime(nHour, nMinute, nSecond); tools::Time tmpTime(nHour, nMinute, nSecond);