summaryrefslogtreecommitdiff
path: root/sc/inc/compiler.hxx
diff options
context:
space:
mode:
authorEike Rathke <erack@redhat.com>2014-08-05 22:51:01 +0200
committerMarkus Mohrhard <markus.mohrhard@googlemail.com>2014-09-03 14:15:56 -0500
commitd3483180e684ab8272b30676a395a53c9c7c6ad2 (patch)
tree6a58df0f92b3c11318c862ab0e5c82b935c0a86e /sc/inc/compiler.hxx
parentf8fdcfe28859fee61c87e0a6a06f5d8eab82eed4 (diff)
write OOXML externalReferences, externalLinks, fdo#45286
This for the first time writes external references (hopefully) correctly and adds the necessary relationship streams and the externalLink streams with sheetData. At least Excel 2013 loaded the result without complaining, so do we. (cherry picked from commit 8c23a767d926d8d08213f5e2f8e81775c653cbd7) Conflicts: sc/source/filter/excel/xelink.cxx do not write empty externalReferences element, fdo#45286 follow-up OOXML validation spewed - (xl/workbook.xml:2 col:700) cvc-complex-type.2.4.b: The content of element ┬┤externalReferences┬┤ is not complete. One of ┬┤{"http://schemas.openxmlformats.org/spreadsheetml/2006/main":externalReference}┬┤ is expected. (cherry picked from commit 8c51532289db36337c4984baec1bf5a7ca9e40af) really do not write empty externalReferences element, fdo#45286 follow-up Xti records exist also for internal sheet references in BIFF. It is not enough to check for their presence, at least one EXC_SBTYPE_EXTERN must be present as SUPBOOK. (cherry picked from commit e04a4d2d2c18134556bb4e001d497ca7d66c6828) Change-Id: I3d615490a60c5420ae13c0bfc6297642d86a07b9 Reviewed-on: https://gerrit.libreoffice.org/10872 Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Diffstat (limited to 'sc/inc/compiler.hxx')
-rw-r--r--sc/inc/compiler.hxx7
1 files changed, 4 insertions, 3 deletions
diff --git a/sc/inc/compiler.hxx b/sc/inc/compiler.hxx
index 61008358b235..18d788aab3c4 100644
--- a/sc/inc/compiler.hxx
+++ b/sc/inc/compiler.hxx
@@ -256,15 +256,16 @@ public:
const ::com::sun::star::uno::Sequence<
com::sun::star::sheet::ExternalLinkInfo>* pExternalLinks ) const = 0;
- virtual OUString makeExternalNameStr( const OUString& rFile, const OUString& rName ) const = 0;
+ virtual OUString makeExternalNameStr( sal_uInt16 nFileId, const OUString& rFile,
+ const OUString& rName ) const = 0;
virtual void makeExternalRefStr(
- OUStringBuffer& rBuffer, const ScAddress& rPos, const OUString& rFileName,
+ OUStringBuffer& rBuffer, const ScAddress& rPos, sal_uInt16 nFileId, const OUString& rFileName,
const OUString& rTabName, const ScSingleRefData& rRef ) const = 0;
virtual void makeExternalRefStr(
OUStringBuffer& rBuffer, const ScAddress& rPos,
- const OUString& rFileName, const std::vector<OUString>& rTabNames,
+ sal_uInt16 nFileId, const OUString& rFileName, const std::vector<OUString>& rTabNames,
const OUString& rTabName, const ScComplexRefData& rRef ) const = 0;
enum SpecialSymbolType