mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Resolves: tdf#103531 OOXML: write external file ID within quoted sheet names

Browse Source 
Excel expects '[1]Sheet Name' instead of [1]'Sheet Name' and complains if it
encounters the latter.

Fortunately Calc handles both.

Change-Id: If1129e58725b522ca4755c05e313c03fca065f28
This commit is contained in:
Eike Rathke
2016-10-27 12:52:01 +02:00
parent 91114f68e0
commit 02af87fdd7
1 changed files with 33 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
sc/source/core/tool/compiler.cxx
View File

@@ -1470,12 +1470,23 @@ struct ConventionXL_OOX : public ConventionXL_A1
OUStringBuffer& rBuffer, const ScAddress& rPos, sal_uInt16 nFileId, const OUString& /*rFileName*/, OUStringBuffer& rBuffer, const ScAddress& rPos, sal_uInt16 nFileId, const OUString& /*rFileName*/,
const OUString& rTabName, const ScSingleRefData& rRef ) const override const OUString& rTabName, const ScSingleRefData& rRef ) const override
{ {
// [N]'Sheet Name'!$A$1 // '[N]Sheet Name'!$A$1 or [N]SheetName!$A$1
// Where N is a 1-based positive integer number of a file name in OOXML // Where N is a 1-based positive integer number of a file name in OOXML
// xl/externalLinks/externalLinkN.xml // xl/externalLinks/externalLinkN.xml
ConventionXL_OOX::makeExternalDocStr(rBuffer, nFileId); OUString aQuotedTab( rTabName);
ScRangeStringConverter::AppendTableName(rBuffer, rTabName); ScCompiler::CheckTabQuotes( aQuotedTab);
if (!aQuotedTab.isEmpty() && aQuotedTab[0] == '\'')
{
rBuffer.append('\'');
ConventionXL_OOX::makeExternalDocStr( rBuffer, nFileId);
rBuffer.append( aQuotedTab.copy(1));
}
else
{
ConventionXL_OOX::makeExternalDocStr( rBuffer, nFileId);
rBuffer.append( aQuotedTab);
}
rBuffer.append('!'); rBuffer.append('!');
makeSingleCellStr(rBuffer, rRef, rRef.toAbs(rPos)); makeSingleCellStr(rBuffer, rRef, rRef.toAbs(rPos));
@@ -1486,10 +1497,27 @@ struct ConventionXL_OOX : public ConventionXL_A1
const std::vector<OUString>& rTabNames, const OUString& rTabName, const std::vector<OUString>& rTabNames, const OUString& rTabName,
const ScComplexRefData& rRef ) const override const ScComplexRefData& rRef ) const override
{ {
// '[N]Sheet One':'Sheet Two'!A1:B2 or [N]SheetOne!A1:B2
// Actually Excel writes '[N]Sheet One:Sheet Two'!A1:B2 but reads the
// simpler to produce and more logical form with independently quoted
// sheet names as well. The [N] having to be within the quoted sheet
// name is ugly enough..
ScRange aAbsRef = rRef.toAbs(rPos); ScRange aAbsRef = rRef.toAbs(rPos);
ConventionXL_OOX::makeExternalDocStr(rBuffer, nFileId); OUStringBuffer aBuf;
ConventionXL::makeExternalTabNameRange(rBuffer, rTabName, rTabNames, aAbsRef); ConventionXL::makeExternalTabNameRange( aBuf, rTabName, rTabNames, aAbsRef);
if (!aBuf.isEmpty() && aBuf[0] == '\'')
{
rBuffer.append('\'');
ConventionXL_OOX::makeExternalDocStr( rBuffer, nFileId);
rBuffer.append( aBuf.copy(1));
}
else
{
ConventionXL_OOX::makeExternalDocStr( rBuffer, nFileId);
rBuffer.append( aBuf);
}
rBuffer.append('!'); rBuffer.append('!');
makeSingleCellStr(rBuffer, rRef.Ref1, aAbsRef.aStart); makeSingleCellStr(rBuffer, rRef.Ref1, aAbsRef.aStart);