summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEike Rathke <erack@redhat.com>2016-10-11 15:10:46 +0200
committerStephan Bergmann <sbergman@redhat.com>2016-10-25 10:24:07 +0000
commit24cf67d7df78c95011cb7f56c6673b45fffb7bda (patch)
tree7af2542d1e6f990b643f8552c354f7ba6221f803
parentdbf06ea94cc4032c9ffaf646fb749c07f2269f45 (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/29737 Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Reviewed-by: Michael Stahl <mstahl@redhat.com> Reviewed-by: Stephan Bergmann <sbergman@redhat.com> Tested-by: Stephan Bergmann <sbergman@redhat.com>
-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 4ac4112032ef..dac47e581ad2 100644
--- a/sc/source/ui/docshell/externalrefmgr.cxx
+++ b/sc/source/ui/docshell/externalrefmgr.cxx
@@ -1558,8 +1558,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: