[Libreoffice-commits] core.git: sc/source

Eike Rathke erack at redhat.com
Tue Jun 14 17:26:33 UTC 2016


 sc/source/filter/excel/tokstack.cxx |    8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

New commits:
commit 5b562504fa8beb69b3322baae221269d93610d46
Author: Eike Rathke <erack at redhat.com>
Date:   Tue Jun 14 19:21:28 2016 +0200

    intern SharedString
    
    Change-Id: I192b1bb8f2c93002d2c2d22ae8f7c865c75bd9b4

diff --git a/sc/source/filter/excel/tokstack.cxx b/sc/source/filter/excel/tokstack.cxx
index edd2289..f2b87ff 100644
--- a/sc/source/filter/excel/tokstack.cxx
+++ b/sc/source/filter/excel/tokstack.cxx
@@ -473,7 +473,7 @@ bool TokenPool::GetElement( const sal_uInt16 nId )
                 if (n < maExtNames.size())
                 {
                     const ExtName& r = maExtNames[n];
-                    pScToken->AddExternalName(r.mnFileId, svl::SharedString( r.maName));    // string not interned
+                    pScToken->AddExternalName(r.mnFileId, mrStringPool.intern( r.maName));
                 }
                 else
                     bRet = false;
@@ -485,8 +485,7 @@ bool TokenPool::GetElement( const sal_uInt16 nId )
                 if (n < maExtCellRefs.size())
                 {
                     const ExtCellRef& r = maExtCellRefs[n];
-                    pScToken->AddExternalSingleReference(r.mnFileId, svl::SharedString( r.maTabName),
-                            r.maRef); // string not interned
+                    pScToken->AddExternalSingleReference(r.mnFileId, mrStringPool.intern( r.maTabName), r.maRef);
                 }
                 else
                     bRet = false;
@@ -498,8 +497,7 @@ bool TokenPool::GetElement( const sal_uInt16 nId )
                 if (n < maExtAreaRefs.size())
                 {
                     const ExtAreaRef& r = maExtAreaRefs[n];
-                    pScToken->AddExternalDoubleReference(r.mnFileId, svl::SharedString( r.maTabName),
-                            r.maRef);   // string not interned
+                    pScToken->AddExternalDoubleReference(r.mnFileId, mrStringPool.intern( r.maTabName), r.maRef);
                 }
                 else
                     bRet = false;


More information about the Libreoffice-commits mailing list