sc/source/core/tool/address.cxx | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
New commits:
commit 99f096384645234c1299aa97bc433bb0447170ca
Author: Michael Meeks <michael.me...@collabora.com>
Date: Sat May 17 22:16:28 2014 +0100
ODS load perf: don't allocate temporary strings un-necessarily
Of the 53bn cycles consumed loading a large test; this saves up to
30bn parsing tab names, plus ~1bn not copying strings to convert to
integers.
Change-Id: Ie768ff8c2159dec62418088e643fe468e4cd5d70
diff --git a/sc/source/core/tool/address.cxx b/sc/source/core/tool/address.cxx
index 7554b92..55a12d2 100644
--- a/sc/source/core/tool/address.cxx
+++ b/sc/source/core/tool/address.cxx
@@ -1015,6 +1015,7 @@ static sal_uInt16 lcl_ScRange_Parse_XL_A1( ScRange& r,
}
/**
+ @param p pointer to null-terminated sal_Unicode string
@param pRange pointer to range where rAddr effectively is *pRange->aEnd,
used in conjunction with pExtInfo to determine the tab span
of a 3D reference.
@@ -1023,7 +1024,7 @@ static sal_uInt16 lcl_ScAddress_Parse_OOo( const
sal_Unicode* p, ScDocument* pDo
ScAddress::ExternalInfo* pExtInfo =
NULL, ScRange* pRange = NULL )
{
sal_uInt16 nRes = 0;
- OUString aDocName; // der pure Dokumentenname
+ OUString aDocName; // the pure Document Name
OUString aTab;
bool bExtDoc = false;
bool bExtDocInherited = false;
@@ -1072,6 +1073,7 @@ static sal_uInt16 lcl_ScAddress_Parse_OOo( const
sal_Unicode* p, ScDocument* pDo
}
else
{
+ OUStringBuffer aTabAcc;
while (*p)
{
if( *p == '.')
@@ -1081,9 +1083,10 @@ static sal_uInt16 lcl_ScAddress_Parse_OOo( const
sal_Unicode* p, ScDocument* pDo
{
p++; break;
}
- aTab += OUString(*p);
+ aTabAcc.append(*p);
p++;
}
+ aTab = aTabAcc.makeStringAndClear();
}
if( *p++ != '.' )
nBits = 0;
@@ -1148,8 +1151,7 @@ static sal_uInt16 lcl_ScAddress_Parse_OOo( const
sal_Unicode* p, ScDocument* pDo
}
else
{
- OUString aTmp( p );
- long n = aTmp.toInt32() - 1;
+ long n = rtl_ustr_toInt32( p, 10 ) - 1;
while (rtl::isAsciiDigit( *p ))
p++;
if( n < 0 || n > MAXROW )
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
