diff options
| author | Eike Rathke <erack@redhat.com> | 2015-01-09 13:53:27 +0100 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2015-01-10 16:06:34 +0000 |
| commit | b460414bcd1dfd2f260696e306c49c56585c6464 (patch) | |
| tree | 6f68705e4707bef8c0ff45fd71d9ce5b55bf9b24 /sc/source/core/tool | |
| parent | 6c5748de1826f9a712a9a5795b1bc81cb7c63d1d (diff) | |
Resolves: fdo#85617 always store fully encoded external document name
Also OOXML calls these API functions, this is the central place to handle it.
(cherry picked from commit 97a8b3ed5e5bd42e213d3230fa764b0f5d10f0f2)
write externalLink Relationship Target IURI encoded, fdo#85617 related
(cherry picked from commit 7eb5e135422f1a5830a44d129300bc3fafb4627d)
do not drop entire external reference, fdo#85617 related
If there are no matching tab names for a FileId, preserve at least the known
reference parts. In case of 2D references the sheet name is in the token if
for example read from .xlsx, only for 3D references the second sheet name
would be needed. The underlying makeExternalRefStr() and its subroutines
handle the missing tabname elements gracefully.
Still this situation is worth an assertion.
(cherry picked from commit b6339617b1cc3136f9e527acd0746d712cd21643)
Change-Id: I3df065af8e4ef44734f468fd455c3b7c93d7fbc6
Reviewed-on: https://gerrit.libreoffice.org/13835
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Diffstat (limited to 'sc/source/core/tool')
| -rw-r--r-- | sc/source/core/tool/compiler.cxx | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx index 69b6fcc8a2af..40f1de7b7dde 100644 --- a/sc/source/core/tool/compiler.cxx +++ b/sc/source/core/tool/compiler.cxx @@ -4161,8 +4161,7 @@ void ScCompiler::CreateStringFromExternal(OUStringBuffer& rBuffer, FormulaToken* { vector<OUString> aTabNames; pRefMgr->getAllCachedTableNames(nFileId, aTabNames); - if (aTabNames.empty()) - return; + assert(!aTabNames.empty()); // something is seriously wrong, but continue pConv->makeExternalRefStr( rBuffer, GetPos(), nFileId, *pFileName, aTabNames, t->GetString().getString(), |