summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEike Rathke <erack@redhat.com>2016-10-11 15:10:46 +0200
committerjan iversen <jani@documentfoundation.org>2016-10-18 06:28:29 +0000
commitf200b58bd47ca25f7e157c50b36fff4cf4162b70 (patch)
tree46d9e2c0fe19cb0864c29f70361060f1643ce1f1
parent74e0e87c06867aeb60c0b9c64a4be8953920751f (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/29696 Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Reviewed-by: Michael Stahl <mstahl@redhat.com> Reviewed-by: jan iversen <jani@documentfoundation.org> Tested-by: jan iversen <jani@documentfoundation.org>
-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 4b3c5213251b..bb174ad38ede 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: