[Libreoffice-commits] core.git: Branch 'libreoffice-5-1-6' - sc/source

[Eike Rathke]

 sc/source/ui/docshell/externalrefmgr.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit f200b58bd47ca25f7e157c50b36fff4cf4162b70
Author: Eike Rathke <erack at redhat.com>
Date:   Tue Oct 11 15:10:46 2016 +0200

    Resolves: tdf#101691 re-intern strings of external formula results
    
    If the external cell referenced is a formula result of type string that
    string needs to be re-interned for the reference cache as well.
    
    Change-Id: Iea3c3d777dede2ad6ba0b084533af964da991ca6
    (cherry picked from commit 351164ea2c70923e47d5f01f3934c73cfc5839a9)
    Reviewed-on: https://gerrit.libreoffice.org/29696
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Reviewed-by: jan iversen <jani at documentfoundation.org>
    Tested-by: jan iversen <jani at documentfoundation.org>

diff --git a/sc/source/ui/docshell/externalrefmgr.cxx b/sc/source/ui/docshell/externalrefmgr.cxx
index 4b3c521..bb174ad 100644
--- a/sc/source/ui/docshell/externalrefmgr.cxx
+++ b/sc/source/ui/docshell/externalrefmgr.cxx
@@ -1571,8 +1571,8 @@ static FormulaToken* convertToToken( ScDocument* pHostDoc, ScDocument* pSrcDoc,
             }
             else
             {
-                svl::SharedString aStr = pFCell->GetString();
-                return new formula::FormulaStringToken(aStr);
+                svl::SharedString aSS = pHostDoc->GetSharedStringPool().intern( pFCell->GetString().getString());
+                return new formula::FormulaStringToken(aSS);
             }
         }
         default: