[Libreoffice-commits] .: Branch 'feature/gnumake4' - 11 commits - oox/Library_oox.mk oox/Makefile oox/Module_oox.mk oox/oox.component oox/Package_generated.mk oox/Package_inc.mk oox/Package_source.mk oox/prj oox/source oox/util writerfilter/CppunitTest_writerfilter_doctok.mk writerfilter/JunitTest_writerfilter_complex.mk writerfilter/Library_writerfilter_debug.mk writerfilter/Library_writerfilter.mk writerfilter/Module_writerfilter.mk writerfilter/Package_writerfilter_generated.mk writerfilter/source
Bjoern Michaelsen
bmichaelsen at kemper.freedesktop.org
Fri Jun 17 09:06:39 PDT 2011
oox/Library_oox.mk | 335 +++++++++++++++
oox/Makefile | 38 +
oox/Module_oox.mk | 37 +
oox/Package_generated.mk | 53 ++
oox/Package_inc.mk | 45 ++
oox/Package_source.mk | 29 +
oox/oox.component | 67 +++
oox/prj/build.lst | 18
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/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 | 126 +++++
oox/source/token/makefile.mk | 78 ---
oox/source/token/namespacemap.cxx | 2
oox/source/token/namespaces.pl | 79 ---
oox/source/token/properties.pl | 52 --
oox/source/token/propertynames.cxx | 3
oox/source/token/tokenmap.cxx | 22
oox/source/token/tokens.pl | 85 +--
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 ---
writerfilter/CppunitTest_writerfilter_doctok.mk | 4
writerfilter/JunitTest_writerfilter_complex.mk | 5
writerfilter/Library_writerfilter.mk | 2
writerfilter/Library_writerfilter_debug.mk | 6
writerfilter/Module_writerfilter.mk | 1
writerfilter/Package_writerfilter_generated.mk | 7
writerfilter/source/Makefile | 57 +-
writerfilter/source/dmapper/DomainMapperTableHandler.cxx | 58 ++
writerfilter/source/dmapper/DomainMapperTableHandler.hxx | 29 -
writerfilter/source/dmapper/DomainMapper_Impl.cxx | 2
writerfilter/source/dmapper/NumberingManager.cxx | 2
writerfilter/source/resourcemodel/TagLogger.cxx | 16
46 files changed, 973 insertions(+), 1427 deletions(-)
New commits:
commit bd36c585b39a55fa700ab589f77b214daa881b2a
Author: Michael Stahl <mst at openoffice.org>
Date: Fri Apr 15 17:27:06 2011 +0000
gnumake4: oox, writerfilter, CppunitTest.mk: adapt to changes in gnumake4 [hg:d0e98479a69a]
diff --git a/oox/Library_oox.mk b/oox/Library_oox.mk
index 1b60da1..53bb404 100644
--- a/oox/Library_oox.mk
+++ b/oox/Library_oox.mk
@@ -41,8 +41,7 @@ $(eval $(call gb_Library_set_include,oox,\
$$(INCLUDE) \
))
-$(eval $(call gb_Library_set_defs,oox,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,oox,\
-DOOX_DLLIMPLEMENTATION \
))
diff --git a/writerfilter/JunitTest_writerfilter_complex.mk b/writerfilter/JunitTest_writerfilter_complex.mk
index e716921..129ba98 100644
--- a/writerfilter/JunitTest_writerfilter_complex.mk
+++ b/writerfilter/JunitTest_writerfilter_complex.mk
@@ -25,10 +25,9 @@
#
#*************************************************************************
-$(eval $(call gb_JunitTest_JunitTest,writerfilter_complex))
+$(eval $(call gb_JunitTest_JunitTest,writerfilter_complex,SRCDIR))
-$(eval $(call gb_JunitTest_set_defs,writerfilter_complex,\
- $$(DEFS) \
+$(eval $(call gb_JunitTest_add_defs,writerfilter_complex,\
-Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/writerfilter/qa/complex/ooxml/testdocuments \
))
diff --git a/writerfilter/Library_writerfilter_debug.mk b/writerfilter/Library_writerfilter_debug.mk
index ddf3eb7..dabf1f9 100644
--- a/writerfilter/Library_writerfilter_debug.mk
+++ b/writerfilter/Library_writerfilter_debug.mk
@@ -33,10 +33,6 @@ $(eval $(call gb_Library_set_include,writerfilter_debug,\
-I$(SRCDIR)/writerfilter/inc \
))
-$(eval $(call gb_Library_set_defs,writerfilter_debug,\
- $$(DEFS) \
-))
-
$(eval $(call gb_Library_add_linked_libs,writerfilter_debug,\
writerfilter \
comphelper \
diff --git a/writerfilter/Module_writerfilter.mk b/writerfilter/Module_writerfilter.mk
index 0c2138c..7b42985 100644
--- a/writerfilter/Module_writerfilter.mk
+++ b/writerfilter/Module_writerfilter.mk
@@ -38,7 +38,6 @@ $(eval $(call gb_Module_add_check_targets,writerfilter,\
CppunitTest_writerfilter_doctok \
))
-# does not run
$(eval $(call gb_Module_add_subsequentcheck_targets,writerfilter,\
JunitTest_writerfilter_complex \
))
commit 7e045fb813a73fd5197ab92b5fea47782c0984ef
Author: Henning Brinkmann <hbrinkm at openoffice.org>
Date: Tue Apr 5 17:06:00 2011 +0200
writerfilter10: added missing cxxs [hg:972d0c5efbc4]
diff --git a/oox/Library_oox.mk b/oox/Library_oox.mk
index 333a8a8..1b60da1 100644
--- a/oox/Library_oox.mk
+++ b/oox/Library_oox.mk
@@ -106,50 +106,6 @@ $(eval $(call gb_Library_add_exception_objects,oox,\
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/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 \
@@ -177,12 +133,36 @@ $(eval $(call gb_Library_add_exception_objects,oox,\
oox/source/drawingml/chart/typegroupcontext \
oox/source/drawingml/chart/typegroupconverter \
oox/source/drawingml/chart/typegroupmodel \
+ 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/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/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/table/tablebackgroundstylecontext \
oox/source/drawingml/table/tablecell \
oox/source/drawingml/table/tablecellcontext \
@@ -198,6 +178,27 @@ $(eval $(call gb_Library_add_exception_objects,oox,\
oox/source/drawingml/table/tablestylelistfragmenthandler \
oox/source/drawingml/table/tablestylepart \
oox/source/drawingml/table/tablestyletextstylecontext \
+ 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/dump/biffdumper \
oox/source/dump/dffdumper \
oox/source/dump/dumperbase \
@@ -288,7 +289,9 @@ $(eval $(call gb_Library_add_exception_objects,oox,\
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 \
@@ -310,9 +313,9 @@ $(eval $(call gb_Library_add_exception_objects,oox,\
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/sheetdatabuffer \
oox/source/xls/sheetdatacontext \
oox/source/xls/stylesbuffer \
oox/source/xls/stylesfragment \
commit d9c2b0b7a9b1472cc0a344f615b7da178080783a
Author: Henning Brinkmann <hbrinkm at openoffice.org>
Date: Tue Apr 5 12:35:20 2011 +0200
writerfilter10: adapt changes for custom target [hg:e16dd402c207]
diff --git a/oox/Package_generated.mk b/oox/Package_generated.mk
index 6bcfe29..4c9ea73 100644
--- a/oox/Package_generated.mk
+++ b/oox/Package_generated.mk
@@ -28,7 +28,7 @@
$(eval $(call gb_Package_Package,oox_generated,$(WORKDIR)/CustomTarget/oox/source/token))
$(eval $(call \
- gb_Package_add_customtarget,oox_generated,oox/source/token))
+ gb_Package_add_customtarget,oox_generated,oox/source/token,SRCDIR))
$(eval $(call \
gb_CustomTarget_add_dependencies,oox/source/token,\
diff --git a/writerfilter/Package_writerfilter_generated.mk b/writerfilter/Package_writerfilter_generated.mk
index 73d70ea..204e028 100644
--- a/writerfilter/Package_writerfilter_generated.mk
+++ b/writerfilter/Package_writerfilter_generated.mk
@@ -29,8 +29,7 @@ $(eval $(call \
gb_Package_Package,writerfilter_generated,$(WORKDIR)/CustomTarget/writerfilter/source))
$(eval $(call \
- gb_Package_add_customtarget,writerfilter_generated,writerfilter/source))
-
+ gb_Package_add_customtarget,writerfilter_generated,writerfilter/source,SRCDIR))
$(eval $(call \
gb_CustomTarget_add_outdir_dependencies,writerfilter/source,\
commit c2dbdaa7a3f1952a1c98a37324c25bbcaed37e1d
Author: Henning Brinkmann <hbrinkm at openoffice.org>
Date: Tue Apr 5 11:11:44 2011 +0200
writerfilter10: fixes to make wntmsci12 build [hg:704077f08581]
diff --git a/writerfilter/CppunitTest_writerfilter_doctok.mk b/writerfilter/CppunitTest_writerfilter_doctok.mk
index 228901a..f55bc25 100644
--- a/writerfilter/CppunitTest_writerfilter_doctok.mk
+++ b/writerfilter/CppunitTest_writerfilter_doctok.mk
@@ -36,8 +36,8 @@ $(eval $(call gb_CppunitTest_add_linked_libs,writerfilter_doctok, \
cppunit \
cppu \
sal \
- ucbhelper \
- writerfilter \
+ stl \
+ $(gb_STDLIBS) \
))
$(eval $(call gb_CppunitTest_set_include,writerfilter_doctok,\
diff --git a/writerfilter/Library_writerfilter.mk b/writerfilter/Library_writerfilter.mk
index bdcf78d..28980f4 100644
--- a/writerfilter/Library_writerfilter.mk
+++ b/writerfilter/Library_writerfilter.mk
@@ -63,6 +63,8 @@ $(eval $(call gb_Library_add_linked_libs,writerfilter,\
cppuhelper \
cppu \
sal \
+ stl \
+ $(gb_STDLIBS) \
))
$(eval $(call gb_Library_add_exception_objects,writerfilter,\
diff --git a/writerfilter/Library_writerfilter_debug.mk b/writerfilter/Library_writerfilter_debug.mk
index 1285fd8..ddf3eb7 100644
--- a/writerfilter/Library_writerfilter_debug.mk
+++ b/writerfilter/Library_writerfilter_debug.mk
@@ -44,6 +44,8 @@ $(eval $(call gb_Library_add_linked_libs,writerfilter_debug,\
cppuhelper \
cppu \
sal \
+ stl \
+ $(gb_STDLIBS) \
))
$(eval $(call gb_Library_add_exception_objects,writerfilter_debug,\
diff --git a/writerfilter/Package_writerfilter_generated.mk b/writerfilter/Package_writerfilter_generated.mk
index b279811..73d70ea 100644
--- a/writerfilter/Package_writerfilter_generated.mk
+++ b/writerfilter/Package_writerfilter_generated.mk
@@ -35,8 +35,8 @@ $(eval $(call \
$(eval $(call \
gb_CustomTarget_add_outdir_dependencies,writerfilter/source,\
$(gb_XSLTPROCTARGET) \
- $(SOLARVER)/$(INPATH)/inc$(UPDMINOREXT)/oox/token/tokens.txt \
- $(SOLARVER)/$(INPATH)/inc$(UPDMINOREXT)/oox/token/namespaces.txt \
+ $(OUTDIR)/inc$(UPDMINOREXT)/oox/token/tokens.txt \
+ $(OUTDIR)/inc$(UPDMINOREXT)/oox/token/namespaces.txt \
))
$(eval $(call \
diff --git a/writerfilter/source/Makefile b/writerfilter/source/Makefile
index 8e29203..487888c 100644
--- a/writerfilter/source/Makefile
+++ b/writerfilter/source/Makefile
@@ -28,6 +28,7 @@
WFDIR := $(dir $(realpath $(firstword $(MAKEFILE_LIST))))
include $(WFDIR)generated.mk
+include $(GBUILDDIR)/gbuild_simple.mk
# doctok
@@ -47,16 +48,16 @@ wf_GEN_doctok_Resources_hxx=doctok/resources.hxx
wf_GEN_doctok_Resources_cxx=resources.cxx
$(wf_GEN_doctok_SprmIds_hxx) : doctok $(wf_SRC_doctok_SprmIds_xsl) $(wf_SRC_doctok_Model)
- $(gb_XSLTPROC) $(wf_SRC_doctok_SprmIds_xsl) $(wf_SRC_doctok_Model) > $@
+ $(call gb_Helper_abbreviate_dirs_native, $(gb_XSLTPROC) $(wf_SRC_doctok_SprmIds_xsl) $(wf_SRC_doctok_Model)) > $@
$(wf_GEN_doctok_ResourceIds_hxx) : doctok $(wf_SRC_doctok_ResourceIds_xsl) $(wf_SRC_doctok_Model)
- $(gb_XSLTPROC) $(wf_SRC_doctok_ResourceIds_xsl) $(wf_SRC_doctok_Model) > $@
+ $(call gb_Helper_abbreviate_dirs_native, $(gb_XSLTPROC) $(wf_SRC_doctok_ResourceIds_xsl) $(wf_SRC_doctok_Model)) > $@
$(wf_GEN_doctok_Resources_hxx) : doctok $(wf_SRC_doctok_Resources_xsl) $(wf_SRC_doctok_Model)
- $(gb_XSLTPROC) $(wf_SRC_doctok_Resources_xsl) $(wf_SRC_doctok_Model) > $@
+ $(call gb_Helper_abbreviate_dirs_native, $(gb_XSLTPROC) $(wf_SRC_doctok_Resources_xsl) $(wf_SRC_doctok_Model)) > $@
$(wf_GEN_doctok_Resources_cxx) : doctok $(wf_SRC_doctok_ResourcesImpl_xsl) $(wf_SRC_doctok_Model) $(wf_SRC_doctok_ResourceTools_xsl)
- $(gb_XSLTPROC) $(wf_SRC_doctok_ResourcesImpl_xsl) $(wf_SRC_doctok_Model) > $@
+ $(call gb_Helper_abbreviate_dirs_native, $(gb_XSLTPROC) $(wf_SRC_doctok_ResourcesImpl_xsl) $(wf_SRC_doctok_Model)) > $@
# ooxml
@@ -99,61 +100,61 @@ wf_GEN_ooxml_Status_stage3=ooxml/status_stage3.xml
wf_GEN_ooxml_Status_todo=ooxml/todo.xml
wf_GEN_ooxml_Status_efforts=ooxml/efforts.csv
-$(wf_GEN_ooxml_token_tmp) : $(SOLARVER)/$(INPATH)/inc$(UPDMINOREXT)/oox/token/tokens.txt
- cat $(SOLARVER)/$(INPATH)/inc$(UPDMINOREXT)/oox/token/tokens.txt \
+$(wf_GEN_ooxml_token_tmp) : $(OUTDIR)/inc$(UPDMINOREXT)/oox/token/tokens.txt
+ cat $(OUTDIR)/inc$(UPDMINOREXT)/oox/token/tokens.txt \
| sed "s#\(.*\)#<fasttoken>\1</fasttoken>#" > $@
$(wf_GEN_ooxml_token_xml) : $(WFDIR)ooxml/tokenxmlheader $(wf_GEN_ooxml_token_tmp) $(WFDIR)ooxml/tokenxmlfooter
cat $(WFDIR)ooxml/tokenxmlheader $(wf_GEN_ooxml_token_tmp) $(WFDIR)ooxml/tokenxmlfooter > $@
$(wf_GEN_ooxml_FastTokens_hxx) : $(wf_SRC_ooxml_FastTokens_xsl) $(wf_GEN_ooxml_token_xml)
- $(gb_XSLTPROC) $(wf_SRC_ooxml_FastTokens_xsl) $(wf_GEN_ooxml_token_xml) > $@
+ $(call gb_Helper_abbreviate_dirs_native, $(gb_XSLTPROC) $(wf_SRC_ooxml_FastTokens_xsl) $(wf_GEN_ooxml_token_xml)) > $@
$(wf_GEN_ooxml_Factory_hxx) : $(WFDIR)ooxml/factoryinc.xsl $(wf_GEN_ooxml_Model_processed)
- $(gb_XSLTPROC) $< $(wf_GEN_ooxml_Model_processed) > $@
+ $(call gb_Helper_abbreviate_dirs_native, $(gb_XSLTPROC) $< $(wf_GEN_ooxml_Model_processed)) > $@
$(wf_GEN_ooxml_Factory_cxx) : $(WFDIR)ooxml/factoryimpl.xsl $(wf_GEN_ooxml_Model_processed)
- $(gb_XSLTPROC) $< $(wf_GEN_ooxml_Model_processed) > $@
+ $(call gb_Helper_abbreviate_dirs_native, $(gb_XSLTPROC) $< $(wf_GEN_ooxml_Model_processed)) > $@
OOXMLFactory%.cxx : $(WFDIR)ooxml/factoryimpl_ns.xsl $(wf_GEN_ooxml_Model_processed)
- $(gb_XSLTPROC) --stringparam file $@ $< $(wf_GEN_ooxml_Model_processed) > $@
+ $(call gb_Helper_abbreviate_dirs_native, $(gb_XSLTPROC) --stringparam file $@ $< $(wf_GEN_ooxml_Model_processed)) > $@
OOXMLFactory%.hxx : $(WFDIR)ooxml/factory_ns.xsl $(wf_GEN_ooxml_Model_processed)
- $(gb_XSLTPROC) --stringparam file $@ $< $(wf_GEN_ooxml_Model_processed) > $@
+ $(call gb_Helper_abbreviate_dirs_native, $(gb_XSLTPROC) --stringparam file $@ $< $(wf_GEN_ooxml_Model_processed)) > $@
$(wf_GEN_ooxml_FactoryValues_hxx) : $(wf_SRC_ooxml_FactoryValues_xsl) $(wf_GEN_ooxml_Model_processed)
- $(gb_XSLTPROC) $(wf_SRC_ooxml_FactoryValues_xsl) $(wf_GEN_ooxml_Model_processed) > $@
+ $(call gb_Helper_abbreviate_dirs_native, $(gb_XSLTPROC) $(wf_SRC_ooxml_FactoryValues_xsl) $(wf_GEN_ooxml_Model_processed)) > $@
$(wf_GEN_ooxml_FactoryValues_cxx) : $(wf_SRC_ooxml_FactoryValuesImpl_xsl) $(wf_GEN_ooxml_Model_processed)
- $(gb_XSLTPROC) $(wf_SRC_ooxml_FactoryValuesImpl_xsl) $(wf_GEN_ooxml_Model_processed) > $@
+ $(call gb_Helper_abbreviate_dirs_native, $(gb_XSLTPROC) $(wf_SRC_ooxml_FactoryValuesImpl_xsl) $(wf_GEN_ooxml_Model_processed)) > $@
$(wf_GEN_ooxml_ResourceIds_hxx) : ooxml $(wf_SRC_ooxml_ResourceIds_xsl) $(wf_GEN_ooxml_Model_processed)
- $(gb_XSLTPROC) $(wf_SRC_ooxml_ResourceIds_xsl) $(wf_GEN_ooxml_Model_processed) > $@
+ $(call gb_Helper_abbreviate_dirs_native, $(gb_XSLTPROC) $(wf_SRC_ooxml_ResourceIds_xsl) $(wf_GEN_ooxml_Model_processed)) > $@
$(wf_GEN_ooxml_NamespaceIds_hxx) : $(wf_SRC_ooxml_NamespaceIds_xsl) $(wf_GEN_ooxml_Model_processed)
- $(gb_XSLTPROC) $(wf_SRC_ooxml_NamespaceIds_xsl) $(wf_GEN_ooxml_Model_processed) > $@
+ $(call gb_Helper_abbreviate_dirs_native, $(gb_XSLTPROC) $(wf_SRC_ooxml_NamespaceIds_xsl) $(wf_GEN_ooxml_Model_processed)) > $@
$(wf_GEN_ooxml_GperfFastToken_hxx) : $(wf_SRC_ooxml_GperfFastTokenHandler_xsl) $(wf_GEN_ooxml_Model_processed)
- $(gb_XSLTPROC) $(wf_SRC_ooxml_GperfFastTokenHandler_xsl) $(wf_GEN_ooxml_Model_processed) \
+ $(call gb_Helper_abbreviate_dirs_native, $(gb_XSLTPROC) $(wf_SRC_ooxml_GperfFastTokenHandler_xsl) $(wf_GEN_ooxml_Model_processed)) \
| tr -d '\r' | gperf -I -t -E -S1 -c -G -LC++ > $@
$(wf_GEN_ooxml_Model_analyzed): $(wf_SRC_ooxml_Analyze_model_xsl) $(wf_SRC_ooxml_Model)
- $(gb_XSLTPROC) $^ > $@
+ $(call gb_Helper_abbreviate_dirs_native, $(gb_XSLTPROC) $^) > $@
$(wf_GEN_ooxml_Status_stage1) : $(wf_GEN_ooxml_Model_analyzed) $(wf_SRC_ooxml_stage1_sh)
$(wf_SRC_ooxml_Status_stage1_sh) $(wf_GEN_ooxml_Model_analyzed) $(WFDIR)dmapper > $@
$(wf_GEN_ooxml_Status_stage2) : $(wf_SRC_ooxml_Status_stage2_xsl) $(wf_GEN_ooxml_Status_stage1)
- $(gb_XSLTPROC) $^ > $@
+ $(call gb_Helper_abbreviate_dirs_native, $(gb_XSLTPROC) $^) > $@
$(wf_GEN_ooxml_Status_stage3) : $(wf_SRC_ooxml_Status_stage3_xsl) $(wf_GEN_ooxml_Status_stage2)
- $(gb_XSLTPROC) $^ > $@
+ $(call gb_Helper_abbreviate_dirs_native, $(gb_XSLTPROC) $^) > $@
$(wf_GEN_ooxml_Status_todo) : $(wf_SRC_ooxml_Status_todo_xsl) $(wf_GEN_ooxml_Status_stage3)
- $(gb_XSLTPROC) $^ > $@
+ $(call gb_Helper_abbreviate_dirs_native, $(gb_XSLTPROC) $^) > $@
$(wf_GEN_ooxml_Status_efforts) : $(wf_SRC_ooxml_Status_efforts_xsl) $(wf_GEN_ooxml_Status_todo)
- $(gb_XSLTPROC) $^ > $@
+ $(call gb_Helper_abbreviate_dirs_native, $(gb_XSLTPROC) $^) > $@
# rtftok
@@ -178,20 +179,20 @@ wf_SRC_doctok_QNameToStr_xsl=$(WFDIR)doctok/qnametostr.xsl
wf_SRC_ooxml_QNameToStr_xsl=$(WFDIR)ooxml/qnametostr.xsl
wf_SRC_model_NamespacePreprocess=$(WFDIR)resourcemodel/namespace_preprocess.pl
wf_GEN_ooxml_Namespacesmap_xsl=namespacesmap.xsl
-wf_DEP_ooxml_namespaces_txt=$(SOLARVER)/$(INPATH)/inc$(UPDMINOREXT)/oox/token/namespaces.txt
+wf_DEP_ooxml_namespaces_txt=$(OUTDIR)/inc$(UPDMINOREXT)/oox/token/namespaces.txt
wf_GEN_ooxml_preprocess_xsl=modelpreprocess.xsl
$(wf_GEN_ooxml_QNameToStr_tmp): $(wf_SRC_ooxml_QNameToStr_xsl) $(wf_GEN_ooxml_Model_processed)
- $(gb_XSLTPROC) $(wf_SRC_ooxml_QNameToStr_xsl) $(wf_GEN_ooxml_Model_processed) > $@
+ $(call gb_Helper_abbreviate_dirs_native, $(gb_XSLTPROC) $(wf_SRC_ooxml_QNameToStr_xsl) $(wf_GEN_ooxml_Model_processed)) > $@
$(wf_GEN_doctok_QnameToStr_tmp): $(wf_SRC_doctok_QNameToStr_xsl) $(wf_SRC_doctok_Model)
- $(gb_XSLTPROC) $(wf_SRC_doctok_QNameToStr_xsl) $(wf_SRC_doctok_Model) > $@
+ $(call gb_Helper_abbreviate_dirs_native, $(gb_XSLTPROC) $(wf_SRC_doctok_QNameToStr_xsl) $(wf_SRC_doctok_Model)) > $@
$(wf_GEN_model_QNameToStr_cxx): $(wf_GEN_ooxml_QNameToStr_tmp) $(wf_GEN_doctok_QnameToStr_tmp) $(WFDIR)resourcemodel/qnametostrheader $(WFDIR)resourcemodel/qnametostrfooter $(wf_SRC_ooxml_FactoryTools_xsl) $(wf_SRC_doctok_ResourceTools_xsl)
cat $(WFDIR)resourcemodel/qnametostrheader $(wf_GEN_ooxml_QNameToStr_tmp) $(wf_GEN_doctok_QnameToStr_tmp) $(WFDIR)resourcemodel/qnametostrfooter > $@
$(wf_GEN_model_SprmCodeToStr_tmp) : $(wf_SRC_doctok_SprmCodeToStr_xsl) $(wf_SRC_doctok_Model)
- $(gb_XSLTPROC) $(wf_SRC_doctok_SprmCodeToStr_xsl) $(wf_SRC_doctok_Model) > $@
+ $(call gb_Helper_abbreviate_dirs_native, $(gb_XSLTPROC) $(wf_SRC_doctok_SprmCodeToStr_xsl) $(wf_SRC_doctok_Model)) > $@
$(wf_GEN_model_SprmCodeToStr_cxx): $(WFDIR)resourcemodel/sprmcodetostrheader $(wf_GEN_model_SprmCodeToStr_tmp) $(WFDIR)resourcemodel/sprmcodetostrfooter
cat $^ > $@
@@ -203,7 +204,7 @@ $(wf_GEN_ooxml_preprocess_xsl) : $(wf_SRC_ooxml_Preprocess_xsl)
cp -f $(wf_SRC_ooxml_Preprocess_xsl) $@
$(wf_GEN_ooxml_Model_processed) : $(wf_GEN_ooxml_Namespacesmap_xsl) $(wf_GEN_ooxml_preprocess_xsl) $(wf_SRC_ooxml_Model)
- $(gb_XSLTPROC) $(wf_GEN_ooxml_Namespacesmap_xsl) $(wf_SRC_ooxml_Model) > $@
+ $(call gb_Helper_abbreviate_dirs_native, $(gb_XSLTPROC) $(wf_GEN_ooxml_Namespacesmap_xsl) $(wf_SRC_ooxml_Model)) > $@
# all
commit 05cc960a415bbd83b16117902276f76c548b013a
Author: hb <hbrinkm at openoffice.org>
Date: Thu Mar 24 10:26:52 2011 +0100
writerfilter10: make compile on unxsols4.pro [hg:b26ee4159e52]
diff --git a/oox/source/token/properties.pl b/oox/source/token/properties.pl
index 448cec6..9f1262b 100644
--- a/oox/source/token/properties.pl
+++ b/oox/source/token/properties.pl
@@ -53,5 +53,5 @@ while( <> ) {
if( $op == 1 ) {
print( "const sal_Int32 PROP_COUNT = $i;\nconst sal_Int32 PROP_INVALID = -1;\n" );
} elsif( $op == 2 ) {
- print( " \"\"" );
+ print( " \"\"\n" );
}
commit d20b81bc8ad70c69ac88989d646f0cfc9c44d5a4
Author: hb <hbrinkm at openoffice.org>
Date: Wed Mar 23 16:33:02 2011 +0100
writerfilter10: unxsols4.pro: Handle warning in TagLogger.cxx [hg:55b4d6b8eaf0]
diff --git a/writerfilter/source/resourcemodel/TagLogger.cxx b/writerfilter/source/resourcemodel/TagLogger.cxx
index 6a02e76..eaab727 100644
--- a/writerfilter/source/resourcemodel/TagLogger.cxx
+++ b/writerfilter/source/resourcemodel/TagLogger.cxx
@@ -182,14 +182,16 @@ string XMLTag::toTree(const string & sIndent) const
string sResult;
- size_t nSize = sIndent.size();
- if (nSize > 1)
{
- sResult += sIndent.substr(0, nSize - 2) + "+-\\" + mTag;
- }
- else
- {
- sResult += "\\" + mTag;
+ size_t nSize = sIndent.size();
+ if (nSize > 1)
+ {
+ sResult += sIndent.substr(0, nSize - 2) + "+-\\" + mTag;
+ }
+ else
+ {
+ sResult += "\\" + mTag;
+ }
}
XMLAttributes_t::const_iterator aIt = mAttrs.begin();
commit 2aa85e0079652b1f42068ec77b3b8cd0e6d6b288
Author: Henning Brinkmann <hbrinkm at openoffice.org>
Date: Wed Mar 23 14:53:37 2011 +0100
writerfilter10: Incorporate changes in layout of /inc/oox [hg:fd65d2c21e88]
diff --git a/writerfilter/Package_writerfilter_generated.mk b/writerfilter/Package_writerfilter_generated.mk
index fcd8bfd..b279811 100644
--- a/writerfilter/Package_writerfilter_generated.mk
+++ b/writerfilter/Package_writerfilter_generated.mk
@@ -35,8 +35,8 @@ $(eval $(call \
$(eval $(call \
gb_CustomTarget_add_outdir_dependencies,writerfilter/source,\
$(gb_XSLTPROCTARGET) \
- $(SOLARVER)/$(INPATH)/inc$(UPDMINOREXT)/oox/token.txt \
- $(SOLARVER)/$(INPATH)/inc$(UPDMINOREXT)/oox/namespaces.txt \
+ $(SOLARVER)/$(INPATH)/inc$(UPDMINOREXT)/oox/token/tokens.txt \
+ $(SOLARVER)/$(INPATH)/inc$(UPDMINOREXT)/oox/token/namespaces.txt \
))
$(eval $(call \
diff --git a/writerfilter/source/Makefile b/writerfilter/source/Makefile
index d8724d7..8e29203 100644
--- a/writerfilter/source/Makefile
+++ b/writerfilter/source/Makefile
@@ -99,8 +99,8 @@ wf_GEN_ooxml_Status_stage3=ooxml/status_stage3.xml
wf_GEN_ooxml_Status_todo=ooxml/todo.xml
wf_GEN_ooxml_Status_efforts=ooxml/efforts.csv
-$(wf_GEN_ooxml_token_tmp) : $(SOLARVER)/$(INPATH)/inc$(UPDMINOREXT)/oox/token.txt
- cat $(SOLARVER)/$(INPATH)/inc$(UPDMINOREXT)/oox/token.txt \
+$(wf_GEN_ooxml_token_tmp) : $(SOLARVER)/$(INPATH)/inc$(UPDMINOREXT)/oox/token/tokens.txt
+ cat $(SOLARVER)/$(INPATH)/inc$(UPDMINOREXT)/oox/token/tokens.txt \
| sed "s#\(.*\)#<fasttoken>\1</fasttoken>#" > $@
$(wf_GEN_ooxml_token_xml) : $(WFDIR)ooxml/tokenxmlheader $(wf_GEN_ooxml_token_tmp) $(WFDIR)ooxml/tokenxmlfooter
@@ -178,7 +178,7 @@ wf_SRC_doctok_QNameToStr_xsl=$(WFDIR)doctok/qnametostr.xsl
wf_SRC_ooxml_QNameToStr_xsl=$(WFDIR)ooxml/qnametostr.xsl
wf_SRC_model_NamespacePreprocess=$(WFDIR)resourcemodel/namespace_preprocess.pl
wf_GEN_ooxml_Namespacesmap_xsl=namespacesmap.xsl
-wf_DEP_ooxml_namespaces_txt=$(SOLARVER)/$(INPATH)/inc$(UPDMINOREXT)/oox/namespaces.txt
+wf_DEP_ooxml_namespaces_txt=$(SOLARVER)/$(INPATH)/inc$(UPDMINOREXT)/oox/token/namespaces.txt
wf_GEN_ooxml_preprocess_xsl=modelpreprocess.xsl
$(wf_GEN_ooxml_QNameToStr_tmp): $(wf_SRC_ooxml_QNameToStr_xsl) $(wf_GEN_ooxml_Model_processed)
@@ -227,7 +227,3 @@ all : \
$(wf_GEN_model_SprmCodeToStr_cxx) \
$(patsubst %,OOXMLFactory_%.hxx,$(WRITERFILTER_OOXMLNAMESPACES)) \
$(patsubst %,OOXMLFactory_%.cxx,$(WRITERFILTER_OOXMLNAMESPACES)) \
-
-# $(wf_GEN_rtftok_scanner_cxx) \
-
-
commit 1be8770362e838abb9be019a13f40ac18674ab4e
Author: Henning Brinkmann <hbrinkm at openoffice.org>
Date: Tue Mar 15 10:20:26 2011 +0100
removed defines [hg:5a96ba55f5a0]
diff --git a/writerfilter/Library_writerfilter.mk b/writerfilter/Library_writerfilter.mk
index 907277f..bdcf78d 100644
--- a/writerfilter/Library_writerfilter.mk
+++ b/writerfilter/Library_writerfilter.mk
@@ -50,9 +50,6 @@ $(eval $(call gb_Library_set_include,writerfilter,\
$(eval $(call gb_Library_set_defs,writerfilter,\
$$(DEFS) \
-DWRITERFILTER_DLLIMPLEMENTATION \
- -DDEBUG_CONTEXT_HANDLER \
- -DDEBUG_FACTORY \
- -DDEBUG_IMPORT \
))
$(eval $(call gb_Library_add_linked_libs,writerfilter,\
commit d3bd4579214f30beb785b1039793dcbde6e66cb1
Author: Daniel Rentz [dr] <daniel.rentz at oracle.com>
Date: Mon Mar 7 13:07:44 2011 +0100
[mq]: oox_gmake.patch [hg:d0beb4a8aa40]
diff --git a/oox/Library_oox.mk b/oox/Library_oox.mk
new file mode 100644
index 0000000..333a8a8
--- /dev/null
+++ b/oox/Library_oox.mk
@@ -0,0 +1,333 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2011 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org. If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+$(eval $(call gb_Library_Library,oox))
+
+$(eval $(call gb_Library_add_package_headers,oox,oox_inc))
+$(eval $(call gb_Library_add_package_headers,oox,oox_source))
+$(eval $(call gb_Library_add_package_headers,oox,oox_generated))
+
+$(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)/CustomTarget/oox/source \
+ $$(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 \
+ xcr \
+ stl \
+ $(gb_STDLIBS) \
+))
+
+ifeq ($(SYSTEM_OPENSSL),YES)
+$(eval $(call gb_Library_add_linked_libs,oox,\
+ crypto \
+ ssl \
+))
+else
+ifeq ($(OS),WNT)
+$(eval $(call gb_Library_add_linked_libs,oox,\
+ crypto \
+ ssl \
+))
+else
+$(eval $(call gb_Library_add_linked_static_libs,oox,\
+ crypto \
+ ssl \
+))
+endif
+endif
+
+# this is for openssl
+ifeq ($(OS),SOLARIS)
+$(eval $(call gb_Library_add_linked_libs,oox,\
+ nsl \
+ socket \
+))
+endif
+#probably not necessary: dl \
+
+# 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/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/drawingfragment \
+ 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 \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/oox/Makefile b/oox/Makefile
new file mode 100644
index 0000000..90947b2
--- /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
+# <http://www.openoffice.org/license.html>
+# 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 100644
index 0000000..b833d08
--- /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
+# <http://www.openoffice.org/license.html>
+# 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_generated \
+))
+
+# vim: set noet ts=4 sw=4:
diff --git a/oox/Package_generated.mk b/oox/Package_generated.mk
new file mode 100644
index 0000000..6bcfe29
--- /dev/null
+++ b/oox/Package_generated.mk
@@ -0,0 +1,53 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2011 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org. If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+$(eval $(call gb_Package_Package,oox_generated,$(WORKDIR)/CustomTarget/oox/source/token))
+
+$(eval $(call \
+ gb_Package_add_customtarget,oox_generated,oox/source/token))
+
+$(eval $(call \
+ gb_CustomTarget_add_dependencies,oox/source/token,\
+ oox/source/token/namespaces.hxx.head \
+ oox/source/token/namespaces.hxx.tail \
+ oox/source/token/namespaces.txt \
+ oox/source/token/namespaces.pl \
+ oox/source/token/tokens.hxx.head \
+ oox/source/token/tokens.hxx.tail \
+ oox/source/token/tokens.txt \
+ oox/source/token/tokens.pl \
+ oox/source/token/properties.hxx.head \
+ oox/source/token/properties.hxx.tail \
+ oox/source/token/properties.txt \
+ oox/source/token/properties.pl \
+))
+
+$(eval $(call gb_Package_add_file,oox_generated,inc/oox/token/namespaces.hxx,namespaces.hxx))
+$(eval $(call gb_Package_add_file,oox_generated,inc/oox/token/namespaces.txt,namespaces.txt))
+$(eval $(call gb_Package_add_file,oox_generated,inc/oox/token/properties.hxx,properties.hxx))
+$(eval $(call gb_Package_add_file,oox_generated,inc/oox/token/tokens.hxx,tokens.hxx))
+
diff --git a/oox/Package_inc.mk b/oox/Package_inc.mk
new file mode 100644
index 0000000..6870821
--- /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
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+$(eval $(call gb_Package_Package,oox_inc,$(SRCDIR)/oox/inc))
+$(eval $(call gb_Package_add_file,oox_inc,inc/oox/dllapi.h,oox/dllapi.h))
+$(eval $(call gb_Package_add_file,oox_inc,inc/oox/core/filterbase.hxx,oox/core/filterbase.hxx))
+$(eval $(call gb_Package_add_file,oox_inc,inc/oox/core/filterdetect.hxx,oox/core/filterdetect.hxx))
+$(eval $(call gb_Package_add_file,oox_inc,inc/oox/core/relations.hxx,oox/core/relations.hxx))
+$(eval $(call gb_Package_add_file,oox_inc,inc/oox/core/xmlfilterbase.hxx,oox/core/xmlfilterbase.hxx))
+$(eval $(call gb_Package_add_file,oox_inc,inc/oox/drawingml/chart/chartconverter.hxx,oox/drawingml/chart/chartconverter.hxx))
+$(eval $(call gb_Package_add_file,oox_inc,inc/oox/drawingml/table/tablestylelist.hxx,oox/drawingml/table/tablestylelist.hxx))
+$(eval $(call gb_Package_add_file,oox_inc,inc/oox/helper/binarystreambase.hxx,oox/helper/binarystreambase.hxx))
+$(eval $(call gb_Package_add_file,oox_inc,inc/oox/helper/helper.hxx,oox/helper/helper.hxx))
+$(eval $(call gb_Package_add_file,oox_inc,inc/oox/helper/refmap.hxx,oox/helper/refmap.hxx))
+$(eval $(call gb_Package_add_file,oox_inc,inc/oox/helper/refvector.hxx,oox/helper/refvector.hxx))
+$(eval $(call gb_Package_add_file,oox_inc,inc/oox/helper/storagebase.hxx,oox/helper/storagebase.hxx))
+$(eval $(call gb_Package_add_file,oox_inc,inc/oox/helper/zipstorage.hxx,oox/helper/zipstorage.hxx))
+$(eval $(call gb_Package_add_file,oox_inc,inc/oox/ole/vbaproject.hxx,oox/ole/vbaproject.hxx))
+$(eval $(call gb_Package_add_file,oox_inc,inc/oox/vml/vmldrawing.hxx,oox/vml/vmldrawing.hxx))
+$(eval $(call gb_Package_add_file,oox_inc,inc/oox/vml/vmlshape.hxx,oox/vml/vmlshape.hxx))
+$(eval $(call gb_Package_add_file,oox_inc,inc/oox/xls/excelvbaproject.hxx,oox/xls/excelvbaproject.hxx))
diff --git a/oox/Package_source.mk b/oox/Package_source.mk
new file mode 100644
index 0000000..9591761
--- /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
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+$(eval $(call gb_Package_Package,oox_source,$(SRCDIR)/oox/source))
+$(eval $(call gb_Package_add_file,oox_source,inc/oox/token/tokens.txt,token/tokens.txt))
diff --git a/oox/oox.component b/oox/oox.component
new file mode 100644
index 0000000..f6519d5
--- /dev/null
+++ b/oox/oox.component
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2000, 2010 Oracle and/or its affiliates.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org. If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+ xmlns="http://openoffice.org/2010/uno-components">
+ <implementation name="com.sun.star.comp.oox.core.FastTokenHandler">
+ <service name="com.sun.star.xml.sax.FastTokenHandler"/>
+ </implementation>
+ <implementation name="com.sun.star.comp.oox.FormatDetector">
+ <service name="com.sun.star.frame.ExtendedTypeDetection"/>
+ </implementation>
+ <implementation name="com.sun.star.comp.oox.docprop.DocumentPropertiesImporter">
+ <service name="com.sun.star.document.OOXMLDocumentPropertiesImporter"/>
+ </implementation>
+ <implementation name="com.sun.star.comp.oox.WordVbaProjectFilter">
+ <service name="com.sun.star.document.ImportFilter"/>
+ </implementation>
+ <implementation name="com.sun.star.comp.oox.ppt.PowerPointImport">
+ <service name="com.sun.star.document.ImportFilter"/>
+ <service name="com.sun.star.document.ExportFilter"/>
+ </implementation>
+ <implementation name="com.sun.star.comp.oox.ShapeContextHandler">
+ <service name="com.sun.star.xml.sax.FastShapeContextHandler"/>
+ </implementation>
+ <implementation name="com.sun.star.comp.oox.xls.BiffDetector">
+ <service name="com.sun.star.frame.ExtendedTypeDetection"/>
+ </implementation>
+ <implementation name="com.sun.star.comp.oox.xls.ExcelFilter">
+ <service name="com.sun.star.document.ImportFilter"/>
+ <service name="com.sun.star.document.ExportFilter"/>
+ </implementation>
+ <implementation name="com.sun.star.comp.oox.xls.ExcelBiffFilter">
+ <service name="com.sun.star.document.ImportFilter"/>
+ <service name="com.sun.star.document.ExportFilter"/>
+ </implementation>
+ <implementation name="com.sun.star.comp.oox.xls.ExcelVbaProjectFilter">
+ <service name="com.sun.star.document.ImportFilter"/>
+ </implementation>
+ <implementation name="com.sun.star.comp.oox.xls.FormulaParser">
+ <service name="com.sun.star.sheet.FilterFormulaParser"/>
+ </implementation>
+</component>
diff --git a/oox/prj/build.lst b/oox/prj/build.lst
index 03735c7..dd5adb8 100644
--- a/oox/prj/build.lst
+++ b/oox/prj/build.lst
@@ -1,18 +1,2 @@
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\prj nmake - all oox_prj NULL
diff --git a/oox/prj/d.lst b/oox/prj/d.lst
index 8b27a19..8b13789 100644
--- a/oox/prj/d.lst
+++ b/oox/prj/d.lst
@@ -1,47 +1 @@
-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\token\namespaces.txt
-
-..\source\token\tokens.txt %_DEST%\inc%_EXT%\oox\token\tokens.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 100644
index 0000000..0fdd19d
--- /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
+# <http://www.openoffice.org/license.html>
+# 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) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog
diff --git a/oox/source/core/makefile.mk b/oox/source/core/makefile.mk
deleted file mode 100755
index 2b58b95..0000000
--- 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
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=oox
-TARGET=core
-AUTOSEG=true
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-.INCLUDE: $(PRJ)$/util$/makefile.pmk
-
-.IF "$(SYSTEM_OPENSSL)" == "YES"
-CFLAGS+= $(OPENSSL_CFLAGS)
-.ENDIF
-
-# --- Files --------------------------------------------------------
-
-SLOFILES = \
- $(SLO)$/binarycodec.obj \
- $(SLO)$/binaryfilterbase.obj \
- $(SLO)$/contexthandler.obj \
- $(SLO)$/contexthandler2.obj \
- $(SLO)$/fastparser.obj \
- $(SLO)$/fasttokenhandler.obj \
- $(SLO)$/filterbase.obj \
- $(SLO)$/filterdetect.obj \
- $(SLO)$/fragmenthandler.obj \
- $(SLO)$/fragmenthandler2.obj \
- $(SLO)$/recordparser.obj \
- $(SLO)$/relations.obj \
- $(SLO)$/relationshandler.obj \
- $(SLO)$/services.obj \
- $(SLO)$/xmlfilterbase.obj
-
-# --- Targets -------------------------------------------------------
-
-.INCLUDE : target.mk
diff --git a/oox/source/docprop/makefile.mk b/oox/source/docprop/makefile.mk
deleted file mode 100755
index 5687178..0000000
--- 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
-# <http://www.openoffice.org/license.html>
-# 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 100755
index 84762e6..0000000
--- 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
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PRJNAME=oox
-TARGET=chart
-AUTOSEG=true
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-.INCLUDE: $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES = \
- $(SLO)$/axiscontext.obj \
- $(SLO)$/axisconverter.obj \
- $(SLO)$/axismodel.obj \
- $(SLO)$/chartcontextbase.obj \
- $(SLO)$/chartconverter.obj \
- $(SLO)$/chartdrawingfragment.obj \
- $(SLO)$/chartspaceconverter.obj \
- $(SLO)$/chartspacefragment.obj \
- $(SLO)$/chartspacemodel.obj \
- $(SLO)$/converterbase.obj \
- $(SLO)$/datasourcecontext.obj \
- $(SLO)$/datasourceconverter.obj \
- $(SLO)$/datasourcemodel.obj \
- $(SLO)$/modelbase.obj \
- $(SLO)$/objectformatter.obj \
- $(SLO)$/plotareacontext.obj \
- $(SLO)$/plotareaconverter.obj \
- $(SLO)$/plotareamodel.obj \
- $(SLO)$/seriescontext.obj \
- $(SLO)$/seriesconverter.obj \
- $(SLO)$/seriesmodel.obj \
- $(SLO)$/titlecontext.obj \
- $(SLO)$/titleconverter.obj \
- $(SLO)$/titlemodel.obj \
- $(SLO)$/typegroupcontext.obj \
- $(SLO)$/typegroupconverter.obj \
- $(SLO)$/typegroupmodel.obj
-
-# --- Targets -------------------------------------------------------
-
-.INCLUDE : target.mk
diff --git a/oox/source/drawingml/diagram/makefile.mk b/oox/source/drawingml/diagram/makefile.mk
deleted file mode 100755
index 9d526ed..0000000
--- 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
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PRJNAME=oox
-TARGET=diagram
-AUTOSEG=true
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-.INCLUDE: $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES = \
- $(SLO)$/diagram.obj \
- $(SLO)$/diagramfragmenthandler.obj \
- $(SLO)$/diagramdefinitioncontext.obj \
- $(SLO)$/diagramlayoutatoms.obj \
- $(SLO)$/datamodelcontext.obj \
- $(SLO)$/layoutnodecontext.obj
-
-# --- Targets -------------------------------------------------------
-
-.INCLUDE : target.mk
diff --git a/oox/source/drawingml/makefile.mk b/oox/source/drawingml/makefile.mk
deleted file mode 100755
index 0546fb4..0000000
--- 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
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=oox
-TARGET=drawingml
-AUTOSEG=true
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-.INCLUDE: $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES = \
- $(SLO)$/clrscheme.obj\
- $(SLO)$/clrschemecontext.obj\
- $(SLO)$/color.obj\
- $(SLO)$/colorchoicecontext.obj\
- $(SLO)$/connectorshapecontext.obj\
- $(SLO)$/customshapegeometry.obj\
- $(SLO)$/customshapeproperties.obj\
- $(SLO)$/drawingmltypes.obj\
- $(SLO)$/embeddedwavaudiofile.obj\
- $(SLO)$/fillproperties.obj\
- $(SLO)$/fillpropertiesgroupcontext.obj\
- $(SLO)$/graphicshapecontext.obj\
- $(SLO)$/guidcontext.obj\
- $(SLO)$/hyperlinkcontext.obj\
- $(SLO)$/lineproperties.obj\
- $(SLO)$/linepropertiescontext.obj\
- $(SLO)$/objectdefaultcontext.obj\
- $(SLO)$/shape.obj\
- $(SLO)$/shapecontext.obj\
- $(SLO)$/shapegroupcontext.obj\
- $(SLO)$/shapepropertiescontext.obj\
- $(SLO)$/shapepropertymap.obj\
- $(SLO)$/shapestylecontext.obj\
- $(SLO)$/spdefcontext.obj\
- $(SLO)$/textbody.obj\
- $(SLO)$/textbodycontext.obj\
- $(SLO)$/textbodyproperties.obj\
- $(SLO)$/textbodypropertiescontext.obj\
- $(SLO)$/textcharacterproperties.obj\
- $(SLO)$/textcharacterpropertiescontext.obj\
- $(SLO)$/textfield.obj\
- $(SLO)$/textfieldcontext.obj\
- $(SLO)$/textfont.obj\
- $(SLO)$/textliststyle.obj \
- $(SLO)$/textliststylecontext.obj\
- $(SLO)$/textparagraph.obj\
- $(SLO)$/textparagraphproperties.obj\
- $(SLO)$/textparagraphpropertiescontext.obj\
- $(SLO)$/textrun.obj\
- $(SLO)$/textspacingcontext.obj\
- $(SLO)$/texttabstoplistcontext.obj\
- $(SLO)$/theme.obj\
- $(SLO)$/themeelementscontext.obj\
- $(SLO)$/themefragmenthandler.obj\
- $(SLO)$/transform2dcontext.obj
-
-# --- Targets -------------------------------------------------------
-
-.INCLUDE : target.mk
diff --git a/oox/source/drawingml/table/makefile.mk b/oox/source/drawingml/table/makefile.mk
deleted file mode 100755
index fa71971..0000000
--- 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
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PRJNAME=oox
-TARGET=table
-AUTOSEG=true
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-.INCLUDE: $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES = \
- $(SLO)$/tablecontext.obj \
- $(SLO)$/tableproperties.obj \
- $(SLO)$/tablerow.obj \
- $(SLO)$/tablerowcontext.obj \
- $(SLO)$/tablecell.obj \
- $(SLO)$/tablecellcontext.obj \
- $(SLO)$/tablestylelist.obj \
- $(SLO)$/tablestylelistfragmenthandler.obj \
- $(SLO)$/tablestylecontext.obj \
- $(SLO)$/tablestyle.obj \
- $(SLO)$/tablebackgroundstylecontext.obj \
- $(SLO)$/tablepartstylecontext.obj \
- $(SLO)$/tablestyletextstylecontext.obj \
- $(SLO)$/tablestylecellstylecontext.obj \
- $(SLO)$/tablestylepart.obj
-
-# --- Targets -------------------------------------------------------
-
-.INCLUDE : target.mk
diff --git a/oox/source/dump/makefile.mk b/oox/source/dump/makefile.mk
deleted file mode 100755
index 1e5f615..0000000
--- 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
-# <http://www.openoffice.org/license.html>
-# 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/helper/makefile.mk b/oox/source/helper/makefile.mk
deleted file mode 100755
index f31736f..0000000
--- 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
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=oox
-TARGET=helper
-AUTOSEG=true
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-.INCLUDE: $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES = \
- $(SLO)$/attributelist.obj \
- $(SLO)$/binaryinputstream.obj \
- $(SLO)$/binaryoutputstream.obj \
- $(SLO)$/binarystreambase.obj \
- $(SLO)$/containerhelper.obj \
- $(SLO)$/graphichelper.obj \
- $(SLO)$/modelobjecthelper.obj \
- $(SLO)$/progressbar.obj \
- $(SLO)$/propertymap.obj \
- $(SLO)$/propertyset.obj \
- $(SLO)$/storagebase.obj \
- $(SLO)$/textinputstream.obj \
- $(SLO)$/zipstorage.obj
-
-# --- Targets -------------------------------------------------------
-
-.INCLUDE : target.mk
diff --git a/oox/source/ole/makefile.mk b/oox/source/ole/makefile.mk
deleted file mode 100755
index a523224..0000000
--- 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
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=oox
-TARGET=ole
-AUTOSEG=true
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-.INCLUDE: $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES = \
- $(SLO)$/axbinaryreader.obj \
- $(SLO)$/axcontrol.obj \
- $(SLO)$/axcontrolfragment.obj \
- $(SLO)$/olehelper.obj \
- $(SLO)$/oleobjecthelper.obj \
- $(SLO)$/olestorage.obj \
- $(SLO)$/vbacontrol.obj \
- $(SLO)$/vbahelper.obj \
- $(SLO)$/vbainputstream.obj \
- $(SLO)$/vbamodule.obj \
- $(SLO)$/vbaproject.obj \
- $(SLO)$/vbaprojectfilter.obj
-
-# --- Targets -------------------------------------------------------
-
-.INCLUDE : target.mk
-
diff --git a/oox/source/ppt/makefile.mk b/oox/source/ppt/makefile.mk
deleted file mode 100755
index 8d902ed..0000000
--- 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
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=oox
-TARGET=ppt
-AUTOSEG=true
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-.INCLUDE: $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES = \
- $(SLO)$/animationspersist.obj \
- $(SLO)$/animationtypes.obj \
- $(SLO)$/animvariantcontext.obj \
- $(SLO)$/backgroundproperties.obj\
- $(SLO)$/buildlistcontext.obj \
- $(SLO)$/commonbehaviorcontext.obj \
- $(SLO)$/commontimenodecontext.obj \
- $(SLO)$/conditioncontext.obj \
- $(SLO)$/customshowlistcontext.obj \
- $(SLO)$/headerfootercontext.obj \
- $(SLO)$/layoutfragmenthandler.obj\
- $(SLO)$/pptfilterhelpers.obj\
- $(SLO)$/pptimport.obj\
- $(SLO)$/pptshape.obj \
- $(SLO)$/pptshapecontext.obj \
- $(SLO)$/pptshapegroupcontext.obj \
- $(SLO)$/pptshapepropertiescontext.obj \
- $(SLO)$/presentationfragmenthandler.obj\
- $(SLO)$/slidefragmenthandler.obj\
- $(SLO)$/slidemastertextstylescontext.obj \
- $(SLO)$/slidepersist.obj\
- $(SLO)$/slidetimingcontext.obj\
- $(SLO)$/slidetransition.obj\
- $(SLO)$/slidetransitioncontext.obj\
- $(SLO)$/soundactioncontext.obj \
- $(SLO)$/timeanimvaluecontext.obj \
- $(SLO)$/timenode.obj\
- $(SLO)$/timenodelistcontext.obj \
- $(SLO)$/timetargetelementcontext.obj
-
-# --- Targets -------------------------------------------------------
-
-.INCLUDE : target.mk
diff --git a/oox/source/shape/makefile.mk b/oox/source/shape/makefile.mk
deleted file mode 100755
index c6534b3..0000000
--- 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
-# <http://www.openoffice.org/license.html>
-# 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 b/oox/source/token/Makefile
new file mode 100644
index 0000000..cdd94e7
--- /dev/null
+++ b/oox/source/token/Makefile
@@ -0,0 +1,126 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2009 by Sun Microsystems, Inc.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org. If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+# generate source and header files from text files ----------------------------
+
+SRCDIR_TOKEN := $(dir $(realpath $(firstword $(MAKEFILE_LIST))))
+WORKDIR_TOKEN := .
+
+include $(GBUILDDIR)/Output.mk
+include $(GBUILDDIR)/BuildDirs.mk
+include $(GBUILDDIR)/Helper.mk
+
+# 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,$@,build,CAT,1)
+ $(call gb_Helper_abbreviate_dirs,cat $^ > $@)
+
+$(WORKDIR_TOKEN)/namespaceids.inc : $(SRCDIR_TOKEN)/namespaces.txt $(SRCDIR_TOKEN)/namespaces.pl
+ $(call gb_Output_announce,$@,build,PRL,1)
+ $(call gb_Helper_abbreviate_dirs, \
+ mkdir -p $(dir $@) && $(PERL) $(SRCDIR_TOKEN)/namespaces.pl 1 < $< > $@ \
+ )
+
+$(WORKDIR_TOKEN)/namespacenames.inc : $(SRCDIR_TOKEN)/namespaces.txt $(SRCDIR_TOKEN)/namespaces.pl
+ $(call gb_Output_announce,$@,build,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,$@,build,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,$@,build,CAT,1)
+ $(call gb_Helper_abbreviate_dirs,cat $^ > $@)
+
+$(WORKDIR_TOKEN)/tokenids.inc : $(SRCDIR_TOKEN)/tokens.txt $(SRCDIR_TOKEN)/tokens.pl
+ $(call gb_Output_announce,$@,build,PRL,1)
+ $(call gb_Helper_abbreviate_dirs, \
+ mkdir -p $(dir $@) && $(PERL) $(SRCDIR_TOKEN)/tokens.pl 1 < $< > $@ \
+ )
+
+$(WORKDIR_TOKEN)/tokennames.inc : $(SRCDIR_TOKEN)/tokens.txt $(SRCDIR_TOKEN)/tokens.pl
+ $(call gb_Output_announce,$@,build,PRL,1)
+ $(call gb_Helper_abbreviate_dirs, \
+ mkdir -p $(dir $@) && $(PERL) $(SRCDIR_TOKEN)/tokens.pl 2 < $< > $@ \
+ )
+
+$(WORKDIR_TOKEN)/tokenhash.inc : $(WORKDIR_TOKEN)/tokenhash.gperf
+ $(call gb_Output_announce,$@,build,GPF,3)
+ $(call gb_Helper_abbreviate_dirs, \
+ gperf $< | $(gb_AWK) -- '{ if ($$0 !~ /^#line/){ gsub("\\(char\\*\\)0", "0", $$0); print; } }' > $@ \
+ )
+
+$(WORKDIR_TOKEN)/tokenhash.gperf : $(SRCDIR_TOKEN)/tokens.txt $(SRCDIR_TOKEN)/tokens.pl
+ $(call gb_Output_announce,$@,build,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,$@,build,CAT,1)
+ $(call gb_Helper_abbreviate_dirs,cat $^ > $@)
+
+$(WORKDIR_TOKEN)/propertyids.inc : $(SRCDIR_TOKEN)/properties.txt $(SRCDIR_TOKEN)/properties.pl
+ $(call gb_Output_announce,$@,build,PRL,1)
+ $(call gb_Helper_abbreviate_dirs, \
+ mkdir -p $(dir $@) && $(PERL) $(SRCDIR_TOKEN)/properties.pl 1 < $< > $@ \
+ )
+
+$(WORKDIR_TOKEN)/propertynames.inc : $(SRCDIR_TOKEN)/properties.txt $(SRCDIR_TOKEN)/properties.pl
+ $(call gb_Output_announce,$@,build,PRL,1)
+ $(call gb_Helper_abbreviate_dirs, \
+ mkdir -p $(dir $@) && $(PERL) $(SRCDIR_TOKEN)/properties.pl 2 < $< > $@ \
+ )
+
+.DEFAULT_GOAL:=all
+.PHONY: all
+all : \
+ namespaces.hxx \
+ namespaceids.inc \
+ namespacenames.inc \
+ namespaces.txt \
+ tokens.hxx \
+ tokenids.inc \
+ tokennames.inc \
+ tokenhash.inc \
+ tokenhash.gperf \
+ properties.hxx \
+ propertyids.inc \
+ propertynames.inc \
+
+
+# vim: set noet sw=4 ts=4:
diff --git a/oox/source/token/makefile.mk b/oox/source/token/makefile.mk
deleted file mode 100755
index ff42967..0000000
--- 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
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=oox
-TARGET=token
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-.INCLUDE: $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES = \
- $(SLO)$/namespacemap.obj \
- $(SLO)$/propertynames.obj \
- $(SLO)$/tokenmap.obj
-
-# --- Targets -------------------------------------------------------
-
-.INCLUDE : target.mk
-
-GENHEADERPATH = $(INCCOM)$/oox$/token
-
-$(MISC)$/tokenhash.gperf $(INCCOM)$/tokennames.inc $(GENHEADERPATH)$/tokens.hxx $(INCCOM)$/namespacenames.inc $(MISC)$/namespaces.txt $(GENHEADERPATH)$/namespaces.hxx $(INCCOM)$/propertynames.inc $(GENHEADERPATH)$/properties.hxx :
- @@noop $(assign do_phony:=.PHONY)
-
-$(SLO)$/tokenmap.obj : $(INCCOM)$/tokenhash.inc $(INCCOM)$/tokennames.inc $(GENHEADERPATH)$/tokens.hxx $(MISC)$/do_tokens
-
-$(INCCOM)$/tokenhash.inc : $(MISC)$/tokenhash.gperf $(MISC)$/do_tokens
- $(AUGMENT_LIBRARY_PATH) gperf --compare-strncmp $(MISC)$/tokenhash.gperf | $(SED) -e "s/(char\*)0/(char\*)0, 0/g" | $(GREP) -v "^#line" >$(INCCOM)$/tokenhash.inc
-
-$(MISC)$/do_tokens $(do_phony) : tokens.txt tokens.pl tokens.hxx.head tokens.hxx.tail $(GENHEADERPATH)$/tokens.hxx $(INCCOM)$/tokennames.inc $(MISC)$/tokenhash.gperf
- @@-$(RM) $@
- $(MKDIRHIER) $(GENHEADERPATH)
- $(PERL) tokens.pl tokens.txt $(MISC)$/tokenids.inc $(INCCOM)$/tokennames.inc $(MISC)$/tokenhash.gperf && $(TYPE) tokens.hxx.head $(MISC)$/tokenids.inc tokens.hxx.tail > $(GENHEADERPATH)$/tokens.hxx && $(TOUCH) $@
-
-$(SLO)$/namespacemap.obj : $(INCCOM)$/namespacenames.inc $(MISC)$/namespaces.txt $(GENHEADERPATH)$/namespaces.hxx $(MISC)$/do_namespaces
-
-$(MISC)$/do_namespaces $(do_phony) : namespaces.txt namespaces.pl namespaces.hxx.head namespaces.hxx.tail $(INCCOM)$/namespacenames.inc $(MISC)$/namespaces.txt $(GENHEADERPATH)$/namespaces.hxx
- @@-$(RM) $@
- $(MKDIRHIER) $(GENHEADERPATH)
- $(PERL) namespaces.pl namespaces.txt $(MISC)$/namespaceids.inc $(INCCOM)$/namespacenames.inc $(MISC)$/namespaces.txt && $(TYPE) namespaces.hxx.head $(MISC)$/namespaceids.inc namespaces.hxx.tail > $(GENHEADERPATH)$/namespaces.hxx && $(TOUCH) $@
-
-$(SLO)$/propertynames.obj : $(INCCOM)$/propertynames.inc $(GENHEADERPATH)$/properties.hxx $(MISC)$/do_properties
-
-$(MISC)$/do_properties $(do_phony) : properties.txt properties.pl properties.hxx.head properties.hxx.tail $(INCCOM)$/propertynames.inc $(GENHEADERPATH)$/properties.hxx
- @@-$(RM) $@
- $(MKDIRHIER) $(GENHEADERPATH)
- $(PERL) properties.pl properties.txt $(MISC)$/propertyids.inc $(INCCOM)$/propertynames.inc && $(TYPE) properties.hxx.head $(MISC)$/propertyids.inc properties.hxx.tail > $(GENHEADERPATH)$/properties.hxx && $(TOUCH) $@
diff --git a/oox/source/token/namespacemap.cxx b/oox/source/token/namespacemap.cxx
index 6fa4ee4..62f4c91 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 <token/namespacenames.inc>
{ -1, "" }
};
diff --git a/oox/source/token/namespaces.pl b/oox/source/token/namespaces.pl
deleted file mode 100644
index 3c741fa..0000000
--- a/oox/source/token/namespaces.pl
+++ /dev/null
@@ -1,79 +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
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-$ARGV0 = shift @ARGV;
-$ARGV1 = shift @ARGV;
-$ARGV2 = shift @ARGV;
-$ARGV3 = shift @ARGV;
-
-# parse input file
-
-open( INFILE, $ARGV0 ) or die "cannot open input file: $!";
-my %namespaces;
-while( <INFILE> )
-{
- # trim newline
- chomp( $_ );
- # trim leading/trailing whitespace
- $_ =~ s/^\s*//g;
- $_ =~ s/\s*$//g;
- # trim comments
- $_ =~ s/^#.*//;
- # skip empty lines
- 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;
- }
-}
-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 f341924..448cec6 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( <INFILE> )
-{
+$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 146ff2f..12a64a3 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 <token/propertynames.inc>
};
size_t nArraySize = (sizeof( sppcPropertyNames ) / sizeof( *sppcPropertyNames )) - 1;
diff --git a/oox/source/token/tokenmap.cxx b/oox/source/token/tokenmap.cxx
index 4957963..9030e3d 100644
--- a/oox/source/token/tokenmap.cxx
+++ b/oox/source/token/tokenmap.cxx
@@ -43,8 +43,10 @@ using ::rtl::OUString;
// ============================================================================
namespace {
-// include auto-generated Perfect_Hash
-#include "tokenhash.inc"
+
+// include auto-generated Perfect_Hash class
+#include <token/tokenhash.inc>
+
} // namespace
// ============================================================================
@@ -55,7 +57,7 @@ TokenMap::TokenMap() :
static const sal_Char* sppcTokenNames[] =
{
// include auto-generated C array with token names as C strings
-#include "tokennames.inc"
+#include <token/tokennames.inc>
""
};
@@ -68,14 +70,14 @@ TokenMap::TokenMap() :
}
#if OSL_DEBUG_LEVEL > 0
- // check that the perfect_hash is in sync with the token name list
+ // check that the Perfect_Hash is in sync with the token name list
bool bOk = true;
for( sal_Int32 nToken = 0; bOk && (nToken < XML_TOKEN_COUNT); ++nToken )
{
// check that the getIdentifier <-> getToken roundtrip works
OString aUtf8Name = OUStringToOString( maTokenNames[ nToken ].maUniName, RTL_TEXTENCODING_UTF8 );
- struct xmltoken* pToken = Perfect_Hash::in_word_set( aUtf8Name.getStr(), aUtf8Name.getLength() );
- bOk = pToken && (pToken->nToken == nToken);
+ const XMLTokenInfo* pTokenInfo = Perfect_Hash::getTokenInfo( aUtf8Name.getStr(), aUtf8Name.getLength() );
+ bOk = pTokenInfo && (pTokenInfo->mnToken == nToken);
OSL_ENSURE( bOk, ::rtl::OStringBuffer( "TokenMap::TokenMap - token list broken, #" ).
append( nToken ).append( ", '" ).append( aUtf8Name ).append( '\'' ).getStr() );
}
@@ -96,8 +98,8 @@ OUString TokenMap::getUnicodeTokenName( sal_Int32 nToken ) const
sal_Int32 TokenMap::getTokenFromUnicode( const OUString& rUnicodeName ) const
{
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list