[ooo-build-commit] bin/gen-xlsx-copy-of-xls.sh patches/dev300

[Kohei Yoshida]

 bin/gen-xlsx-copy-of-xls.sh                              |    2 
 patches/dev300/xlsx-filter-as-a-separate-lib-guards.diff |  120 +++++++++++++++
 2 files changed, 122 insertions(+)

New commits:
commit 2f9aa41c1152a298f7004301389308a7d02cd7e0
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Mon Dec 14 14:41:25 2009 -0500

    More headers to copy into xlsx & added header guards.
    
    * bin/gen-xlsx-copy-of-xls.sh: two additional headers to copy.
    
    * patches/dev300/xlsx-filter-as-a-separate-lib-guards.diff: added
      header guards to the original headers, to make sure they are not
      included from the xlsx source files.

diff --git a/bin/gen-xlsx-copy-of-xls.sh b/bin/gen-xlsx-copy-of-xls.sh
index ea8a7a8..64c7a36 100755
--- a/bin/gen-xlsx-copy-of-xls.sh
+++ b/bin/gen-xlsx-copy-of-xls.sh
@@ -20,6 +20,7 @@ XclExpChangeTrack.hxx
 excdoc.hxx
 excrecds.hxx
 exp_op.hxx
+imp_op.hxx
 xcl97esc.hxx
 xcl97rec.hxx
 xechart.hxx
@@ -36,6 +37,7 @@ xestream.hxx
 xestyle.hxx
 xetable.hxx
 xeview.hxx
+xistyle.hxx
 xladdress.hxx
 xlescher.hxx
 xlpivot.hxx
diff --git a/patches/dev300/xlsx-filter-as-a-separate-lib-guards.diff b/patches/dev300/xlsx-filter-as-a-separate-lib-guards.diff
index 7f3cbf8..085c1d2 100644
--- a/patches/dev300/xlsx-filter-as-a-separate-lib-guards.diff
+++ b/patches/dev300/xlsx-filter-as-a-separate-lib-guards.diff
@@ -281,3 +281,123 @@ index 656ecf3..fdaa385 100644
  SLOFILES =	\
  		$(SLO)$/xlsx-colrowst.obj				\
  		$(SLO)$/xlsx-excdoc.obj					\
+diff --git sc/source/filter/inc/imp_op.hxx sc/source/filter/inc/imp_op.hxx
+index ea286bc..3572a82 100644
+--- sc/source/filter/inc/imp_op.hxx
++++ sc/source/filter/inc/imp_op.hxx
+@@ -31,6 +31,10 @@
+ #ifndef SC_IMP_OP_HXX
+ #define SC_IMP_OP_HXX
+ 
++#ifdef XLSX_GUARD
++#error Should not include this from sc/source/filter/xlsx code
++#endif
++
+ #include <tools/gen.hxx>
+ #include "xiroot.hxx"
+ #include "xistream.hxx"
+diff --git sc/source/filter/inc/xehelper.hxx sc/source/filter/inc/xehelper.hxx
+index b9ed319..c9b751d 100644
+--- sc/source/filter/inc/xehelper.hxx
++++ sc/source/filter/inc/xehelper.hxx
+@@ -31,6 +31,10 @@
+ #ifndef SC_XEHELPER_HXX
+ #define SC_XEHELPER_HXX
+ 
++#ifdef XLSX_GUARD
++#error Should not include this from sc/source/filter/xlsx code
++#endif
++
+ #include "xladdress.hxx"
+ #include "xeroot.hxx"
+ #include "xestring.hxx"
+diff --git sc/source/filter/inc/xeroot.hxx sc/source/filter/inc/xeroot.hxx
+index f4e1d25..c318278 100644
+--- sc/source/filter/inc/xeroot.hxx
++++ sc/source/filter/inc/xeroot.hxx
+@@ -31,6 +31,10 @@
+ #ifndef SC_XEROOT_HXX
+ #define SC_XEROOT_HXX
+ 
++#ifdef XLSX_GUARD
++#error Should not include this from sc/source/filter/xlsx code
++#endif
++
+ #include "xlroot.hxx"
+ 
+ // Forward declarations of objects in public use ==============================
+diff --git sc/source/filter/inc/xistyle.hxx sc/source/filter/inc/xistyle.hxx
+index baebad3..e04a79b 100644
+--- sc/source/filter/inc/xistyle.hxx
++++ sc/source/filter/inc/xistyle.hxx
+@@ -31,6 +31,10 @@
+ #ifndef SC_XISTYLE_HXX
+ #define SC_XISTYLE_HXX
+ 
++#ifdef XLSX_GUARD
++#error Should not include this from sc/source/filter/xlsx code
++#endif
++
+ #include <list>
+ #include <tools/mempool.hxx>
+ #include "rangelst.hxx"
+diff --git sc/source/filter/inc/xladdress.hxx sc/source/filter/inc/xladdress.hxx
+index c4aff69..e521a86 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_GUARD
++#error Should not include this from sc/source/filter/xlsx code
++#endif
++
+ #include <vector>
+ #include "address.hxx"
+ 
+diff --git sc/source/filter/inc/xlescher.hxx sc/source/filter/inc/xlescher.hxx
+index d6c9b7c..28efd8a 100644
+--- sc/source/filter/inc/xlescher.hxx
++++ sc/source/filter/inc/xlescher.hxx
+@@ -31,6 +31,10 @@
+ #ifndef SC_XLESCHER_HXX
+ #define SC_XLESCHER_HXX
+ 
++#ifdef XLSX_GUARD
++#error Should not include this from sc/source/filter/xlsx code
++#endif
++
+ #include <vcl/mapunit.hxx>
+ #include "fapihelper.hxx"
+ #include "xladdress.hxx"
+diff --git sc/source/filter/inc/xlpivot.hxx sc/source/filter/inc/xlpivot.hxx
+index 8b5bd4e..4d1f1b9 100644
+--- sc/source/filter/inc/xlpivot.hxx
++++ sc/source/filter/inc/xlpivot.hxx
+@@ -31,6 +31,10 @@
+ #ifndef SC_XLPIVOT_HXX
+ #define SC_XLPIVOT_HXX
+ 
++#ifdef XLSX_GUARD
++#error Should not include this from sc/source/filter/xlsx code
++#endif
++
+ #include <com/sun/star/sheet/GeneralFunction.hpp>
+ #include <com/sun/star/sheet/DataPilotFieldOrientation.hpp>
+ #include <com/sun/star/sheet/DataPilotFieldSortMode.hpp>
+diff --git sc/source/filter/inc/xlview.hxx sc/source/filter/inc/xlview.hxx
+index 3070c28..1386899 100644
+--- sc/source/filter/inc/xlview.hxx
++++ sc/source/filter/inc/xlview.hxx
+@@ -31,6 +31,10 @@
+ #ifndef SC_XLVIEW_HXX
+ #define SC_XLVIEW_HXX
+ 
++#ifdef XLSX_GUARD
++#error Should not include this from sc/source/filter/xlsx code
++#endif
++
+ #include <map>
+ #include <tools/color.hxx>
+ #include "ftools.hxx"