oox/Library_oox.mk | 13 ++---
sc/Library_scfilt.mk | 116 +++++++++++++++++++++++++--------------------------
2 files changed, 64 insertions(+), 65 deletions(-)
New commits:
commit 2ea580358671a840dbd70db13db72a6e5b8be062
Author: Tor Lillqvist <t...@iki.fi>
Date: Mon Nov 26 13:48:39 2012 +0200
Revert "Skip a bunch of files in the disable-export case"
Causes too much pain in scfilt, let's try without for now.
This reverts commit 421c8febe88920bb6ebdfb05ce85568f241ddd0e.
diff --git a/oox/Library_oox.mk b/oox/Library_oox.mk
index a50e25b..b1b8164 100644
--- a/oox/Library_oox.mk
+++ b/oox/Library_oox.mk
@@ -207,13 +207,12 @@ $(eval $(call gb_Library_add_exception_objects,oox,\
oox/source/dump/dumperbase \
oox/source/dump/oledumper \
oox/source/dump/pptxdumper \
- $(if $(filter EXPORT,$(BUILD_TYPE)), \
- oox/source/export/chartexport \
- oox/source/export/ColorPropertySet \
- oox/source/export/drawingml \
- oox/source/export/SchXMLSeriesHelper \
- oox/source/export/shapes \
- oox/source/export/vmlexport) \
+ oox/source/export/chartexport \
+ oox/source/export/ColorPropertySet \
+ oox/source/export/drawingml \
+ oox/source/export/SchXMLSeriesHelper \
+ oox/source/export/shapes \
+ oox/source/export/vmlexport \
oox/source/helper/attributelist \
oox/source/helper/binaryinputstream \
oox/source/helper/binaryoutputstream \
commit a6e64c35cbac9d3fd5cb2e377575c746a40eaff8
Author: Tor Lillqvist <t...@iki.fi>
Date: Mon Nov 26 13:06:44 2012 +0200
Indent consistently
Change-Id: I2f0a472a92d9db5d18225fd47a90c98fd26d9435
diff --git a/sc/Library_scfilt.mk b/sc/Library_scfilt.mk
index 8359c73..6403539 100644
--- a/sc/Library_scfilt.mk
+++ b/sc/Library_scfilt.mk
@@ -144,7 +144,7 @@ $(eval $(call gb_Library_add_exception_objects,scfilt,\
sc/source/filter/lotus/lotus \
sc/source/filter/lotus/memory \
sc/source/filter/lotus/op \
- sc/source/filter/lotus/optab \
+ sc/source/filter/lotus/optab \
sc/source/filter/lotus/tool \
sc/source/filter/qpro/biff \
sc/source/filter/qpro/qpro \
@@ -162,64 +162,64 @@ $(eval $(call gb_Library_add_exception_objects,scfilt,\
sc/source/filter/xcl97/XclImpChangeTrack \
sc/source/filter/xcl97/xcl97esc \
sc/source/filter/xcl97/xcl97rec \
- sc/source/filter/oox/excelfilter \
- sc/source/filter/oox/addressconverter \
- sc/source/filter/oox/autofilterbuffer \
- sc/source/filter/oox/autofiltercontext \
- sc/source/filter/oox/biffcodec \
- sc/source/filter/oox/biffhelper \
- sc/source/filter/oox/biffinputstream \
- sc/source/filter/oox/chartsheetfragment \
- sc/source/filter/oox/commentsbuffer \
- sc/source/filter/oox/commentsfragment \
- sc/source/filter/oox/condformatbuffer \
- sc/source/filter/oox/condformatcontext \
- sc/source/filter/oox/connectionsbuffer \
- sc/source/filter/oox/connectionsfragment \
- sc/source/filter/oox/defnamesbuffer \
- sc/source/filter/oox/drawingbase \
- sc/source/filter/oox/drawingfragment \
- sc/source/filter/oox/drawingmanager \
- sc/source/filter/oox/excelchartconverter \
- sc/source/filter/oox/excelhandlers \
- sc/source/filter/oox/excelvbaproject \
- sc/source/filter/oox/externallinkbuffer \
- sc/source/filter/oox/externallinkfragment \
+ sc/source/filter/oox/excelfilter \
+ sc/source/filter/oox/addressconverter \
+ sc/source/filter/oox/autofilterbuffer \
+ sc/source/filter/oox/autofiltercontext \
+ sc/source/filter/oox/biffcodec \
+ sc/source/filter/oox/biffhelper \
+ sc/source/filter/oox/biffinputstream \
+ sc/source/filter/oox/chartsheetfragment \
+ sc/source/filter/oox/commentsbuffer \
+ sc/source/filter/oox/commentsfragment \
+ sc/source/filter/oox/condformatbuffer \
+ sc/source/filter/oox/condformatcontext \
+ sc/source/filter/oox/connectionsbuffer \
+ sc/source/filter/oox/connectionsfragment \
+ sc/source/filter/oox/defnamesbuffer \
+ sc/source/filter/oox/drawingbase \
+ sc/source/filter/oox/drawingfragment \
+ sc/source/filter/oox/drawingmanager \
+ sc/source/filter/oox/excelchartconverter \
+ sc/source/filter/oox/excelhandlers \
+ sc/source/filter/oox/excelvbaproject \
+ sc/source/filter/oox/externallinkbuffer \
+ sc/source/filter/oox/externallinkfragment \
sc/source/filter/oox/extlstcontext \
- sc/source/filter/oox/formulabase \
- sc/source/filter/oox/formulabuffer \
- sc/source/filter/oox/formulaparser \
- sc/source/filter/oox/numberformatsbuffer \
- sc/source/filter/oox/pagesettings \
- sc/source/filter/oox/pivotcachebuffer \
- sc/source/filter/oox/pivotcachefragment \
- sc/source/filter/oox/pivottablebuffer \
- sc/source/filter/oox/pivottablefragment \
- sc/source/filter/oox/querytablebuffer \
- sc/source/filter/oox/querytablefragment \
- sc/source/filter/oox/richstringcontext \
- sc/source/filter/oox/richstring \
- sc/source/filter/oox/scenariobuffer \
- sc/source/filter/oox/scenariocontext \
- sc/source/filter/oox/sharedstringsbuffer \
- sc/source/filter/oox/sharedstringsfragment \
- sc/source/filter/oox/sheetdatabuffer \
- sc/source/filter/oox/sheetdatacontext \
- sc/source/filter/oox/stylesbuffer \
- sc/source/filter/oox/stylesfragment \
- sc/source/filter/oox/tablebuffer \
- sc/source/filter/oox/tablefragment \
- sc/source/filter/oox/themebuffer \
- sc/source/filter/oox/unitconverter \
- sc/source/filter/oox/viewsettings \
- sc/source/filter/oox/workbookfragment \
- sc/source/filter/oox/workbookhelper \
- sc/source/filter/oox/workbooksettings \
- sc/source/filter/oox/worksheetbuffer \
- sc/source/filter/oox/worksheetfragment \
- sc/source/filter/oox/worksheethelper \
- sc/source/filter/oox/worksheetsettings \
- sc/source/filter/orcus/orcusfiltersimpl \
+ sc/source/filter/oox/formulabase \
+ sc/source/filter/oox/formulabuffer \
+ sc/source/filter/oox/formulaparser \
+ sc/source/filter/oox/numberformatsbuffer \
+ sc/source/filter/oox/pagesettings \
+ sc/source/filter/oox/pivotcachebuffer \
+ sc/source/filter/oox/pivotcachefragment \
+ sc/source/filter/oox/pivottablebuffer \
+ sc/source/filter/oox/pivottablefragment \
+ sc/source/filter/oox/querytablebuffer \
+ sc/source/filter/oox/querytablefragment \
+ sc/source/filter/oox/richstringcontext \
+ sc/source/filter/oox/richstring \
+ sc/source/filter/oox/scenariobuffer \
+ sc/source/filter/oox/scenariocontext \
+ sc/source/filter/oox/sharedstringsbuffer \
+ sc/source/filter/oox/sharedstringsfragment \
+ sc/source/filter/oox/sheetdatabuffer \
+ sc/source/filter/oox/sheetdatacontext \
+ sc/source/filter/oox/stylesbuffer \
+ sc/source/filter/oox/stylesfragment \
+ sc/source/filter/oox/tablebuffer \
+ sc/source/filter/oox/tablefragment \
+ sc/source/filter/oox/themebuffer \
+ sc/source/filter/oox/unitconverter \
+ sc/source/filter/oox/viewsettings \
+ sc/source/filter/oox/workbookfragment \
+ sc/source/filter/oox/workbookhelper \
+ sc/source/filter/oox/workbooksettings \
+ sc/source/filter/oox/worksheetbuffer \
+ sc/source/filter/oox/worksheetfragment \
+ sc/source/filter/oox/worksheethelper \
+ sc/source/filter/oox/worksheetsettings \
+ sc/source/filter/orcus/orcusfiltersimpl \
))
# vim: set noet sw=4 ts=4:
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
