summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEike Rathke <erack@redhat.com>2016-10-11 15:10:46 +0200
committerAndras Timar <andras.timar@collabora.com>2016-10-23 22:17:09 +0200
commit814d572b6713d6e7c16663b706e6e9e706ebca29 (patch)
tree510aeacfa8a5b7dcac4bb66c3a4b0bcffc7ab189
parent8f38d944c61008cf0a84f400c94aad890f40281e (diff)
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/29695 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> (cherry picked from commit dfcf0bbcc51f50dfa93ac74623a069c3b527527a)
-rw-r--r--sc/source/ui/docshell/externalrefmgr.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/sc/source/ui/docshell/externalrefmgr.cxx b/sc/source/ui/docshell/externalrefmgr.cxx
index 3e1ca8e098cd..dcb5cd7565aa 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: