[ooo-build-commit] patches/dev300
Jan Nieuwenhuizen
janneke at kemper.freedesktop.org
Fri Oct 23 08:10:46 PDT 2009
patches/dev300/apply | 22
patches/dev300/oox-calc-export-export-pivot-content.diff | 10
patches/dev300/oox-calc-export-row-limit.diff | 1200 ++++-----------
patches/dev300/oox-calc-export-sotstorage-init.diff | 10
patches/dev300/xlsx-arabic-export-crash.diff | 6
patches/dev300/xlsx-export-cell-style-max-builtin.diff | 10
patches/dev300/xlsx-export-set-xml-2007-flavour.diff | 10
patches/dev300/xlsx-export-simple-autofilter.diff | 20
patches/dev300/xlsx-export-skip-auto-format.diff | 10
9 files changed, 397 insertions(+), 901 deletions(-)
New commits:
commit 72e72261d6e14000d52270a9571452f42fbef40e
Author: Jan Nieuwenhuizen <janneke at gnu.org>
Date: Fri Oct 23 15:40:21 2009 +0200
Update remaining xlsx calc patches to ooo320.
* Modified patches/dev300/apply
* Modified patches/dev300/oox-calc-export-export-pivot-content.diff
* Modified patches/dev300/oox-calc-export-row-limit.diff
* Modified patches/dev300/oox-calc-export-sotstorage-init.diff
* Modified patches/dev300/xlsx-arabic-export-crash.diff
* Modified patches/dev300/xlsx-export-cell-style-max-builtin.diff
* Modified patches/dev300/xlsx-export-set-xml-2007-flavour.diff
* Modified patches/dev300/xlsx-export-simple-autofilter.diff
* Modified patches/dev300/xlsx-export-skip-auto-format.diff
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 6b3fba1..73cd961 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3099,28 +3099,24 @@ xlsx-snapshot.diff
# (converts the xlsx export to a UNO filter)
xlsx-shared-import-and-export.diff
-# xlsx-arabic-export-crash.diff, n#497419, janneke
+xlsx-arabic-export-crash.diff, n#497419, janneke
xlsx-export-notes-avoid-dereferencing-0-svx.diff, n#497417, janneke
-# FIXME: 2009-08-17: These don't apply either. Can't find file to patch etc. --tml
-# xlsx-export-set-xml-2007-flavour.diff, n#502090, janneke
-# xlsx-export-simple-autofilter.diff, n#497559, janneke
+xlsx-export-set-xml-2007-flavour.diff, n#502090, janneke
+xlsx-export-simple-autofilter.diff, n#497559, janneke
# hack to ignore writerfilter when odf-converter is present
odf-converter-ignore-writerfilter.diff, n#348471, n#502173, jholesov
-# FIXME: 2009-08-17: These don't apply either. Can't find file to patch etc. --tml
-# xlsx-export-skip-auto-format.diff, n#497560, janneke
+xlsx-export-skip-auto-format.diff, n#497560, janneke
# this here depends on oox changes in OOXMLExport
# FIXME: 2009-08-20: Parts do not apply to dev300-m54, some do, but presumably
# best to let thorsten look into it . --tml
# oox-smartart-import.diff, thorsten
-# FIXME: 2009-08-20: Depends on xlsx-filter-as-a-separate-lib.diff
-# which is commented out. --tml
-# xlsx-export-cell-style-max-builtin.diff, n#497563, janneke
+xlsx-export-cell-style-max-builtin.diff, n#497563, janneke
[ OOXML ]
# FIXME: 2009-09-07: Doesn't apply because of patches commented out
@@ -3128,9 +3124,7 @@ odf-converter-ignore-writerfilter.diff, n#348471, n#502173, jholesov
# oox-pptx-export-fix-hidden-slides.diff, n#499131, rodo
[ OOXMLExport ]
-# FIXME: 2009-08-21: Otherwise applies, but patches nonexistent files
-# (created by diffs above that are commented out for now).
-# oox-calc-export-row-limit.diff, n#504623, janneke.
+oox-calc-export-row-limit.diff, n#504623, janneke.
[ Fixes ]
external-apm-header.diff, freuter
@@ -3191,10 +3185,10 @@ oox-pptx-import-fix-text-body-properties-priority.diff, n#403402, rodo
# oox-pptx-export-fix-action-button-presets.diff, n#497570, rodo
# oox-drawingml-fix-shapes-map-crash.diff, rodo
# oox-pptx-export-animations-filter.diff, n#497570, rodo
-# oox-calc-export-export-pivot-content.diff, n#505917, janneke
+oox-calc-export-export-pivot-content.diff, n#505917, janneke
# oox-pptx-export-animations-paragraph-target.diff, n#497570, rodo
# oox-pptx-export-blip-luminance.diff, n#497570, rodo
-# oox-calc-export-sotstorage-init.diff, n#505917, janneke
+oox-calc-export-sotstorage-init.diff, n#505917, janneke
[ CrossWin32Patches ]
# Experimental patches to crosscompile OOo for Win32
diff --git a/patches/dev300/oox-calc-export-export-pivot-content.diff b/patches/dev300/oox-calc-export-export-pivot-content.diff
index 6e36ca6..14a5913 100644
--- a/patches/dev300/oox-calc-export-export-pivot-content.diff
+++ b/patches/dev300/oox-calc-export-export-pivot-content.diff
@@ -3,15 +3,15 @@ From: Jan Nieuwenhuizen <janneke at gnu.org>
Date: Mon, 27 Jul 2009 11:27:36 +0200
Subject: [PATCH] OOXML: Disable pivot cache export. Fixes content-bit of n#505917.
- * Modified sc/source/filter/xlsx/xlsx-xepivot.cxx
+ * Modified sc/source/filter/excel/xepivot.cxx
---
- sc/source/filter/xlsx/xlsx-xepivot.cxx | 6 ++++++
+ sc/source/filter/excel/xepivot.cxx | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
-diff --git sc/source/filter/xlsx/xlsx-xepivot.cxx sc/source/filter/xlsx/xlsx-xepivot.cxx
+diff --git sc/source/filter/excel/xepivot.cxx sc/source/filter/excel/xepivot.cxx
index 57409c1..217e01d 100644
---- sc/source/filter/xlsx/xlsx-xepivot.cxx
-+++ sc/source/filter/xlsx/xlsx-xepivot.cxx
+--- sc/source/filter/excel/xepivot.cxx
++++ sc/source/filter/excel/xepivot.cxx
@@ -740,6 +740,8 @@ void XclExpPivotCache::Save( XclExpStream& rStrm )
void XclExpPivotCache::SaveXml( XclExpXmlStream& rStrm )
{
diff --git a/patches/dev300/oox-calc-export-row-limit.diff b/patches/dev300/oox-calc-export-row-limit.diff
index 6da17fc..2a311a1 100644
--- a/patches/dev300/oox-calc-export-row-limit.diff
+++ b/patches/dev300/oox-calc-export-row-limit.diff
@@ -17,196 +17,136 @@ copied headers.
* Modified sc/source/filter/inc/xladdress.hxx
* Modified sc/source/filter/inc/xlconst.hxx
* Modified sc/source/filter/inc/xlformula.hxx
- * Added sc/source/filter/inc/xlsx/xetable.hxx
- * Added sc/source/filter/inc/xlsx/xladdress.hxx
- * Added sc/source/filter/inc/xlsx/xlconst.hxx
- * Added sc/source/filter/inc/xlsx/xlformula.hxx
- * Modified sc/source/filter/xlsx/XclExpChangeTrack.hxx
- * Modified sc/source/filter/xlsx/excrecds.hxx
+ * Modified sc/source/filter/inc/xetable.hxx
+ * Modified sc/source/filter/inc/xladdress.hxx
+ * Modified sc/source/filter/inc/xlconst.hxx
+ * Modified sc/source/filter/inc/xlformula.hxx
+ * Modified sc/source/filter/inc/XclExpChangeTrack.hxx
+ * Modified sc/source/filter/inc/excrecds.hxx
* Modified sc/source/filter/xlsx/makefile.mk
- * Modified sc/source/filter/xlsx/xestream.hxx
- * Modified sc/source/filter/xlsx/xlsx-colrowst.cxx
- * Modified sc/source/filter/xlsx/xlsx-excdoc.cxx
- * Modified sc/source/filter/xlsx/xlsx-excel.cxx
- * Modified sc/source/filter/xlsx/xlsx-excform.cxx
- * Modified sc/source/filter/xlsx/xlsx-excform8.cxx
- * Modified sc/source/filter/xlsx/xlsx-excimp8.cxx
- * Modified sc/source/filter/xlsx/xlsx-exctools.cxx
- * Modified sc/source/filter/xlsx/xlsx-expop2.cxx
- * Modified sc/source/filter/xlsx/xlsx-impop.cxx
- * Modified sc/source/filter/xlsx/xlsx-namebuff.cxx
- * Modified sc/source/filter/xlsx/xlsx-read.cxx
- * Modified sc/source/filter/xlsx/xlsx-xcl97esc.cxx
- * Modified sc/source/filter/xlsx/xlsx-xechart.cxx
- * Modified sc/source/filter/xlsx/xlsx-xecontent.cxx
- * Modified sc/source/filter/xlsx/xlsx-xeescher.cxx
- * Modified sc/source/filter/xlsx/xlsx-xeformula.cxx
- * Modified sc/source/filter/xlsx/xlsx-xehelper.cxx
- * Modified sc/source/filter/xlsx/xlsx-xelink.cxx
- * Modified sc/source/filter/xlsx/xlsx-xename.cxx
- * Modified sc/source/filter/xlsx/xlsx-xepage.cxx
- * Modified sc/source/filter/xlsx/xlsx-xepivot.cxx
- * Modified sc/source/filter/xlsx/xlsx-xerecord.cxx
- * Modified sc/source/filter/xlsx/xlsx-xeroot.cxx
- * Modified sc/source/filter/xlsx/xlsx-xestream.cxx
- * Modified sc/source/filter/xlsx/xlsx-xetable.cxx
- * Modified sc/source/filter/xlsx/xlsx-xeview.cxx
- * Modified sc/source/filter/xlsx/xlsx-xichart.cxx
- * Modified sc/source/filter/xlsx/xlsx-xicontent.cxx
- * Modified sc/source/filter/xlsx/xlsx-xiescher.cxx
- * Modified sc/source/filter/xlsx/xlsx-xiformula.cxx
- * Modified sc/source/filter/xlsx/xlsx-xihelper.cxx
- * Modified sc/source/filter/xlsx/xlsx-xilink.cxx
- * Modified sc/source/filter/xlsx/xlsx-xiname.cxx
- * Modified sc/source/filter/xlsx/xlsx-xipage.cxx
- * Modified sc/source/filter/xlsx/xlsx-xipivot.cxx
- * Modified sc/source/filter/xlsx/xlsx-xiroot.cxx
- * Modified sc/source/filter/xlsx/xlsx-xistream.cxx
- * Modified sc/source/filter/xlsx/xlsx-xistring.cxx
- * Modified sc/source/filter/xlsx/xlsx-xistyle.cxx
- * Modified sc/source/filter/xlsx/xlsx-xiview.cxx
- * Modified sc/source/filter/xlsx/xlsx-xladdress.cxx
- * Modified sc/source/filter/xlsx/xlsx-xlchart.cxx
- * Modified sc/source/filter/xlsx/xlsx-xlescher.cxx
- * Modified sc/source/filter/xlsx/xlsx-xlformula.cxx
- * Modified sc/source/filter/xlsx/xlsx-xlpage.cxx
- * Modified sc/source/filter/xlsx/xlsx-xlpivot.cxx
- * Modified sc/source/filter/xlsx/xlsx-xlroot.cxx
- * Modified sc/source/filter/xlsx/xlsx-xlstyle.cxx
- * Modified sc/source/filter/xlsx/xlsx-xlview.cxx
+ * Modified sc/source/filter/inc/xestream.hxx
+ * Modified sc/source/filter/excel/colrowst.cxx
+ * Modified sc/source/filter/excel/excdoc.cxx
+ * Modified sc/source/filter/excel/excel.cxx
+ * Modified sc/source/filter/excel/excform.cxx
+ * Modified sc/source/filter/excel/excform8.cxx
+ * Modified sc/source/filter/excel/excimp8.cxx
+ * Modified sc/source/filter/excel/exctools.cxx
+ * Modified sc/source/filter/excel/expop2.cxx
+ * Modified sc/source/filter/excel/impop.cxx
+ * Modified sc/source/filter/excel/namebuff.cxx
+ * Modified sc/source/filter/excel/read.cxx
+ * Modified sc/source/filter/xcl97/xcl97esc.cxx
+ * Modified sc/source/filter/excel/xechart.cxx
+ * Modified sc/source/filter/excel/xecontent.cxx
+ * Modified sc/source/filter/excel/xeescher.cxx
+ * Modified sc/source/filter/excel/xeformula.cxx
+ * Modified sc/source/filter/excel/xehelper.cxx
+ * Modified sc/source/filter/excel/xelink.cxx
+ * Modified sc/source/filter/excel/xename.cxx
+ * Modified sc/source/filter/excel/xepage.cxx
+ * Modified sc/source/filter/excel/xepivot.cxx
+ * Modified sc/source/filter/excel/xerecord.cxx
+ * Modified sc/source/filter/excel/xeroot.cxx
+ * Modified sc/source/filter/excel/xestream.cxx
+ * Modified sc/source/filter/excel/xetable.cxx
+ * Modified sc/source/filter/excel/xeview.cxx
+ * Modified sc/source/filter/excel/xichart.cxx
+ * Modified sc/source/filter/excel/xicontent.cxx
+ * Modified sc/source/filter/excel/xiescher.cxx
+ * Modified sc/source/filter/excel/xiformula.cxx
+ * Modified sc/source/filter/excel/xihelper.cxx
+ * Modified sc/source/filter/excel/xilink.cxx
+ * Modified sc/source/filter/excel/xiname.cxx
+ * Modified sc/source/filter/excel/xipage.cxx
+ * Modified sc/source/filter/excel/xipivot.cxx
+ * Modified sc/source/filter/excel/xiroot.cxx
+ * Modified sc/source/filter/excel/xistream.cxx
+ * Modified sc/source/filter/excel/xistring.cxx
+ * Modified sc/source/filter/excel/xistyle.cxx
+ * Modified sc/source/filter/excel/xiview.cxx
+ * Modified sc/source/filter/excel/xladdress.cxx
+ * Modified sc/source/filter/excel/xlchart.cxx
+ * Modified sc/source/filter/excel/xlescher.cxx
+ * Modified sc/source/filter/excel/xlformula.cxx
+ * Modified sc/source/filter/excel/xlpage.cxx
+ * Modified sc/source/filter/excel/xlpivot.cxx
+ * Modified sc/source/filter/excel/xlroot.cxx
+ * Modified sc/source/filter/excel/xlstyle.cxx
+ * Modified sc/source/filter/excel/xlview.cxx
---
sc/source/filter/inc/xetable.hxx | 4 +
sc/source/filter/inc/xladdress.hxx | 4 +
sc/source/filter/inc/xlconst.hxx | 4 +
sc/source/filter/inc/xlformula.hxx | 4 +
- sc/source/filter/inc/xlsx/xetable.hxx | 1092 +++++++++++++++++++++++++++
- sc/source/filter/inc/xlsx/xladdress.hxx | 200 +++++
- sc/source/filter/inc/xlsx/xlconst.hxx | 236 ++++++
- sc/source/filter/inc/xlsx/xlformula.hxx | 477 ++++++++++++
- sc/source/filter/xlsx/XclExpChangeTrack.hxx | 6 +-
- sc/source/filter/xlsx/excrecds.hxx | 3 +
+ sc/source/filter/inc/inc/xetable.hxx | 1092 +++++++++++++++++++++++++++
+ sc/source/filter/inc/inc/xladdress.hxx | 200 +++++
+ sc/source/filter/inc/inc/xlconst.hxx | 236 ++++++
+ sc/source/filter/inc/inc/xlformula.hxx | 477 ++++++++++++
+ sc/source/filter/inc/XclExpChangeTrack.hxx | 6 +-
+ sc/source/filter/inc/excrecds.hxx | 3 +
sc/source/filter/xlsx/makefile.mk | 2 +
- sc/source/filter/xlsx/xestream.hxx | 3 +
- sc/source/filter/xlsx/xlsx-colrowst.cxx | 3 +-
- sc/source/filter/xlsx/xlsx-excdoc.cxx | 4 +
- sc/source/filter/xlsx/xlsx-excel.cxx | 3 +
- sc/source/filter/xlsx/xlsx-excform.cxx | 3 +
- sc/source/filter/xlsx/xlsx-excform8.cxx | 3 +
- sc/source/filter/xlsx/xlsx-excimp8.cxx | 3 +
- sc/source/filter/xlsx/xlsx-exctools.cxx | 2 +-
- sc/source/filter/xlsx/xlsx-expop2.cxx | 3 +
- sc/source/filter/xlsx/xlsx-impop.cxx | 3 +
- sc/source/filter/xlsx/xlsx-namebuff.cxx | 3 +
- sc/source/filter/xlsx/xlsx-read.cxx | 3 +
- sc/source/filter/xlsx/xlsx-xcl97esc.cxx | 3 +
- sc/source/filter/xlsx/xlsx-xechart.cxx | 3 +
- sc/source/filter/xlsx/xlsx-xecontent.cxx | 5 +-
- sc/source/filter/xlsx/xlsx-xeescher.cxx | 12 +-
- sc/source/filter/xlsx/xlsx-xeformula.cxx | 28 +-
- sc/source/filter/xlsx/xlsx-xehelper.cxx | 5 +-
- sc/source/filter/xlsx/xlsx-xelink.cxx | 3 +
- sc/source/filter/xlsx/xlsx-xename.cxx | 3 +
- sc/source/filter/xlsx/xlsx-xepage.cxx | 5 +-
- sc/source/filter/xlsx/xlsx-xepivot.cxx | 6 +-
- sc/source/filter/xlsx/xlsx-xerecord.cxx | 3 +
- sc/source/filter/xlsx/xlsx-xeroot.cxx | 3 +
- sc/source/filter/xlsx/xlsx-xestream.cxx | 4 +-
- sc/source/filter/xlsx/xlsx-xetable.cxx | 36 +-
- sc/source/filter/xlsx/xlsx-xeview.cxx | 3 +
- sc/source/filter/xlsx/xlsx-xichart.cxx | 3 +
- sc/source/filter/xlsx/xlsx-xicontent.cxx | 3 +
- sc/source/filter/xlsx/xlsx-xiescher.cxx | 3 +
- sc/source/filter/xlsx/xlsx-xiformula.cxx | 2 +
- sc/source/filter/xlsx/xlsx-xihelper.cxx | 5 +-
- sc/source/filter/xlsx/xlsx-xilink.cxx | 3 +
- sc/source/filter/xlsx/xlsx-xiname.cxx | 3 +
- sc/source/filter/xlsx/xlsx-xipage.cxx | 3 +
- sc/source/filter/xlsx/xlsx-xipivot.cxx | 3 +
- sc/source/filter/xlsx/xlsx-xiroot.cxx | 3 +
- sc/source/filter/xlsx/xlsx-xistream.cxx | 3 +
- sc/source/filter/xlsx/xlsx-xistring.cxx | 3 +
- sc/source/filter/xlsx/xlsx-xistyle.cxx | 3 +
- sc/source/filter/xlsx/xlsx-xiview.cxx | 3 +
- sc/source/filter/xlsx/xlsx-xladdress.cxx | 2 +-
- sc/source/filter/xlsx/xlsx-xlchart.cxx | 3 +
- sc/source/filter/xlsx/xlsx-xlescher.cxx | 2 +-
- sc/source/filter/xlsx/xlsx-xlformula.cxx | 2 +-
- sc/source/filter/xlsx/xlsx-xlpage.cxx | 1 +
- sc/source/filter/xlsx/xlsx-xlpivot.cxx | 3 +
- sc/source/filter/xlsx/xlsx-xlroot.cxx | 1 +
- sc/source/filter/xlsx/xlsx-xlstyle.cxx | 1 +
- sc/source/filter/xlsx/xlsx-xlview.cxx | 1 +
+ sc/source/filter/inc/xestream.hxx | 3 +
+ sc/source/filter/excel/colrowst.cxx | 3 +-
+ sc/source/filter/excel/excdoc.cxx | 4 +
+ sc/source/filter/excel/excel.cxx | 3 +
+ sc/source/filter/excel/excform.cxx | 3 +
+ sc/source/filter/excel/excform8.cxx | 3 +
+ sc/source/filter/excel/excimp8.cxx | 3 +
+ sc/source/filter/excel/exctools.cxx | 2 +-
+ sc/source/filter/excel/expop2.cxx | 3 +
+ sc/source/filter/excel/impop.cxx | 3 +
+ sc/source/filter/excel/namebuff.cxx | 3 +
+ sc/source/filter/excel/read.cxx | 3 +
+ sc/source/filter/xcl97/xcl97esc.cxx | 3 +
+ sc/source/filter/excel/xechart.cxx | 3 +
+ sc/source/filter/excel/xecontent.cxx | 5 +-
+ sc/source/filter/excel/xeescher.cxx | 12 +-
+ sc/source/filter/excel/xeformula.cxx | 28 +-
+ sc/source/filter/excel/xehelper.cxx | 5 +-
+ sc/source/filter/excel/xelink.cxx | 3 +
+ sc/source/filter/excel/xename.cxx | 3 +
+ sc/source/filter/excel/xepage.cxx | 5 +-
+ sc/source/filter/excel/xepivot.cxx | 6 +-
+ sc/source/filter/excel/xerecord.cxx | 3 +
+ sc/source/filter/excel/xeroot.cxx | 3 +
+ sc/source/filter/excel/xestream.cxx | 4 +-
+ sc/source/filter/excel/xetable.cxx | 36 +-
+ sc/source/filter/excel/xeview.cxx | 3 +
+ sc/source/filter/excel/xichart.cxx | 3 +
+ sc/source/filter/excel/xicontent.cxx | 3 +
+ sc/source/filter/excel/xiescher.cxx | 3 +
+ sc/source/filter/excel/xiformula.cxx | 2 +
+ sc/source/filter/excel/xihelper.cxx | 5 +-
+ sc/source/filter/excel/xilink.cxx | 3 +
+ sc/source/filter/excel/xiname.cxx | 3 +
+ sc/source/filter/excel/xipage.cxx | 3 +
+ sc/source/filter/excel/xipivot.cxx | 3 +
+ sc/source/filter/excel/xiroot.cxx | 3 +
+ sc/source/filter/excel/xistream.cxx | 3 +
+ sc/source/filter/excel/xistring.cxx | 3 +
+ sc/source/filter/excel/xistyle.cxx | 3 +
+ sc/source/filter/excel/xiview.cxx | 3 +
+ sc/source/filter/excel/xladdress.cxx | 2 +-
+ sc/source/filter/excel/xlchart.cxx | 3 +
+ sc/source/filter/excel/xlescher.cxx | 2 +-
+ sc/source/filter/excel/xlformula.cxx | 2 +-
+ sc/source/filter/excel/xlpage.cxx | 1 +
+ sc/source/filter/excel/xlpivot.cxx | 3 +
+ sc/source/filter/excel/xlroot.cxx | 1 +
+ sc/source/filter/excel/xlstyle.cxx | 1 +
+ sc/source/filter/excel/xlview.cxx | 1 +
61 files changed, 2199 insertions(+), 50 deletions(-)
- create mode 100644 sc/source/filter/inc/xlsx/xetable.hxx
- create mode 100644 sc/source/filter/inc/xlsx/xladdress.hxx
- create mode 100644 sc/source/filter/inc/xlsx/xlconst.hxx
- create mode 100644 sc/source/filter/inc/xlsx/xlformula.hxx
+ create mode 100644 sc/source/filter/inc/inc/xetable.hxx
+ create mode 100644 sc/source/filter/inc/inc/xladdress.hxx
+ create mode 100644 sc/source/filter/inc/inc/xlconst.hxx
+ create mode 100644 sc/source/filter/inc/inc/xlformula.hxx
-diff --git sc/source/filter/inc/xetable.hxx sc/source/filter/inc/xetable.hxx
-index 3da59d2..3f5b0ab 100644
---- sc/source/filter/inc/xetable.hxx
-+++ sc/source/filter/inc/xetable.hxx
-@@ -31,6 +31,10 @@
- #ifndef SC_XETABLE_HXX
- #define SC_XETABLE_HXX
-
-+#ifdef XLSX_COPY
-+#error XLSX_COPY
-+#endif
-+
- #include "xltable.hxx"
-
- #include <deque>
-diff --git sc/source/filter/inc/xladdress.hxx sc/source/filter/inc/xladdress.hxx
-index c4aff69..05f033a 100644
---- sc/source/filter/inc/xladdress.hxx
-+++ sc/source/filter/inc/xladdress.hxx
-@@ -31,6 +31,10 @@
- #ifndef SC_XLADDRESS_HXX
- #define SC_XLADDRESS_HXX
-
-+#ifdef XLSX_COPY
-+#error XLSX_COPY
-+#endif
-+
- #include <vector>
- #include "address.hxx"
-
-diff --git sc/source/filter/inc/xlconst.hxx sc/source/filter/inc/xlconst.hxx
-index 5cca23d..ff9bc8d 100644
---- sc/source/filter/inc/xlconst.hxx
-+++ sc/source/filter/inc/xlconst.hxx
-@@ -31,6 +31,10 @@
- #ifndef SC_XLCONST_HXX
- #define SC_XLCONST_HXX
-
-+#ifdef XLSX_COPY
-+#error XLSX_COPY
-+#endif
-+
- #include "address.hxx"
-
- // Common =====================================================================
-diff --git sc/source/filter/inc/xlformula.hxx sc/source/filter/inc/xlformula.hxx
-index f0f54e4..c145f70 100644
---- sc/source/filter/inc/xlformula.hxx
-+++ sc/source/filter/inc/xlformula.hxx
-@@ -31,6 +31,10 @@
- #ifndef SC_XLFORMULA_HXX
- #define SC_XLFORMULA_HXX
-
-+#ifdef XLSX_COPY
-+#error XLSX_COPY
-+#endif
-+
- #include <map>
- #include "address.hxx"
- #include "formula/opcode.hxx"
-diff --git sc/source/filter/inc/xlsx/xetable.hxx sc/source/filter/inc/xlsx/xetable.hxx
+diff --git sc/source/filter/inc/inc/xetable.hxx sc/source/filter/inc/inc/xetable.hxx
new file mode 100644
index 0000000..7a30a2f
--- /dev/null
-+++ sc/source/filter/inc/xlsx/xetable.hxx
++++ sc/source/filter/inc/inc/xetable.hxx
@@ -0,0 +1,1092 @@
+/*************************************************************************
+ *
@@ -1300,11 +1240,11 @@ index 0000000..7a30a2f
+
+#endif
+
-diff --git sc/source/filter/inc/xlsx/xladdress.hxx sc/source/filter/inc/xlsx/xladdress.hxx
+diff --git sc/source/filter/inc/inc/xladdress.hxx sc/source/filter/inc/inc/xladdress.hxx
new file mode 100644
index 0000000..79ccc28
--- /dev/null
-+++ sc/source/filter/inc/xlsx/xladdress.hxx
++++ sc/source/filter/inc/inc/xladdress.hxx
@@ -0,0 +1,200 @@
+/*************************************************************************
+ *
@@ -1506,11 +1446,11 @@ index 0000000..79ccc28
+
+#endif
+
-diff --git sc/source/filter/inc/xlsx/xlconst.hxx sc/source/filter/inc/xlsx/xlconst.hxx
+diff --git sc/source/filter/inc/inc/xlconst.hxx sc/source/filter/inc/inc/xlconst.hxx
new file mode 100644
index 0000000..bec17d3
--- /dev/null
-+++ sc/source/filter/inc/xlsx/xlconst.hxx
++++ sc/source/filter/inc/inc/xlconst.hxx
@@ -0,0 +1,236 @@
+/*************************************************************************
+ *
@@ -1748,11 +1688,11 @@ index 0000000..bec17d3
+
+#endif
+
-diff --git sc/source/filter/inc/xlsx/xlformula.hxx sc/source/filter/inc/xlsx/xlformula.hxx
+diff --git sc/source/filter/inc/inc/xlformula.hxx sc/source/filter/inc/inc/xlformula.hxx
new file mode 100644
index 0000000..d8ffa5a
--- /dev/null
-+++ sc/source/filter/inc/xlsx/xlformula.hxx
++++ sc/source/filter/inc/inc/xlformula.hxx
@@ -0,0 +1,477 @@
+/*************************************************************************
+ *
@@ -2231,10 +2171,10 @@ index 0000000..d8ffa5a
+
+#endif
+
-diff --git sc/source/filter/xlsx/XclExpChangeTrack.hxx sc/source/filter/xlsx/XclExpChangeTrack.hxx
+diff --git sc/source/filter/inc/XclExpChangeTrack.hxx sc/source/filter/inc/XclExpChangeTrack.hxx
index 59ec5db..0c6a0d7 100644
---- sc/source/filter/xlsx/XclExpChangeTrack.hxx
-+++ sc/source/filter/xlsx/XclExpChangeTrack.hxx
+--- sc/source/filter/inc/XclExpChangeTrack.hxx
++++ sc/source/filter/inc/XclExpChangeTrack.hxx
@@ -426,14 +426,14 @@ public:
inline void XclExpChTrAction::Write2DAddress( XclExpStream& rStrm, const ScAddress& rAddress ) const
@@ -2253,136 +2193,10 @@ index 59ec5db..0c6a0d7 100644
<< (sal_uInt16) rRange.aStart.Col()
<< (sal_uInt16) rRange.aEnd.Col();
}
-diff --git sc/source/filter/xlsx/excrecds.hxx sc/source/filter/xlsx/excrecds.hxx
-index 57744dc..2752561 100644
---- sc/source/filter/xlsx/excrecds.hxx
-+++ sc/source/filter/xlsx/excrecds.hxx
-@@ -39,6 +39,9 @@
-
-
- #include <vector>
-+#include "xlsx/xladdress.hxx"
-+#include "xlsx/xlconst.hxx"
-+#include "xlsx/xlformula.hxx"
- #include "olinetab.hxx"
- #include "filter.hxx"
- #include "rangelst.hxx"
-diff --git sc/source/filter/xlsx/makefile.mk sc/source/filter/xlsx/makefile.mk
-index 63b9235..b31b352 100644
---- sc/source/filter/xlsx/makefile.mk
-+++ sc/source/filter/xlsx/makefile.mk
-@@ -46,6 +46,8 @@ PROJECTPCHSOURCE=..\pch\filt_pch
- .INCLUDE : settings.mk
- .INCLUDE : sc.mk
-
-+CFLAGS+=-DXLSX_COPY
-+
- # --- Files --------------------------------------------------------
-
- SLOFILES = \
-diff --git sc/source/filter/xlsx/xestream.hxx sc/source/filter/xlsx/xestream.hxx
-index e18fe72..3863e8b 100644
---- sc/source/filter/xlsx/xestream.hxx
-+++ sc/source/filter/xlsx/xestream.hxx
-@@ -40,6 +40,9 @@
- #include <oox/core/xmlfilterbase.hxx>
- #include <sax/fshelper.hxx>
-
-+#include "xlsx/xladdress.hxx"
-+#include "xlsx/xlconst.hxx"
-+#include "xlsx/xlformula.hxx"
- #include "xlstream.hxx"
- #include "xestring.hxx"
-
-diff --git sc/source/filter/xlsx/xlsx-colrowst.cxx sc/source/filter/xlsx/xlsx-colrowst.cxx
-index 9c686fe..996303a 100644
---- sc/source/filter/xlsx/xlsx-colrowst.cxx
-+++ sc/source/filter/xlsx/xlsx-colrowst.cxx
-@@ -31,7 +31,8 @@
- // MARKER(update_precomp.py): autogen include statement, do not remove
- #include "precompiled_sc.hxx"
-
--
-+#include "xlsx/xladdress.hxx"
-+#include "xlsx/xlconst.hxx"
-
- #include "colrowst.hxx"
-
-diff --git sc/source/filter/xlsx/xlsx-excdoc.cxx sc/source/filter/xlsx/xlsx-excdoc.cxx
-index 0e213f6..29ab499 100644
---- sc/source/filter/xlsx/xlsx-excdoc.cxx
-+++ sc/source/filter/xlsx/xlsx-excdoc.cxx
-@@ -31,6 +31,10 @@
- // MARKER(update_precomp.py): autogen include statement, do not remove
- #include "precompiled_sc.hxx"
-
-+#include "xlsx/xladdress.hxx"
-+#include "xlsx/xlconst.hxx"
-+#include "xlsx/xlformula.hxx"
-+#include "xlsx/xetable.hxx"
-
- //------------------------------------------------------------------------
-
-diff --git sc/source/filter/xlsx/xlsx-excel.cxx sc/source/filter/xlsx/xlsx-excel.cxx
-index d19958d..cbc4a16 100644
---- sc/source/filter/xlsx/xlsx-excel.cxx
-+++ sc/source/filter/xlsx/xlsx-excel.cxx
-@@ -31,6 +31,9 @@
- // MARKER(update_precomp.py): autogen include statement, do not remove
- #include "precompiled_sc.hxx"
-
-+#include "xlsx/xladdress.hxx"
-+#include "xlsx/xlconst.hxx"
-+#include "xlsx/xlformula.hxx"
- #include <sfx2/docfile.hxx>
- #include <sfx2/objsh.hxx>
- #include <sfx2/app.hxx>
-diff --git sc/source/filter/xlsx/xlsx-excform.cxx sc/source/filter/xlsx/xlsx-excform.cxx
-index f30eb80..b6cf22c 100644
---- sc/source/filter/xlsx/xlsx-excform.cxx
-+++ sc/source/filter/xlsx/xlsx-excform.cxx
-@@ -30,6 +30,9 @@
-
- // MARKER(update_precomp.py): autogen include statement, do not remove
- #include "precompiled_sc.hxx"
-+#include "xlsx/xladdress.hxx"
-+#include "xlsx/xlconst.hxx"
-+#include "xlsx/xlformula.hxx"
- #include "excform.hxx"
- #include <osl/endian.h>
-
-diff --git sc/source/filter/xlsx/xlsx-excform8.cxx sc/source/filter/xlsx/xlsx-excform8.cxx
-index c6340a1..24f50b1 100644
---- sc/source/filter/xlsx/xlsx-excform8.cxx
-+++ sc/source/filter/xlsx/xlsx-excform8.cxx
-@@ -30,6 +30,9 @@
-
- // MARKER(update_precomp.py): autogen include statement, do not remove
- #include "precompiled_sc.hxx"
-+#include "xlsx/xladdress.hxx"
-+#include "xlsx/xlconst.hxx"
-+#include "xlsx/xlformula.hxx"
- #include "excform.hxx"
-
- #include "cell.hxx"
-diff --git sc/source/filter/xlsx/xlsx-excimp8.cxx sc/source/filter/xlsx/xlsx-excimp8.cxx
-index 60c2f6d..2995571 100644
---- sc/source/filter/xlsx/xlsx-excimp8.cxx
-+++ sc/source/filter/xlsx/xlsx-excimp8.cxx
-@@ -31,6 +31,9 @@
- // MARKER(update_precomp.py): autogen include statement, do not remove
- #include "precompiled_sc.hxx"
-
-+#include "xlsx/xladdress.hxx"
-+#include "xlsx/xlconst.hxx"
-+#include "xlsx/xlformula.hxx"
- #include "excimp8.hxx"
-
-
-diff --git sc/source/filter/xlsx/xlsx-exctools.cxx sc/source/filter/xlsx/xlsx-exctools.cxx
+diff --git sc/source/filter/excel/exctools.cxx sc/source/filter/excel/exctools.cxx
index 4243edf..365b31a 100644
---- sc/source/filter/xlsx/xlsx-exctools.cxx
-+++ sc/source/filter/xlsx/xlsx-exctools.cxx
+--- sc/source/filter/excel/exctools.cxx
++++ sc/source/filter/excel/exctools.cxx
@@ -390,7 +390,7 @@ void ExcScenario::Apply( const XclImpRoot& rRoot, const BOOL bLast )
while( p )
{
@@ -2392,104 +2206,10 @@ index 4243edf..365b31a 100644
String aVal = p->GetValue();
r.ApplyFlagsTab( nCol, nRow, nCol, nRow, nNewTab, SC_MF_SCENARIO );
-diff --git sc/source/filter/xlsx/xlsx-expop2.cxx sc/source/filter/xlsx/xlsx-expop2.cxx
-index b4763c4..3561bf7 100644
---- sc/source/filter/xlsx/xlsx-expop2.cxx
-+++ sc/source/filter/xlsx/xlsx-expop2.cxx
-@@ -31,6 +31,9 @@
- // MARKER(update_precomp.py): autogen include statement, do not remove
- #include "precompiled_sc.hxx"
-
-+#include "xlsx/xladdress.hxx"
-+#include "xlsx/xlconst.hxx"
-+#include "xlsx/xlformula.hxx"
-
-
- //------------------------------------------------------------------------
-diff --git sc/source/filter/xlsx/xlsx-impop.cxx sc/source/filter/xlsx/xlsx-impop.cxx
-index 666ce76..35fb4fc 100644
---- sc/source/filter/xlsx/xlsx-impop.cxx
-+++ sc/source/filter/xlsx/xlsx-impop.cxx
-@@ -30,6 +30,9 @@
-
- // MARKER(update_precomp.py): autogen include statement, do not remove
- #include "precompiled_sc.hxx"
-+#include "xlsx/xladdress.hxx"
-+#include "xlsx/xlconst.hxx"
-+#include "xlsx/xlformula.hxx"
-
- #include "imp_op.hxx"
-
-diff --git sc/source/filter/xlsx/xlsx-namebuff.cxx sc/source/filter/xlsx/xlsx-namebuff.cxx
-index 0c42767..eb4e73a 100644
---- sc/source/filter/xlsx/xlsx-namebuff.cxx
-+++ sc/source/filter/xlsx/xlsx-namebuff.cxx
-@@ -30,6 +30,9 @@
-
- // MARKER(update_precomp.py): autogen include statement, do not remove
- #include "precompiled_sc.hxx"
-+#include "xlsx/xladdress.hxx"
-+#include "xlsx/xlconst.hxx"
-+#include "xlsx/xlformula.hxx"
-
- #include "namebuff.hxx"
-
-diff --git sc/source/filter/xlsx/xlsx-read.cxx sc/source/filter/xlsx/xlsx-read.cxx
-index 6c1e50a..86f108c 100644
---- sc/source/filter/xlsx/xlsx-read.cxx
-+++ sc/source/filter/xlsx/xlsx-read.cxx
-@@ -30,6 +30,9 @@
-
- // MARKER(update_precomp.py): autogen include statement, do not remove
- #include "precompiled_sc.hxx"
-+#include "xlsx/xladdress.hxx"
-+#include "xlsx/xlconst.hxx"
-+#include "xlsx/xlformula.hxx"
-
-
-
-diff --git sc/source/filter/xlsx/xlsx-xcl97esc.cxx sc/source/filter/xlsx/xlsx-xcl97esc.cxx
-index e4f2344..828a7a1 100644
---- sc/source/filter/xlsx/xlsx-xcl97esc.cxx
-+++ sc/source/filter/xlsx/xlsx-xcl97esc.cxx
-@@ -30,6 +30,9 @@
-
- // MARKER(update_precomp.py): autogen include statement, do not remove
- #include "precompiled_sc.hxx"
-+#include "xlsx/xladdress.hxx"
-+#include "xlsx/xlconst.hxx"
-+#include "xlsx/xlformula.hxx"
-
- #include <com/sun/star/awt/XControlModel.hpp>
- #include <com/sun/star/embed/XClassifiedObject.hpp>
-diff --git sc/source/filter/xlsx/xlsx-xechart.cxx sc/source/filter/xlsx/xlsx-xechart.cxx
-index cf3f218..5198737 100644
---- sc/source/filter/xlsx/xlsx-xechart.cxx
-+++ sc/source/filter/xlsx/xlsx-xechart.cxx
-@@ -31,6 +31,9 @@
- // MARKER(update_precomp.py): autogen include statement, do not remove
- #include "precompiled_sc.hxx"
-
-+#include "xlsx/xladdress.hxx"
-+#include "xlsx/xlconst.hxx"
-+#include "xlsx/xlformula.hxx"
- #include "xechart.hxx"
-
- #include <com/sun/star/i18n/XBreakIterator.hpp>
-diff --git sc/source/filter/xlsx/xlsx-xecontent.cxx sc/source/filter/xlsx/xlsx-xecontent.cxx
+diff --git sc/source/filter/excel/xecontent.cxx sc/source/filter/excel/xecontent.cxx
index 9b8986e..3117555 100644
---- sc/source/filter/xlsx/xlsx-xecontent.cxx
-+++ sc/source/filter/xlsx/xlsx-xecontent.cxx
-@@ -30,6 +30,9 @@
-
- // MARKER(update_precomp.py): autogen include statement, do not remove
- #include "precompiled_sc.hxx"
-+#include "xlsx/xladdress.hxx"
-+#include "xlsx/xlconst.hxx"
-+#include "xlsx/xlformula.hxx"
- #include "xecontent.hxx"
-
- #include <list>
+--- sc/source/filter/excel/xecontent.cxx
++++ sc/source/filter/excel/xecontent.cxx
@@ -526,7 +529,7 @@ String XclExpHyperlink::BuildFileName(
void XclExpHyperlink::WriteBody( XclExpStream& rStrm )
{
@@ -2499,10 +2219,10 @@ index 9b8986e..3117555 100644
rStrm << nXclRow << nXclRow << nXclCol << nXclCol;
WriteEmbeddedData( rStrm );
}
-diff --git sc/source/filter/xlsx/xlsx-xeescher.cxx sc/source/filter/xlsx/xlsx-xeescher.cxx
+diff --git sc/source/filter/excel/xeescher.cxx sc/source/filter/excel/xeescher.cxx
index d3d10ff..43c6f54 100644
---- sc/source/filter/xlsx/xlsx-xeescher.cxx
-+++ sc/source/filter/xlsx/xlsx-xeescher.cxx
+--- sc/source/filter/excel/xeescher.cxx
++++ sc/source/filter/excel/xeescher.cxx
@@ -948,14 +948,14 @@ void XclExpNote::WriteXml( sal_Int32 nAuthorId, XclExpXmlStream& rStrm )
FSEND );
rComments->startElement( XML_text, FSEND );
@@ -2524,29 +2244,41 @@ index d3d10ff..43c6f54 100644
rComments->endElement( XML_text );
rComments->endElement( XML_comment );
}
-diff --git sc/source/filter/xlsx/xlsx-xeformula.cxx sc/source/filter/xlsx/xlsx-xeformula.cxx
-index 956d72a..31af0f9 100644
---- sc/source/filter/xlsx/xlsx-xeformula.cxx
-+++ sc/source/filter/xlsx/xlsx-xeformula.cxx
-@@ -429,7 +429,7 @@ private:
+diff --git a/sc/source/filter/excel/xeformula.cxx sc/source/filter/excel/xeformula.cxx
+index 849ac08..69dd726 100644
+--- sc/source/filter/excel/xeformula.cxx
++++ sc/source/filter/excel/xeformula.cxx
+@@ -494,7 +494,7 @@ private:
const SCsCOL mnMaxScCol; /// Maximum column index in Calc itself.
const SCsROW mnMaxScRow; /// Maximum row index in Calc itself.
const sal_uInt16 mnMaxColMask; /// Mask to delete invalid bits in column fields.
- const sal_uInt16 mnMaxRowMask; /// Mask to delete invalid bits in row fields.
+ const sal_uInt32 mnMaxRowMask; /// Mask to delete invalid bits in row fields.
- bool mbRunning; /// true = compiler already running (for recursive calls).
};
-@@ -466,7 +466,7 @@ XclExpFmlaCompImpl::XclExpFmlaCompImpl( const XclExpRoot& rRoot ) :
+ // ----------------------------------------------------------------------------
+@@ -508,7 +508,7 @@ XclExpFmlaCompImpl::XclExpFmlaCompImpl( const XclExpRoot& rRoot ) :
mnMaxScCol( static_cast< SCsCOL >( rRoot.GetScMaxPos().Col() ) ),
mnMaxScRow( static_cast< SCsROW >( rRoot.GetScMaxPos().Row() ) ),
mnMaxColMask( static_cast< sal_uInt16 >( rRoot.GetXclMaxPos().Col() ) ),
-- mnMaxRowMask( static_cast< sal_uInt16 >( rRoot.GetXclMaxPos().Row() ) ),
-+ mnMaxRowMask( static_cast< sal_uInt32 >( rRoot.GetXclMaxPos().Row() ) ),
- mbRunning( false )
+- mnMaxRowMask( static_cast< sal_uInt16 >( rRoot.GetXclMaxPos().Row() ) )
++ mnMaxRowMask( static_cast< sal_uInt32 >( rRoot.GetXclMaxPos().Row() ) )
{
// build the configuration map
-@@ -1863,7 +1863,7 @@ void XclExpFmlaCompImpl::ConvertRefData(
+ for( const XclExpCompConfig* pEntry = spConfigTable; pEntry != STATIC_TABLE_END( spConfigTable ); ++pEntry )
+@@ -1316,7 +1316,10 @@ void XclExpFmlaCompImpl::ProcessMatrix( const XclExpScToken& rTokData )
+ // create the tArray token
+ AppendOperandTokenId( GetTokenId( EXC_TOKID_ARRAY, EXC_TOKCLASS_ARR ), rTokData.mnSpaces );
+ Append( static_cast< sal_uInt8 >( (meBiff == EXC_BIFF8) ? (nCols - 1) : nCols ) );
+- Append( static_cast< sal_uInt16 >( (meBiff == EXC_BIFF8) ? (nRows - 1) : nRows ) );
++ if (meBiff == EXC_BIFF8)
++ Append( static_cast< sal_uInt16 > ( nRows - 1 ) );
++ else
++ Append( static_cast< sal_uInt16 > ( nRows - 1 ) );
+ Append( static_cast< sal_uInt32 >( 0 ) );
+
+ // create the extended data containing the array values
+@@ -1835,7 +1838,7 @@ void XclExpFmlaCompImpl::ConvertRefData(
rnScRow = mnMaxAbsRow;
else if( (rnScRow < 0) || (rnScRow > mnMaxAbsRow) )
rRefData.SetRowDeleted( TRUE );
@@ -2555,7 +2287,7 @@ index 956d72a..31af0f9 100644
}
else
{
-@@ -1874,8 +1874,8 @@ void XclExpFmlaCompImpl::ConvertRefData(
+@@ -1846,8 +1849,8 @@ void XclExpFmlaCompImpl::ConvertRefData(
rXclPos.mnCol = static_cast< sal_uInt16 >( nXclRelCol ) & mnMaxColMask;
// convert row index (2-step-cast ScsROW->sal_Int16->sal_uInt16 to get all bits correctly)
@@ -2563,10 +2295,10 @@ index 956d72a..31af0f9 100644
- rXclPos.mnRow = static_cast< sal_uInt16 >( nXclRelRow ) & mnMaxRowMask;
+ sal_Int32 nXclRelRow = static_cast< sal_Int32 >( rRefData.IsRowRel() ? rRefData.nRelRow : rRefData.nRow );
+ rXclPos.mnRow = static_cast< sal_uInt32 >( nXclRelRow ) & mnMaxRowMask;
- }
- // flags for relative column and row
-@@ -1887,9 +1887,16 @@ void XclExpFmlaCompImpl::ConvertRefData(
+ // resolve relative tab index if possible
+ if( rRefData.IsTabRel() && !IsInGlobals() && (GetCurrScTab() < GetDoc().GetTableCount()) )
+@@ -1863,9 +1866,16 @@ void XclExpFmlaCompImpl::ConvertRefData(
}
else
{
@@ -2586,32 +2318,10 @@ index 956d72a..31af0f9 100644
}
}
-@@ -2540,7 +2547,10 @@ void XclExpFmlaCompImpl::ProcessMatrix( const XclExpTokenData& rTokData, sal_uIn
-
- AppendOpTokenId( GetTokenId( EXC_TOKID_ARRAY, EXC_TOKCLASS_ARR ), nExpClass, rTokData.mnSpaces );
- Append( static_cast< sal_uInt8 >( (meBiff == EXC_BIFF8) ? (nCols - 1) : nCols ) );
-- Append( static_cast< sal_uInt16 >( (meBiff == EXC_BIFF8) ? (nRows - 1) : nRows ) );
-+ if (meBiff == EXC_BIFF8)
-+ Append( static_cast< sal_uInt16 > ( nRows - 1 ) );
-+ else
-+ Append( static_cast< sal_uInt16 > ( nRows - 1 ) );
- Append( static_cast< sal_uInt32 >( 0 ) );
-
- if( !mxInlineArr )
-diff --git sc/source/filter/xlsx/xlsx-xehelper.cxx sc/source/filter/xlsx/xlsx-xehelper.cxx
+diff --git sc/source/filter/excel/xehelper.cxx sc/source/filter/excel/xehelper.cxx
index 7dbe4b8..ca3fc38 100644
---- sc/source/filter/xlsx/xlsx-xehelper.cxx
-+++ sc/source/filter/xlsx/xlsx-xehelper.cxx
-@@ -30,6 +30,9 @@
-
- // MARKER(update_precomp.py): autogen include statement, do not remove
- #include "precompiled_sc.hxx"
-+#include "xlsx/xladdress.hxx"
-+#include "xlsx/xlconst.hxx"
-+#include "xlsx/xlformula.hxx"
- #include <com/sun/star/i18n/XBreakIterator.hpp>
- #include <com/sun/star/i18n/ScriptType.hpp>
- #include <sfx2/objsh.hxx>
+--- sc/source/filter/excel/xehelper.cxx
++++ sc/source/filter/excel/xehelper.cxx
@@ -159,7 +162,7 @@ namespace {
inline void lclFillAddress( XclAddress& rXclPos, SCCOL nScCol, SCROW nScRow )
{
@@ -2621,48 +2331,10 @@ index 7dbe4b8..ca3fc38 100644
}
} // namespace
-diff --git sc/source/filter/xlsx/xlsx-xelink.cxx sc/source/filter/xlsx/xlsx-xelink.cxx
-index 0277877..66dc667 100644
---- sc/source/filter/xlsx/xlsx-xelink.cxx
-+++ sc/source/filter/xlsx/xlsx-xelink.cxx
-@@ -30,6 +30,9 @@
-
- // MARKER(update_precomp.py): autogen include statement, do not remove
- #include "precompiled_sc.hxx"
-+#include "xlsx/xladdress.hxx"
-+#include "xlsx/xlconst.hxx"
-+#include "xlsx/xlformula.hxx"
- #include "xelink.hxx"
-
- #include <algorithm>
-diff --git sc/source/filter/xlsx/xlsx-xename.cxx sc/source/filter/xlsx/xlsx-xename.cxx
-index 9bd6ac4..3cf1e7f 100644
---- sc/source/filter/xlsx/xlsx-xename.cxx
-+++ sc/source/filter/xlsx/xlsx-xename.cxx
-@@ -30,6 +30,9 @@
-
- // MARKER(update_precomp.py): autogen include statement, do not remove
- #include "precompiled_sc.hxx"
-+#include "xlsx/xladdress.hxx"
-+#include "xlsx/xlconst.hxx"
-+#include "xlsx/xlformula.hxx"
- #include "xename.hxx"
-
- #include <map>
-diff --git sc/source/filter/xlsx/xlsx-xepage.cxx sc/source/filter/xlsx/xlsx-xepage.cxx
+diff --git sc/source/filter/excel/xepage.cxx sc/source/filter/excel/xepage.cxx
index f99b732..d79e950 100644
---- sc/source/filter/xlsx/xlsx-xepage.cxx
-+++ sc/source/filter/xlsx/xlsx-xepage.cxx
-@@ -30,6 +30,9 @@
-
- // MARKER(update_precomp.py): autogen include statement, do not remove
- #include "precompiled_sc.hxx"
-+#include "xlsx/xladdress.hxx"
-+#include "xlsx/xlconst.hxx"
-+#include "xlsx/xlformula.hxx"
-
- #include "xepage.hxx"
- #include <svtools/itemset.hxx>
+--- sc/source/filter/excel/xepage.cxx
++++ sc/source/filter/excel/xepage.cxx
@@ -310,7 +313,7 @@ XclExpPageSettings::XclExpPageSettings( const XclExpRoot& rRoot ) :
set<SCROW> aRowBreaks;
rDoc.GetAllRowBreaks(aRowBreaks, nScTab, false, true);
@@ -2672,10 +2344,10 @@ index f99b732..d79e950 100644
for (set<SCROW>::const_iterator itr = aRowBreaks.begin(), itrEnd = aRowBreaks.end(); itr != itrEnd; ++itr)
{
SCROW nRow = *itr;
-diff --git sc/source/filter/xlsx/xlsx-xepivot.cxx sc/source/filter/xlsx/xlsx-xepivot.cxx
+diff --git sc/source/filter/excel/xepivot.cxx sc/source/filter/excel/xepivot.cxx
index c19bee2..57409c1 100644
---- sc/source/filter/xlsx/xlsx-xepivot.cxx
-+++ sc/source/filter/xlsx/xlsx-xepivot.cxx
+--- sc/source/filter/excel/xepivot.cxx
++++ sc/source/filter/excel/xepivot.cxx
@@ -1593,9 +1593,9 @@ void XclExpPivotTable::Finalize()
// update output range (initialized in ctor)
@@ -2697,38 +2369,10 @@ index c19bee2..57409c1 100644
rnDataXclCol = rnXclCol1 + maPTInfo.mnRowFields;
rnDataXclRow = rnXclRow1 + maPTInfo.mnColFields + 1;
if( maDataFields.empty() )
-diff --git sc/source/filter/xlsx/xlsx-xerecord.cxx sc/source/filter/xlsx/xlsx-xerecord.cxx
-index 8b927c5..225b030 100644
---- sc/source/filter/xlsx/xlsx-xerecord.cxx
-+++ sc/source/filter/xlsx/xlsx-xerecord.cxx
-@@ -30,6 +30,9 @@
-
- // MARKER(update_precomp.py): autogen include statement, do not remove
- #include "precompiled_sc.hxx"
-+#include "xlsx/xladdress.hxx"
-+#include "xlsx/xlconst.hxx"
-+#include "xlsx/xlformula.hxx"
- #include "xerecord.hxx"
- #include "xeroot.hxx"
-
-diff --git sc/source/filter/xlsx/xlsx-xeroot.cxx sc/source/filter/xlsx/xlsx-xeroot.cxx
-index 600a928..0e76f05 100644
---- sc/source/filter/xlsx/xlsx-xeroot.cxx
-+++ sc/source/filter/xlsx/xlsx-xeroot.cxx
-@@ -30,6 +30,9 @@
-
- // MARKER(update_precomp.py): autogen include statement, do not remove
- #include "precompiled_sc.hxx"
-+#include "xlsx/xladdress.hxx"
-+#include "xlsx/xlconst.hxx"
-+#include "xlsx/xlformula.hxx"
- #include <sfx2/docfile.hxx>
- #include <sfx2/sfxsids.hrc>
- #include <svtools/saveopt.hxx>
-diff --git sc/source/filter/xlsx/xlsx-xestream.cxx sc/source/filter/xlsx/xlsx-xestream.cxx
+diff --git sc/source/filter/excel/xestream.cxx sc/source/filter/excel/xestream.cxx
index 14bc6b4..0568512 100644
---- sc/source/filter/xlsx/xlsx-xestream.cxx
-+++ sc/source/filter/xlsx/xlsx-xestream.cxx
+--- sc/source/filter/excel/xestream.cxx
++++ sc/source/filter/excel/xestream.cxx
@@ -802,8 +802,8 @@ static ScAddress lcl_ToAddress( const XclAddress& rAddress )
// For some reason, ScRange::Format() returns omits row numbers if
// the row is >= MAXROW or the column is >= MAXCOL, and Excel doesn't
@@ -2740,19 +2384,10 @@ index 14bc6b4..0568512 100644
return aAddress;
}
-diff --git sc/source/filter/xlsx/xlsx-xetable.cxx sc/source/filter/xlsx/xlsx-xetable.cxx
+diff --git sc/source/filter/excel/xetable.cxx sc/source/filter/excel/xetable.cxx
index 92dd71e..bf7af82 100644
---- sc/source/filter/xlsx/xlsx-xetable.cxx
-+++ sc/source/filter/xlsx/xlsx-xetable.cxx
-@@ -31,7 +31,7 @@
- // MARKER(update_precomp.py): autogen include statement, do not remove
- #include "precompiled_sc.hxx"
- #include "xestream.hxx"
--#include "xetable.hxx"
-+#include "xlsx/xetable.hxx"
-
- #include <map>
- #include <com/sun/star/i18n/ScriptType.hpp>
+--- sc/source/filter/excel/xetable.cxx
++++ sc/source/filter/excel/xetable.cxx
@@ -81,7 +81,7 @@ XclExpRangeFmlaBase::XclExpRangeFmlaBase(
maXclRange( ScAddress::UNINITIALIZED ),
maBaseXclPos( ScAddress::UNINITIALIZED )
@@ -2890,89 +2525,10 @@ index 92dd71e..bf7af82 100644
sal_uInt16 nLastXclCol = static_cast< sal_uInt16 >( nLastScCol );
const ScBaseCell* pScCell = aIt.GetCell();
-diff --git sc/source/filter/xlsx/xlsx-xeview.cxx sc/source/filter/xlsx/xlsx-xeview.cxx
-index d15634b..4cf8efb 100644
---- sc/source/filter/xlsx/xlsx-xeview.cxx
-+++ sc/source/filter/xlsx/xlsx-xeview.cxx
-@@ -30,6 +30,9 @@
-
- // MARKER(update_precomp.py): autogen include statement, do not remove
- #include "precompiled_sc.hxx"
-+#include "xlsx/xladdress.hxx"
-+#include "xlsx/xlconst.hxx"
-+#include "xlsx/xlformula.hxx"
- #include "xeview.hxx"
- #include "document.hxx"
- #include "scextopt.hxx"
-diff --git sc/source/filter/xlsx/xlsx-xichart.cxx sc/source/filter/xlsx/xlsx-xichart.cxx
-index 77d9eae..fb19b0c 100644
---- sc/source/filter/xlsx/xlsx-xichart.cxx
-+++ sc/source/filter/xlsx/xlsx-xichart.cxx
-@@ -30,6 +30,9 @@
-
- // MARKER(update_precomp.py): autogen include statement, do not remove
- #include "precompiled_sc.hxx"
-+#include "xlsx/xladdress.hxx"
-+#include "xlsx/xlconst.hxx"
-+#include "xlsx/xlformula.hxx"
-
- #include "xichart.hxx"
-
-diff --git sc/source/filter/xlsx/xlsx-xicontent.cxx sc/source/filter/xlsx/xlsx-xicontent.cxx
-index abc5d02..a6f1dad 100644
---- sc/source/filter/xlsx/xlsx-xicontent.cxx
-+++ sc/source/filter/xlsx/xlsx-xicontent.cxx
-@@ -30,6 +30,9 @@
-
- // MARKER(update_precomp.py): autogen include statement, do not remove
- #include "precompiled_sc.hxx"
-+#include "xlsx/xladdress.hxx"
-+#include "xlsx/xlconst.hxx"
-+#include "xlsx/xlformula.hxx"
- #include "xicontent.hxx"
- #include <sfx2/objsh.hxx>
- #include <sfx2/docfile.hxx>
-diff --git sc/source/filter/xlsx/xlsx-xiescher.cxx sc/source/filter/xlsx/xlsx-xiescher.cxx
-index b1ea638..3751674 100644
---- sc/source/filter/xlsx/xlsx-xiescher.cxx
-+++ sc/source/filter/xlsx/xlsx-xiescher.cxx
-@@ -30,6 +30,9 @@
-
- // MARKER(update_precomp.py): autogen include statement, do not remove
- #include "precompiled_sc.hxx"
-+#include "xlsx/xladdress.hxx"
-+#include "xlsx/xlconst.hxx"
-+#include "xlsx/xlformula.hxx"
-
- #include "xiescher.hxx"
-
-diff --git sc/source/filter/xlsx/xlsx-xiformula.cxx sc/source/filter/xlsx/xlsx-xiformula.cxx
-index 240358e..5ae34f1 100644
---- sc/source/filter/xlsx/xlsx-xiformula.cxx
-+++ sc/source/filter/xlsx/xlsx-xiformula.cxx
-@@ -29,6 +29,8 @@
- ************************************************************************/
-
- #include "precompiled_sc.hxx"
-+#include "xlsx/xlconst.hxx"
-+#include "xlsx/xlformula.hxx"
- #include "xiformula.hxx"
- #include "rangelst.hxx"
- #include "xistream.hxx"
-diff --git sc/source/filter/xlsx/xlsx-xihelper.cxx sc/source/filter/xlsx/xlsx-xihelper.cxx
+diff --git sc/source/filter/excel/xihelper.cxx sc/source/filter/excel/xihelper.cxx
index 0e44ba6..d2fd000 100644
---- sc/source/filter/xlsx/xlsx-xihelper.cxx
-+++ sc/source/filter/xlsx/xlsx-xihelper.cxx
-@@ -30,6 +30,9 @@
-
- // MARKER(update_precomp.py): autogen include statement, do not remove
- #include "precompiled_sc.hxx"
-+#include "xlsx/xladdress.hxx"
-+#include "xlsx/xlconst.hxx"
-+#include "xlsx/xlformula.hxx"
- #include "xihelper.hxx"
- #include <svtools/itemset.hxx>
- #include <svx/editobj.hxx>
+--- sc/source/filter/excel/xihelper.cxx
++++ sc/source/filter/excel/xihelper.cxx
@@ -126,7 +129,7 @@ bool XclImpAddressConverter::ConvertRange( ScRange& rScRange,
// check & correct end position
@@ -2982,247 +2538,193 @@ index 0e44ba6..d2fd000 100644
if( !CheckAddress( rXclRange.maLast, bWarn ) )
{
nXclCol2 = ::std::min( nXclCol2, mnMaxCol );
-diff --git sc/source/filter/xlsx/xlsx-xilink.cxx sc/source/filter/xlsx/xlsx-xilink.cxx
-index 2c24263..3f9cb2a 100644
---- sc/source/filter/xlsx/xlsx-xilink.cxx
-+++ sc/source/filter/xlsx/xlsx-xilink.cxx
-@@ -30,6 +30,9 @@
-
- // MARKER(update_precomp.py): autogen include statement, do not remove
- #include "precompiled_sc.hxx"
-+#include "xlsx/xladdress.hxx"
-+#include "xlsx/xlconst.hxx"
-+#include "xlsx/xlformula.hxx"
- #include "xilink.hxx"
- #include "document.hxx"
- #include "cell.hxx"
-diff --git sc/source/filter/xlsx/xlsx-xiname.cxx sc/source/filter/xlsx/xlsx-xiname.cxx
-index 72f4701..84e8098 100644
---- sc/source/filter/xlsx/xlsx-xiname.cxx
-+++ sc/source/filter/xlsx/xlsx-xiname.cxx
-@@ -30,6 +30,9 @@
-
- // MARKER(update_precomp.py): autogen include statement, do not remove
- #include "precompiled_sc.hxx"
-+#include "xlsx/xladdress.hxx"
-+#include "xlsx/xlconst.hxx"
-+#include "xlsx/xlformula.hxx"
- #include "xiname.hxx"
- #include "rangenam.hxx"
- #include "xistream.hxx"
-diff --git sc/source/filter/xlsx/xlsx-xipage.cxx sc/source/filter/xlsx/xlsx-xipage.cxx
-index cb1aba2..d1ab698 100644
---- sc/source/filter/xlsx/xlsx-xipage.cxx
-+++ sc/source/filter/xlsx/xlsx-xipage.cxx
-@@ -30,6 +30,9 @@
-
- // MARKER(update_precomp.py): autogen include statement, do not remove
- #include "precompiled_sc.hxx"
-+#include "xlsx/xladdress.hxx"
-+#include "xlsx/xlconst.hxx"
-+#include "xlsx/xlformula.hxx"
- #include "xipage.hxx"
- #include <svtools/itemset.hxx>
- #include <vcl/graph.hxx>
-diff --git sc/source/filter/xlsx/xlsx-xipivot.cxx sc/source/filter/xlsx/xlsx-xipivot.cxx
-index fd85060..23ac48a 100644
---- sc/source/filter/xlsx/xlsx-xipivot.cxx
-+++ sc/source/filter/xlsx/xlsx-xipivot.cxx
-@@ -30,6 +30,9 @@
-
- // MARKER(update_precomp.py): autogen include statement, do not remove
- #include "precompiled_sc.hxx"
-+#include "xlsx/xladdress.hxx"
-+#include "xlsx/xlconst.hxx"
-+#include "xlsx/xlformula.hxx"
+diff --git sc/source/filter/excel/xlescher.cxx sc/source/filter/excel/xlescher.cxx
+index a2a64b8..841eeb7 100644
+--- sc/source/filter/excel/xlescher.cxx
++++ sc/source/filter/excel/xlescher.cxx
+@@ -138,7 +138,7 @@ void lclGetColFromX(
+ /** Calculates an object row position from a drawing layer Y position (in twips). */
+ void lclGetRowFromY(
+ ScDocument& rDoc, SCTAB nScTab,
+- sal_uInt16& rnXclRow, sal_uInt16& rnOffset, sal_uInt16 nXclStartRow,
++ sal_uInt32& rnXclRow, sal_uInt16& rnOffset, sal_uInt32 nXclStartRow,
+ long& rnStartH, long nY, double fScale )
+ {
+ // rnStartH in conjunction with nXclStartRow is used as buffer for previously calculated height
+diff -pur sc/source/filter/inc/xetable.hxx sc/source/filter/inc/xetable.hxx
+--- sc/source/filter/inc/xetable.hxx 2009-10-16 10:32:55.000000000 +0200
++++ sc/source/filter/inc/xetable.hxx 2009-10-23 15:19:13.456138907 +0200
+@@ -73,7 +73,7 @@ class XclExpRangeFmlaBase : public XclEx
+ {
+ public:
+ /** Returns true, if the passed cell position is equal to own base position. */
+- bool IsBasePos( sal_uInt16 nXclCol, sal_uInt16 nXclRow ) const;
++ bool IsBasePos( sal_uInt16 nXclCol, sal_uInt32 nXclRow ) const;
- #include "xipivot.hxx"
+ /** Derived classes create the token array for a corresponding FORMULA cell record. */
+ virtual XclTokenArrayRef CreateCellTokenArray( const XclExpRoot& rRoot ) const = 0;
+@@ -231,7 +231,7 @@ public:
-diff --git sc/source/filter/xlsx/xlsx-xiroot.cxx sc/source/filter/xlsx/xlsx-xiroot.cxx
-index 55ba4bd..63985cb 100644
---- sc/source/filter/xlsx/xlsx-xiroot.cxx
-+++ sc/source/filter/xlsx/xlsx-xiroot.cxx
-@@ -30,6 +30,9 @@
+ private:
+ /** Returns true, if the passed cell position can be appended to this record. */
+- bool IsAppendable( sal_uInt16 nXclCol, sal_uInt16 nXclRow ) const;
++ bool IsAppendable( sal_uInt16 nXclCol, sal_uInt32 nXclRow ) const;
- // MARKER(update_precomp.py): autogen include statement, do not remove
- #include "precompiled_sc.hxx"
-+#include "xlsx/xladdress.hxx"
-+#include "xlsx/xlconst.hxx"
-+#include "xlsx/xlformula.hxx"
- #include "xiroot.hxx"
- #include "addincol.hxx"
- #include "xltracer.hxx"
-diff --git sc/source/filter/xlsx/xlsx-xistream.cxx sc/source/filter/xlsx/xlsx-xistream.cxx
-index 7b19660..89a9302 100644
---- sc/source/filter/xlsx/xlsx-xistream.cxx
-+++ sc/source/filter/xlsx/xlsx-xistream.cxx
-@@ -30,6 +30,9 @@
+ /** Writes the contents of the TABLEOP record. */
+ virtual void WriteBody( XclExpStream& rStrm );
+@@ -240,9 +240,9 @@ private:
+ SCTAB mnScTab; /// Sheet index of this record.
+ sal_uInt16 mnLastAppXclCol;/// Column index of last appended cell.
+ sal_uInt16 mnColInpXclCol; /// Column index of column input cell.
+- sal_uInt16 mnColInpXclRow; /// Row index of column input cell.
++ sal_uInt32 mnColInpXclRow; /// Row index of column input cell.
+ sal_uInt16 mnRowInpXclCol; /// Column index of row input cell.
+- sal_uInt16 mnRowInpXclRow; /// Row index of row input cell.
++ sal_uInt32 mnRowInpXclRow; /// Row index of row input cell.
+ sal_uInt8 mnScMode; /// Type of the multiple operation (Calc constant).
+ bool mbValid; /// true = Contains valid references.
+ };
+@@ -289,7 +289,7 @@ public:
+ /** Returns the (first) Excel column index of the cell(s). */
+ inline sal_uInt16 GetXclCol() const { return maXclPos.mnCol; }
+ /** Returns the Excel row index of the cell. */
+- inline sal_uInt16 GetXclRow() const { return maXclPos.mnRow; }
++ inline sal_uInt32 GetXclRow() const { return maXclPos.mnRow; }
- // MARKER(update_precomp.py): autogen include statement, do not remove
- #include "precompiled_sc.hxx"
-+#include "xlsx/xladdress.hxx"
-+#include "xlsx/xlconst.hxx"
-+#include "xlsx/xlformula.hxx"
+ /** Derived classes return the column index of the last contained cell. */
+ virtual sal_uInt16 GetLastXclCol() const = 0;
+@@ -317,7 +317,7 @@ protected:
+ /** Sets this record to a new column position. */
+ inline void SetXclCol( sal_uInt16 nXclCol ) { maXclPos.mnCol = nXclCol; }
+ /** Sets this record to a new row position. */
+- inline void SetXclRow( sal_uInt16 nXclRow ) { maXclPos.mnRow = nXclRow; }
++ inline void SetXclRow( sal_uInt32 nXclRow ) { maXclPos.mnRow = nXclRow; }
- // ============================================================================
- #include "xistream.hxx"
-diff --git sc/source/filter/xlsx/xlsx-xistring.cxx sc/source/filter/xlsx/xlsx-xistring.cxx
-index 5e785ca..b67db15 100644
---- sc/source/filter/xlsx/xlsx-xistring.cxx
-+++ sc/source/filter/xlsx/xlsx-xistring.cxx
-@@ -29,6 +29,9 @@
- ************************************************************************/
+ private:
+ XclAddress maXclPos; /// Address of the cell.
+@@ -900,11 +900,11 @@ public:
+ /** Constructs the ROW record and converts the Calc row settings.
+ @param bAlwaysEmpty true = This row will not be filled with blank cells
+ in the Finalize() function. */
+- explicit XclExpRow( const XclExpRoot& rRoot, sal_uInt16 nXclRow,
+- XclExpRowOutlineBuffer& rOutlineBfr, bool bAlwaysEmpty );
++ explicit XclExpRow( const XclExpRoot& rRoot, sal_uInt32 nXclRow,
++ XclExpRowOutlineBuffer& rOutlineBfr, bool bAlwaysEmpty );
- #include "precompiled_sc.hxx"
-+#include "xlsx/xladdress.hxx"
-+#include "xlsx/xlconst.hxx"
-+#include "xlsx/xlformula.hxx"
- #include "xistring.hxx"
- #include "xlstyle.hxx"
- #include "xistream.hxx"
-diff --git sc/source/filter/xlsx/xlsx-xistyle.cxx sc/source/filter/xlsx/xlsx-xistyle.cxx
-index d81bcc5..d63cbf8 100644
---- sc/source/filter/xlsx/xlsx-xistyle.cxx
-+++ sc/source/filter/xlsx/xlsx-xistyle.cxx
-@@ -30,6 +30,9 @@
+ /** Returns the excel row index of this ROW record. */
+- inline sal_uInt16 GetXclRow() const { return mnXclRow; }
++ inline sal_uInt32 GetXclRow() const { return mnXclRow; }
+ /** Returns the height of the row in twips. */
+ inline sal_uInt16 GetHeight() const { return mnHeight; }
+ /** Returns true, if this row does not contain at least one valid cell. */
+@@ -948,7 +948,7 @@ public:
+
+ private:
+ /** Initializes the record data. Called from constructors. */
+- void Init( sal_uInt16 nXclRow, XclExpRowOutlineBuffer* pOutlineBfr );
++ void Init( sal_uInt32 nXclRow, XclExpRowOutlineBuffer* pOutlineBfr );
+ /** Inserts a cell at the specified list position, tries to merge with neighbors. */
+ void InsertCell( XclExpCellRef xCell, size_t nPos, bool bIsMergedBase );
- // MARKER(update_precomp.py): autogen include statement, do not remove
- #include "precompiled_sc.hxx"
-+#include "xlsx/xladdress.hxx"
-+#include "xlsx/xlconst.hxx"
-+#include "xlsx/xlformula.hxx"
- #include "xistyle.hxx"
- #include <sfx2/printer.hxx>
- #include <sfx2/objsh.hxx>
-diff --git sc/source/filter/xlsx/xlsx-xiview.cxx sc/source/filter/xlsx/xlsx-xiview.cxx
-index ce76483..39a8678 100644
---- sc/source/filter/xlsx/xlsx-xiview.cxx
-+++ sc/source/filter/xlsx/xlsx-xiview.cxx
-@@ -30,6 +30,9 @@
+@@ -959,7 +959,7 @@ private:
+ typedef XclExpRecordList< XclExpCellBase > XclExpCellList;
- // MARKER(update_precomp.py): autogen include statement, do not remove
- #include "precompiled_sc.hxx"
-+#include "xlsx/xladdress.hxx"
-+#include "xlsx/xlconst.hxx"
-+#include "xlsx/xlformula.hxx"
- #include "xiview.hxx"
- #include "document.hxx"
- #include "scextopt.hxx"
-diff --git sc/source/filter/xlsx/xlsx-xladdress.cxx sc/source/filter/xlsx/xlsx-xladdress.cxx
-index 290a7dc..5455d2c 100644
---- sc/source/filter/xlsx/xlsx-xladdress.cxx
-+++ sc/source/filter/xlsx/xlsx-xladdress.cxx
-@@ -30,7 +30,7 @@
+ XclExpCellList maCellList; /// List of cell records for this row.
+- sal_uInt16 mnXclRow; /// Excel row index of this row.
++ sal_uInt32 mnXclRow; /// Excel row index of this row.
+ sal_uInt16 mnHeight; /// Row height in twips.
+ sal_uInt16 mnFlags; /// Flags for the ROW record.
+ sal_uInt16 mnXFIndex; /// Default row formatting.
+@@ -1002,7 +1002,7 @@ private:
+ /** Returns access to the specified ROW record. Inserts preceding missing ROW records.
+ @param bRowAlwaysEmpty true = Created rows will not be filled with blank cells
+ in the XclExpRow::Finalize() function. */
+- XclExpRow& GetOrCreateRow( sal_uInt16 nXclRow, bool bRowAlwaysEmpty );
++ XclExpRow& GetOrCreateRow( sal_uInt32 nXclRow, bool bRowAlwaysEmpty );
- // MARKER(update_precomp.py): autogen include statement, do not remove
- #include "precompiled_sc.hxx"
--#include "xladdress.hxx"
-+#include "xlsx/xladdress.hxx"
- #include "xestream.hxx"
- #include "xltracer.hxx"
- #include "xistream.hxx"
-diff --git sc/source/filter/xlsx/xlsx-xlchart.cxx sc/source/filter/xlsx/xlsx-xlchart.cxx
-index 76253fc..50d4095 100644
---- sc/source/filter/xlsx/xlsx-xlchart.cxx
-+++ sc/source/filter/xlsx/xlsx-xlchart.cxx
-@@ -30,6 +30,9 @@
+ private:
+ typedef XclExpRecordList< XclExpRow > XclExpRowList;
+@@ -1012,7 +1012,7 @@ private:
+ XclExpRowOutlineBuffer maOutlineBfr; /// Buffer for row outline groups.
+ XclExpDimensions maDimensions; /// DIMENSIONS record for used area.
+ XclExpRow* mpLastUsedRow; /// Last used row for faster access.
+- sal_uInt16 mnLastUsedXclRow; /// Last used row for faster access.
++ sal_uInt32 mnLastUsedXclRow; /// Last used row for faster access.
+ };
- // MARKER(update_precomp.py): autogen include statement, do not remove
- #include "precompiled_sc.hxx"
-+#include "xlsx/xladdress.hxx"
-+#include "xlsx/xlconst.hxx"
-+#include "xlsx/xlformula.hxx"
+ // ============================================================================
+diff -pur sc/source/filter/inc/xladdress.hxx sc/source/filter/inc/xladdress.hxx
+--- sc/source/filter/inc/xladdress.hxx 2009-10-16 10:32:55.000000000 +0200
++++ sc/source/filter/inc/xladdress.hxx 2009-10-23 15:19:13.456138907 +0200
+@@ -44,13 +44,13 @@ class XclExpStream;
+ struct XclAddress
+ {
+ sal_uInt16 mnCol;
+- sal_uInt16 mnRow;
++ sal_uInt32 mnRow;
- #include "xlchart.hxx"
+ inline explicit XclAddress( ScAddress::Uninitialized ) {}
+ inline explicit XclAddress() : mnCol( 0 ), mnRow( 0 ) {}
+- inline explicit XclAddress( sal_uInt16 nCol, sal_uInt16 nRow ) : mnCol( nCol ), mnRow( nRow ) {}
++ inline explicit XclAddress( sal_uInt16 nCol, sal_uInt32 nRow ) : mnCol( nCol ), mnRow( nRow ) {}
-diff --git sc/source/filter/xlsx/xlsx-xlescher.cxx sc/source/filter/xlsx/xlsx-xlescher.cxx
-index a2a64b8..841eeb7 100644
---- sc/source/filter/xlsx/xlsx-xlescher.cxx
-+++ sc/source/filter/xlsx/xlsx-xlescher.cxx
-@@ -137,7 +137,7 @@ void lclGetColFromX(
- /** Calculates an object row position from a drawing layer Y position (in twips). */
- void lclGetRowFromY(
- ScDocument& rDoc, SCTAB nScTab,
-- sal_uInt16& rnXclRow, sal_uInt16& rnOffset, sal_uInt16 nXclStartRow,
-+ sal_uInt32& rnXclRow, sal_uInt16& rnOffset, sal_uInt32 nXclStartRow,
- long& rnStartH, long nY, double fScale )
- {
- // rnStartH in conjunction with nXclStartRow is used as buffer for previously calculated height
-diff --git sc/source/filter/xlsx/xlsx-xlformula.cxx sc/source/filter/xlsx/xlsx-xlformula.cxx
-index 94b3951..c55c02a 100644
---- sc/source/filter/xlsx/xlsx-xlformula.cxx
-+++ sc/source/filter/xlsx/xlsx-xlformula.cxx
-@@ -31,7 +31,7 @@
- // MARKER(update_precomp.py): autogen include statement, do not remove
- #include "precompiled_sc.hxx"
- #include "xestream.hxx"
--#include "xlformula.hxx"
-+#include "xlsx/xlformula.hxx"
- #include "compiler.hxx"
- #include "rangenam.hxx"
- #include "xlroot.hxx"
-diff --git sc/source/filter/xlsx/xlsx-xlpage.cxx sc/source/filter/xlsx/xlsx-xlpage.cxx
-index e9a8142..66920a6 100644
---- sc/source/filter/xlsx/xlsx-xlpage.cxx
-+++ sc/source/filter/xlsx/xlsx-xlpage.cxx
-@@ -30,6 +30,7 @@
+- inline void Set( sal_uInt16 nCol, sal_uInt16 nRow ) { mnCol = nCol; mnRow = nRow; }
++ inline void Set( sal_uInt16 nCol, sal_uInt32 nRow ) { mnCol = nCol; mnRow = nRow; }
- // MARKER(update_precomp.py): autogen include statement, do not remove
- #include "precompiled_sc.hxx"
-+#include "xlsx/xlconst.hxx"
- #include "xlpage.hxx"
- #include <sfx2/printer.hxx>
- #include <svx/svxenum.hxx>
-diff --git sc/source/filter/xlsx/xlsx-xlpivot.cxx sc/source/filter/xlsx/xlsx-xlpivot.cxx
-index c915903..9568c09 100644
---- sc/source/filter/xlsx/xlsx-xlpivot.cxx
-+++ sc/source/filter/xlsx/xlsx-xlpivot.cxx
-@@ -30,6 +30,9 @@
+ void Read( XclImpStream& rStrm, bool bCol16Bit = true );
+ void Write( XclExpStream& rStrm, bool bCol16Bit = true ) const;
+@@ -90,16 +90,16 @@ struct XclRange
+ inline explicit XclRange() {}
+ inline explicit XclRange( const XclAddress& rPos ) : maFirst( rPos ), maLast( rPos ) {}
+ inline explicit XclRange( const XclAddress& rFirst, const XclAddress& rLast ) : maFirst( rFirst ), maLast( rLast ) {}
+- inline explicit XclRange( sal_uInt16 nCol1, sal_uInt16 nRow1, sal_uInt16 nCol2, sal_uInt16 nRow2 ) :
++ inline explicit XclRange( sal_uInt16 nCol1, sal_uInt32 nRow1, sal_uInt16 nCol2, sal_uInt32 nRow2 ) :
+ maFirst( nCol1, nRow1 ), maLast( nCol2, nRow2 ) {}
- // MARKER(update_precomp.py): autogen include statement, do not remove
- #include "precompiled_sc.hxx"
-+#include "xlsx/xladdress.hxx"
-+#include "xlsx/xlconst.hxx"
-+#include "xlsx/xlformula.hxx"
- #include "dpgroup.hxx"
- #include "dpsave.hxx"
- #include "xestream.hxx"
-diff --git sc/source/filter/xlsx/xlsx-xlroot.cxx sc/source/filter/xlsx/xlsx-xlroot.cxx
-index 8f5ddad..4f218e4 100644
---- sc/source/filter/xlsx/xlsx-xlroot.cxx
-+++ sc/source/filter/xlsx/xlsx-xlroot.cxx
-@@ -30,6 +30,7 @@
+ inline void Set( const XclAddress& rFirst, const XclAddress& rLast )
+ { maFirst = rFirst; maLast = rLast; }
+- inline void Set( sal_uInt16 nCol1, sal_uInt16 nRow1, sal_uInt16 nCol2, sal_uInt16 nRow2 )
++ inline void Set( sal_uInt16 nCol1, sal_uInt32 nRow1, sal_uInt16 nCol2, sal_uInt32 nRow2 )
+ { maFirst.Set( nCol1, nRow1 ); maLast.Set( nCol2, nRow2 ); }
- // MARKER(update_precomp.py): autogen include statement, do not remove
- #include "precompiled_sc.hxx"
-+#include "xlsx/xlconst.hxx"
- #include "xlroot.hxx"
- #include <com/sun/star/i18n/ScriptType.hpp>
- #include <vcl/svapp.hxx>
-diff --git sc/source/filter/xlsx/xlsx-xlstyle.cxx sc/source/filter/xlsx/xlsx-xlstyle.cxx
-index bd56de2..cb3ba62 100644
---- sc/source/filter/xlsx/xlsx-xlstyle.cxx
-+++ sc/source/filter/xlsx/xlsx-xlstyle.cxx
-@@ -31,6 +31,7 @@
- // MARKER(update_precomp.py): autogen include statement, do not remove
- #include "precompiled_sc.hxx"
+ inline sal_uInt16 GetColCount() const { return maLast.mnCol - maFirst.mnCol + 1; }
+- inline sal_uInt16 GetRowCount() const { return maLast.mnRow - maFirst.mnRow + 1; }
++ inline sal_uInt32 GetRowCount() const { return maLast.mnRow - maFirst.mnRow + 1; }
+ bool Contains( const XclAddress& rPos ) const;
+
+ void Read( XclImpStream& rStrm, bool bCol16Bit = true );
+@@ -188,7 +188,7 @@ protected:
+ XclTracer& mrTracer; /// Tracer for invalid addresses.
+ ScAddress maMaxPos; /// Default maximum position.
+ sal_uInt16 mnMaxCol; /// Maximum column index, as 16-bit value.
+- sal_uInt16 mnMaxRow; /// Maximum row index, as 16-bit value.
++ sal_uInt32 mnMaxRow; /// Maximum row index
+ bool mbColTrunc; /// Flag for "columns truncated" warning box.
+ bool mbRowTrunc; /// Flag for "rows truncated" warning box.
+ bool mbTabTrunc; /// Flag for "tables truncated" warning box.
+diff -pur sc/source/filter/inc/xlconst.hxx sc/source/filter/inc/xlconst.hxx
+--- sc/source/filter/inc/xlconst.hxx 2009-10-16 10:32:55.000000000 +0200
++++ sc/source/filter/inc/xlconst.hxx 2009-10-23 15:19:13.466128493 +0200
+@@ -74,7 +74,7 @@ const SCROW EXC_MAXROW5
+ const SCTAB EXC_MAXTAB5 = EXC_MAXTAB4;
+
+ const SCCOL EXC_MAXCOL8 = EXC_MAXCOL5;
+-const SCROW EXC_MAXROW8 = 65535;
++const SCROW EXC_MAXROW8 = MAXROWCOUNT_DEFINE;
+ const SCTAB EXC_MAXTAB8 = EXC_MAXTAB5;
-+#include "xlsx/xlconst.hxx"
- #include "xlstyle.hxx"
- #include <com/sun/star/awt/FontFamily.hpp>
- #include <com/sun/star/awt/FontSlant.hpp>
-diff --git sc/source/filter/xlsx/xlsx-xlview.cxx sc/source/filter/xlsx/xlsx-xlview.cxx
-index 8580d7a..78d07ed 100644
---- sc/source/filter/xlsx/xlsx-xlview.cxx
-+++ sc/source/filter/xlsx/xlsx-xlview.cxx
-@@ -30,6 +30,7 @@
+ const sal_uInt16 EXC_NOTAB = SAL_MAX_UINT16; /// An invalid Excel sheet index, for common use.
+diff -pur sc/source/filter/inc/xlformula.hxx sc/source/filter/inc/xlformula.hxx
+--- sc/source/filter/inc/xlformula.hxx 2009-10-16 10:32:55.000000000 +0200
++++ sc/source/filter/inc/xlformula.hxx 2009-10-23 15:19:13.466128493 +0200
+@@ -139,7 +146,7 @@ const sal_uInt8 EXC_TOK_FUNCVAR_PROMPT
+ const sal_uInt8 EXC_TOK_FUNCVAR_COUNTMASK = 0x7F; /// Mask for parameter count.
- // MARKER(update_precomp.py): autogen include statement, do not remove
- #include "precompiled_sc.hxx"
-+#include "xlsx/xladdress.hxx"
- #include "xlview.hxx"
- #include "ftools.hxx"
+ const sal_uInt16 EXC_TOK_REF_COLREL = 0x4000; /// True = Column is relative.
+-const sal_uInt16 EXC_TOK_REF_ROWREL = 0x8000; /// True = Row is relative.
++const sal_uInt32 EXC_TOK_REF_ROWREL = 0x8000; /// True = Row is relative.
+ const sal_uInt8 EXC_TOK_NLR_ERR = 0x01; /// NLR: Invalid/deleted.
+ const sal_uInt8 EXC_TOK_NLR_ROWR = 0x02; /// NLR: Row index.
--
1.6.0.rc1.49.g98a8
-
diff --git a/patches/dev300/oox-calc-export-sotstorage-init.diff b/patches/dev300/oox-calc-export-sotstorage-init.diff
index 119a035..1ad9b53 100644
--- a/patches/dev300/oox-calc-export-sotstorage-init.diff
+++ b/patches/dev300/oox-calc-export-sotstorage-init.diff
@@ -7,15 +7,15 @@ While moving xlsx export to uno filter, SotStorage init code had to
be added. While it compiled, it always produced a NULL pointer.
This inhibits any export using rStorage, such as pivotCache.
- * Modified sc/source/filter/xlsx/xlsx-xestream.cxx
+ * Modified sc/source/filter/excel/xestream.cxx
---
- sc/source/filter/xlsx/xlsx-xestream.cxx | 8 +++++++-
+ sc/source/filter/excel/xestream.cxx | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
-diff --git sc/source/filter/xlsx/xlsx-xestream.cxx sc/source/filter/xlsx/xlsx-xestream.cxx
+diff --git sc/source/filter/excel/xestream.cxx sc/source/filter/excel/xestream.cxx
index 0568512..84d038c 100644
---- sc/source/filter/xlsx/xlsx-xestream.cxx
-+++ sc/source/filter/xlsx/xlsx-xestream.cxx
+--- sc/source/filter/excel/xestream.cxx
++++ sc/source/filter/excel/xestream.cxx
@@ -58,6 +58,10 @@
#include <formula/grammar.hxx>
#include <oox/export/drawingml.hxx>
diff --git a/patches/dev300/xlsx-arabic-export-crash.diff b/patches/dev300/xlsx-arabic-export-crash.diff
index 4235764..5072ded 100644
--- a/patches/dev300/xlsx-arabic-export-crash.diff
+++ b/patches/dev300/xlsx-arabic-export-crash.diff
@@ -3,11 +3,11 @@
# a filter for the XLSX files. After the release, the changes will be
# reverted so that the binary and ooxml are shared again.
# The changes include:
-# sc/source/filter/excel/* -> sc/source/filter/xlsx/xlsx-*
+# sc/source/filter/excel/* -> sc/source/filter/excel/*
diff --git sc/source/filter/excel/xetable.cxx sc/source/filter/excel/xetable.cxx
index 3c2b1a5..8dea9e7 100644
---- sc/source/filter/xlsx/xlsx-xetable.cxx
-+++ sc/source/filter/xlsx/xlsx-xetable.cxx
+--- sc/source/filter/excel/xetable.cxx
++++ sc/source/filter/excel/xetable.cxx
@@ -894,7 +894,7 @@ XclExpFormulaCell::XclExpFormulaCell(
mxAddRec = rShrfmlaBfr.CreateOrExtendShrfmla( rScTokArr, aScPos );
diff --git a/patches/dev300/xlsx-export-cell-style-max-builtin.diff b/patches/dev300/xlsx-export-cell-style-max-builtin.diff
index 070c59a..5de5ff4 100644
--- a/patches/dev300/xlsx-export-cell-style-max-builtin.diff
+++ b/patches/dev300/xlsx-export-cell-style-max-builtin.diff
@@ -3,15 +3,15 @@ From: Jan Nieuwenhuizen <janneke at gnu.org>
Date: Wed, 10 Jun 2009 14:59:58 +0200
Subject: [PATCH] [OOXML]: calc export: respect CELL_STYLE_MAX_BUILTIN_ID=55. Fixes n#497563.
- * Modified sc/source/filter/xlsx/xlsx-xestyle.cxx
+ * Modified sc/source/filter/excel/xestyle.cxx
---
- sc/source/filter/xlsx/xlsx-xestyle.cxx | 5 ++++-
+ sc/source/filter/excel/xestyle.cxx | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
-diff --git sc/source/filter/xlsx/xlsx-xestyle.cxx sc/source/filter/xlsx/xlsx-xestyle.cxx
+diff --git sc/source/filter/excel/xestyle.cxx sc/source/filter/excel/xestyle.cxx
index d5c5499..bf49bef 100644
---- sc/source/filter/xlsx/xlsx-xestyle.cxx
-+++ sc/source/filter/xlsx/xlsx-xestyle.cxx
+--- sc/source/filter/excel/xestyle.cxx
++++ sc/source/filter/excel/xestyle.cxx
@@ -2213,7 +2213,10 @@ void XclExpStyle::SaveXml( XclExpXmlStream& rStrm )
rStrm.GetCurrentStream()->singleElement( XML_cellStyle,
XML_name, sName.getStr(),
diff --git a/patches/dev300/xlsx-export-set-xml-2007-flavour.diff b/patches/dev300/xlsx-export-set-xml-2007-flavour.diff
index 5c2f827..4719415 100644
--- a/patches/dev300/xlsx-export-set-xml-2007-flavour.diff
+++ b/patches/dev300/xlsx-export-set-xml-2007-flavour.diff
@@ -3,15 +3,15 @@ From: Jan Nieuwenhuizen <janneke at gnu.org>
Date: Fri, 8 May 2009 12:42:47 +0200
Subject: [PATCH] OOXML: set .xlsx output flavour to EXC_OUTPUT_XML_2007. Fixes n#502090.
- * Modified sc/source/filter/xlsx/xlsx-xestream.cxx
+ * Modified sc/source/filter/excel/xestream.cxx
---
- sc/source/filter/xlsx/xlsx-xestream.cxx | 1 +
+ sc/source/filter/excel/xestream.cxx | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
-diff --git sc/source/filter/xlsx/xlsx-xestream.cxx sc/source/filter/xlsx/xlsx-xestream.cxx
+diff --git sc/source/filter/excel/xestream.cxx sc/source/filter/excel/xestream.cxx
index a147e13..dbba4aa 100644
---- sc/source/filter/xlsx/xlsx-xestream.cxx
-+++ sc/source/filter/xlsx/xlsx-xestream.cxx
+--- sc/source/filter/excel/xestream.cxx
++++ sc/source/filter/excel/xestream.cxx
@@ -1119,6 +1119,7 @@ bool XclExpXmlStream::exportDocument() throw()
SotStorageRef rStorage = dynamic_cast <SotStorage*>( Reference<XStorage>( pShell->GetStorage() ).get() );
diff --git a/patches/dev300/xlsx-export-simple-autofilter.diff b/patches/dev300/xlsx-export-simple-autofilter.diff
index 05c1dc8..988414b 100644
--- a/patches/dev300/xlsx-export-simple-autofilter.diff
+++ b/patches/dev300/xlsx-export-simple-autofilter.diff
@@ -3,17 +3,17 @@ From: Jan Nieuwenhuizen <janneke at gnu.org>
Date: Mon, 11 May 2009 16:02:14 +0200
Subject: [PATCH] OOXML: export autoFilter if it set, even if details are empty. Fixes n#497559.
- * Modified sc/source/filter/xlsx/excrecds.hxx
- * Modified sc/source/filter/xlsx/xlsx-excrecds.cxx
+ * Modified sc/source/filter/inc/excrecds.hxx
+ * Modified sc/source/filter/excel/excrecds.cxx
---
- sc/source/filter/xlsx/excrecds.hxx | 1 +
- sc/source/filter/xlsx/xlsx-excrecds.cxx | 9 +++++++--
+ sc/source/filter/inc/excrecds.hxx | 1 +
+ sc/source/filter/excel/excrecds.cxx | 9 +++++++--
2 files changed, 8 insertions(+), 2 deletions(-)
-diff --git sc/source/filter/xlsx/excrecds.hxx sc/source/filter/xlsx/excrecds.hxx
+diff --git sc/source/filter/inc/excrecds.hxx sc/source/filter/inc/excrecds.hxx
index 6ad0f71..57744dc 100644
---- sc/source/filter/xlsx/excrecds.hxx
-+++ sc/source/filter/xlsx/excrecds.hxx
+--- sc/source/filter/inc/excrecds.hxx
++++ sc/source/filter/inc/excrecds.hxx
@@ -488,6 +488,7 @@ private:
XclExpFiltermode* pFilterMode;
XclExpAutofilterinfo* pFilterInfo;
@@ -22,10 +22,10 @@ index 6ad0f71..57744dc 100644
};
// ----------------------------------------------------------------------------
-diff --git sc/source/filter/xlsx/xlsx-excrecds.cxx sc/source/filter/xlsx/xlsx-excrecds.cxx
+diff --git sc/source/filter/excel/excrecds.cxx sc/source/filter/excel/excrecds.cxx
index 6bf8e9e..171009a 100644
---- sc/source/filter/xlsx/xlsx-excrecds.cxx
-+++ sc/source/filter/xlsx/xlsx-excrecds.cxx
+--- sc/source/filter/excel/excrecds.cxx
++++ sc/source/filter/excel/excrecds.cxx
@@ -883,6 +883,7 @@ ExcAutoFilterRecs::ExcAutoFilterRecs( const XclExpRoot& rRoot, SCTAB nTab ) :
XclExpRoot( rRoot ),
pFilterMode( NULL ),
diff --git a/patches/dev300/xlsx-export-skip-auto-format.diff b/patches/dev300/xlsx-export-skip-auto-format.diff
index 479751c..8323799 100644
--- a/patches/dev300/xlsx-export-skip-auto-format.diff
+++ b/patches/dev300/xlsx-export-skip-auto-format.diff
@@ -3,16 +3,16 @@ From: Jan Nieuwenhuizen <janneke at gnu.org>
Date: Tue, 12 May 2009 16:20:36 +0200
Subject: [PATCH] OOXML: do not write XML_useAutoFormatting key without value. Fixes n#497560.
- * Modified sc/source/filter/xlsx/xlsx-xepivot.cxx
+ * Modified sc/source/filter/excel/xepivot.cxx
---
- sc/source/filter/xlsx/xlsx-xepivot.cxx | 4 +++-
+ sc/source/filter/excel/xepivot.cxx | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
-diff --git sc/source/filter/xlsx/xlsx-xepivot.cxx sc/source/filter/xlsx/xlsx-xepivot.cxx
+diff --git sc/source/filter/excel/xepivot.cxx sc/source/filter/excel/xepivot.cxx
index d255cc4..c19bee2 100644
---- sc/source/filter/xlsx/xlsx-xepivot.cxx
-+++ sc/source/filter/xlsx/xlsx-xepivot.cxx
+--- sc/source/filter/excel/xepivot.cxx
++++ sc/source/filter/excel/xepivot.cxx
@@ -1376,7 +1376,9 @@ void XclExpPivotTable::SaveXml( XclExpXmlStream& rStrm )
XML_enableDrill, XclXmlUtils::ToPsz( maPTExtInfo.mnFlags & EXC_SXEX_DRILLDOWN ), // ???
// OOXTODO: XML_enableFieldProperties, [ SXEx fEnableFieldDialog (maPTExtInfo.mnFlags) ]
More information about the ooo-build-commit
mailing list