diff options
author | Eike Rathke <erack@redhat.com> | 2015-12-15 17:44:30 +0100 |
---|---|---|
committer | Eike Rathke <erack@redhat.com> | 2015-12-15 18:25:57 +0100 |
commit | 4ede95a90dc299ab2026285ba8baa95b63454cc2 (patch) | |
tree | 29ada12e769f35b33e7a53ed43003f926155071c /sc | |
parent | c4f6cd2848c60969043aa3d1804e138669a6f14a (diff) |
Resolves: tdf#95440 SharedString are interned per document, re-intern
... if literal strings are copied with formula expression tokens.
Change-Id: I13526907bb6c2c605c6ed9584fa6e3f2b18623b8
(cherry picked from commit dad412e07f805a53ad73ce2e80d187a70c77e8de)
Diffstat (limited to 'sc')
-rw-r--r-- | sc/source/core/data/formulacell.cxx | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sc/source/core/data/formulacell.cxx b/sc/source/core/data/formulacell.cxx index 5c87b52fee04..e574af78c742 100644 --- a/sc/source/core/data/formulacell.cxx +++ b/sc/source/core/data/formulacell.cxx @@ -916,7 +916,11 @@ ScFormulaCell::ScFormulaCell( const ScFormulaCell& rCell, ScDocument& rDoc, cons } if (!pDocument->IsClipOrUndo()) + { + if (&pDocument->GetSharedStringPool() != &rCell.pDocument->GetSharedStringPool()) + pCode->ReinternStrings( pDocument->GetSharedStringPool()); pCode->AdjustReferenceOnCopy( aPos); + } if ( nCloneFlags & SC_CLONECELL_ADJUST3DREL ) pCode->ReadjustRelative3DReferences( rCell.aPos, aPos ); |