From f9a70973626de755d37fe31b8ccec359dffeb1a0 Mon Sep 17 00:00:00 2001 From: "Daniel Rentz [dr]" Date: Tue, 18 Jan 2011 17:22:36 +0100 Subject: dr78: switch module oox to new gbuild system --- oox/Library_oox.mk | 421 ++++++++++++++++++++++++++ oox/Makefile | 38 +++ oox/Module_oox.mk | 37 +++ oox/Package_inc.mk | 45 +++ oox/Package_source.mk | 29 ++ oox/Package_workdir.mk | 32 ++ oox/oox.component | 67 ++++ oox/prj/build.lst | 19 +- oox/prj/d.lst | 46 --- oox/prj/makefile.mk | 40 +++ oox/source/core/makefile.mk | 66 ---- oox/source/docprop/makefile.mk | 49 --- oox/source/drawingml/chart/makefile.mk | 74 ----- oox/source/drawingml/diagram/makefile.mk | 53 ---- oox/source/drawingml/makefile.mk | 92 ------ oox/source/drawingml/table/makefile.mk | 62 ---- oox/source/dump/makefile.mk | 53 ---- oox/source/export/ooxml-export-notes.txt | 220 ++++++++++++++ oox/source/helper/makefile.mk | 60 ---- oox/source/ole/makefile.mk | 60 ---- oox/source/ppt/makefile.mk | 76 ----- oox/source/shape/makefile.mk | 49 --- oox/source/token/makefile.mk | 78 ----- oox/source/token/namespacemap.cxx | 2 +- oox/source/token/namespaces.pl | 58 ++-- oox/source/token/properties.pl | 52 ++-- oox/source/token/propertynames.cxx | 3 +- oox/source/token/tokenmap.cxx | 4 +- oox/source/token/tokens.pl | 80 +++-- oox/source/vml/makefile.mk | 56 ---- oox/source/xls/makefile.mk | 105 ------- oox/util/makefile.mk | 104 ------- oox/util/makefile.pmk | 30 -- oox/util/oox.component | 67 ---- oox/workben/ooxml-export-notes.txt | 220 -------------- writerfilter/source/ooxml/makefile.mk | 4 +- writerfilter/source/resourcemodel/makefile.mk | 2 +- 37 files changed, 1015 insertions(+), 1538 deletions(-) create mode 100755 oox/Library_oox.mk create mode 100755 oox/Makefile create mode 100755 oox/Module_oox.mk create mode 100755 oox/Package_inc.mk create mode 100755 oox/Package_source.mk create mode 100755 oox/Package_workdir.mk create mode 100644 oox/oox.component create mode 100755 oox/prj/makefile.mk delete mode 100644 oox/source/core/makefile.mk delete mode 100644 oox/source/docprop/makefile.mk delete mode 100644 oox/source/drawingml/chart/makefile.mk delete mode 100644 oox/source/drawingml/diagram/makefile.mk delete mode 100644 oox/source/drawingml/makefile.mk delete mode 100644 oox/source/drawingml/table/makefile.mk delete mode 100644 oox/source/dump/makefile.mk create mode 100644 oox/source/export/ooxml-export-notes.txt delete mode 100644 oox/source/helper/makefile.mk delete mode 100644 oox/source/ole/makefile.mk delete mode 100644 oox/source/ppt/makefile.mk delete mode 100644 oox/source/shape/makefile.mk delete mode 100644 oox/source/token/makefile.mk delete mode 100644 oox/source/vml/makefile.mk delete mode 100644 oox/source/xls/makefile.mk delete mode 100644 oox/util/makefile.mk delete mode 100644 oox/util/makefile.pmk delete mode 100644 oox/util/oox.component delete mode 100644 oox/workben/ooxml-export-notes.txt diff --git a/oox/Library_oox.mk b/oox/Library_oox.mk new file mode 100755 index 000000000000..2989e18ee523 --- /dev/null +++ b/oox/Library_oox.mk @@ -0,0 +1,421 @@ +#************************************************************************* +# +# 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 +# +# 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 --compare-strncmp $< | $(gb_AWK) -- '{ if ($$0 !~ /^#line/){ gsub("\\(char\\*\\)0", "(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/Makefile b/oox/Makefile new file mode 100755 index 000000000000..90947b2e5f48 --- /dev/null +++ b/oox/Makefile @@ -0,0 +1,38 @@ +#************************************************************************* +# +# 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 +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +ifeq ($(strip $(SOLARENV)),) +$(error No environment set!) +endif + +gb_PARTIALBUILD := T +GBUILDDIR := $(SOLARENV)/gbuild +include $(GBUILDDIR)/gbuild.mk + +$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk))) + +# vim: set noet sw=4 ts=4: diff --git a/oox/Module_oox.mk b/oox/Module_oox.mk new file mode 100755 index 000000000000..f5412ea1d221 --- /dev/null +++ b/oox/Module_oox.mk @@ -0,0 +1,37 @@ +#************************************************************************* +# +# 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 +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_Module_Module,oox)) + +$(eval $(call gb_Module_add_targets,oox,\ + Library_oox \ + Package_inc \ + Package_source \ + Package_workdir \ +)) + +# vim: set noet ts=4 sw=4: diff --git a/oox/Package_inc.mk b/oox/Package_inc.mk new file mode 100755 index 000000000000..6870821343d2 --- /dev/null +++ b/oox/Package_inc.mk @@ -0,0 +1,45 @@ +#************************************************************************* +# +# 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 +# +# 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 new file mode 100755 index 000000000000..95917616602a --- /dev/null +++ b/oox/Package_source.mk @@ -0,0 +1,29 @@ +#************************************************************************* +# +# 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 +# +# 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/Package_workdir.mk b/oox/Package_workdir.mk new file mode 100755 index 000000000000..8bbde7140301 --- /dev/null +++ b/oox/Package_workdir.mk @@ -0,0 +1,32 @@ +#************************************************************************* +# +# 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 +# +# 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)) diff --git a/oox/oox.component b/oox/oox.component new file mode 100644 index 000000000000..f6519d5a8664 --- /dev/null +++ b/oox/oox.component @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/oox/prj/build.lst b/oox/prj/build.lst index 03735c73dd11..2c965458b9fa 100644 --- a/oox/prj/build.lst +++ b/oox/prj/build.lst @@ -1,18 +1,3 @@ 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 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 +oox oox usr1 - all oox_mkout NULL +oox oox\prj nmake - all oox_prj NULL diff --git a/oox/prj/d.lst b/oox/prj/d.lst index 69ff66b95bc5..e69de29bb2d1 100644 --- a/oox/prj/d.lst +++ b/oox/prj/d.lst @@ -1,46 +0,0 @@ -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/prj/makefile.mk b/oox/prj/makefile.mk new file mode 100755 index 000000000000..83510a6a4ce1 --- /dev/null +++ b/oox/prj/makefile.mk @@ -0,0 +1,40 @@ +#************************************************************************* +# +# 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 +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +PRJ=.. +TARGET=prj + +.INCLUDE : settings.mk + +.IF "$(VERBOSE)"!="" +VERBOSEFLAG := +.ELSE +VERBOSEFLAG := -s +.ENDIF + +all: + cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) diff --git a/oox/source/core/makefile.mk b/oox/source/core/makefile.mk deleted file mode 100644 index 2b58b95777df..000000000000 --- a/oox/source/core/makefile.mk +++ /dev/null @@ -1,66 +0,0 @@ -#************************************************************************* -# -# 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 -# -# 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/source/docprop/makefile.mk b/oox/source/docprop/makefile.mk deleted file mode 100644 index 5687178da9e0..000000000000 --- a/oox/source/docprop/makefile.mk +++ /dev/null @@ -1,49 +0,0 @@ -#************************************************************************* -# -# 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 -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/.. - -PRJNAME=oox -TARGET=docprop -AUTOSEG=true - -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 deleted file mode 100644 index 84762e6a2540..000000000000 --- a/oox/source/drawingml/chart/makefile.mk +++ /dev/null @@ -1,74 +0,0 @@ -#************************************************************************* -# -# 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 -# -# 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 deleted file mode 100644 index 9d526ed3d3fb..000000000000 --- a/oox/source/drawingml/diagram/makefile.mk +++ /dev/null @@ -1,53 +0,0 @@ -#************************************************************************* -# -# 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 -# -# 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 deleted file mode 100644 index 0546fb4c233d..000000000000 --- a/oox/source/drawingml/makefile.mk +++ /dev/null @@ -1,92 +0,0 @@ -#************************************************************************* -# -# 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 -# -# 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 deleted file mode 100644 index fa71971fc278..000000000000 --- a/oox/source/drawingml/table/makefile.mk +++ /dev/null @@ -1,62 +0,0 @@ -#************************************************************************* -# -# 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 -# -# 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/source/dump/makefile.mk b/oox/source/dump/makefile.mk deleted file mode 100644 index 1e5f615675cc..000000000000 --- a/oox/source/dump/makefile.mk +++ /dev/null @@ -1,53 +0,0 @@ -#************************************************************************* -# -# 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 -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -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/export/ooxml-export-notes.txt b/oox/source/export/ooxml-export-notes.txt new file mode 100644 index 000000000000..8da4582b72b1 --- /dev/null +++ b/oox/source/export/ooxml-export-notes.txt @@ -0,0 +1,220 @@ +How to install this +------------------- + +> cd instsetoo_native/util +> LOCALINSTALLDIR=/where/you/want dmake openoffice_en-US PKGFORMAT=installed + +OOXML generally +--------------- + +- http://www.ecma-international.org/publications/standards/Ecma-376.htm +- http://www.asahi-net.or.jp/~eb2m-mrt/ooxml/dependencies.html + +Related modules +--------------- + +- oox + - .xlsx and .pptx import + +- writerfilter + - import of .docx, uses also oox for the graphics etc. + - can also parse .doc; but used for ooxml only for now + +- filter + - the configuration stuff (so that the filters appear in the filepicker) + +Old binary filters (export) +--------------------------- + +- doc export + - sw/source/filter/ww8/wrtww8* + - wrtww8.cxx:2191 [SwWW8Writer::StoreDoc()] is the entry point + + - eg. + #0 SwWW8Writer::WriteText (this=0x2aaab3dfb7c0) at /local/ooxml/ooxml/sw/source/filter/ww8/wrtww8.cxx:1846 + #1 0x00002aaaae75a545 in SwWW8Writer::WriteMainText (this=0x2aaab3d6a870) + at /local/ooxml/ooxml/sw/source/filter/ww8/wrtww8.cxx:1925 + #2 0x00002aaaae75e357 in SwWW8Writer::StoreDoc1 (this=0x2aaab3d6a870) + at /local/ooxml/ooxml/sw/source/filter/ww8/wrtww8.cxx:2076 + #3 0x00002aaaae7605ec in SwWW8Writer::StoreDoc (this=0x2aaab3d6a870) + at /local/ooxml/ooxml/sw/source/filter/ww8/wrtww8.cxx:2383 + #4 0x00002aaaae760fd5 in SwWW8Writer::WriteStorage (this=0x2aaab3d6a870) + at /local/ooxml/ooxml/sw/source/filter/ww8/wrtww8.cxx:2547 + #5 0x00002aaaae70b793 in StgWriter::Write (this=0x2aaab3d6a870, rPaM=@0x2b3802a2b640, rStg=@0x2aaab3d621c0, + pFName=0x7fffb1b285c0) at /local/ooxml/ooxml/sw/source/filter/writer/writer.cxx:653 + #6 0x00002aaaae70b84d in Writer::Write (this=0x2aaab3d6a870, rPaM=@0x2b3802a2b640, rStrm=@0x2aaaad979d20, + pFName=0x7fffb1b285c0) at /local/ooxml/ooxml/sw/source/filter/writer/writer.cxx:358 + #7 0x00002aaaae70b993 in Writer::Write (this=0x2aaab3d6a870, rPam=@0x2b3802a2b640, rMed=@0x2aaaad999f30, + pFileName=0x7fffb1b285c0) at /local/ooxml/ooxml/sw/source/filter/writer/writer.cxx:385 + #8 0x00002aaaae6375d7 in SwWriter::Write (this=0x7fffb1b28410, rxWriter=@0x7fffb1b285d0, + pRealFileName=0x7fffb1b285c0) at /local/ooxml/ooxml/sw/source/filter/basflt/shellio.cxx:963 + #9 0x00002aaaae87cc1e in SwDocShell::ConvertTo (this=0xcc27f0, rMedium=@0x2aaaad999f30) + at /local/ooxml/ooxml/sw/source/ui/app/docsh.cxx:924 + #10 0x00002b37faae6b58 in SfxObjectShell::DoLoad () + from /local/ooxml/inst/openoffice.org3.0/program/../basis-link/program//libsfxlx.so + +- xls export + - sc/source/filter/excel/xe* + + - eg. + #0 XclExpRecord::Save (this=0x11ae4c0, rStrm=@0x7fff5e6335d0) + at /local/ooxml/ooxml/sc/source/filter/excel/xerecord.cxx:88 + #1 0x00002aaaae562c4a in ExcRecord::Save (this=0x11ae4c0, rStrm=@0x7fff5e6335d0) + at /local/ooxml/ooxml/sc/source/filter/excel/excrecds.cxx:168 + #2 0x00002aaaae54b0fa in XclExpRecordList::Save (this=0x11c5d18, rStrm=@0x7fff5e6335d0) + at ../inc/xerecord.hxx:281 + #3 0x00002aaaae547541 in ExcTable::Write (this=0x11c5cf8, rStr=@0x7fff5e6335d0) + at /local/ooxml/ooxml/sc/source/filter/excel/excdoc.cxx:455 + #4 0x00002aaaae5475fb in ExcDocument::Write (this=0x11c5ce0, rSvStrm=@0x2aaab3dcd070) + at /local/ooxml/ooxml/sc/source/filter/excel/excdoc.cxx:525 + #5 0x00002aaaae568add in ExportBiff5::Write (this=0x7fff5e6339c0) + at /local/ooxml/ooxml/sc/source/filter/excel/expop2.cxx:119 + #6 0x00002aaaae54f4af in ScExportExcel5 (rMedium=@0x2aaab3d87410, pDocument=0xce6a00, bBiff8=1 '\001', eNach=1) + at /local/ooxml/ooxml/sc/source/filter/excel/excel.cxx:252 + #7 0x00002aaaadf1b70a in ScDocShell::ConvertTo (this=0xce6990, rMed=@0x2aaab3d87410) + at /local/ooxml/ooxml/sc/source/ui/docshell/docsh.cxx:2080 + #8 0x00002b354dfd8b58 in SfxObjectShell::DoLoad () + from /local/ooxml/inst/openoffice.org3.0/program/../basis-link/program//libsfxlx.so + + - Current approach is to add a XclExpRecordBase::SaveXml() method, which + would be used to write the XML content (while Save() would continue + writing the BIFF format). + - Q: How do we get to the Save()/SaveXml() methods (e.g. the SST export code) + #0 XclExpSstImpl::Save (this=0x1b170b0, rStrm=@0x7fffd4d5c4a0) + at /home/jon/Development/OpenOffice.org/ooxml/sc/source/filter/excel/xecontent.cxx:224 + #1 0x00007f68b7e46ff7 in XclExpSst::Save (this=0x1abc300, + rStrm=@0x7fffd4d5c4a0) + at /home/jon/Development/OpenOffice.org/ooxml/sc/source/filter/excel/xecontent.cxx:351 + #2 0x00007f68b7de5090 in XclExpRecordList::Save ( + this=0x1b2d168, rStrm=@0x7fffd4d5c4a0) at ../inc/xerecord.hxx:282 + // as above, starting at frame 2 + + - Thus, to get to the SaveXml() method, we need to add a slew of WriteXml() + methods that will (eventually) invoke the SaveXml() methods. + + - ZipStorage for XML handling and StorageRef (XStorage interface) + - To construct ZipStorage, need XMultiServiceFactory (!), and + XInputStream. + - Have an SvStream; need to wrap SvStream with XInputStream + - OInputStreamWrapper in + - Where do I get XMultiServiceFactory? + - Lots of places -- just grep + - perhaps XmlFilterBase _does_ make sense here. + - Do it anyway. + - Looking into having XclExpXmlStream inherit from ZipFilterBase + - problem: exception during construction, because ZipStorage hates me: + #0 OStorageFactory::createInstanceWithArguments (this=0x10612a0, + aArguments=@0x7fffe2ef76d0) + at /home/jon/Development/OpenOffice.org/ooxml/package/source/xstor/xfactory.cxx:275 + #1 0x00007f12d93f0d5c in comphelper::OStorageHelper::GetStorageOfFormatFromStream (aFormat=@0x7fffe2ef7780, xStream=@0x1a502d8, nStorageMode=15, + xFactory=@0x1a502c0) + at /home/jon/Development/OpenOffice.org/ooxml/comphelper/source/misc/storagehelper.cxx:342 + #2 0x00007f12c33d1a6d in ZipStorage (this=0x1a92550, rxFactory=@0x1a502c0, + rxStream=@0x1a502d8) + at /home/jon/Development/OpenOffice.org/ooxml/oox/source/helper/zipstorage.cxx:87 + #3 0x00007f12c33f089e in oox::core::XmlFilterBase::implCreateStorage ( + this=0x7fffe2ef7930, rxInStream=@0x1a502d0, rxStream=@0x1a502d8) + at /home/jon/Development/OpenOffice.org/ooxml/oox/source/core/xmlfilterbase.cxx:298 + #4 0x00007f12c33dd204 in oox::core::FilterBase::filter (this=0x7fffe2ef7930, + rDescriptor=@0x7fffe2ef78d0) + at /home/jon/Development/OpenOffice.org/ooxml/oox/source/core/filterbase.cxx:284 + #5 0x00007f12c68097a2 in XclExpXmlStream (this=0x7fffe2ef7930, + rSMgr=@0x7fffe2ef79a0, rStrm=@0x18d6f90) + at /home/jon/Development/OpenOffice.org/ooxml/sc/source/filter/excel/xestream.cxx:659 + #6 0x00007f12c674c8c1 in ExcDocument::WriteXml (this=0x15911f0, + rStrm=@0x18d6f90) + at /home/jon/Development/OpenOffice.org/ooxml/sc/source/filter/excel/excdoc.cxx:575 + ... + - Actual problem: xfactory.cxx:274, the CheckPackageSignature_Impl() call. + - fails because the empty file has content (!), thus fails the "package + signature check" (which tries to ensure the file format is correct). + - Underlying file is an SvFileStream, created in + SfxMedium::GetOutStream(). + - So why's CheckPackageSignature_Impl() fail? Because + lcl_ExportExcel2007Xml() had the code: + + SotStorageRef xRootStrg = new SotStorage( pMedStrm, FALSE ); + + That is, it was creating an OLE Structured Storage document over the + SvStream, and then (later) used the *same* SvStream and passed it to + ZipStorage. This caused ZipStorage to complain because OLESS data was + already present in the file, with a different file signature than what + ZipPackage was expecting (go figure). + +- ppt export + - sd/source/filter/eppt/* + - svx/source/msfilter + - for eg. Escher export + - Escher: http://chicago.sourceforge.net/devel/docs/escher/index.html + + - eg. + #0 PPTWriter (this=0x15807d0, rSvStorage=@0x7fff894f5340, rXModel=@0x142a2e8, rXStatInd=@0x142a2f0, pVBA=0x0, + nCnvrtFlags=15) at /local/ooxml/ooxml/sd/source/filter/eppt/eppt.cxx:268 + #1 0x00002aaab3895719 in ExportPPT (rSvStorage=@0x7fff894f5340, rXModel=@0x142a2e8, rXStatInd=@0x142a2f0, + pVBA=0x0, nCnvrtFlags=15) at /local/ooxml/ooxml/sd/source/filter/eppt/eppt.cxx:2503 + #2 0x00002aaaadef85b7 in SdPage::onParagraphRemoving () + from /local/ooxml/inst/openoffice.org3.0/program/../basis-link/program/libsdlx.so + #3 0x00002aaaade202e3 in sd::DrawDocShell::ConvertTo () + from /local/ooxml/inst/openoffice.org3.0/program/../basis-link/program/libsdlx.so + #4 0x00002aec23119b58 in SfxObjectShell::DoLoad () + from /local/ooxml/inst/openoffice.org3.0/program/../basis-link/program//libsfxlx.so + +- odp export + #0 ZipPackage (this=0x1805e80, xNewFactory=@0x7fffe284e990) at /home/rodo/git/ooxml/package/source/zippackage/ZipPackage.cxx:279 + #1 0x00002aaaadd3dc94 in ZipPackage_createInstance (xMgr=@0x7fffe284e990) at /home/rodo/git/ooxml/package/source/zippackage/ZipPackage.cxx:1546 + #2 0x00002b0fca7ab6b3 in ?? () from /opt/openoffice.org3.0/program/../basis-link/program/../ure-link/lib/libuno_cppuhelpergcc3.so.3 + #3 0x00002b0fca7a7fda in ?? () from /opt/openoffice.org3.0/program/../basis-link/program/../ure-link/lib/libuno_cppuhelpergcc3.so.3 + #4 0x00002b0fca7a811e in ?? () from /opt/openoffice.org3.0/program/../basis-link/program/../ure-link/lib/libuno_cppuhelpergcc3.so.3 + #5 0x00002b0fca7aa7cc in ?? () from /opt/openoffice.org3.0/program/../basis-link/program/../ure-link/lib/libuno_cppuhelpergcc3.so.3 + #6 0x00002b0fca7aacbe in ?? () from /opt/openoffice.org3.0/program/../basis-link/program/../ure-link/lib/libuno_cppuhelpergcc3.so.3 + #7 0x00002b0fca7aa035 in ?? () from /opt/openoffice.org3.0/program/../basis-link/program/../ure-link/lib/libuno_cppuhelpergcc3.so.3 + #8 0x00002aaaaadae1b3 in ?? () from /opt/openoffice.org/ure/lib/bootstrap.uno.so + #9 0x00002aaaaadaa84c in ?? () from /opt/openoffice.org/ure/lib/bootstrap.uno.so + #10 0x00002aaab5c7a7e5 in OStorage_Impl::OpenOwnPackage (this=0x185cac0) at /home/rodo/git/ooxml/package/source/xstor/xstorage.cxx:549 + #11 0x00002aaab5c7ab3e in OStorage_Impl::ReadContents (this=0x185cac0) at /home/rodo/git/ooxml/package/source/xstor/xstorage.cxx:649 + #12 0x00002aaab5c7d32f in OStorage_Impl::FindElement (this=0x185cac0, rName=@0x7fffe284f280) at /home/rodo/git/ooxml/package/source/xstor/xstorage.cxx:1387 + #13 0x00002aaab5c7dc45 in OStorage::hasByName (this=0x1808880, aName=@0x7fffe284f280) at /home/rodo/git/ooxml/package/source/xstor/xstorage.cxx:4045 + #14 0x00002aaab1fde8c5 in XMLVersionListPersistence::load () from /opt/openoffice.org3.0/program/../basis-link/program/libxolx.so + #15 0x00002b0fcb058bb2 in SfxMedium::GetVersionList (this=0x1750050, _bNoReload=false) at /home/rodo/git/ooxml/sfx2/source/doc/docfile.cxx:3247 + #16 0x00002b0fcb0571b5 in SfxMedium::GetStorage (this=0x1750050) at /home/rodo/git/ooxml/sfx2/source/doc/docfile.cxx:1328 + #17 0x00002b0fcb05d0d7 in SfxMedium::GetOutputStorage (this=0x1750050) at /home/rodo/git/ooxml/sfx2/source/doc/docfile.cxx:1068 + #18 0x00002b0fcb091227 in SfxObjectShell::SaveTo_Impl (this=0xf44d60, rMedium=@0x1750050, pSet=0x0) at /home/rodo/git/ooxml/sfx2/source/doc/objstor.cxx:1557 + #19 0x00002b0fcb09443c in SfxObjectShell::PreDoSaveAs_Impl (this=0xf44d60, rFileName=@0x7fffe2850700, aFilterName=@0x7fffe28507f0, pParams=0xf10c10) + at /home/rodo/git/ooxml/sfx2/source/doc/objstor.cxx:2984 + #20 0x00002b0fcb094ea5 in SfxObjectShell::CommonSaveAs_Impl (this=0xf44d60, aURL=@0x7fffe2850870, aFilterName=@0x7fffe28507f0, aParams=0x1740310) + at /home/rodo/git/ooxml/sfx2/source/doc/objstor.cxx:2855 + #21 0x00002b0fcb0a1da2 in SfxObjectShell::APISaveAs_Impl (this=0xf44d60, aFileName=@0x7fffe2850b70, aParams=0x1740310) + at /home/rodo/git/ooxml/sfx2/source/doc/objserv.cxx:432 + #22 0x00002b0fcb0e74c8 in SfxBaseModel::impl_store (this=0xf96a00, sURL=@0x7fffe28516b0, seqArguments=@0x7fffe2851ae0, bSaveTo=0 '\0') + at /home/rodo/git/ooxml/sfx2/source/doc/sfxbasemodel.cxx:2591 + #23 0x00002b0fcb0f124b in SfxBaseModel::storeAsURL (this=0xf96a00, rURL=@0x7fffe28516b0, rArgs=@0x7fffe2851ae0) + at /home/rodo/git/ooxml/sfx2/source/doc/sfxbasemodel.cxx:1568 + #24 0x00002b0fcb101d3d in SfxStoringHelper::GUIStoreModel (this=0x7fffe28519f0, xModel=@0xf18798, aSlotName=@0x7fffe2852200, aArgsSequence=@0x7fffe2851ae0, + bPreselectPassword=0 '\0') at /home/rodo/git/ooxml/sfx2/source/doc/guisaveas.cxx:1529 + #25 0x00002b0fcb0a4051 in SfxObjectShell::ExecFile_Impl (this=0xf44d60, rReq=@0x1484f20) at /home/rodo/git/ooxml/sfx2/source/doc/objserv.cxx:744 + #26 0x00002b0fcb0a5c73 in SfxStubSfxObjectShellExecFile_Impl (pShell=0xf44d60, rReq=@0x1484f20) at ../../unxlngx6.pro/inc/sfxslots.hxx:161 + #27 0x00002b0fcb17f398 in SfxShell::CallExec (this=0xf44d60, pFunc=0x2b0fcb0a5c56 , rReq=@0x1484f20) + at ../../inc/sfx2/shell.hxx:226 + #28 0x00002b0fcb17cec3 in SfxDispatcher::Call_Impl (this=0x110fde0, rShell=@0xf44d60, rSlot=@0x2b0fcb576368, rReq=@0x1484f20, bRecord=1 '\001') + at /home/rodo/git/ooxml/sfx2/source/control/dispatch.cxx:338 + #29 0x00002b0fcb17d3f2 in SfxDispatcher::PostMsgHandler (this=0x110fde0, pReq=0x1484f20) at /home/rodo/git/ooxml/sfx2/source/control/dispatch.cxx:1643 + #30 0x00002b0fcb17d51d in SfxDispatcher::LinkStubPostMsgHandler (pThis=0x110fde0, pCaller=0x1484f20) at /home/rodo/git/ooxml/sfx2/source/control/dispatch.cxx:1610 + #31 0x00002b0fcafb3e70 in Link::Call (this=0x11488f8, pCaller=0x1484f20) at /home/rodo/git/ooxml/solver/300/unxlngx6.pro/inc/tools/link.hxx:158 + #32 0x00002b0fcb1a9952 in GenLink::Call (this=0x11488f8, pCaller=0x1484f20) at ../../inc/sfx2/genlink.hxx:63 + #33 0x00002b0fcb1a9773 in SfxHintPoster::Event (this=0x11488e0, pPostedHint=0x1484f20) at /home/rodo/git/ooxml/sfx2/source/notify/hintpost.cxx:98 + #34 0x00002b0fcb1a9984 in SfxHintPoster::DoEvent_Impl (this=0x11488e0, pPostedHint=0x1484f20) at /home/rodo/git/ooxml/sfx2/source/notify/hintpost.cxx:88 + #35 0x00002b0fcb1a974f in SfxHintPoster::LinkStubDoEvent_Impl (pThis=0x11488e0, pCaller=0x1484f20) at /home/rodo/git/ooxml/sfx2/source/notify/hintpost.cxx:92 + #36 0x00002b0fccef69f8 in ImplWindowFrameProc () from /opt/openoffice.org3.0/program/../basis-link/program/libvcllx.so + #37 0x00002b0fd3f91f8f in SalDisplay::DispatchInternalEvent () from /opt/openoffice.org/basis3.0/program/libvclplug_genlx.so + #38 0x00002b0fd0fa4a84 in GtkXLib::userEventFn () from /opt/openoffice.org/basis3.0/program/libvclplug_gtklx.so + #39 0x00002b0fd3cb0204 in g_main_context_dispatch () from /usr/lib64/libglib-2.0.so.0 + #40 0x00002b0fd3cb34fd in ?? () from /usr/lib64/libglib-2.0.so.0 + #41 0x00002b0fd3cb39ce in g_main_context_iteration () from /usr/lib64/libglib-2.0.so.0 + #42 0x00002b0fd0fa4fd9 in GtkXLib::Yield () from /opt/openoffice.org/basis3.0/program/libvclplug_gtklx.so + #43 0x00002b0fccd1859e in Application::Yield () from /opt/openoffice.org3.0/program/../basis-link/program/libvcllx.so + #44 0x00002b0fccd18677 in Application::Execute () from /opt/openoffice.org3.0/program/../basis-link/program/libvcllx.so + #45 0x00002b0fc86fd803 in ?? () from /opt/openoffice.org3.0/program/../basis-link/program/libsoffice.so + #46 0x00002b0fccd1da24 in ImplSVMain () from /opt/openoffice.org3.0/program/../basis-link/program/libvcllx.so + #47 0x00002b0fccd1db15 in SVMain () from /opt/openoffice.org3.0/program/../basis-link/program/libvcllx.so + #48 0x00002b0fc872fe6c in soffice_main () from /opt/openoffice.org3.0/program/../basis-link/program/libsoffice.so + #49 0x000000000040114b in main () diff --git a/oox/source/helper/makefile.mk b/oox/source/helper/makefile.mk deleted file mode 100644 index f31736faac8d..000000000000 --- a/oox/source/helper/makefile.mk +++ /dev/null @@ -1,60 +0,0 @@ -#************************************************************************* -# -# 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 -# -# 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 deleted file mode 100644 index a5232247cfa5..000000000000 --- a/oox/source/ole/makefile.mk +++ /dev/null @@ -1,60 +0,0 @@ -#************************************************************************* -# -# 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 -# -# 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 deleted file mode 100644 index 8d902ed51337..000000000000 --- a/oox/source/ppt/makefile.mk +++ /dev/null @@ -1,76 +0,0 @@ -#************************************************************************* -# -# 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 -# -# 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/source/shape/makefile.mk b/oox/source/shape/makefile.mk deleted file mode 100644 index c6534b3a8a6f..000000000000 --- a/oox/source/shape/makefile.mk +++ /dev/null @@ -1,49 +0,0 @@ -#************************************************************************* -# -# 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 -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/.. - -PRJNAME=oox -TARGET=shape -AUTOSEG=true - -ENABLE_EXCEPTIONS=TRUE - -# --- 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 deleted file mode 100644 index ff42967f0bb1..000000000000 --- a/oox/source/token/makefile.mk +++ /dev/null @@ -1,78 +0,0 @@ -#************************************************************************* -# -# 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 -# -# 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 0f4373d2dc59..d021f2a3a353 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 "namespacenames.inc" +#include { -1, "" } }; diff --git a/oox/source/token/namespaces.pl b/oox/source/token/namespaces.pl index 3c741fa7b2af..7c602f70128d 100644 --- a/oox/source/token/namespaces.pl +++ b/oox/source/token/namespaces.pl @@ -25,17 +25,19 @@ # #************************************************************************* -$ARGV0 = shift @ARGV; -$ARGV1 = shift @ARGV; -$ARGV2 = shift @ARGV; -$ARGV3 = shift @ARGV; +# operation mode (1 = identifiers, 2 = names, 3 = plain) +$op = shift @ARGV; +die "Error: invalid operation" unless( $op >= 1 && $op <= 3); -# parse input file +# number of bits to shift the namespace identifier +$shift = 16; + +if( $op == 1 ) { + print( "const size_t NMSP_SHIFT = $shift;\n" ); +} -open( INFILE, $ARGV0 ) or die "cannot open input file: $!"; -my %namespaces; -while( ) -{ +$i = 1; +while( <> ) { # trim newline chomp( $_ ); # trim leading/trailing whitespace @@ -44,36 +46,14 @@ 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 character in input data"; - $namespaces{$1} = $2; + $_ =~ /^([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; } } -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 f341924bbb90..448cec632343 100644 --- a/oox/source/token/properties.pl +++ b/oox/source/token/properties.pl @@ -25,43 +25,33 @@ # #************************************************************************* -$ARGV0 = shift @ARGV; -$ARGV1 = shift @ARGV; -$ARGV2 = shift @ARGV; +# operation mode (1 = identifiers, 2 = names) +$op = shift @ARGV; +die "Error: invalid operation" unless( $op >= 1 && $op <= 2); -# parse input file - -open( INFILE, $ARGV0 ) or die "Error: cannot open input file: $!"; -my %props; -while( ) -{ +$i = 0; +while( <> ) { # trim newline chomp( $_ ); # trim leading/trailing whitespace $_ =~ s/^\s*//g; $_ =~ s/\s*$//g; - # check for valid characters - $_ =~ /^[A-Z][a-zA-Z0-9]*$/ or die "Error: invalid character in property '$_'"; - $id = "PROP_$_"; - $props{$_} = $id; + # 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; + } } -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: $!"; -$i = 0; -foreach( sort( keys( %props ) ) ) -{ - print( IDFILE "const sal_Int32 $props{$_} = $i;\n" ); - print( NAMEFILE "/* $i */ \"$_\",\n" ); - ++$i; +if( $op == 1 ) { + print( "const sal_Int32 PROP_COUNT = $i;\nconst sal_Int32 PROP_INVALID = -1;\n" ); +} elsif( $op == 2 ) { + print( " \"\"" ); } - -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 401d168fe696..b8f06496c7ff 100644 --- a/oox/source/token/propertynames.cxx +++ b/oox/source/token/propertynames.cxx @@ -36,8 +36,7 @@ PropertyNameVector::PropertyNameVector() static const sal_Char* sppcPropertyNames[] = { // include auto-generated C array with property names as C strings -#include "propertynames.inc" - "" +#include }; size_t nArraySize = (sizeof( sppcPropertyNames ) / sizeof( *sppcPropertyNames )) - 1; diff --git a/oox/source/token/tokenmap.cxx b/oox/source/token/tokenmap.cxx index a5189269c3c8..8f097b10c7fb 100644 --- a/oox/source/token/tokenmap.cxx +++ b/oox/source/token/tokenmap.cxx @@ -44,7 +44,7 @@ using ::rtl::OUString; namespace { // include auto-generated Perfect_Hash -#include "tokenhash.inc" +#include } // namespace // ============================================================================ @@ -55,7 +55,7 @@ TokenMap::TokenMap() : static const sal_Char* sppcTokenNames[] = { // include auto-generated C array with token names as C strings -#include "tokennames.inc" +#include "" }; diff --git a/oox/source/token/tokens.pl b/oox/source/token/tokens.pl index a951cee80db2..4307a7d9047a 100644 --- a/oox/source/token/tokens.pl +++ b/oox/source/token/tokens.pl @@ -25,56 +25,50 @@ # #************************************************************************* -$ARGV0 = shift @ARGV; -$ARGV1 = shift @ARGV; -$ARGV2 = shift @ARGV; -$ARGV3 = shift @ARGV; +# operation mode (1 = identifiers, 2 = names, 3 = gperf) +$op = shift @ARGV; +die "Error: invalid operation" unless( $op >= 1 && $op <= 3); -open( INFILE, $ARGV0 ) or die "Error: cannot open input file: $!"; -my %tokens; -while ( ) +if( $op == 3 ) { + print( "%language=C++\n" ); + print( "%global-table\n" ); + print( "%null-strings\n" ); + print( "%struct-type\n" ); + print( "struct xmltoken {\n" ); + print( " const sal_Char *name;\n" ); + print( " sal_Int32 nToken;\n" ); + print( "};\n" ); + print( "%%\n" ); +} + +$i = 0; +while( <> ) { # trim newline chomp( $_ ); # trim leading/trailing whitespace $_ =~ s/^\s*//g; $_ =~ s/\s*$//g; - # check for valid characters - $_ =~ /^[a-zA-Z0-9-_]+$/ or die "Error: invalid character in token '$_'"; - $id = "XML_$_"; - $id =~ s/-/_/g; - $tokens{$_} = $id; + # 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; + } } -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: $!"; -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; +if( $op == 1 ) { + print( "const sal_Int32 XML_TOKEN_COUNT = $i;\n" ); +} elsif( $op == 3 ) { + print( "%%\n" ); } - -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 deleted file mode 100644 index 094d37cd8c1c..000000000000 --- a/oox/source/vml/makefile.mk +++ /dev/null @@ -1,56 +0,0 @@ -#************************************************************************* -# -# 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 -# -# 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 deleted file mode 100644 index e337afe786a8..000000000000 --- a/oox/source/xls/makefile.mk +++ /dev/null @@ -1,105 +0,0 @@ -#************************************************************************* -# -# 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 -# -# 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 deleted file mode 100644 index 329ced792164..000000000000 --- a/oox/util/makefile.mk +++ /dev/null @@ -1,104 +0,0 @@ -#************************************************************************* -# -# 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 -# -# 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/util/makefile.pmk b/oox/util/makefile.pmk deleted file mode 100644 index adb0222c2ba2..000000000000 --- a/oox/util/makefile.pmk +++ /dev/null @@ -1,30 +0,0 @@ -#************************************************************************* -# -# 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 -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -# Reduction of exported symbols: -CDEFS += -DOOX_DLLIMPLEMENTATION -VISIBILITY_HIDDEN=TRUE diff --git a/oox/util/oox.component b/oox/util/oox.component deleted file mode 100644 index f6519d5a8664..000000000000 --- a/oox/util/oox.component +++ /dev/null @@ -1,67 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/oox/workben/ooxml-export-notes.txt b/oox/workben/ooxml-export-notes.txt deleted file mode 100644 index 8da4582b72b1..000000000000 --- a/oox/workben/ooxml-export-notes.txt +++ /dev/null @@ -1,220 +0,0 @@ -How to install this -------------------- - -> cd instsetoo_native/util -> LOCALINSTALLDIR=/where/you/want dmake openoffice_en-US PKGFORMAT=installed - -OOXML generally ---------------- - -- http://www.ecma-international.org/publications/standards/Ecma-376.htm -- http://www.asahi-net.or.jp/~eb2m-mrt/ooxml/dependencies.html - -Related modules ---------------- - -- oox - - .xlsx and .pptx import - -- writerfilter - - import of .docx, uses also oox for the graphics etc. - - can also parse .doc; but used for ooxml only for now - -- filter - - the configuration stuff (so that the filters appear in the filepicker) - -Old binary filters (export) ---------------------------- - -- doc export - - sw/source/filter/ww8/wrtww8* - - wrtww8.cxx:2191 [SwWW8Writer::StoreDoc()] is the entry point - - - eg. - #0 SwWW8Writer::WriteText (this=0x2aaab3dfb7c0) at /local/ooxml/ooxml/sw/source/filter/ww8/wrtww8.cxx:1846 - #1 0x00002aaaae75a545 in SwWW8Writer::WriteMainText (this=0x2aaab3d6a870) - at /local/ooxml/ooxml/sw/source/filter/ww8/wrtww8.cxx:1925 - #2 0x00002aaaae75e357 in SwWW8Writer::StoreDoc1 (this=0x2aaab3d6a870) - at /local/ooxml/ooxml/sw/source/filter/ww8/wrtww8.cxx:2076 - #3 0x00002aaaae7605ec in SwWW8Writer::StoreDoc (this=0x2aaab3d6a870) - at /local/ooxml/ooxml/sw/source/filter/ww8/wrtww8.cxx:2383 - #4 0x00002aaaae760fd5 in SwWW8Writer::WriteStorage (this=0x2aaab3d6a870) - at /local/ooxml/ooxml/sw/source/filter/ww8/wrtww8.cxx:2547 - #5 0x00002aaaae70b793 in StgWriter::Write (this=0x2aaab3d6a870, rPaM=@0x2b3802a2b640, rStg=@0x2aaab3d621c0, - pFName=0x7fffb1b285c0) at /local/ooxml/ooxml/sw/source/filter/writer/writer.cxx:653 - #6 0x00002aaaae70b84d in Writer::Write (this=0x2aaab3d6a870, rPaM=@0x2b3802a2b640, rStrm=@0x2aaaad979d20, - pFName=0x7fffb1b285c0) at /local/ooxml/ooxml/sw/source/filter/writer/writer.cxx:358 - #7 0x00002aaaae70b993 in Writer::Write (this=0x2aaab3d6a870, rPam=@0x2b3802a2b640, rMed=@0x2aaaad999f30, - pFileName=0x7fffb1b285c0) at /local/ooxml/ooxml/sw/source/filter/writer/writer.cxx:385 - #8 0x00002aaaae6375d7 in SwWriter::Write (this=0x7fffb1b28410, rxWriter=@0x7fffb1b285d0, - pRealFileName=0x7fffb1b285c0) at /local/ooxml/ooxml/sw/source/filter/basflt/shellio.cxx:963 - #9 0x00002aaaae87cc1e in SwDocShell::ConvertTo (this=0xcc27f0, rMedium=@0x2aaaad999f30) - at /local/ooxml/ooxml/sw/source/ui/app/docsh.cxx:924 - #10 0x00002b37faae6b58 in SfxObjectShell::DoLoad () - from /local/ooxml/inst/openoffice.org3.0/program/../basis-link/program//libsfxlx.so - -- xls export - - sc/source/filter/excel/xe* - - - eg. - #0 XclExpRecord::Save (this=0x11ae4c0, rStrm=@0x7fff5e6335d0) - at /local/ooxml/ooxml/sc/source/filter/excel/xerecord.cxx:88 - #1 0x00002aaaae562c4a in ExcRecord::Save (this=0x11ae4c0, rStrm=@0x7fff5e6335d0) - at /local/ooxml/ooxml/sc/source/filter/excel/excrecds.cxx:168 - #2 0x00002aaaae54b0fa in XclExpRecordList::Save (this=0x11c5d18, rStrm=@0x7fff5e6335d0) - at ../inc/xerecord.hxx:281 - #3 0x00002aaaae547541 in ExcTable::Write (this=0x11c5cf8, rStr=@0x7fff5e6335d0) - at /local/ooxml/ooxml/sc/source/filter/excel/excdoc.cxx:455 - #4 0x00002aaaae5475fb in ExcDocument::Write (this=0x11c5ce0, rSvStrm=@0x2aaab3dcd070) - at /local/ooxml/ooxml/sc/source/filter/excel/excdoc.cxx:525 - #5 0x00002aaaae568add in ExportBiff5::Write (this=0x7fff5e6339c0) - at /local/ooxml/ooxml/sc/source/filter/excel/expop2.cxx:119 - #6 0x00002aaaae54f4af in ScExportExcel5 (rMedium=@0x2aaab3d87410, pDocument=0xce6a00, bBiff8=1 '\001', eNach=1) - at /local/ooxml/ooxml/sc/source/filter/excel/excel.cxx:252 - #7 0x00002aaaadf1b70a in ScDocShell::ConvertTo (this=0xce6990, rMed=@0x2aaab3d87410) - at /local/ooxml/ooxml/sc/source/ui/docshell/docsh.cxx:2080 - #8 0x00002b354dfd8b58 in SfxObjectShell::DoLoad () - from /local/ooxml/inst/openoffice.org3.0/program/../basis-link/program//libsfxlx.so - - - Current approach is to add a XclExpRecordBase::SaveXml() method, which - would be used to write the XML content (while Save() would continue - writing the BIFF format). - - Q: How do we get to the Save()/SaveXml() methods (e.g. the SST export code) - #0 XclExpSstImpl::Save (this=0x1b170b0, rStrm=@0x7fffd4d5c4a0) - at /home/jon/Development/OpenOffice.org/ooxml/sc/source/filter/excel/xecontent.cxx:224 - #1 0x00007f68b7e46ff7 in XclExpSst::Save (this=0x1abc300, - rStrm=@0x7fffd4d5c4a0) - at /home/jon/Development/OpenOffice.org/ooxml/sc/source/filter/excel/xecontent.cxx:351 - #2 0x00007f68b7de5090 in XclExpRecordList::Save ( - this=0x1b2d168, rStrm=@0x7fffd4d5c4a0) at ../inc/xerecord.hxx:282 - // as above, starting at frame 2 - - - Thus, to get to the SaveXml() method, we need to add a slew of WriteXml() - methods that will (eventually) invoke the SaveXml() methods. - - - ZipStorage for XML handling and StorageRef (XStorage interface) - - To construct ZipStorage, need XMultiServiceFactory (!), and - XInputStream. - - Have an SvStream; need to wrap SvStream with XInputStream - - OInputStreamWrapper in - - Where do I get XMultiServiceFactory? - - Lots of places -- just grep - - perhaps XmlFilterBase _does_ make sense here. - - Do it anyway. - - Looking into having XclExpXmlStream inherit from ZipFilterBase - - problem: exception during construction, because ZipStorage hates me: - #0 OStorageFactory::createInstanceWithArguments (this=0x10612a0, - aArguments=@0x7fffe2ef76d0) - at /home/jon/Development/OpenOffice.org/ooxml/package/source/xstor/xfactory.cxx:275 - #1 0x00007f12d93f0d5c in comphelper::OStorageHelper::GetStorageOfFormatFromStream (aFormat=@0x7fffe2ef7780, xStream=@0x1a502d8, nStorageMode=15, - xFactory=@0x1a502c0) - at /home/jon/Development/OpenOffice.org/ooxml/comphelper/source/misc/storagehelper.cxx:342 - #2 0x00007f12c33d1a6d in ZipStorage (this=0x1a92550, rxFactory=@0x1a502c0, - rxStream=@0x1a502d8) - at /home/jon/Development/OpenOffice.org/ooxml/oox/source/helper/zipstorage.cxx:87 - #3 0x00007f12c33f089e in oox::core::XmlFilterBase::implCreateStorage ( - this=0x7fffe2ef7930, rxInStream=@0x1a502d0, rxStream=@0x1a502d8) - at /home/jon/Development/OpenOffice.org/ooxml/oox/source/core/xmlfilterbase.cxx:298 - #4 0x00007f12c33dd204 in oox::core::FilterBase::filter (this=0x7fffe2ef7930, - rDescriptor=@0x7fffe2ef78d0) - at /home/jon/Development/OpenOffice.org/ooxml/oox/source/core/filterbase.cxx:284 - #5 0x00007f12c68097a2 in XclExpXmlStream (this=0x7fffe2ef7930, - rSMgr=@0x7fffe2ef79a0, rStrm=@0x18d6f90) - at /home/jon/Development/OpenOffice.org/ooxml/sc/source/filter/excel/xestream.cxx:659 - #6 0x00007f12c674c8c1 in ExcDocument::WriteXml (this=0x15911f0, - rStrm=@0x18d6f90) - at /home/jon/Development/OpenOffice.org/ooxml/sc/source/filter/excel/excdoc.cxx:575 - ... - - Actual problem: xfactory.cxx:274, the CheckPackageSignature_Impl() call. - - fails because the empty file has content (!), thus fails the "package - signature check" (which tries to ensure the file format is correct). - - Underlying file is an SvFileStream, created in - SfxMedium::GetOutStream(). - - So why's CheckPackageSignature_Impl() fail? Because - lcl_ExportExcel2007Xml() had the code: - - SotStorageRef xRootStrg = new SotStorage( pMedStrm, FALSE ); - - That is, it was creating an OLE Structured Storage document over the - SvStream, and then (later) used the *same* SvStream and passed it to - ZipStorage. This caused ZipStorage to complain because OLESS data was - already present in the file, with a different file signature than what - ZipPackage was expecting (go figure). - -- ppt export - - sd/source/filter/eppt/* - - svx/source/msfilter - - for eg. Escher export - - Escher: http://chicago.sourceforge.net/devel/docs/escher/index.html - - - eg. - #0 PPTWriter (this=0x15807d0, rSvStorage=@0x7fff894f5340, rXModel=@0x142a2e8, rXStatInd=@0x142a2f0, pVBA=0x0, - nCnvrtFlags=15) at /local/ooxml/ooxml/sd/source/filter/eppt/eppt.cxx:268 - #1 0x00002aaab3895719 in ExportPPT (rSvStorage=@0x7fff894f5340, rXModel=@0x142a2e8, rXStatInd=@0x142a2f0, - pVBA=0x0, nCnvrtFlags=15) at /local/ooxml/ooxml/sd/source/filter/eppt/eppt.cxx:2503 - #2 0x00002aaaadef85b7 in SdPage::onParagraphRemoving () - from /local/ooxml/inst/openoffice.org3.0/program/../basis-link/program/libsdlx.so - #3 0x00002aaaade202e3 in sd::DrawDocShell::ConvertTo () - from /local/ooxml/inst/openoffice.org3.0/program/../basis-link/program/libsdlx.so - #4 0x00002aec23119b58 in SfxObjectShell::DoLoad () - from /local/ooxml/inst/openoffice.org3.0/program/../basis-link/program//libsfxlx.so - -- odp export - #0 ZipPackage (this=0x1805e80, xNewFactory=@0x7fffe284e990) at /home/rodo/git/ooxml/package/source/zippackage/ZipPackage.cxx:279 - #1 0x00002aaaadd3dc94 in ZipPackage_createInstance (xMgr=@0x7fffe284e990) at /home/rodo/git/ooxml/package/source/zippackage/ZipPackage.cxx:1546 - #2 0x00002b0fca7ab6b3 in ?? () from /opt/openoffice.org3.0/program/../basis-link/program/../ure-link/lib/libuno_cppuhelpergcc3.so.3 - #3 0x00002b0fca7a7fda in ?? () from /opt/openoffice.org3.0/program/../basis-link/program/../ure-link/lib/libuno_cppuhelpergcc3.so.3 - #4 0x00002b0fca7a811e in ?? () from /opt/openoffice.org3.0/program/../basis-link/program/../ure-link/lib/libuno_cppuhelpergcc3.so.3 - #5 0x00002b0fca7aa7cc in ?? () from /opt/openoffice.org3.0/program/../basis-link/program/../ure-link/lib/libuno_cppuhelpergcc3.so.3 - #6 0x00002b0fca7aacbe in ?? () from /opt/openoffice.org3.0/program/../basis-link/program/../ure-link/lib/libuno_cppuhelpergcc3.so.3 - #7 0x00002b0fca7aa035 in ?? () from /opt/openoffice.org3.0/program/../basis-link/program/../ure-link/lib/libuno_cppuhelpergcc3.so.3 - #8 0x00002aaaaadae1b3 in ?? () from /opt/openoffice.org/ure/lib/bootstrap.uno.so - #9 0x00002aaaaadaa84c in ?? () from /opt/openoffice.org/ure/lib/bootstrap.uno.so - #10 0x00002aaab5c7a7e5 in OStorage_Impl::OpenOwnPackage (this=0x185cac0) at /home/rodo/git/ooxml/package/source/xstor/xstorage.cxx:549 - #11 0x00002aaab5c7ab3e in OStorage_Impl::ReadContents (this=0x185cac0) at /home/rodo/git/ooxml/package/source/xstor/xstorage.cxx:649 - #12 0x00002aaab5c7d32f in OStorage_Impl::FindElement (this=0x185cac0, rName=@0x7fffe284f280) at /home/rodo/git/ooxml/package/source/xstor/xstorage.cxx:1387 - #13 0x00002aaab5c7dc45 in OStorage::hasByName (this=0x1808880, aName=@0x7fffe284f280) at /home/rodo/git/ooxml/package/source/xstor/xstorage.cxx:4045 - #14 0x00002aaab1fde8c5 in XMLVersionListPersistence::load () from /opt/openoffice.org3.0/program/../basis-link/program/libxolx.so - #15 0x00002b0fcb058bb2 in SfxMedium::GetVersionList (this=0x1750050, _bNoReload=false) at /home/rodo/git/ooxml/sfx2/source/doc/docfile.cxx:3247 - #16 0x00002b0fcb0571b5 in SfxMedium::GetStorage (this=0x1750050) at /home/rodo/git/ooxml/sfx2/source/doc/docfile.cxx:1328 - #17 0x00002b0fcb05d0d7 in SfxMedium::GetOutputStorage (this=0x1750050) at /home/rodo/git/ooxml/sfx2/source/doc/docfile.cxx:1068 - #18 0x00002b0fcb091227 in SfxObjectShell::SaveTo_Impl (this=0xf44d60, rMedium=@0x1750050, pSet=0x0) at /home/rodo/git/ooxml/sfx2/source/doc/objstor.cxx:1557 - #19 0x00002b0fcb09443c in SfxObjectShell::PreDoSaveAs_Impl (this=0xf44d60, rFileName=@0x7fffe2850700, aFilterName=@0x7fffe28507f0, pParams=0xf10c10) - at /home/rodo/git/ooxml/sfx2/source/doc/objstor.cxx:2984 - #20 0x00002b0fcb094ea5 in SfxObjectShell::CommonSaveAs_Impl (this=0xf44d60, aURL=@0x7fffe2850870, aFilterName=@0x7fffe28507f0, aParams=0x1740310) - at /home/rodo/git/ooxml/sfx2/source/doc/objstor.cxx:2855 - #21 0x00002b0fcb0a1da2 in SfxObjectShell::APISaveAs_Impl (this=0xf44d60, aFileName=@0x7fffe2850b70, aParams=0x1740310) - at /home/rodo/git/ooxml/sfx2/source/doc/objserv.cxx:432 - #22 0x00002b0fcb0e74c8 in SfxBaseModel::impl_store (this=0xf96a00, sURL=@0x7fffe28516b0, seqArguments=@0x7fffe2851ae0, bSaveTo=0 '\0') - at /home/rodo/git/ooxml/sfx2/source/doc/sfxbasemodel.cxx:2591 - #23 0x00002b0fcb0f124b in SfxBaseModel::storeAsURL (this=0xf96a00, rURL=@0x7fffe28516b0, rArgs=@0x7fffe2851ae0) - at /home/rodo/git/ooxml/sfx2/source/doc/sfxbasemodel.cxx:1568 - #24 0x00002b0fcb101d3d in SfxStoringHelper::GUIStoreModel (this=0x7fffe28519f0, xModel=@0xf18798, aSlotName=@0x7fffe2852200, aArgsSequence=@0x7fffe2851ae0, - bPreselectPassword=0 '\0') at /home/rodo/git/ooxml/sfx2/source/doc/guisaveas.cxx:1529 - #25 0x00002b0fcb0a4051 in SfxObjectShell::ExecFile_Impl (this=0xf44d60, rReq=@0x1484f20) at /home/rodo/git/ooxml/sfx2/source/doc/objserv.cxx:744 - #26 0x00002b0fcb0a5c73 in SfxStubSfxObjectShellExecFile_Impl (pShell=0xf44d60, rReq=@0x1484f20) at ../../unxlngx6.pro/inc/sfxslots.hxx:161 - #27 0x00002b0fcb17f398 in SfxShell::CallExec (this=0xf44d60, pFunc=0x2b0fcb0a5c56 , rReq=@0x1484f20) - at ../../inc/sfx2/shell.hxx:226 - #28 0x00002b0fcb17cec3 in SfxDispatcher::Call_Impl (this=0x110fde0, rShell=@0xf44d60, rSlot=@0x2b0fcb576368, rReq=@0x1484f20, bRecord=1 '\001') - at /home/rodo/git/ooxml/sfx2/source/control/dispatch.cxx:338 - #29 0x00002b0fcb17d3f2 in SfxDispatcher::PostMsgHandler (this=0x110fde0, pReq=0x1484f20) at /home/rodo/git/ooxml/sfx2/source/control/dispatch.cxx:1643 - #30 0x00002b0fcb17d51d in SfxDispatcher::LinkStubPostMsgHandler (pThis=0x110fde0, pCaller=0x1484f20) at /home/rodo/git/ooxml/sfx2/source/control/dispatch.cxx:1610 - #31 0x00002b0fcafb3e70 in Link::Call (this=0x11488f8, pCaller=0x1484f20) at /home/rodo/git/ooxml/solver/300/unxlngx6.pro/inc/tools/link.hxx:158 - #32 0x00002b0fcb1a9952 in GenLink::Call (this=0x11488f8, pCaller=0x1484f20) at ../../inc/sfx2/genlink.hxx:63 - #33 0x00002b0fcb1a9773 in SfxHintPoster::Event (this=0x11488e0, pPostedHint=0x1484f20) at /home/rodo/git/ooxml/sfx2/source/notify/hintpost.cxx:98 - #34 0x00002b0fcb1a9984 in SfxHintPoster::DoEvent_Impl (this=0x11488e0, pPostedHint=0x1484f20) at /home/rodo/git/ooxml/sfx2/source/notify/hintpost.cxx:88 - #35 0x00002b0fcb1a974f in SfxHintPoster::LinkStubDoEvent_Impl (pThis=0x11488e0, pCaller=0x1484f20) at /home/rodo/git/ooxml/sfx2/source/notify/hintpost.cxx:92 - #36 0x00002b0fccef69f8 in ImplWindowFrameProc () from /opt/openoffice.org3.0/program/../basis-link/program/libvcllx.so - #37 0x00002b0fd3f91f8f in SalDisplay::DispatchInternalEvent () from /opt/openoffice.org/basis3.0/program/libvclplug_genlx.so - #38 0x00002b0fd0fa4a84 in GtkXLib::userEventFn () from /opt/openoffice.org/basis3.0/program/libvclplug_gtklx.so - #39 0x00002b0fd3cb0204 in g_main_context_dispatch () from /usr/lib64/libglib-2.0.so.0 - #40 0x00002b0fd3cb34fd in ?? () from /usr/lib64/libglib-2.0.so.0 - #41 0x00002b0fd3cb39ce in g_main_context_iteration () from /usr/lib64/libglib-2.0.so.0 - #42 0x00002b0fd0fa4fd9 in GtkXLib::Yield () from /opt/openoffice.org/basis3.0/program/libvclplug_gtklx.so - #43 0x00002b0fccd1859e in Application::Yield () from /opt/openoffice.org3.0/program/../basis-link/program/libvcllx.so - #44 0x00002b0fccd18677 in Application::Execute () from /opt/openoffice.org3.0/program/../basis-link/program/libvcllx.so - #45 0x00002b0fc86fd803 in ?? () from /opt/openoffice.org3.0/program/../basis-link/program/libsoffice.so - #46 0x00002b0fccd1da24 in ImplSVMain () from /opt/openoffice.org3.0/program/../basis-link/program/libvcllx.so - #47 0x00002b0fccd1db15 in SVMain () from /opt/openoffice.org3.0/program/../basis-link/program/libvcllx.so - #48 0x00002b0fc872fe6c in soffice_main () from /opt/openoffice.org3.0/program/../basis-link/program/libsoffice.so - #49 0x000000000040114b in main () diff --git a/writerfilter/source/ooxml/makefile.mk b/writerfilter/source/ooxml/makefile.mk index c6a40b4cc5d1..df0e26d1f467 100644 --- a/writerfilter/source/ooxml/makefile.mk +++ b/writerfilter/source/ooxml/makefile.mk @@ -174,8 +174,8 @@ GENERATEDFILES= \ $(TOKENXMLTMP) \ $(TOKENXML) -$(TOKENXMLTMP): $(SOLARVER)$/$(INPATH)$/inc$(UPDMINOREXT)$/oox$/token.txt - @$(TYPE) $(SOLARVER)$/$(INPATH)$/inc$(UPDMINOREXT)$/oox$/token.txt | $(SED) "s#\(.*\)#\1#" > $@ +$(TOKENXMLTMP): $(SOLARVER)$/$(INPATH)$/inc$(UPDMINOREXT)$/oox$/token$/tokens.txt + @$(TYPE) $(SOLARVER)$/$(INPATH)$/inc$(UPDMINOREXT)$/oox$/token$/tokens.txt | $(SED) "s#\(.*\)#\1#" > $@ $(TOKENXML): tokenxmlheader $(TOKENXMLTMP) tokenxmlfooter @$(TYPE) tokenxmlheader $(TOKENXMLTMP) tokenxmlfooter > $@ diff --git a/writerfilter/source/resourcemodel/makefile.mk b/writerfilter/source/resourcemodel/makefile.mk index bb5bc05ac1bd..384cf8cfe38e 100644 --- a/writerfilter/source/resourcemodel/makefile.mk +++ b/writerfilter/source/resourcemodel/makefile.mk @@ -130,7 +130,7 @@ SPRMIDSHXX=$(DOCTOKHXXOUTDIR)$/sprmids.hxx OOXMLRESOURCEIDSHXX=$(OOXMLHXXOUTDIR)$/resourceids.hxx NSXSL=$(MISC)$/namespacesmap.xsl -NAMESPACESTXT=$(SOLARVER)$/$(INPATH)$/inc$(UPDMINOREXT)$/oox$/namespaces.txt +NAMESPACESTXT=$(SOLARVER)$/$(INPATH)$/inc$(UPDMINOREXT)$/oox$/token$/namespaces.txt GENERATEDHEADERS=$(DOCTOKRESOURCEIDSHXX) $(OOXMLRESOURCEIDSHXX) $(SPRMIDSHXX) GENERATEDFILES= \ -- cgit