diff options
| author | Daniel Rentz [dr] <daniel.rentz@oracle.com> | 2011-01-27 13:20:10 +0100 |
|---|---|---|
| committer | Daniel Rentz [dr] <daniel.rentz@oracle.com> | 2011-01-27 13:20:10 +0100 |
| commit | 09f7fc99c442d71852396d97ee1079f0d03901a0 (patch) | |
| tree | df88c3a519fb6db8e48a04b9091e8f9a3f325afd /oox | |
| parent | ae88ed70d0742110277b5f64ce616fa4e5256926 (diff) | |
dr78: revert migration of oox to gbuild (will be done in a dedicated CWS)
Diffstat (limited to 'oox')
29 files changed, 1169 insertions, 653 deletions
diff --git a/oox/Library_oox.mk b/oox/Library_oox.mk deleted file mode 100755 index 5a8184006419..000000000000 --- a/oox/Library_oox.mk +++ /dev/null @@ -1,421 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2011 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -$(eval $(call gb_Library_Library,oox)) - -$(eval $(call gb_Library_add_package_headers,oox,oox_inc)) -$(eval $(call gb_Library_add_package_headers,oox,oox_source)) -$(eval $(call gb_Library_add_package_headers,oox,oox_workdir)) - -$(eval $(call gb_Library_set_componentfile,oox,oox/oox)) - -$(eval $(call gb_Library_set_include,oox,\ - -I$(SRCDIR)/oox/inc \ - -I$(OUTDIR)/inc \ - -I$(OUTDIR)/inc/offuh \ - -I$(WORKDIR)/Misc/oox \ - $$(INCLUDE) \ -)) - -$(eval $(call gb_Library_set_defs,oox,\ - $$(DEFS) \ - -DOOX_DLLIMPLEMENTATION \ -)) - -$(eval $(call gb_Library_add_linked_libs,oox,\ - basegfx \ - comphelper \ - cppu \ - cppuhelper \ - sal \ - sax \ - stl \ - xcr \ - ssl \ - crypto \ -)) - -ifeq ($(OS),SOLARIS) -$(eval $(call gb_Library_add_linked_libs,oox,\ - nsl \ - socket \ - dl \ -)) -endif - -ifeq ($(OS),WNT) -$(eval $(call gb_Library_add_linked_libs,oox,\ - kernel32 \ - msvcrt \ - uwinapi \ -)) -endif - -# object files ---------------------------------------------------------------- - -$(eval $(call gb_Library_add_exception_objects,oox,\ - oox/source/core/binarycodec \ - oox/source/core/binaryfilterbase \ - oox/source/core/contexthandler \ - oox/source/core/contexthandler2 \ - oox/source/core/fastparser \ - oox/source/core/fasttokenhandler \ - oox/source/core/filterbase \ - oox/source/core/filterdetect \ - oox/source/core/fragmenthandler \ - oox/source/core/fragmenthandler2 \ - oox/source/core/recordparser \ - oox/source/core/relations \ - oox/source/core/relationshandler \ - oox/source/core/services \ - oox/source/core/xmlfilterbase \ - oox/source/docprop/docprophandler \ - oox/source/docprop/ooxmldocpropimport \ - oox/source/drawingml/clrscheme \ - oox/source/drawingml/clrschemecontext \ - oox/source/drawingml/color \ - oox/source/drawingml/colorchoicecontext \ - oox/source/drawingml/connectorshapecontext \ - oox/source/drawingml/customshapegeometry \ - oox/source/drawingml/customshapeproperties \ - oox/source/drawingml/drawingmltypes \ - oox/source/drawingml/embeddedwavaudiofile \ - oox/source/drawingml/fillproperties \ - oox/source/drawingml/fillpropertiesgroupcontext \ - oox/source/drawingml/graphicshapecontext \ - oox/source/drawingml/guidcontext \ - oox/source/drawingml/hyperlinkcontext \ - oox/source/drawingml/lineproperties \ - oox/source/drawingml/linepropertiescontext \ - oox/source/drawingml/objectdefaultcontext \ - oox/source/drawingml/shape \ - oox/source/drawingml/shapecontext \ - oox/source/drawingml/shapegroupcontext \ - oox/source/drawingml/shapepropertiescontext \ - oox/source/drawingml/shapepropertymap \ - oox/source/drawingml/shapestylecontext \ - oox/source/drawingml/spdefcontext \ - oox/source/drawingml/textbody \ - oox/source/drawingml/textbodycontext \ - oox/source/drawingml/textbodyproperties \ - oox/source/drawingml/textbodypropertiescontext \ - oox/source/drawingml/textcharacterproperties \ - oox/source/drawingml/textcharacterpropertiescontext \ - oox/source/drawingml/textfield \ - oox/source/drawingml/textfieldcontext \ - oox/source/drawingml/textfont \ - oox/source/drawingml/textliststyle \ - oox/source/drawingml/textliststylecontext \ - oox/source/drawingml/textparagraph \ - oox/source/drawingml/textparagraphproperties \ - oox/source/drawingml/textparagraphpropertiescontext \ - oox/source/drawingml/textrun \ - oox/source/drawingml/textspacingcontext \ - oox/source/drawingml/texttabstoplistcontext \ - oox/source/drawingml/theme \ - oox/source/drawingml/themeelementscontext \ - oox/source/drawingml/themefragmenthandler \ - oox/source/drawingml/transform2dcontext \ - oox/source/drawingml/chart/axiscontext \ - oox/source/drawingml/chart/axisconverter \ - oox/source/drawingml/chart/axismodel \ - oox/source/drawingml/chart/chartcontextbase \ - oox/source/drawingml/chart/chartconverter \ - oox/source/drawingml/chart/chartdrawingfragment \ - oox/source/drawingml/chart/chartspaceconverter \ - oox/source/drawingml/chart/chartspacefragment \ - oox/source/drawingml/chart/chartspacemodel \ - oox/source/drawingml/chart/converterbase \ - oox/source/drawingml/chart/datasourcecontext \ - oox/source/drawingml/chart/datasourceconverter \ - oox/source/drawingml/chart/datasourcemodel \ - oox/source/drawingml/chart/modelbase \ - oox/source/drawingml/chart/objectformatter \ - oox/source/drawingml/chart/plotareacontext \ - oox/source/drawingml/chart/plotareaconverter \ - oox/source/drawingml/chart/plotareamodel \ - oox/source/drawingml/chart/seriescontext \ - oox/source/drawingml/chart/seriesconverter \ - oox/source/drawingml/chart/seriesmodel \ - oox/source/drawingml/chart/titlecontext \ - oox/source/drawingml/chart/titleconverter \ - oox/source/drawingml/chart/titlemodel \ - oox/source/drawingml/chart/typegroupcontext \ - oox/source/drawingml/chart/typegroupconverter \ - oox/source/drawingml/chart/typegroupmodel \ - oox/source/drawingml/diagram/datamodelcontext \ - oox/source/drawingml/diagram/diagram \ - oox/source/drawingml/diagram/diagramdefinitioncontext \ - oox/source/drawingml/diagram/diagramfragmenthandler \ - oox/source/drawingml/diagram/diagramlayoutatoms \ - oox/source/drawingml/diagram/layoutnodecontext \ - oox/source/drawingml/table/tablebackgroundstylecontext \ - oox/source/drawingml/table/tablecell \ - oox/source/drawingml/table/tablecellcontext \ - oox/source/drawingml/table/tablecontext \ - oox/source/drawingml/table/tablepartstylecontext \ - oox/source/drawingml/table/tableproperties \ - oox/source/drawingml/table/tablerow \ - oox/source/drawingml/table/tablerowcontext \ - oox/source/drawingml/table/tablestyle \ - oox/source/drawingml/table/tablestylecellstylecontext \ - oox/source/drawingml/table/tablestylecontext \ - oox/source/drawingml/table/tablestylelist \ - oox/source/drawingml/table/tablestylelistfragmenthandler \ - oox/source/drawingml/table/tablestylepart \ - oox/source/drawingml/table/tablestyletextstylecontext \ - oox/source/dump/biffdumper \ - oox/source/dump/dffdumper \ - oox/source/dump/dumperbase \ - oox/source/dump/oledumper \ - oox/source/dump/pptxdumper \ - oox/source/dump/xlsbdumper \ - oox/source/helper/attributelist \ - oox/source/helper/binaryinputstream \ - oox/source/helper/binaryoutputstream \ - oox/source/helper/binarystreambase \ - oox/source/helper/containerhelper \ - oox/source/helper/graphichelper \ - oox/source/helper/modelobjecthelper \ - oox/source/helper/progressbar \ - oox/source/helper/propertymap \ - oox/source/helper/propertyset \ - oox/source/helper/storagebase \ - oox/source/helper/textinputstream \ - oox/source/helper/zipstorage \ - oox/source/ole/axbinaryreader \ - oox/source/ole/axcontrol \ - oox/source/ole/axcontrolfragment \ - oox/source/ole/olehelper \ - oox/source/ole/oleobjecthelper \ - oox/source/ole/olestorage \ - oox/source/ole/vbacontrol \ - oox/source/ole/vbahelper \ - oox/source/ole/vbainputstream \ - oox/source/ole/vbamodule \ - oox/source/ole/vbaproject \ - oox/source/ole/vbaprojectfilter \ - oox/source/ppt/animationspersist \ - oox/source/ppt/animationtypes \ - oox/source/ppt/animvariantcontext \ - oox/source/ppt/backgroundproperties \ - oox/source/ppt/buildlistcontext \ - oox/source/ppt/commonbehaviorcontext \ - oox/source/ppt/commontimenodecontext \ - oox/source/ppt/conditioncontext \ - oox/source/ppt/customshowlistcontext \ - oox/source/ppt/headerfootercontext \ - oox/source/ppt/layoutfragmenthandler \ - oox/source/ppt/pptfilterhelpers \ - oox/source/ppt/pptimport \ - oox/source/ppt/pptshape \ - oox/source/ppt/pptshapecontext \ - oox/source/ppt/pptshapegroupcontext \ - oox/source/ppt/pptshapepropertiescontext \ - oox/source/ppt/presentationfragmenthandler \ - oox/source/ppt/slidefragmenthandler \ - oox/source/ppt/slidemastertextstylescontext \ - oox/source/ppt/slidepersist \ - oox/source/ppt/slidetimingcontext \ - oox/source/ppt/slidetransition \ - oox/source/ppt/slidetransitioncontext \ - oox/source/ppt/soundactioncontext \ - oox/source/ppt/timeanimvaluecontext \ - oox/source/ppt/timenode \ - oox/source/ppt/timenodelistcontext \ - oox/source/ppt/timetargetelementcontext \ - oox/source/shape/ShapeContextHandler \ - oox/source/shape/ShapeFilterBase \ - oox/source/token/namespacemap \ - oox/source/token/propertynames \ - oox/source/token/tokenmap \ - oox/source/vml/vmldrawing \ - oox/source/vml/vmldrawingfragment \ - oox/source/vml/vmlformatting \ - oox/source/vml/vmlinputstream \ - oox/source/vml/vmlshape \ - oox/source/vml/vmlshapecontainer \ - oox/source/vml/vmlshapecontext \ - oox/source/vml/vmltextbox \ - oox/source/vml/vmltextboxcontext \ - oox/source/xls/addressconverter \ - oox/source/xls/autofilterbuffer \ - oox/source/xls/autofiltercontext \ - oox/source/xls/biffcodec \ - oox/source/xls/biffdetector \ - oox/source/xls/biffhelper \ - oox/source/xls/biffinputstream \ - oox/source/xls/biffoutputstream \ - oox/source/xls/chartsheetfragment \ - oox/source/xls/commentsbuffer \ - oox/source/xls/commentsfragment \ - oox/source/xls/condformatbuffer \ - oox/source/xls/condformatcontext \ - oox/source/xls/connectionsbuffer \ - oox/source/xls/connectionsfragment \ - oox/source/xls/defnamesbuffer \ - oox/source/xls/drawingbase \ - oox/source/xls/drawingfragment \ - oox/source/xls/drawingmanager \ - oox/source/xls/excelchartconverter \ - oox/source/xls/excelfilter \ - oox/source/xls/excelhandlers \ - oox/source/xls/excelvbaproject \ - oox/source/xls/externallinkbuffer \ - oox/source/xls/externallinkfragment \ - oox/source/xls/formulabase \ - oox/source/xls/formulaparser \ - oox/source/xls/numberformatsbuffer \ - oox/source/xls/ooxformulaparser \ - oox/source/xls/pagesettings \ - oox/source/xls/pivotcachebuffer \ - oox/source/xls/pivotcachefragment \ - oox/source/xls/pivottablebuffer \ - oox/source/xls/pivottablefragment \ - oox/source/xls/querytablebuffer \ - oox/source/xls/querytablefragment \ - oox/source/xls/richstring \ - oox/source/xls/richstringcontext \ - oox/source/xls/scenariobuffer \ - oox/source/xls/scenariocontext \ - oox/source/xls/sharedformulabuffer \ - oox/source/xls/sharedstringsbuffer \ - oox/source/xls/sharedstringsfragment \ - oox/source/xls/sheetdatacontext \ - oox/source/xls/stylesbuffer \ - oox/source/xls/stylesfragment \ - oox/source/xls/tablebuffer \ - oox/source/xls/tablefragment \ - oox/source/xls/themebuffer \ - oox/source/xls/unitconverter \ - oox/source/xls/viewsettings \ - oox/source/xls/workbookfragment \ - oox/source/xls/workbookhelper \ - oox/source/xls/workbooksettings \ - oox/source/xls/worksheetbuffer \ - oox/source/xls/worksheetfragment \ - oox/source/xls/worksheethelper \ - oox/source/xls/worksheetsettings \ -)) - -# generate source and header files from text files ---------------------------- - -SRCDIR_TOKEN = $(SRCDIR)/oox/source/token -WORKDIR_TOKEN = $(WORKDIR)/Misc/oox/token - -$(call gb_LinkTarget_get_headers_target,$(call gb_Library_get_linktargetname,$(call gb_Library_get_filename,oox))) : $(WORKDIR_TOKEN)/namespaces.hxx $(WORKDIR_TOKEN)/namespaces.txt $(WORKDIR_TOKEN)/tokens.hxx $(WORKDIR_TOKEN)/properties.hxx - -# XML namespace identifiers and names - -$(WORKDIR_TOKEN)/namespaces.hxx : $(SRCDIR_TOKEN)/namespaces.hxx.head $(WORKDIR_TOKEN)/namespaceids.inc $(SRCDIR_TOKEN)/namespaces.hxx.tail - $(call gb_Output_announce,$@,$(true),CAT,1) - $(call gb_Helper_abbreviate_dirs,cat $^ > $@) - -$(WORKDIR_TOKEN)/namespaceids.inc : $(SRCDIR_TOKEN)/namespaces.txt $(SRCDIR_TOKEN)/namespaces.pl - $(call gb_Output_announce,$@,$(true),PRL,1) - $(call gb_Helper_abbreviate_dirs, \ - mkdir -p $(dir $@) && $(PERL) $(SRCDIR_TOKEN)/namespaces.pl 1 < $< > $@ \ - ) - -$(SRCDIR_TOKEN)/namespacemap.cxx : $(WORKDIR_TOKEN)/namespacenames.inc - -$(WORKDIR_TOKEN)/namespacenames.inc : $(SRCDIR_TOKEN)/namespaces.txt $(SRCDIR_TOKEN)/namespaces.pl - $(call gb_Output_announce,$@,$(true),PRL,1) - $(call gb_Helper_abbreviate_dirs, \ - mkdir -p $(dir $@) && $(PERL) $(SRCDIR_TOKEN)/namespaces.pl 2 < $< > $@ \ - ) - -$(WORKDIR_TOKEN)/namespaces.txt : $(SRCDIR_TOKEN)/namespaces.txt $(SRCDIR_TOKEN)/namespaces.pl - $(call gb_Output_announce,$@,$(true),PRL,1) - $(call gb_Helper_abbreviate_dirs, \ - mkdir -p $(dir $@) && $(PERL) $(SRCDIR_TOKEN)/namespaces.pl 3 < $< > $@ \ - ) - -# XML token identifiers and names - -$(WORKDIR_TOKEN)/tokens.hxx : $(SRCDIR_TOKEN)/tokens.hxx.head $(WORKDIR_TOKEN)/tokenids.inc $(SRCDIR_TOKEN)/tokens.hxx.tail - $(call gb_Output_announce,$@,$(true),CAT,1) - $(call gb_Helper_abbreviate_dirs,cat $^ > $@) - -$(WORKDIR_TOKEN)/tokenids.inc : $(SRCDIR_TOKEN)/tokens.txt $(SRCDIR_TOKEN)/tokens.pl - $(call gb_Output_announce,$@,$(true),PRL,1) - $(call gb_Helper_abbreviate_dirs, \ - mkdir -p $(dir $@) && $(PERL) $(SRCDIR_TOKEN)/tokens.pl 1 < $< > $@ \ - ) - -$(SRCDIR_TOKEN)/tokenmap.cxx : $(WORKDIR_TOKEN)/tokennames.inc - -$(WORKDIR_TOKEN)/tokennames.inc : $(SRCDIR_TOKEN)/tokens.txt $(SRCDIR_TOKEN)/tokens.pl - $(call gb_Output_announce,$@,$(true),PRL,1) - $(call gb_Helper_abbreviate_dirs, \ - mkdir -p $(dir $@) && $(PERL) $(SRCDIR_TOKEN)/tokens.pl 2 < $< > $@ \ - ) - -$(SRCDIR_TOKEN)/tokenmap.cxx : $(WORKDIR_TOKEN)/tokenhash.inc - -$(WORKDIR_TOKEN)/tokenhash.inc : $(WORKDIR_TOKEN)/tokenhash.gperf - $(call gb_Output_announce,$@,$(true),GPF,3) - $(call gb_Helper_abbreviate_dirs, \ - gperf $< | $(gb_AWK) -- '{ if ($$0 !~ /^#line/){ gsub("\\(char\\*\\)0", "0", $$0); print; } }' > $@ \ - ) - -$(WORKDIR_TOKEN)/tokenhash.gperf : $(SRCDIR_TOKEN)/tokens.txt $(SRCDIR_TOKEN)/tokens.pl - $(call gb_Output_announce,$@,$(true),PRL,1) - $(call gb_Helper_abbreviate_dirs, \ - mkdir -p $(dir $@) && $(PERL) $(SRCDIR_TOKEN)/tokens.pl 3 < $< > $@ \ - ) - -# UNO property identifiers and names - -$(WORKDIR_TOKEN)/properties.hxx : $(SRCDIR_TOKEN)/properties.hxx.head $(WORKDIR_TOKEN)/propertyids.inc $(SRCDIR_TOKEN)/properties.hxx.tail - $(call gb_Output_announce,$@,$(true),CAT,1) - $(call gb_Helper_abbreviate_dirs,cat $^ > $@) - -$(WORKDIR_TOKEN)/propertyids.inc : $(SRCDIR_TOKEN)/properties.txt $(SRCDIR_TOKEN)/properties.pl - $(call gb_Output_announce,$@,$(true),PRL,1) - $(call gb_Helper_abbreviate_dirs, \ - mkdir -p $(dir $@) && $(PERL) $(SRCDIR_TOKEN)/properties.pl 1 < $< > $@ \ - ) - -$(SRCDIR_TOKEN)/propertynames.cxx : $(WORKDIR_TOKEN)/propertynames.inc - -$(WORKDIR_TOKEN)/propertynames.inc : $(SRCDIR_TOKEN)/properties.txt $(SRCDIR_TOKEN)/properties.pl - $(call gb_Output_announce,$@,$(true),PRL,1) - $(call gb_Helper_abbreviate_dirs, \ - mkdir -p $(dir $@) && $(PERL) $(SRCDIR_TOKEN)/properties.pl 2 < $< > $@ \ - ) - -# clean generated files ------------------------------------------------------- - -.PHONY : $(WORKDIR)/Misc/oox/misc_clean - -$(call gb_LinkTarget_get_clean_target,$(call gb_Library_get_linktargetname,$(call gb_Library_get_filename,oox))) : $(WORKDIR)/Misc/oox/misc_clean - -$(WORKDIR)/Misc/oox/misc_clean : - $(call gb_Helper_abbreviate_dirs,rm -rf $(dir $@)) - -# vim: set noet sw=4 ts=4: diff --git a/oox/Package_inc.mk b/oox/Package_inc.mk deleted file mode 100755 index 6870821343d2..000000000000 --- a/oox/Package_inc.mk +++ /dev/null @@ -1,45 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2011 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -$(eval $(call gb_Package_Package,oox_inc,$(SRCDIR)/oox/inc)) -$(eval $(call gb_Package_add_file,oox_inc,inc/oox/dllapi.h,oox/dllapi.h)) -$(eval $(call gb_Package_add_file,oox_inc,inc/oox/core/filterbase.hxx,oox/core/filterbase.hxx)) -$(eval $(call gb_Package_add_file,oox_inc,inc/oox/core/filterdetect.hxx,oox/core/filterdetect.hxx)) -$(eval $(call gb_Package_add_file,oox_inc,inc/oox/core/relations.hxx,oox/core/relations.hxx)) -$(eval $(call gb_Package_add_file,oox_inc,inc/oox/core/xmlfilterbase.hxx,oox/core/xmlfilterbase.hxx)) -$(eval $(call gb_Package_add_file,oox_inc,inc/oox/drawingml/chart/chartconverter.hxx,oox/drawingml/chart/chartconverter.hxx)) -$(eval $(call gb_Package_add_file,oox_inc,inc/oox/drawingml/table/tablestylelist.hxx,oox/drawingml/table/tablestylelist.hxx)) -$(eval $(call gb_Package_add_file,oox_inc,inc/oox/helper/binarystreambase.hxx,oox/helper/binarystreambase.hxx)) -$(eval $(call gb_Package_add_file,oox_inc,inc/oox/helper/helper.hxx,oox/helper/helper.hxx)) -$(eval $(call gb_Package_add_file,oox_inc,inc/oox/helper/refmap.hxx,oox/helper/refmap.hxx)) -$(eval $(call gb_Package_add_file,oox_inc,inc/oox/helper/refvector.hxx,oox/helper/refvector.hxx)) -$(eval $(call gb_Package_add_file,oox_inc,inc/oox/helper/storagebase.hxx,oox/helper/storagebase.hxx)) -$(eval $(call gb_Package_add_file,oox_inc,inc/oox/helper/zipstorage.hxx,oox/helper/zipstorage.hxx)) -$(eval $(call gb_Package_add_file,oox_inc,inc/oox/ole/vbaproject.hxx,oox/ole/vbaproject.hxx)) -$(eval $(call gb_Package_add_file,oox_inc,inc/oox/vml/vmldrawing.hxx,oox/vml/vmldrawing.hxx)) -$(eval $(call gb_Package_add_file,oox_inc,inc/oox/vml/vmlshape.hxx,oox/vml/vmlshape.hxx)) -$(eval $(call gb_Package_add_file,oox_inc,inc/oox/xls/excelvbaproject.hxx,oox/xls/excelvbaproject.hxx)) diff --git a/oox/Package_source.mk b/oox/Package_source.mk deleted file mode 100755 index 95917616602a..000000000000 --- a/oox/Package_source.mk +++ /dev/null @@ -1,29 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2011 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -$(eval $(call gb_Package_Package,oox_source,$(SRCDIR)/oox/source)) -$(eval $(call gb_Package_add_file,oox_source,inc/oox/token/tokens.txt,token/tokens.txt)) diff --git a/oox/prj/build.lst b/oox/prj/build.lst index 2c965458b9fa..03735c73dd11 100644 --- a/oox/prj/build.lst +++ b/oox/prj/build.lst @@ -1,3 +1,18 @@ oox oox : vos cppu cppuhelper comphelper sal offapi sax basegfx xmlscript tools vcl BOOST:boost OPENSSL:openssl LIBXSLT:libxslt NULL -oox oox usr1 - all oox_mkout NULL -oox oox\prj nmake - all oox_prj NULL +oox oox usr1 - all oox_mkout NULL +oox oox\prj get - all oox_prj NULL +oox oox\source\token nmake - all oox_token NULL +oox oox\source\helper nmake - all oox_helper oox_token NULL +oox oox\source\core nmake - all oox_core oox_token NULL +oox oox\source\ole nmake - all oox_ole oox_token NULL +oox oox\source\docprop nmake - all oox_docprop oox_token NULL +oox oox\source\drawingml nmake - all oox_drawingml oox_token NULL +oox oox\source\drawingml\diagram nmake - all oox_diagram oox_token NULL +oox oox\source\drawingml\chart nmake - all oox_chart oox_token NULL +oox oox\source\drawingml\table nmake - all oox_table oox_token NULL +oox oox\source\ppt nmake - all oox_ppt oox_token NULL +oox oox\source\vml nmake - all oox_vml oox_token NULL +oox oox\source\xls nmake - all oox_xls oox_token NULL +oox oox\source\dump nmake - all oox_dump oox_token NULL +oox oox\source\shape nmake - all oox_shape oox_token NULL +oox oox\util nmake - all oox_util oox_token oox_helper oox_core oox_ole oox_vml oox_drawingml oox_diagram oox_chart oox_table oox_ppt oox_xls oox_dump oox_shape oox_docprop NULL diff --git a/oox/prj/d.lst b/oox/prj/d.lst index e69de29bb2d1..69ff66b95bc5 100644 --- a/oox/prj/d.lst +++ b/oox/prj/d.lst @@ -0,0 +1,46 @@ +mkdir: %_DEST%\inc%_EXT%\oox +mkdir: %_DEST%\inc%_EXT%\oox\core +mkdir: %_DEST%\inc%_EXT%\oox\drawingml +mkdir: %_DEST%\inc%_EXT%\oox\drawingml\chart +mkdir: %_DEST%\inc%_EXT%\oox\drawingml\table +mkdir: %_DEST%\inc%_EXT%\oox\helper +mkdir: %_DEST%\inc%_EXT%\oox\ole +mkdir: %_DEST%\inc%_EXT%\oox\token +mkdir: %_DEST%\inc%_EXT%\oox\vml +mkdir: %_DEST%\inc%_EXT%\oox\xls + +..\%__SRC%\misc\*.map %_DEST%\bin%_EXT%\*.map +..\%__SRC%\lib\ixo.lib %_DEST%\lib%_EXT%\ixo.lib +..\%__SRC%\lib\xol.lib %_DEST%\lib%_EXT%\xol.lib +..\%__SRC%\lib\libxol.a %_DEST%\lib%_EXT%\libxol.a +..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll +..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%\lib*.so +..\%__SRC%\lib\i*.lib %_DEST%\lib%_EXT%\i*.lib +..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib + +..\%__SRC%\inc\oox\token\tokens.hxx %_DEST%\inc%_EXT%\oox\token\tokens.hxx +..\%__SRC%\misc\namespaces.txt %_DEST%\inc%_EXT%\oox\namespaces.txt + +..\source\token\tokens.txt %_DEST%\inc%_EXT%\oox\token.txt +..\inc\oox\dllapi.h %_DEST%\inc%_EXT%\oox\dllapi.h +..\inc\oox\helper\binarystreambase.hxx %_DEST%\inc%_EXT%\oox\helper\binarystreambase.hxx +..\inc\oox\helper\helper.hxx %_DEST%\inc%_EXT%\oox\helper\helper.hxx +..\inc\oox\helper\refmap.hxx %_DEST%\inc%_EXT%\oox\helper\refmap.hxx +..\inc\oox\helper\refvector.hxx %_DEST%\inc%_EXT%\oox\helper\refvector.hxx +..\inc\oox\helper\storagebase.hxx %_DEST%\inc%_EXT%\oox\helper\storagebase.hxx +..\inc\oox\helper\zipstorage.hxx %_DEST%\inc%_EXT%\oox\helper\zipstorage.hxx +..\inc\oox\core\filterbase.hxx %_DEST%\inc%_EXT%\oox\core\filterbase.hxx +..\inc\oox\core\filterdetect.hxx %_DEST%\inc%_EXT%\oox\core\filterdetect.hxx +..\inc\oox\core\relations.hxx %_DEST%\inc%_EXT%\oox\core\relations.hxx +..\inc\oox\core\xmlfilterbase.hxx %_DEST%\inc%_EXT%\oox\core\xmlfilterbase.hxx +..\inc\oox\drawingml\chart\chartconverter.hxx %_DEST%\inc%_EXT%\oox\drawingml\chart\chartconverter.hxx +..\inc\oox\drawingml\table\tablestylelist.hxx %_DEST%\inc%_EXT%\oox\drawingml\table\tablestylelist.hxx +..\inc\oox\ole\vbaproject.hxx %_DEST%\inc%_EXT%\oox\ole\vbaproject.hxx +..\inc\oox\vml\vmldrawing.hxx %_DEST%\inc%_EXT%\oox\vml\vmldrawing.hxx +..\inc\oox\vml\vmlshape.hxx %_DEST%\inc%_EXT%\oox\vml\vmlshape.hxx +..\inc\oox\xls\excelvbaproject.hxx %_DEST%\inc%_EXT%\oox\xls\excelvbaproject.hxx + +dos: sh -c "if test %OS% = MACOSX; then create-bundle %_DEST%\lib%_EXT%\*.dylib; fi" + +..\xml\components.xml %_DEST%\xml%_EXT%\components.xml +..\%__SRC%\misc\oox.component %_DEST%\xml%_EXT%\oox.component diff --git a/oox/source/core/makefile.mk b/oox/source/core/makefile.mk new file mode 100755 index 000000000000..2b58b95777df --- /dev/null +++ b/oox/source/core/makefile.mk @@ -0,0 +1,66 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2010 Oracle and/or its affiliates. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# <http://www.openoffice.org/license.html> +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +PRJ=..$/.. + +PRJNAME=oox +TARGET=core +AUTOSEG=true + +ENABLE_EXCEPTIONS=TRUE + +# --- Settings ----------------------------------------------------- + +.INCLUDE : settings.mk +.INCLUDE: $(PRJ)$/util$/makefile.pmk + +.IF "$(SYSTEM_OPENSSL)" == "YES" +CFLAGS+= $(OPENSSL_CFLAGS) +.ENDIF + +# --- Files -------------------------------------------------------- + +SLOFILES = \ + $(SLO)$/binarycodec.obj \ + $(SLO)$/binaryfilterbase.obj \ + $(SLO)$/contexthandler.obj \ + $(SLO)$/contexthandler2.obj \ + $(SLO)$/fastparser.obj \ + $(SLO)$/fasttokenhandler.obj \ + $(SLO)$/filterbase.obj \ + $(SLO)$/filterdetect.obj \ + $(SLO)$/fragmenthandler.obj \ + $(SLO)$/fragmenthandler2.obj \ + $(SLO)$/recordparser.obj \ + $(SLO)$/relations.obj \ + $(SLO)$/relationshandler.obj \ + $(SLO)$/services.obj \ + $(SLO)$/xmlfilterbase.obj + +# --- Targets ------------------------------------------------------- + +.INCLUDE : target.mk diff --git a/oox/Module_oox.mk b/oox/source/docprop/makefile.mk index f5412ea1d221..5687178da9e0 100755 --- a/oox/Module_oox.mk +++ b/oox/source/docprop/makefile.mk @@ -2,7 +2,7 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2000, 2011 Oracle and/or its affiliates. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # @@ -14,24 +14,36 @@ # # OpenOffice.org is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU Lesser General Public License version 3 for more details # (a copy is included in the LICENSE file that accompanied this code). # # You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see +# version 3 along with OpenOffice.org. If not, see # <http://www.openoffice.org/license.html> # for a copy of the LGPLv3 License. # #************************************************************************* -$(eval $(call gb_Module_Module,oox)) +PRJ=..$/.. -$(eval $(call gb_Module_add_targets,oox,\ - Library_oox \ - Package_inc \ - Package_source \ - Package_workdir \ -)) +PRJNAME=oox +TARGET=docprop +AUTOSEG=true -# vim: set noet ts=4 sw=4: +ENABLE_EXCEPTIONS=TRUE + +# --- Settings ----------------------------------------------------- + +.INCLUDE : settings.mk +.INCLUDE: $(PRJ)$/util$/makefile.pmk + +# --- Files -------------------------------------------------------- + +SLOFILES = \ + $(SLO)$/ooxmldocpropimport.obj \ + $(SLO)$/docprophandler.obj + +# --- Targets ------------------------------------------------------- + +.INCLUDE : target.mk diff --git a/oox/source/drawingml/chart/makefile.mk b/oox/source/drawingml/chart/makefile.mk new file mode 100755 index 000000000000..84762e6a2540 --- /dev/null +++ b/oox/source/drawingml/chart/makefile.mk @@ -0,0 +1,74 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2010 Oracle and/or its affiliates. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# <http://www.openoffice.org/license.html> +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +PRJ=..$/..$/.. + +PRJNAME=oox +TARGET=chart +AUTOSEG=true + +ENABLE_EXCEPTIONS=TRUE + +# --- Settings ----------------------------------------------------- + +.INCLUDE : settings.mk +.INCLUDE: $(PRJ)$/util$/makefile.pmk + +# --- Files -------------------------------------------------------- + +SLOFILES = \ + $(SLO)$/axiscontext.obj \ + $(SLO)$/axisconverter.obj \ + $(SLO)$/axismodel.obj \ + $(SLO)$/chartcontextbase.obj \ + $(SLO)$/chartconverter.obj \ + $(SLO)$/chartdrawingfragment.obj \ + $(SLO)$/chartspaceconverter.obj \ + $(SLO)$/chartspacefragment.obj \ + $(SLO)$/chartspacemodel.obj \ + $(SLO)$/converterbase.obj \ + $(SLO)$/datasourcecontext.obj \ + $(SLO)$/datasourceconverter.obj \ + $(SLO)$/datasourcemodel.obj \ + $(SLO)$/modelbase.obj \ + $(SLO)$/objectformatter.obj \ + $(SLO)$/plotareacontext.obj \ + $(SLO)$/plotareaconverter.obj \ + $(SLO)$/plotareamodel.obj \ + $(SLO)$/seriescontext.obj \ + $(SLO)$/seriesconverter.obj \ + $(SLO)$/seriesmodel.obj \ + $(SLO)$/titlecontext.obj \ + $(SLO)$/titleconverter.obj \ + $(SLO)$/titlemodel.obj \ + $(SLO)$/typegroupcontext.obj \ + $(SLO)$/typegroupconverter.obj \ + $(SLO)$/typegroupmodel.obj + +# --- Targets ------------------------------------------------------- + +.INCLUDE : target.mk diff --git a/oox/source/drawingml/diagram/makefile.mk b/oox/source/drawingml/diagram/makefile.mk new file mode 100755 index 000000000000..9d526ed3d3fb --- /dev/null +++ b/oox/source/drawingml/diagram/makefile.mk @@ -0,0 +1,53 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2010 Oracle and/or its affiliates. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# <http://www.openoffice.org/license.html> +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +PRJ=..$/..$/.. + +PRJNAME=oox +TARGET=diagram +AUTOSEG=true + +ENABLE_EXCEPTIONS=TRUE + +# --- Settings ----------------------------------------------------- + +.INCLUDE : settings.mk +.INCLUDE: $(PRJ)$/util$/makefile.pmk + +# --- Files -------------------------------------------------------- + +SLOFILES = \ + $(SLO)$/diagram.obj \ + $(SLO)$/diagramfragmenthandler.obj \ + $(SLO)$/diagramdefinitioncontext.obj \ + $(SLO)$/diagramlayoutatoms.obj \ + $(SLO)$/datamodelcontext.obj \ + $(SLO)$/layoutnodecontext.obj + +# --- Targets ------------------------------------------------------- + +.INCLUDE : target.mk diff --git a/oox/source/drawingml/makefile.mk b/oox/source/drawingml/makefile.mk new file mode 100755 index 000000000000..0546fb4c233d --- /dev/null +++ b/oox/source/drawingml/makefile.mk @@ -0,0 +1,92 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2010 Oracle and/or its affiliates. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# <http://www.openoffice.org/license.html> +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +PRJ=..$/.. + +PRJNAME=oox +TARGET=drawingml +AUTOSEG=true + +ENABLE_EXCEPTIONS=TRUE + +# --- Settings ----------------------------------------------------- + +.INCLUDE : settings.mk +.INCLUDE: $(PRJ)$/util$/makefile.pmk + +# --- Files -------------------------------------------------------- + +SLOFILES = \ + $(SLO)$/clrscheme.obj\ + $(SLO)$/clrschemecontext.obj\ + $(SLO)$/color.obj\ + $(SLO)$/colorchoicecontext.obj\ + $(SLO)$/connectorshapecontext.obj\ + $(SLO)$/customshapegeometry.obj\ + $(SLO)$/customshapeproperties.obj\ + $(SLO)$/drawingmltypes.obj\ + $(SLO)$/embeddedwavaudiofile.obj\ + $(SLO)$/fillproperties.obj\ + $(SLO)$/fillpropertiesgroupcontext.obj\ + $(SLO)$/graphicshapecontext.obj\ + $(SLO)$/guidcontext.obj\ + $(SLO)$/hyperlinkcontext.obj\ + $(SLO)$/lineproperties.obj\ + $(SLO)$/linepropertiescontext.obj\ + $(SLO)$/objectdefaultcontext.obj\ + $(SLO)$/shape.obj\ + $(SLO)$/shapecontext.obj\ + $(SLO)$/shapegroupcontext.obj\ + $(SLO)$/shapepropertiescontext.obj\ + $(SLO)$/shapepropertymap.obj\ + $(SLO)$/shapestylecontext.obj\ + $(SLO)$/spdefcontext.obj\ + $(SLO)$/textbody.obj\ + $(SLO)$/textbodycontext.obj\ + $(SLO)$/textbodyproperties.obj\ + $(SLO)$/textbodypropertiescontext.obj\ + $(SLO)$/textcharacterproperties.obj\ + $(SLO)$/textcharacterpropertiescontext.obj\ + $(SLO)$/textfield.obj\ + $(SLO)$/textfieldcontext.obj\ + $(SLO)$/textfont.obj\ + $(SLO)$/textliststyle.obj \ + $(SLO)$/textliststylecontext.obj\ + $(SLO)$/textparagraph.obj\ + $(SLO)$/textparagraphproperties.obj\ + $(SLO)$/textparagraphpropertiescontext.obj\ + $(SLO)$/textrun.obj\ + $(SLO)$/textspacingcontext.obj\ + $(SLO)$/texttabstoplistcontext.obj\ + $(SLO)$/theme.obj\ + $(SLO)$/themeelementscontext.obj\ + $(SLO)$/themefragmenthandler.obj\ + $(SLO)$/transform2dcontext.obj + +# --- Targets ------------------------------------------------------- + +.INCLUDE : target.mk diff --git a/oox/source/drawingml/table/makefile.mk b/oox/source/drawingml/table/makefile.mk new file mode 100755 index 000000000000..fa71971fc278 --- /dev/null +++ b/oox/source/drawingml/table/makefile.mk @@ -0,0 +1,62 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2010 Oracle and/or its affiliates. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# <http://www.openoffice.org/license.html> +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +PRJ=..$/..$/.. + +PRJNAME=oox +TARGET=table +AUTOSEG=true + +ENABLE_EXCEPTIONS=TRUE + +# --- Settings ----------------------------------------------------- + +.INCLUDE : settings.mk +.INCLUDE: $(PRJ)$/util$/makefile.pmk + +# --- Files -------------------------------------------------------- + +SLOFILES = \ + $(SLO)$/tablecontext.obj \ + $(SLO)$/tableproperties.obj \ + $(SLO)$/tablerow.obj \ + $(SLO)$/tablerowcontext.obj \ + $(SLO)$/tablecell.obj \ + $(SLO)$/tablecellcontext.obj \ + $(SLO)$/tablestylelist.obj \ + $(SLO)$/tablestylelistfragmenthandler.obj \ + $(SLO)$/tablestylecontext.obj \ + $(SLO)$/tablestyle.obj \ + $(SLO)$/tablebackgroundstylecontext.obj \ + $(SLO)$/tablepartstylecontext.obj \ + $(SLO)$/tablestyletextstylecontext.obj \ + $(SLO)$/tablestylecellstylecontext.obj \ + $(SLO)$/tablestylepart.obj + +# --- Targets ------------------------------------------------------- + +.INCLUDE : target.mk diff --git a/oox/Package_workdir.mk b/oox/source/dump/makefile.mk index 8bbde7140301..1e5f615675cc 100755 --- a/oox/Package_workdir.mk +++ b/oox/source/dump/makefile.mk @@ -2,7 +2,7 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2000, 2011 Oracle and/or its affiliates. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # @@ -14,19 +14,40 @@ # # OpenOffice.org is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU Lesser General Public License version 3 for more details # (a copy is included in the LICENSE file that accompanied this code). # # You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see +# version 3 along with OpenOffice.org. If not, see # <http://www.openoffice.org/license.html> # for a copy of the LGPLv3 License. # #************************************************************************* -$(eval $(call gb_Package_Package,oox_workdir,$(WORKDIR)/Misc/oox)) -$(eval $(call gb_Package_add_file,oox_workdir,inc/oox/token/namespaces.hxx,token/namespaces.hxx)) -$(eval $(call gb_Package_add_file,oox_workdir,inc/oox/token/namespaces.txt,token/namespaces.txt)) -$(eval $(call gb_Package_add_file,oox_workdir,inc/oox/token/properties.hxx,token/properties.hxx)) -$(eval $(call gb_Package_add_file,oox_workdir,inc/oox/token/tokens.hxx,token/tokens.hxx)) +PRJ=..$/.. + +PRJNAME=oox +TARGET=dump +AUTOSEG=true + +ENABLE_EXCEPTIONS=TRUE + +# --- Settings ----------------------------------------------------- + +.INCLUDE : settings.mk +.INCLUDE: $(PRJ)$/util$/makefile.pmk + +# --- Files -------------------------------------------------------- + +SLOFILES = \ + $(SLO)$/biffdumper.obj \ + $(SLO)$/dffdumper.obj \ + $(SLO)$/dumperbase.obj \ + $(SLO)$/oledumper.obj \ + $(SLO)$/pptxdumper.obj \ + $(SLO)$/xlsbdumper.obj + +# --- Targets ------------------------------------------------------- + +.INCLUDE : target.mk diff --git a/oox/source/helper/makefile.mk b/oox/source/helper/makefile.mk new file mode 100755 index 000000000000..f31736faac8d --- /dev/null +++ b/oox/source/helper/makefile.mk @@ -0,0 +1,60 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2010 Oracle and/or its affiliates. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# <http://www.openoffice.org/license.html> +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +PRJ=..$/.. + +PRJNAME=oox +TARGET=helper +AUTOSEG=true + +ENABLE_EXCEPTIONS=TRUE + +# --- Settings ----------------------------------------------------- + +.INCLUDE : settings.mk +.INCLUDE: $(PRJ)$/util$/makefile.pmk + +# --- Files -------------------------------------------------------- + +SLOFILES = \ + $(SLO)$/attributelist.obj \ + $(SLO)$/binaryinputstream.obj \ + $(SLO)$/binaryoutputstream.obj \ + $(SLO)$/binarystreambase.obj \ + $(SLO)$/containerhelper.obj \ + $(SLO)$/graphichelper.obj \ + $(SLO)$/modelobjecthelper.obj \ + $(SLO)$/progressbar.obj \ + $(SLO)$/propertymap.obj \ + $(SLO)$/propertyset.obj \ + $(SLO)$/storagebase.obj \ + $(SLO)$/textinputstream.obj \ + $(SLO)$/zipstorage.obj + +# --- Targets ------------------------------------------------------- + +.INCLUDE : target.mk diff --git a/oox/source/ole/makefile.mk b/oox/source/ole/makefile.mk new file mode 100755 index 000000000000..a5232247cfa5 --- /dev/null +++ b/oox/source/ole/makefile.mk @@ -0,0 +1,60 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2010 Oracle and/or its affiliates. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# <http://www.openoffice.org/license.html> +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +PRJ=..$/.. + +PRJNAME=oox +TARGET=ole +AUTOSEG=true + +ENABLE_EXCEPTIONS=TRUE + +# --- Settings ----------------------------------------------------- + +.INCLUDE : settings.mk +.INCLUDE: $(PRJ)$/util$/makefile.pmk + +# --- Files -------------------------------------------------------- + +SLOFILES = \ + $(SLO)$/axbinaryreader.obj \ + $(SLO)$/axcontrol.obj \ + $(SLO)$/axcontrolfragment.obj \ + $(SLO)$/olehelper.obj \ + $(SLO)$/oleobjecthelper.obj \ + $(SLO)$/olestorage.obj \ + $(SLO)$/vbacontrol.obj \ + $(SLO)$/vbahelper.obj \ + $(SLO)$/vbainputstream.obj \ + $(SLO)$/vbamodule.obj \ + $(SLO)$/vbaproject.obj \ + $(SLO)$/vbaprojectfilter.obj + +# --- Targets ------------------------------------------------------- + +.INCLUDE : target.mk + diff --git a/oox/source/ppt/makefile.mk b/oox/source/ppt/makefile.mk new file mode 100755 index 000000000000..8d902ed51337 --- /dev/null +++ b/oox/source/ppt/makefile.mk @@ -0,0 +1,76 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2010 Oracle and/or its affiliates. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# <http://www.openoffice.org/license.html> +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +PRJ=..$/.. + +PRJNAME=oox +TARGET=ppt +AUTOSEG=true + +ENABLE_EXCEPTIONS=TRUE + +# --- Settings ----------------------------------------------------- + +.INCLUDE : settings.mk +.INCLUDE: $(PRJ)$/util$/makefile.pmk + +# --- Files -------------------------------------------------------- + +SLOFILES = \ + $(SLO)$/animationspersist.obj \ + $(SLO)$/animationtypes.obj \ + $(SLO)$/animvariantcontext.obj \ + $(SLO)$/backgroundproperties.obj\ + $(SLO)$/buildlistcontext.obj \ + $(SLO)$/commonbehaviorcontext.obj \ + $(SLO)$/commontimenodecontext.obj \ + $(SLO)$/conditioncontext.obj \ + $(SLO)$/customshowlistcontext.obj \ + $(SLO)$/headerfootercontext.obj \ + $(SLO)$/layoutfragmenthandler.obj\ + $(SLO)$/pptfilterhelpers.obj\ + $(SLO)$/pptimport.obj\ + $(SLO)$/pptshape.obj \ + $(SLO)$/pptshapecontext.obj \ + $(SLO)$/pptshapegroupcontext.obj \ + $(SLO)$/pptshapepropertiescontext.obj \ + $(SLO)$/presentationfragmenthandler.obj\ + $(SLO)$/slidefragmenthandler.obj\ + $(SLO)$/slidemastertextstylescontext.obj \ + $(SLO)$/slidepersist.obj\ + $(SLO)$/slidetimingcontext.obj\ + $(SLO)$/slidetransition.obj\ + $(SLO)$/slidetransitioncontext.obj\ + $(SLO)$/soundactioncontext.obj \ + $(SLO)$/timeanimvaluecontext.obj \ + $(SLO)$/timenode.obj\ + $(SLO)$/timenodelistcontext.obj \ + $(SLO)$/timetargetelementcontext.obj + +# --- Targets ------------------------------------------------------- + +.INCLUDE : target.mk diff --git a/oox/Makefile b/oox/source/shape/makefile.mk index 90947b2e5f48..c6534b3a8a6f 100755 --- a/oox/Makefile +++ b/oox/source/shape/makefile.mk @@ -2,7 +2,7 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2000, 2011 Oracle and/or its affiliates. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # @@ -25,14 +25,25 @@ # #************************************************************************* -ifeq ($(strip $(SOLARENV)),) -$(error No environment set!) -endif +PRJ=..$/.. -gb_PARTIALBUILD := T -GBUILDDIR := $(SOLARENV)/gbuild -include $(GBUILDDIR)/gbuild.mk +PRJNAME=oox +TARGET=shape +AUTOSEG=true -$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk))) +ENABLE_EXCEPTIONS=TRUE -# vim: set noet sw=4 ts=4: +# --- Settings ----------------------------------------------------- + +.INCLUDE : settings.mk +.INCLUDE: $(PRJ)$/util$/makefile.pmk + +# --- Files -------------------------------------------------------- + +SLOFILES = \ + $(SLO)$/ShapeContextHandler.obj \ + $(SLO)$/ShapeFilterBase.obj + +# --- Targets ------------------------------------------------------- + +.INCLUDE : target.mk diff --git a/oox/source/token/makefile.mk b/oox/source/token/makefile.mk new file mode 100755 index 000000000000..ff42967f0bb1 --- /dev/null +++ b/oox/source/token/makefile.mk @@ -0,0 +1,78 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2010 Oracle and/or its affiliates. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# <http://www.openoffice.org/license.html> +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +PRJ=..$/.. + +PRJNAME=oox +TARGET=token + +ENABLE_EXCEPTIONS=TRUE + +# --- Settings ----------------------------------------------------- + +.INCLUDE : settings.mk +.INCLUDE: $(PRJ)$/util$/makefile.pmk + +# --- Files -------------------------------------------------------- + +SLOFILES = \ + $(SLO)$/namespacemap.obj \ + $(SLO)$/propertynames.obj \ + $(SLO)$/tokenmap.obj + +# --- Targets ------------------------------------------------------- + +.INCLUDE : target.mk + +GENHEADERPATH = $(INCCOM)$/oox$/token + +$(MISC)$/tokenhash.gperf $(INCCOM)$/tokennames.inc $(GENHEADERPATH)$/tokens.hxx $(INCCOM)$/namespacenames.inc $(MISC)$/namespaces.txt $(GENHEADERPATH)$/namespaces.hxx $(INCCOM)$/propertynames.inc $(GENHEADERPATH)$/properties.hxx : + @@noop $(assign do_phony:=.PHONY) + +$(SLO)$/tokenmap.obj : $(INCCOM)$/tokenhash.inc $(INCCOM)$/tokennames.inc $(GENHEADERPATH)$/tokens.hxx $(MISC)$/do_tokens + +$(INCCOM)$/tokenhash.inc : $(MISC)$/tokenhash.gperf $(MISC)$/do_tokens + $(AUGMENT_LIBRARY_PATH) gperf --compare-strncmp $(MISC)$/tokenhash.gperf | $(SED) -e "s/(char\*)0/(char\*)0, 0/g" | $(GREP) -v "^#line" >$(INCCOM)$/tokenhash.inc + +$(MISC)$/do_tokens $(do_phony) : tokens.txt tokens.pl tokens.hxx.head tokens.hxx.tail $(GENHEADERPATH)$/tokens.hxx $(INCCOM)$/tokennames.inc $(MISC)$/tokenhash.gperf + @@-$(RM) $@ + $(MKDIRHIER) $(GENHEADERPATH) + $(PERL) tokens.pl tokens.txt $(MISC)$/tokenids.inc $(INCCOM)$/tokennames.inc $(MISC)$/tokenhash.gperf && $(TYPE) tokens.hxx.head $(MISC)$/tokenids.inc tokens.hxx.tail > $(GENHEADERPATH)$/tokens.hxx && $(TOUCH) $@ + +$(SLO)$/namespacemap.obj : $(INCCOM)$/namespacenames.inc $(MISC)$/namespaces.txt $(GENHEADERPATH)$/namespaces.hxx $(MISC)$/do_namespaces + +$(MISC)$/do_namespaces $(do_phony) : namespaces.txt namespaces.pl namespaces.hxx.head namespaces.hxx.tail $(INCCOM)$/namespacenames.inc $(MISC)$/namespaces.txt $(GENHEADERPATH)$/namespaces.hxx + @@-$(RM) $@ + $(MKDIRHIER) $(GENHEADERPATH) + $(PERL) namespaces.pl namespaces.txt $(MISC)$/namespaceids.inc $(INCCOM)$/namespacenames.inc $(MISC)$/namespaces.txt && $(TYPE) namespaces.hxx.head $(MISC)$/namespaceids.inc namespaces.hxx.tail > $(GENHEADERPATH)$/namespaces.hxx && $(TOUCH) $@ + +$(SLO)$/propertynames.obj : $(INCCOM)$/propertynames.inc $(GENHEADERPATH)$/properties.hxx $(MISC)$/do_properties + +$(MISC)$/do_properties $(do_phony) : properties.txt properties.pl properties.hxx.head properties.hxx.tail $(INCCOM)$/propertynames.inc $(GENHEADERPATH)$/properties.hxx + @@-$(RM) $@ + $(MKDIRHIER) $(GENHEADERPATH) + $(PERL) properties.pl properties.txt $(MISC)$/propertyids.inc $(INCCOM)$/propertynames.inc && $(TYPE) properties.hxx.head $(MISC)$/propertyids.inc properties.hxx.tail > $(GENHEADERPATH)$/properties.hxx && $(TOUCH) $@ diff --git a/oox/source/token/namespacemap.cxx b/oox/source/token/namespacemap.cxx index d021f2a3a353..0f4373d2dc59 100755 --- a/oox/source/token/namespacemap.cxx +++ b/oox/source/token/namespacemap.cxx @@ -36,7 +36,7 @@ NamespaceMap::NamespaceMap() static const struct NamespaceUrl { sal_Int32 mnId; const sal_Char* mpcUrl; } spNamespaceUrls[] = { // include auto-generated C array with namespace URLs as C strings -#include <token/namespacenames.inc> +#include "namespacenames.inc" { -1, "" } }; diff --git a/oox/source/token/namespaces.hxx.tail b/oox/source/token/namespaces.hxx.tail index 1e6ba5881589..60ce5b18305d 100755 --- a/oox/source/token/namespaces.hxx.tail +++ b/oox/source/token/namespaces.hxx.tail @@ -12,24 +12,24 @@ inline sal_Int32 getNamespace( sal_Int32 nToken ) { return nToken & NMSP_MASK; } // defines for tokens with specific namespaces -#define OOX_TOKEN( token, namespace ) (::oox::XML_##token | ::oox::NMSP_##namespace) - -#define A_TOKEN( token ) OOX_TOKEN( token, dml ) -#define AX_TOKEN( token ) OOX_TOKEN( token, ax ) -#define C_TOKEN( token ) OOX_TOKEN( token, dmlChart ) -#define CDR_TOKEN( token ) OOX_TOKEN( token, dmlChartDr ) -#define DGM_TOKEN( token ) OOX_TOKEN( token, dmlDiagram ) -#define O_TOKEN( token ) OOX_TOKEN( token, vmlOffice ) -#define PC_TOKEN( token ) OOX_TOKEN( token, packageContentTypes ) -#define PPT_TOKEN( token ) OOX_TOKEN( token, ppt ) -#define PR_TOKEN( token ) OOX_TOKEN( token, packageRel ) -#define R_TOKEN( token ) OOX_TOKEN( token, officeRel ) -#define VML_TOKEN( token ) OOX_TOKEN( token, vml ) -#define VMLX_TOKEN( token ) OOX_TOKEN( token, vmlExcel ) -#define XDR_TOKEN( token ) OOX_TOKEN( token, dmlSpreadDr ) -#define XLS_TOKEN( token ) OOX_TOKEN( token, xls ) -#define XM_TOKEN( token ) OOX_TOKEN( token, xm ) -#define XML_TOKEN( token ) OOX_TOKEN( token, xml ) +#define OOX_TOKEN( namespace, token ) (::oox::NMSP_##namespace | ::oox::XML_##token) + +#define A_TOKEN( token ) OOX_TOKEN( dml, token ) +#define AX_TOKEN( token ) OOX_TOKEN( ax, token ) +#define C_TOKEN( token ) OOX_TOKEN( dmlChart, token ) +#define CDR_TOKEN( token ) OOX_TOKEN( dmlChartDr, token ) +#define DGM_TOKEN( token ) OOX_TOKEN( dmlDiagram, token ) +#define O_TOKEN( token ) OOX_TOKEN( vmlOffice, token ) +#define PC_TOKEN( token ) OOX_TOKEN( packageContentTypes, token ) +#define PPT_TOKEN( token ) OOX_TOKEN( ppt, token ) +#define PR_TOKEN( token ) OOX_TOKEN( packageRel, token ) +#define R_TOKEN( token ) OOX_TOKEN( officeRel, token ) +#define VML_TOKEN( token ) OOX_TOKEN( vml, token ) +#define VMLX_TOKEN( token ) OOX_TOKEN( vmlExcel, token ) +#define XDR_TOKEN( token ) OOX_TOKEN( dmlSpreadDr, token ) +#define XLS_TOKEN( token ) OOX_TOKEN( xls, token ) +#define XM_TOKEN( token ) OOX_TOKEN( xm, token ) +#define XML_TOKEN( token ) OOX_TOKEN( xml, token ) // ============================================================================ diff --git a/oox/source/token/namespaces.pl b/oox/source/token/namespaces.pl index 7c602f70128d..3c741fa7b2af 100644 --- a/oox/source/token/namespaces.pl +++ b/oox/source/token/namespaces.pl @@ -25,19 +25,17 @@ # #************************************************************************* -# operation mode (1 = identifiers, 2 = names, 3 = plain) -$op = shift @ARGV; -die "Error: invalid operation" unless( $op >= 1 && $op <= 3); +$ARGV0 = shift @ARGV; +$ARGV1 = shift @ARGV; +$ARGV2 = shift @ARGV; +$ARGV3 = shift @ARGV; -# number of bits to shift the namespace identifier -$shift = 16; - -if( $op == 1 ) { - print( "const size_t NMSP_SHIFT = $shift;\n" ); -} +# parse input file -$i = 1; -while( <> ) { +open( INFILE, $ARGV0 ) or die "cannot open input file: $!"; +my %namespaces; +while( <INFILE> ) +{ # trim newline chomp( $_ ); # trim leading/trailing whitespace @@ -46,14 +44,36 @@ while( <> ) { # trim comments $_ =~ s/^#.*//; # skip empty lines - if( $_ ) { + if( $_ ) + { # check for valid characters - $_ =~ /^([a-zA-Z]+)\s+([a-zA-Z0-9-.:\/]+)\s*$/ or die "Error: invalid entry: '$_'"; - # generate output - $id = $i << $shift; - if( $op == 1 ) { print( "const sal_Int32 NMSP_$1 = $i << NMSP_SHIFT;\n" ); } - elsif( $op == 2 ) { print( "{ $id, \"$2\" },\n" ); } - elsif( $op == 3 ) { print( "$id $1 $2\n" ); } - ++$i; + $_ =~ /^([a-zA-Z]+)\s+([a-zA-Z0-9-.:\/]+)\s*$/ or die "Error: invalid character in input data"; + $namespaces{$1} = $2; } } +close( INFILE ); + +# generate output files + +open( IDFILE, ">$ARGV1" ) or die "Error: cannot open output file: $!"; +open( NAMEFILE, ">$ARGV2" ) or die "Error: cannot open output file: $!"; +open( TXTFILE, ">$ARGV3" ) or die "Error: cannot open output file: $!"; + +# number of bits to shift the namespace identifier +$shift = 16; + +print ( IDFILE "const size_t NMSP_SHIFT = $shift;\n" ); + +$i = 1; +foreach( keys( %namespaces ) ) +{ + print( IDFILE "const sal_Int32 NMSP_$_ = $i << NMSP_SHIFT;\n" ); + $id = $i << $shift; + print( NAMEFILE "{ $id, \"$namespaces{$_}\" },\n" ); + print( TXTFILE "$id $_ $namespaces{$_}\n" ); + ++$i; +} + +close( IDFILE ); +close( nameFILE ); +close( TXTFILE ); diff --git a/oox/source/token/properties.pl b/oox/source/token/properties.pl index 448cec632343..f341924bbb90 100644 --- a/oox/source/token/properties.pl +++ b/oox/source/token/properties.pl @@ -25,33 +25,43 @@ # #************************************************************************* -# operation mode (1 = identifiers, 2 = names) -$op = shift @ARGV; -die "Error: invalid operation" unless( $op >= 1 && $op <= 2); +$ARGV0 = shift @ARGV; +$ARGV1 = shift @ARGV; +$ARGV2 = shift @ARGV; -$i = 0; -while( <> ) { +# parse input file + +open( INFILE, $ARGV0 ) or die "Error: cannot open input file: $!"; +my %props; +while( <INFILE> ) +{ # trim newline chomp( $_ ); # trim leading/trailing whitespace $_ =~ s/^\s*//g; $_ =~ s/\s*$//g; - # skip empty lines - if( $_ ) { - # check for valid characters - $_ =~ /^[A-Z][a-zA-Z0-9]+$/ or die "Error: invalid entry: '$_'"; - # generate output - if( $op == 1 ) { - print( "const sal_Int32 PROP_$_ = $i;\n" ); - } elsif( $op == 2 ) { - print( "/* $i */ \"$_\",\n" ); - } - ++$i; - } + # check for valid characters + $_ =~ /^[A-Z][a-zA-Z0-9]*$/ or die "Error: invalid character in property '$_'"; + $id = "PROP_$_"; + $props{$_} = $id; } +close( INFILE ); + +# generate output files + +open( IDFILE, ">$ARGV1" ) or die "Error: cannot open output file: $!"; +open( NAMEFILE, ">$ARGV2" ) or die "Error: cannot open output file: $!"; -if( $op == 1 ) { - print( "const sal_Int32 PROP_COUNT = $i;\nconst sal_Int32 PROP_INVALID = -1;\n" ); -} elsif( $op == 2 ) { - print( " \"\"" ); +$i = 0; +foreach( sort( keys( %props ) ) ) +{ + print( IDFILE "const sal_Int32 $props{$_} = $i;\n" ); + print( NAMEFILE "/* $i */ \"$_\",\n" ); + ++$i; } + +print( IDFILE "const sal_Int32 PROP_COUNT = $i;\n" ); +print( IDFILE "const sal_Int32 PROP_INVALID = -1;\n" ); + +close( IDFILE ); +close( NAMEFILE ); diff --git a/oox/source/token/propertynames.cxx b/oox/source/token/propertynames.cxx index b8f06496c7ff..401d168fe696 100644 --- a/oox/source/token/propertynames.cxx +++ b/oox/source/token/propertynames.cxx @@ -36,7 +36,8 @@ PropertyNameVector::PropertyNameVector() static const sal_Char* sppcPropertyNames[] = { // include auto-generated C array with property names as C strings -#include <token/propertynames.inc> +#include "propertynames.inc" + "" }; size_t nArraySize = (sizeof( sppcPropertyNames ) / sizeof( *sppcPropertyNames )) - 1; diff --git a/oox/source/token/tokenmap.cxx b/oox/source/token/tokenmap.cxx index 0be0a1c4c470..a5189269c3c8 100644 --- a/oox/source/token/tokenmap.cxx +++ b/oox/source/token/tokenmap.cxx @@ -43,10 +43,8 @@ using ::rtl::OUString; // ============================================================================ namespace { - -// include auto-generated Perfect_Hash class -#include <token/tokenhash.inc> - +// include auto-generated Perfect_Hash +#include "tokenhash.inc" } // namespace // ============================================================================ @@ -57,7 +55,7 @@ TokenMap::TokenMap() : static const sal_Char* sppcTokenNames[] = { // include auto-generated C array with token names as C strings -#include <token/tokennames.inc> +#include "tokennames.inc" "" }; @@ -70,14 +68,14 @@ TokenMap::TokenMap() : } #if OSL_DEBUG_LEVEL > 0 - // check that the Perfect_Hash is in sync with the token name list + // check that the perfect_hash is in sync with the token name list bool bOk = true; for( sal_Int32 nToken = 0; bOk && (nToken < XML_TOKEN_COUNT); ++nToken ) { // check that the getIdentifier <-> getToken roundtrip works OString aUtf8Name = OUStringToOString( maTokenNames[ nToken ].maUniName, RTL_TEXTENCODING_UTF8 ); - const XMLTokenInfo* pTokenInfo = Perfect_Hash::getTokenInfo( aUtf8Name.getStr(), aUtf8Name.getLength() ); - bOk = pTokenInfo && (pTokenInfo->mnToken == nToken); + struct xmltoken* pToken = Perfect_Hash::in_word_set( aUtf8Name.getStr(), aUtf8Name.getLength() ); + bOk = pToken && (pToken->nToken == nToken); OSL_ENSURE( bOk, ::rtl::OStringBuffer( "TokenMap::TokenMap - token list broken, #" ). append( nToken ).append( ", '" ).append( aUtf8Name ).append( '\'' ).getStr() ); } @@ -98,8 +96,8 @@ OUString TokenMap::getUnicodeTokenName( sal_Int32 nToken ) const sal_Int32 TokenMap::getTokenFromUnicode( const OUString& rUnicodeName ) const { OString aUtf8Name = OUStringToOString( rUnicodeName, RTL_TEXTENCODING_UTF8 ); - const XMLTokenInfo* pTokenInfo = Perfect_Hash::getTokenInfo( aUtf8Name.getStr(), aUtf8Name.getLength() ); - return pTokenInfo ? pTokenInfo->mnToken : XML_TOKEN_INVALID; + struct xmltoken* pToken = Perfect_Hash::in_word_set( aUtf8Name.getStr(), aUtf8Name.getLength() ); + return pToken ? pToken->nToken : XML_TOKEN_INVALID; } Sequence< sal_Int8 > TokenMap::getUtf8TokenName( sal_Int32 nToken ) const @@ -111,9 +109,9 @@ Sequence< sal_Int8 > TokenMap::getUtf8TokenName( sal_Int32 nToken ) const sal_Int32 TokenMap::getTokenFromUtf8( const Sequence< sal_Int8 >& rUtf8Name ) const { - const XMLTokenInfo* pTokenInfo = Perfect_Hash::getTokenInfo( + struct xmltoken* pToken = Perfect_Hash::in_word_set( reinterpret_cast< const char* >( rUtf8Name.getConstArray() ), rUtf8Name.getLength() ); - return pTokenInfo ? pTokenInfo->mnToken : XML_TOKEN_INVALID; + return pToken ? pToken->nToken : XML_TOKEN_INVALID; } // ============================================================================ diff --git a/oox/source/token/tokens.pl b/oox/source/token/tokens.pl index ba7f39f2be39..a951cee80db2 100644 --- a/oox/source/token/tokens.pl +++ b/oox/source/token/tokens.pl @@ -25,55 +25,56 @@ # #************************************************************************* -# operation mode (1 = identifiers, 2 = names, 3 = gperf) -$op = shift @ARGV; -die "Error: invalid operation" unless( $op >= 1 && $op <= 3); +$ARGV0 = shift @ARGV; +$ARGV1 = shift @ARGV; +$ARGV2 = shift @ARGV; +$ARGV3 = shift @ARGV; -if( $op == 3 ) { - print( "%language=C++\n" ); - print( "%define slot-name mpcName\n" ); - print( "%define initializer-suffix ,0\n" ); - print( "%define lookup-function-name getTokenInfo\n" ); - print( "%compare-strncmp\n" ); - print( "%readonly-tables\n" ); - print( "%enum\n" ); - print( "%null-strings\n" ); - print( "%struct-type\n" ); - print( "struct XMLTokenInfo {\n" ); - print( " const sal_Char* mpcName;\n" ); - print( " sal_Int32 mnToken;\n" ); - print( "};\n" ); - print( "%%\n" ); -} - -$i = 0; -while( <> ) +open( INFILE, $ARGV0 ) or die "Error: cannot open input file: $!"; +my %tokens; +while ( <INFILE> ) { # trim newline chomp( $_ ); # trim leading/trailing whitespace $_ =~ s/^\s*//g; $_ =~ s/\s*$//g; - # skip empty lines - if( $_ ) { - # check for valid characters - $_ =~ /^[a-zA-Z0-9-_]+$/ or die "Error: invalid entry: '$_'"; - # generate output - $id = "XML_$_"; - $id =~ s/-/_/g; - if( $op == 1 ) { - print( "const sal_Int32 $id = $i;\n" ); - } elsif( $op == 2 ) { - print( "\"$_\",\n" ); - } elsif( $op == 3 ) { - print( "$_,$id\n" ); - } - ++$i; - } + # check for valid characters + $_ =~ /^[a-zA-Z0-9-_]+$/ or die "Error: invalid character in token '$_'"; + $id = "XML_$_"; + $id =~ s/-/_/g; + $tokens{$_} = $id; } +close ( INFILE ); + +# generate output files + +open ( IDFILE, ">$ARGV1" ) or die "Error: cannot open output file: $!"; +open ( NAMEFILE, ">$ARGV2" ) or die "Error: cannot open output file: $!"; +open ( GPERFFILE, ">$ARGV3" ) or die "Error: cannot open output file: $!"; -if( $op == 1 ) { - print( "const sal_Int32 XML_TOKEN_COUNT = $i;\n" ); -} elsif( $op == 3 ) { - print( "%%\n" ); +print( GPERFFILE "%language=C++\n" ); +print( GPERFFILE "%global-table\n" ); +print( GPERFFILE "%null-strings\n" ); +print( GPERFFILE "%struct-type\n" ); +print( GPERFFILE "struct xmltoken {\n" ); +print( GPERFFILE " const sal_Char *name;\n" ); +print( GPERFFILE " sal_Int32 nToken;\n" ); +print( GPERFFILE "};\n" ); +print( GPERFFILE "%%\n" ); + +$i = 0; +foreach( sort( keys( %tokens ) ) ) +{ + print( IDFILE "const sal_Int32 $tokens{$_} = $i;\n" ); + print( NAMEFILE "\"$_\",\n" ); + print( GPERFFILE "$_,$tokens{$_}\n" ); + ++$i; } + +print( IDFILE "const sal_Int32 XML_TOKEN_COUNT = $i;\n" ); +print( GPERFFILE "%%\n" ); + +close( IDFILE ); +close( NAMEFILE ); +close( GPERFFILE ); diff --git a/oox/source/vml/makefile.mk b/oox/source/vml/makefile.mk new file mode 100755 index 000000000000..094d37cd8c1c --- /dev/null +++ b/oox/source/vml/makefile.mk @@ -0,0 +1,56 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2010 Oracle and/or its affiliates. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# <http://www.openoffice.org/license.html> +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +PRJ=..$/.. + +PRJNAME=oox +TARGET=vml +AUTOSEG=true + +ENABLE_EXCEPTIONS=TRUE + +# --- Settings ----------------------------------------------------- + +.INCLUDE : settings.mk +.INCLUDE: $(PRJ)$/util$/makefile.pmk + +# --- Files -------------------------------------------------------- + +SLOFILES = \ + $(SLO)$/vmldrawing.obj \ + $(SLO)$/vmldrawingfragment.obj \ + $(SLO)$/vmlformatting.obj \ + $(SLO)$/vmlinputstream.obj \ + $(SLO)$/vmlshape.obj \ + $(SLO)$/vmlshapecontainer.obj \ + $(SLO)$/vmlshapecontext.obj \ + $(SLO)$/vmltextbox.obj \ + $(SLO)$/vmltextboxcontext.obj + +# --- Targets ------------------------------------------------------- + +.INCLUDE : target.mk diff --git a/oox/source/xls/makefile.mk b/oox/source/xls/makefile.mk new file mode 100755 index 000000000000..e337afe786a8 --- /dev/null +++ b/oox/source/xls/makefile.mk @@ -0,0 +1,105 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2010 Oracle and/or its affiliates. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# <http://www.openoffice.org/license.html> +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +PRJ=..$/.. + +PRJNAME=oox +TARGET=xls +AUTOSEG=true + +ENABLE_EXCEPTIONS=TRUE + +# --- Settings ----------------------------------------------------- + +.INCLUDE : settings.mk +.INCLUDE: $(PRJ)$/util$/makefile.pmk + +# --- Files -------------------------------------------------------- + +SLOFILES = \ + $(SLO)$/addressconverter.obj \ + $(SLO)$/autofilterbuffer.obj \ + $(SLO)$/autofiltercontext.obj \ + $(SLO)$/biffcodec.obj \ + $(SLO)$/biffdetector.obj \ + $(SLO)$/biffhelper.obj \ + $(SLO)$/biffinputstream.obj \ + $(SLO)$/biffoutputstream.obj \ + $(SLO)$/chartsheetfragment.obj \ + $(SLO)$/commentsbuffer.obj \ + $(SLO)$/commentsfragment.obj \ + $(SLO)$/condformatbuffer.obj \ + $(SLO)$/condformatcontext.obj \ + $(SLO)$/connectionsbuffer.obj \ + $(SLO)$/connectionsfragment.obj \ + $(SLO)$/defnamesbuffer.obj \ + $(SLO)$/drawingbase.obj \ + $(SLO)$/drawingfragment.obj \ + $(SLO)$/drawingmanager.obj \ + $(SLO)$/excelchartconverter.obj \ + $(SLO)$/excelfilter.obj \ + $(SLO)$/excelhandlers.obj \ + $(SLO)$/excelvbaproject.obj \ + $(SLO)$/externallinkbuffer.obj \ + $(SLO)$/externallinkfragment.obj \ + $(SLO)$/formulabase.obj \ + $(SLO)$/formulaparser.obj \ + $(SLO)$/numberformatsbuffer.obj \ + $(SLO)$/ooxformulaparser.obj \ + $(SLO)$/pagesettings.obj \ + $(SLO)$/pivotcachebuffer.obj \ + $(SLO)$/pivotcachefragment.obj \ + $(SLO)$/pivottablebuffer.obj \ + $(SLO)$/pivottablefragment.obj \ + $(SLO)$/querytablebuffer.obj \ + $(SLO)$/querytablefragment.obj \ + $(SLO)$/richstring.obj \ + $(SLO)$/richstringcontext.obj \ + $(SLO)$/scenariobuffer.obj \ + $(SLO)$/scenariocontext.obj \ + $(SLO)$/sharedformulabuffer.obj \ + $(SLO)$/sharedstringsbuffer.obj \ + $(SLO)$/sharedstringsfragment.obj \ + $(SLO)$/sheetdatacontext.obj \ + $(SLO)$/stylesbuffer.obj \ + $(SLO)$/stylesfragment.obj \ + $(SLO)$/tablebuffer.obj \ + $(SLO)$/tablefragment.obj \ + $(SLO)$/themebuffer.obj \ + $(SLO)$/unitconverter.obj \ + $(SLO)$/viewsettings.obj \ + $(SLO)$/workbookfragment.obj \ + $(SLO)$/workbookhelper.obj \ + $(SLO)$/workbooksettings.obj \ + $(SLO)$/worksheetbuffer.obj \ + $(SLO)$/worksheetfragment.obj \ + $(SLO)$/worksheethelper.obj \ + $(SLO)$/worksheetsettings.obj + +# --- Targets ------------------------------------------------------- + +.INCLUDE : target.mk diff --git a/oox/util/makefile.mk b/oox/util/makefile.mk new file mode 100755 index 000000000000..329ced792164 --- /dev/null +++ b/oox/util/makefile.mk @@ -0,0 +1,104 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2010 Oracle and/or its affiliates. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# <http://www.openoffice.org/license.html> +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +PRJ=.. + +PRJNAME=oox +TARGET=oox +USE_DEFFILE=TRUE +ENABLE_EXCEPTIONS=TRUE + +# --- Settings ----------------------------------------------------- + +.INCLUDE : settings.mk +.IF "$(L10N_framework)"=="" +# --- Allgemein ---------------------------------------------------- + +LIB1TARGET= $(SLB)$/$(TARGET).lib +LIB1FILES= \ + $(SLB)$/token.lib\ + $(SLB)$/helper.lib\ + $(SLB)$/core.lib\ + $(SLB)$/ole.lib\ + $(SLB)$/ppt.lib\ + $(SLB)$/xls.lib\ + $(SLB)$/vml.lib\ + $(SLB)$/drawingml.lib\ + $(SLB)$/diagram.lib\ + $(SLB)$/chart.lib\ + $(SLB)$/table.lib\ + $(SLB)$/shape.lib\ + $(SLB)$/dump.lib\ + $(SLB)$/docprop.lib + +# --- Shared-Library ----------------------------------------------- + +SHL1TARGET= $(TARGET)$(DLLPOSTFIX) +SHL1IMPLIB= i$(TARGET) +SHL1USE_EXPORTS=name + +SHL1STDLIBS= \ + $(CPPULIB) \ + $(CPPUHELPERLIB)\ + $(COMPHELPERLIB)\ + $(RTLLIB) \ + $(SALLIB) \ + $(BASEGFXLIB) \ + $(SAXLIB) \ + $(XMLSCRIPTLIB) + +# link openssl, copied this bit from ucb/source/ucp/webdav/makefile.mk +.IF "$(GUI)"=="WNT" +SHL1STDLIBS+= $(OPENSSLLIB) +.ELSE # WNT +.IF "$(OS)"=="SOLARIS" +SHL1STDLIBS+= -lnsl -lsocket -ldl +.ENDIF # SOLARIS +.IF "$(SYSTEM_OPENSSL)"=="YES" +SHL1STDLIBS+= $(OPENSSLLIB) +.ELSE +SHL1STDLIBS+= $(OPENSSLLIBST) +.ENDIF +.ENDIF # WNT + +SHL1DEF= $(MISC)$/$(SHL1TARGET).def +SHL1LIBS= $(LIB1TARGET) +DEF1NAME =$(SHL1TARGET) +DEFLIB1NAME =$(TARGET) + +# --- Targets ---------------------------------------------------------- +.ENDIF # L10N_framework + +.INCLUDE : target.mk + +ALLTAR : $(MISC)/oox.component + +$(MISC)/oox.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + oox.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt oox.component diff --git a/oox/prj/makefile.mk b/oox/util/makefile.pmk index 83510a6a4ce1..adb0222c2ba2 100755 --- a/oox/prj/makefile.mk +++ b/oox/util/makefile.pmk @@ -2,7 +2,7 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2000, 2011 Oracle and/or its affiliates. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # @@ -25,16 +25,6 @@ # #************************************************************************* -PRJ=.. -TARGET=prj - -.INCLUDE : settings.mk - -.IF "$(VERBOSE)"!="" -VERBOSEFLAG := -.ELSE -VERBOSEFLAG := -s -.ENDIF - -all: - cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) +# Reduction of exported symbols: +CDEFS += -DOOX_DLLIMPLEMENTATION +VISIBILITY_HIDDEN=TRUE diff --git a/oox/oox.component b/oox/util/oox.component index f6519d5a8664..f6519d5a8664 100644 --- a/oox/oox.component +++ b/oox/util/oox.component |