[Libreoffice-commits] .: 8 commits - lotuswordpro/Library_lwpft.mk lotuswordpro/Makefile lotuswordpro/Module_lotuswordpro.mk lotuswordpro/prj lotuswordpro/source lotuswordpro/util oox/Library_oox.mk oox/Makefile oox/Module_oox.mk oox/Package_generated.mk oox/Package_inc.mk oox/Package_tokens.mk oox/prj oox/source oox/util writerfilter/debug_setup.mk writerfilter/inc writerfilter/Library_doctok.mk writerfilter/Library_ooxml.mk writerfilter/Library_resourcemodel.mk writerfilter/Library_rtftok.mk writerfilter/Library_writerfilter.mk writerfilter/Library_writerfilter_uno.mk writerfilter/Makefile writerfilter/Module_writerfilter.mk writerfilter/prj writerfilter/source writerfilter/unocomponent writerfilter/util
David Tardon
dtardon at kemper.freedesktop.org
Thu Apr 14 07:28:47 PDT 2011
lotuswordpro/Library_lwpft.mk | 234 ++++++
lotuswordpro/Makefile | 38 +
lotuswordpro/Module_lotuswordpro.mk | 34
lotuswordpro/prj/build.lst | 5
lotuswordpro/prj/d.lst | 4
lotuswordpro/prj/makefile.mk | 40 +
lotuswordpro/source/filter/lwpchartstreamtools.cxx | 360 ---------
lotuswordpro/source/filter/lwpchartstreamtools.hxx | 152 ----
lotuswordpro/source/filter/lwpchartwrapper.cxx | 96 --
lotuswordpro/source/filter/lwpchartwrapper.hxx | 82 --
lotuswordpro/source/filter/makefile.mk | 112 --
lotuswordpro/source/filter/schxmlwrapper.cxx | 491 -------------
lotuswordpro/source/filter/schxmlwrapper.hxx | 121 ---
lotuswordpro/source/filter/xfilter/makefile.mk | 146 ---
lotuswordpro/source/filter/xfilter/xfchartstreamtools.cxx | 120 ---
lotuswordpro/source/filter/xfilter/xfchartstreamtools.hxx | 114 ---
lotuswordpro/source/filter/xfilter/xfchartxmlhandler.cxx | 127 ---
lotuswordpro/source/filter/xfilter/xfchartxmlhandler.hxx | 132 ---
lotuswordpro/source/filter/xfilter/xfdrawchart.cxx | 93 --
lotuswordpro/source/filter/xfilter/xfdrawchart.hxx | 96 --
lotuswordpro/source/filter/xfilter/xftexttable.cxx | 140 ---
lotuswordpro/source/filter/xfilter/xftexttable.hxx | 85 --
lotuswordpro/util/lwpft.map | 7
lotuswordpro/util/makefile.mk | 51 -
oox/Library_oox.mk | 375 +++++++++
oox/Makefile | 38 +
oox/Module_oox.mk | 37
oox/Package_generated.mk | 33
oox/Package_inc.mk | 58 +
oox/Package_tokens.mk | 32
oox/prj/build.lst | 18
oox/prj/d.lst | 53 -
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 | 91 --
oox/source/drawingml/table/makefile.mk | 62 -
oox/source/dump/makefile.mk | 53 -
oox/source/export/makefile.mk | 33
oox/source/helper/makefile.mk | 60 -
oox/source/ole/makefile.mk | 60 -
oox/source/ppt/makefile.mk | 77 --
oox/source/shape/makefile.mk | 49 -
oox/source/token/makefile.mk | 78 --
oox/source/vml/makefile.mk | 56 -
oox/source/xls/makefile.mk | 103 --
oox/util/makefile.mk | 114 ---
writerfilter/Library_doctok.mk | 145 +++
writerfilter/Library_ooxml.mk | 287 +++++++
writerfilter/Library_resourcemodel.mk | 100 ++
writerfilter/Library_rtftok.mk | 63 +
writerfilter/Library_writerfilter.mk | 71 +
writerfilter/Library_writerfilter_uno.mk | 70 +
writerfilter/Makefile | 38 +
writerfilter/Module_writerfilter.mk | 41 +
writerfilter/debug_setup.mk | 12
writerfilter/inc/resourcemodel/Fraction.hxx | 5
writerfilter/inc/resourcemodel/LoggedResources.hxx | 6
writerfilter/prj/build.lst | 10
writerfilter/prj/d.lst | 8
writerfilter/prj/makefile.mk | 40 +
writerfilter/source/dmapper/makefile.mk | 78 --
writerfilter/source/doctok/makefile.mk | 148 ---
writerfilter/source/filter/makefile.mk | 52 -
writerfilter/source/ooxml/makefile.mk | 251 ------
writerfilter/source/resourcemodel/makefile.mk | 200 -----
writerfilter/source/rtftok/makefile.mk | 76 --
writerfilter/unocomponent/debugservices/doctok/makefile.mk | 44 -
writerfilter/unocomponent/debugservices/ooxml/makefile.mk | 59 -
writerfilter/unocomponent/debugservices/rtftok/makefile.mk | 45 -
writerfilter/unocomponent/makefile.mk | 90 --
writerfilter/util/makefile.mk | 88 --
74 files changed, 1835 insertions(+), 4834 deletions(-)
New commits:
commit 229c402a27ffcc72ddff11774402979882b11d13
Author: David Tardon <dtardon at redhat.com>
Date: Thu Apr 14 14:47:50 2011 +0200
fix build
diff --git a/writerfilter/prj/build.lst b/writerfilter/prj/build.lst
index c085993..0553bc3 100644
--- a/writerfilter/prj/build.lst
+++ b/writerfilter/prj/build.lst
@@ -1,3 +1,3 @@
wf writerfilter : soltools sal BOOST:boost cppu cppuhelper ucbhelper tools svx LIBXSLT:libxslt oox NULL
wf writerfilter usr1 - all wf_mkout NULL
-wf writerfilter\prj nmake - all wf_prj
+wf writerfilter\prj nmake - all wf_prj NULL
commit 1b5f51662990af9483fecfb6bdcc220c9801f81c
Author: David Tardon <dtardon at redhat.com>
Date: Thu Apr 14 14:47:30 2011 +0200
fix delivery of generated files
diff --git a/oox/Library_oox.mk b/oox/Library_oox.mk
index 4c3db9a..964ba39 100644
--- a/oox/Library_oox.mk
+++ b/oox/Library_oox.mk
@@ -366,17 +366,10 @@ $(eval $(call oox_GenTarget_GenTarget,namespaces,namespace,namespaces.txt))
$(eval $(call oox_GenTarget_GenTarget,properties,property,))
$(eval $(call oox_GenTarget_GenTarget,tokens,token,tokenhash.gperf))
-$(call gb_Package_get_target,oox_tokens) :| $(OUTDIR)/inc/oox/namespaces.txt
-$(call gb_Package_get_clean_target,oox_tokens) : oox_ns_clean
$(call gb_Library_get_clean_target,oox) : oox_clean
oox_clean :
rm -rf $(WORKDIR)/oox
-oox_ns_clean :
- rm -rf $(OUTDIR)/inc/oox/namespaces.txt
-.PHONY: oox_clean oox_ns_clean
-
-$(OUTDIR)/inc/oox/namespaces.txt : $(oox_MISC)/namespaces.txt
- cp $< $@
+.PHONY: oox_clean
# vim: set noet ts=4 sw=4:
diff --git a/oox/Module_oox.mk b/oox/Module_oox.mk
index 453d9ad..9fc9c8e 100644
--- a/oox/Module_oox.mk
+++ b/oox/Module_oox.mk
@@ -30,6 +30,7 @@ $(eval $(call gb_Module_Module,oox))
$(eval $(call gb_Module_add_targets,oox,\
Library_oox \
Package_inc \
+ Package_generated \
Package_tokens \
))
diff --git a/oox/Package_generated.mk b/oox/Package_generated.mk
new file mode 100644
index 0000000..93639b8
--- /dev/null
+++ b/oox/Package_generated.mk
@@ -0,0 +1,33 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+# David Tardon, Red Hat Inc. <dtardon at redhat.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Package_Package,oox_generated,$(WORKDIR)/oox))
+
+$(eval $(call gb_Package_add_file,oox_generated,inc/oox/namespaces.txt,misc/namespaces.txt))
+$(eval $(call gb_Package_add_file,oox_generated,inc/oox/token/tokens.hxx,inc/oox/token/tokens.hxx))
+
+# vim: set noet ts=4 sw=4:
commit 7570fc6a4939a01ad07d77b7210d9f75804121b4
Author: David Tardon <dtardon at redhat.com>
Date: Thu Apr 14 14:21:01 2011 +0200
fix build
diff --git a/lotuswordpro/prj/build.lst b/lotuswordpro/prj/build.lst
index 2c46966..309fdc8 100644
--- a/lotuswordpro/prj/build.lst
+++ b/lotuswordpro/prj/build.lst
@@ -1,3 +1,3 @@
wp lotuswordpro : sfx2 sot svx comphelper BOOST:boost NULL
wp lotuswordpro usr1 - all lwp_mkout NULL
-wp lotuswordpro\prj nmake - all lwp_prj
+wp lotuswordpro\prj nmake - all lwp_prj NULL
commit bd7bec0ca01d452bfaff5349f4cf015f3c5ad3bd
Author: David Tardon <dtardon at redhat.com>
Date: Thu Apr 14 12:35:11 2011 +0200
gbuildize writerfilter
diff --git a/writerfilter/Library_doctok.mk b/writerfilter/Library_doctok.mk
new file mode 100644
index 0000000..912bef2
--- /dev/null
+++ b/writerfilter/Library_doctok.mk
@@ -0,0 +1,145 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+# David Tardon, Red Hat Inc. <dtardon at redhat.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Library_Library,doctok))
+
+$(eval $(call gb_Library_set_include,doctok,\
+ $$(INCLUDE) \
+ -I$(realpath $(SRCDIR)/writerfilter/inc) \
+ -I$(realpath $(SRCDIR)/writerfilter/source/doctok) \
+ -I$(WORKDIR)/writerfilter/inc \
+ -I$(WORKDIR)/writerfilter/inc/doctok \
+ $(if $(filter YES,$(SYSTEM_LIBXML)),$(filter -I%,$(LIBXML_CFLAGS))) \
+ -I$(OUTDIR)/inc \
+ -I$(OUTDIR)/inc/offuh \
+))
+
+include debug_setup.mk
+
+$(eval $(call gb_Library_set_defs,doctok,\
+ $$(DEFS) \
+ -DWRITERFILTER_DLLIMPLEMENTATION \
+ $(writerfilter_debug_flags) \
+ $(if $(filter YES,$(SYSTEM_LIBXML)),$(filter-out -I%,$(LIBXML_CFLAGS))) \
+))
+
+$(eval $(call gb_Library_add_linked_libs,doctok,\
+ cppu \
+ cppuhelper \
+ resourcemodel \
+ sal \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,doctok,\
+ writerfilter/source/doctok/Dff \
+ writerfilter/source/doctok/DffImpl \
+ writerfilter/source/doctok/WW8Annotation \
+ writerfilter/source/doctok/WW8BinTableImpl \
+ writerfilter/source/doctok/WW8Clx \
+ writerfilter/source/doctok/WW8CpAndFc \
+ writerfilter/source/doctok/WW8DocumentImpl \
+ writerfilter/source/doctok/WW8FKPImpl \
+ writerfilter/source/doctok/WW8FontTable \
+ writerfilter/source/doctok/WW8LFOTable \
+ writerfilter/source/doctok/WW8ListTable \
+ writerfilter/source/doctok/WW8OutputWithDepth \
+ writerfilter/source/doctok/WW8Picture \
+ writerfilter/source/doctok/WW8PieceTableImpl \
+ writerfilter/source/doctok/WW8PropertySetImpl \
+ writerfilter/source/doctok/WW8ResourceModelImpl \
+ writerfilter/source/doctok/WW8StreamImpl \
+ writerfilter/source/doctok/WW8StructBase \
+ writerfilter/source/doctok/WW8Sttbf \
+ writerfilter/source/doctok/WW8StyleSheet \
+ writerfilter/source/doctok/WW8Table \
+ writerfilter/source/doctok/WW8Text \
+))
+
+$(eval $(call gb_Library_add_generated_exception_objects,doctok,\
+ writerfilter/source/doctok/resources \
+))
+
+doctok_GENDIR := $(WORKDIR)/writerfilter
+doctok_HXXOUTDIR := $(doctok_GENDIR)/inc/doctok
+doctok_HXXOUTDIRCREATED := $(doctok_HXXOUTDIR)/created
+
+doctok_QNAMETOSTRXSL := $(SRCDIR)/writerfilter/source/doctok/qnametostr.xsl
+doctok_RESOURCEIDSXSL := $(SRCDIR)/writerfilter/source/doctok/resourceids.xsl
+doctok_RESOURCESIMPLXSL := $(SRCDIR)/writerfilter/source/doctok/resourcesimpl.xsl
+doctok_RESOURCESXSL := $(SRCDIR)/writerfilter/source/doctok/resources.xsl
+doctok_RESOURCETOOLSXSL := $(SRCDIR)/writerfilter/source/doctok/resourcetools.xsl
+doctok_SPRMCODETOSTRXSL := $(SRCDIR)/writerfilter/source/doctok/sprmcodetostr.xsl
+doctok_SPRMIDSXSL := $(SRCDIR)/writerfilter/source/doctok/sprmids.xsl
+
+doctok_MODEL := $(SRCDIR)/writerfilter/source/doctok/resources.xmi
+
+doctok_RESOURCEIDSHXX := $(doctok_HXXOUTDIR)/resourceids.hxx
+doctok_SPRMIDSHXX := $(doctok_HXXOUTDIR)/sprmids.hxx
+doctok_RESOURCESHXX := $(doctok_HXXOUTDIR)/resources.hxx
+doctok_RESOURCESCXX := $(call gb_GenCxxObject_get_source,writerfilter/source/doctok/resources)
+
+doctok_QNAMETOSTRTMP := $(doctok_GENDIR)/doctok_qnameToStr.tmp
+doctok_SPRPMCODETOSTRTMP := $(doctok_GENDIR)/sprmcodetostr.tmp
+
+doctok_GENHEADERS = \
+ $(doctok_RESOURCEIDSHXX) \
+ $(doctok_SPRMIDSHXX) \
+ $(doctok_RESOURCESHXX)
+
+doctok_GENFILES = \
+ $(doctok_GENHEADERS) \
+ $(doctok_QNAMETOSTRTMP) \
+ $(doctok_RESOURCESCXX) \
+ $(doctok_SPRPMCODETOSTRTMP)
+
+$(doctok_HXXOUTDIRCREATED) :
+ mkdir -p $(dir $@) && touch $@
+
+$(doctok_GENHEADERS) : $(doctok_HXXOUTDIRCREATED)
+
+define doctok_xsl_process_model
+$(1) : $(2) $(doctok_MODEL)
+ mkdir -p $(dir $(1)) && $(gb_XSLTPROC) --nonet $(2) $(doctok_MODEL) > $(1)
+endef
+
+$(eval $(call doctok_xsl_process_model,$(doctok_RESOURCESHXX),$(doctok_RESOURCESXSL)))
+$(eval $(call doctok_xsl_process_model,$(doctok_QNAMETOSTRTMP),$(doctok_QNAMETOSTRXSL)))
+$(eval $(call doctok_xsl_process_model,$(doctok_SPRMIDSHXX),$(doctok_SPRMIDSXSL)))
+$(eval $(call doctok_xsl_process_model,$(doctok_RESOURCESCXX),$(doctok_RESOURCESIMPLXSL)))
+$(eval $(call doctok_xsl_process_model,$(doctok_RESOURCEIDSHXX),$(doctok_RESOURCEIDSXSL)))
+$(eval $(call doctok_xsl_process_model,$(doctok_SPRPMCODETOSTRTMP),$(doctok_SPRMCODETOSTRXSL)))
+
+$(doctok_RESOURCESCXX) : $(doctok_GENHEADERS) $(doctok_RESOURCETOOLSXSL)
+
+doctok_clean:
+ rm -rf $(doctok_GENFILES) $(doctok_HXXOUTDIR)
+.PHONY: doctok_clean
+
+$(call gb_Library_get_clean_target,doctok) : doctok_clean
+
+# vim: set noet ts=4 sw=4:
diff --git a/writerfilter/Library_ooxml.mk b/writerfilter/Library_ooxml.mk
new file mode 100644
index 0000000..b420836
--- /dev/null
+++ b/writerfilter/Library_ooxml.mk
@@ -0,0 +1,287 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+# David Tardon, Red Hat Inc. <dtardon at redhat.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Library_Library,ooxml))
+
+$(eval $(call gb_Library_set_include,ooxml,\
+ $$(INCLUDE) \
+ -I$(realpath $(SRCDIR)/writerfilter/inc) \
+ -I$(realpath $(SRCDIR)/writerfilter/source/ooxml) \
+ -I$(WORKDIR)/writerfilter/inc \
+ -I$(WORKDIR)/writerfilter/inc/ooxml \
+ $(if $(filter YES,$(SYSTEM_LIBXML)),$(filter -I%,$(LIBXML_CFLAGS))) \
+ -I$(OUTDIR)/inc \
+ -I$(OUTDIR)/inc/offuh \
+))
+
+include debug_setup.mk
+
+$(eval $(call gb_Library_set_defs,ooxml,\
+ $$(DEFS) \
+ -DWRITERFILTER_DLLIMPLEMENTATION \
+ $(writerfilter_debug_flags) \
+ $(if $(filter YES,$(SYSTEM_LIBXML)),$(filter-out -I%,$(LIBXML_CFLAGS))) \
+))
+
+$(eval $(call gb_Library_add_linked_libs,ooxml,\
+ comphelper \
+ cppu \
+ cppuhelper \
+ i18nisolang1 \
+ i18npaper \
+ resourcemodel \
+ sal \
+ tl \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,ooxml,\
+ writerfilter/source/dmapper/BorderHandler \
+ writerfilter/source/dmapper/CellColorHandler \
+ writerfilter/source/dmapper/CellMarginHandler \
+ writerfilter/source/dmapper/ConversionHelper \
+ writerfilter/source/dmapper/DomainMapper \
+ writerfilter/source/dmapper/DomainMapper_Impl \
+ writerfilter/source/dmapper/DomainMapperTableHandler \
+ writerfilter/source/dmapper/DomainMapperTableManager \
+ writerfilter/source/dmapper/FFDataHandler \
+ writerfilter/source/dmapper/FontTable \
+ writerfilter/source/dmapper/FormControlHelper \
+ writerfilter/source/dmapper/GraphicHelpers \
+ writerfilter/source/dmapper/GraphicImport \
+ writerfilter/source/dmapper/MeasureHandler \
+ writerfilter/source/dmapper/ModelEventListener \
+ writerfilter/source/dmapper/NumberingManager \
+ writerfilter/source/dmapper/OLEHandler \
+ writerfilter/source/dmapper/PageBordersHandler \
+ writerfilter/source/dmapper/PropertyIds \
+ writerfilter/source/dmapper/PropertyMap \
+ writerfilter/source/dmapper/PropertyMapHelper \
+ writerfilter/source/dmapper/SectionColumnHandler \
+ writerfilter/source/dmapper/SettingsTable \
+ writerfilter/source/dmapper/StyleSheetTable \
+ writerfilter/source/dmapper/TablePropertiesHandler \
+ writerfilter/source/dmapper/TblStylePrHandler \
+ writerfilter/source/dmapper/TDefTableHandler \
+ writerfilter/source/dmapper/ThemeTable \
+ writerfilter/source/dmapper/WrapPolygonHandler \
+ writerfilter/source/ooxml/Handler \
+ writerfilter/source/ooxml/OOXMLBinaryObjectReference \
+ writerfilter/source/ooxml/OOXMLDocumentImpl \
+ writerfilter/source/ooxml/OOXMLFactory \
+ writerfilter/source/ooxml/OOXMLFastContextHandler \
+ writerfilter/source/ooxml/OOXMLFastDocumentHandler \
+ writerfilter/source/ooxml/OOXMLFastTokenHandler \
+ writerfilter/source/ooxml/OOXMLParserState \
+ writerfilter/source/ooxml/OOXMLPropertySetImpl \
+ writerfilter/source/ooxml/OOXMLStreamImpl \
+))
+
+ooxml_NAMESPACES := \
+ dml-baseStylesheet \
+ dml-baseTypes \
+ dml-chartDrawing \
+ dml-documentProperties \
+ dml-graphicalObject \
+ dml-shape3DCamera \
+ dml-shape3DLighting \
+ dml-shape3DScene \
+ dml-shape3DStyles \
+ dml-shapeEffects \
+ dml-shapeGeometry \
+ dml-shapeLineProperties \
+ dml-shapeProperties \
+ dml-styleDefaults \
+ dml-stylesheet \
+ dml-textCharacter \
+ dml-wordprocessingDrawing \
+ shared-math \
+ shared-relationshipReference \
+ sml-customXmlMappings \
+ vml-main \
+ vml-officeDrawing \
+ vml-wordprocessingDrawing \
+ wml
+
+ooxml_factory_source_stem = writerfilter/source/ooxml/OOXMLFactory_$(1)
+
+define ooxml_factory_source
+$(call gb_GenCxxObject_get_source,$(call ooxml_factory_source_stem,$(1)))
+endef
+
+define ooxml_namespace_sources
+$(foreach namespace,$(ooxml_NAMESPACES),$(call ooxml_factory_source,$(namespace)))
+endef
+
+$(eval $(call gb_Library_add_generated_exception_objects,ooxml,\
+ writerfilter/source/ooxml/OOXMLFactory_generated \
+ writerfilter/source/ooxml/OOXMLFactory_values \
+ $(foreach namespace,$(ooxml_NAMESPACES),$(call ooxml_factory_source_stem,$(namespace))) \
+))
+
+SLOFACTORIESNAMESPACES= \
+ $(SLO)/ooxml_Factory_{$(NAMESPACES)}.obj
+
+ooxml_HXXOUTDIR := $(WORKDIR)/writerfilter/inc/ooxml
+ooxml_CXXOUTDIR := $(dir $(call ooxml_factory_source,generated))
+ooxml_MISCDIR := $(WORKDIR)/writerfilter/ooxml
+
+ooxml_HXXOUTDIRCREATED := $(ooxml_HXXOUTDIR)/created
+
+define ooxml_factory_header
+$(ooxml_HXXOUTDIR)/OOXMLFactory_$(1).hxx
+endef
+
+define ooxml_namespace_headers
+$(foreach namespace,$(ooxml_NAMESPACES),$(call ooxml_factory_header,$(namespace)))
+endef
+
+ooxml_MODEL := $(SRCDIR)/writerfilter/source/ooxml/model.xml
+
+ooxml_FACTORYIMPLNSXSL := $(SRCDIR)/writerfilter/source/ooxml/factoryimpl_ns.xsl
+ooxml_FACTORYIMPLXSL := $(SRCDIR)/writerfilter/source/ooxml/factoryimpl.xsl
+ooxml_FACTORYINCXSL := $(SRCDIR)/writerfilter/source/ooxml/factoryinc.xsl
+ooxml_FACTORYNSXSL := $(SRCDIR)/writerfilter/source/ooxml/factory_ns.xsl
+ooxml_FACTORYTOOLSXSL := $(SRCDIR)/writerfilter/source/ooxml/factorytools.xsl
+ooxml_FACTORYVALUESIMPLXSL := $(SRCDIR)/writerfilter/source/ooxml/factoryimpl_values.xsl
+ooxml_FACTORYVALUESXSL := $(SRCDIR)/writerfilter/source/ooxml/factory_values.xsl
+ooxml_FASTTOKENSXSL := $(SRCDIR)/writerfilter/source/ooxml/fasttokens.xsl
+ooxml_GPERFFASTTOKENXSL := $(SRCDIR)/writerfilter/source/ooxml/gperffasttokenhandler.xsl
+ooxml_NAMESPACEIDSXSL := $(SRCDIR)/writerfilter/source/ooxml/namespaceids.xsl
+ooxml_PREPROCESSXSL := $(SRCDIR)/writerfilter/source/ooxml/modelpreprocess.xsl
+ooxml_QNAMETOSTRXSL := $(SRCDIR)/writerfilter/source/ooxml/qnametostr.xsl
+ooxml_RESORUCETOKENSXSL := $(SRCDIR)/writerfilter/source/ooxml/resourcestokens.xsl
+ooxml_RESOURCEIDSXSL := $(SRCDIR)/writerfilter/source/ooxml/resourceids.xsl
+ooxml_RESOURCESIMPLXSL := $(SRCDIR)/writerfilter/source/ooxml/resourcesimpl.xsl
+
+ooxml_NSPROCESS := $(SRCDIR)/writerfilter/source/resourcemodel/namespace_preprocess.pl
+
+ooxml_RESOURCEIDSHXX := $(ooxml_HXXOUTDIR)/resourceids.hxx
+
+ooxml_TOKENXML := $(ooxml_MISCDIR)/token.xml
+ooxml_TOKENXMLTMP := $(ooxml_MISCDIR)/token.tmp
+
+ooxml_FACTORYGENERATEDHXX := $(call ooxml_factory_header,generated)
+ooxml_FACTORYGENERATEDCXX := $(call ooxml_factory_source,generated)
+ooxml_FASTTOKENSHXX := $(ooxml_HXXOUTDIR)/OOXMLFastTokens.hxx
+ooxml_NAMESPACEIDSHXX := $(ooxml_HXXOUTDIR)/OOXMLnamespaceids.hxx
+ooxml_FACTORYVALUESHXX := $(call ooxml_factory_header,values)
+ooxml_FACTORYVALUESCXX := $(call ooxml_factory_source,values)
+ooxml_GPERFFASTTOKENHXX := $(ooxml_HXXOUTDIR)/gperffasttoken.hxx
+ooxml_GPERFFASTTOKENTMP := $(ooxml_MISCDIR)/gperffasttoken.tmp
+ooxml_QNAMETOSTRTMP := $(WORKDIR)/writerfilter/ooxml_qnameToStr.tmp
+
+ooxml_MODELPROCESSED := $(ooxml_MISCDIR)/model_preprocessed.xml
+ooxml_NSXSL := $(ooxml_MISCDIR)/namespacesmap.xsl
+ooxml_PREPROCESSXSLCOPIED := $(ooxml_MISCDIR)/modelpreprocess.xsl
+
+ooxml_NAMESPACESTXT := $(SOLARVER)/$(INPATH)/inc$(UPDMINOREXT)/oox/namespaces.txt
+
+ooxml_GENHEADERS = \
+ $(ooxml_FACTORYGENERATEDHXX) \
+ $(ooxml_FASTTOKENSHXX) \
+ $(ooxml_FACTORYVALUESHXX) \
+ $(ooxml_GPERFFASTTOKENHXX) \
+ $(ooxml_RESOURCEIDSHXX) \
+ $(ooxml_NAMESPACEIDSHXX) \
+ $(ooxml_namespace_headers)
+
+ooxml_GENERATEDFILES = \
+ $(ooxml_GENHEADERS) \
+ $(ooxml_GPERFFASTTOKENTMP) \
+ $(ooxml_FACTORYGENERATEDCXX) \
+ $(ooxml_MODELPROCESSED) \
+ $(ooxml_namespace_sources) \
+ $(ooxml_NSXSL) \
+ $(ooxml_FACTORYVALUESCXX) \
+ $(ooxml_PREPROCESSXSLCOPIED) \
+ $(ooxml_QNAMETOSTRTMP) \
+ $(ooxml_TOKENXMLTMP) \
+ $(ooxml_TOKENXML)
+
+$(ooxml_TOKENXMLTMP) : $(OUTDIR)/inc/oox/tokens.txt
+ mkdir -p $(dir $@) && sed -e 's#.*#<fasttoken>&</fasttoken>#' $< > $@
+
+$(ooxml_TOKENXML) : $(SRCDIR)/writerfilter/source/ooxml/tokenxmlheader $(ooxml_TOKENXMLTMP) $(SRCDIR)/writerfilter/source/ooxml/tokenxmlfooter
+ mkdir -p $(dir $@) && cat $(SRCDIR)/writerfilter/source/ooxml/tokenxmlheader $(ooxml_TOKENXMLTMP) $(SRCDIR)/writerfilter/source/ooxml/tokenxmlfooter > $@
+
+$(ooxml_HXXOUTDIRCREATED) :
+ mkdir -p $(dir $@) && touch $@
+
+$(ooxml_GENHEADERS) : $(ooxml_HXXOUTDIRCREATED)
+
+$(call ooxml_factory_source,%) :| $(call ooxml_factory_header,%)
+
+$(call ooxml_factory_source,%) : $(ooxml_FACTORYIMPLNSXSL) $(ooxml_MODELPROCESSED)
+ mkdir -p $(dir $@) && $(gb_XSLTPROC) --nonet --stringparam file $@ $(ooxml_FACTORYIMPLNSXSL) $(ooxml_MODELPROCESSED) > $@
+
+$(call ooxml_factory_header,%) : $(ooxml_FACTORYNSXSL) $(ooxml_MODELPROCESSED)
+ mkdir -p $(dir $@) && $(gb_XSLTPROC) --nonet --stringparam file $@ $(ooxml_FACTORYNSXSL) $(ooxml_MODELPROCESSED) > $@
+
+define ooxml_xsl_process
+$(1) : $(2) $(3)
+ mkdir -p $(dir $(1)) && $(gb_XSLTPROC) --nonet $(2) $(3) > $(1)
+endef
+
+define ooxml_xsl_process_model
+$(call ooxml_xsl_process,$(1),$(2),$(ooxml_MODELPROCESSED))
+endef
+
+$(eval $(call ooxml_xsl_process,$(ooxml_MODELPROCESSED),$(ooxml_NSXSL),$(ooxml_MODEL)))
+$(eval $(call ooxml_xsl_process,$(ooxml_FASTTOKENSHXX),$(ooxml_FASTTOKENSXSL),$(ooxml_TOKENXML)))
+
+$(eval $(call ooxml_xsl_process_model,$(ooxml_FACTORYGENERATEDHXX),$(ooxml_FACTORYINCXSL)))
+$(eval $(call ooxml_xsl_process_model,$(ooxml_FACTORYGENERATEDCXX),$(ooxml_FACTORYIMPLXSL)))
+$(eval $(call ooxml_xsl_process_model,$(ooxml_FACTORYVALUESHXX),$(ooxml_FACTORYVALUESXSL)))
+$(eval $(call ooxml_xsl_process_model,$(ooxml_FACTORYVALUESCXX),$(ooxml_FACTORYVALUESIMPLXSL)))
+$(eval $(call ooxml_xsl_process_model,$(ooxml_QNAMETOSTRTMP),$(ooxml_QNAMETOSTRXSL)))
+$(eval $(call ooxml_xsl_process_model,$(ooxml_RESOURCEIDSHXX),$(ooxml_RESOURCEIDSXSL)))
+$(eval $(call ooxml_xsl_process_model,$(ooxml_NAMESPACEIDSHXX),$(ooxml_NAMESPACEIDSXSL)))
+$(eval $(call ooxml_xsl_process_model,$(ooxml_GPERFFASTTOKENTMP),$(ooxml_GPERFFASTTOKENXSL)))
+
+$(ooxml_NSXSL) : $(ooxml_NAMESPACESTXT) $(ooxml_NSPROCESS) $(ooxml_PREPROCESSXSLCOPIED)
+ mkdir -p $(dir $@) && perl $(ooxml_NSPROCESS) $(ooxml_NAMESPACESTXT) > $@
+
+# this is included by relative path from $(ooxml_NSXSL)
+$(ooxml_PREPROCESSXSLCOPIED) : $(ooxml_PREPROCESSXSL)
+ mkdir -p $(dir $@) && cp $< $@
+
+$(ooxml_GPERFFASTTOKENHXX) : $(ooxml_GPERFFASTTOKENTMP) $(ooxml_HXXOUTDIRCREATED)
+ tr -d '\r' < $< | gperf -I -t -E -S1 -c -G -LC++ > $@
+
+$(ooxml_GENERATEDFILES) : $(ooxml_FACTORYTOOLSXSL)
+
+$(ooxml_FACTORYVALUESCXX) :| $(ooxml_FACTORYVALUESHXX)
+$(ooxml_FACTORYGENERATEDCXX) :| $(ooxml_FACTORYGENERATEDHXX) $(ooxml_GENHEADERS)
+
+ooxml_clean :
+ rm -rf $(ooxml_GENERATEDFILES) $(ooxml_HXXOUTDIR)
+.PHONY : ooxml_clean
+
+$(call gb_Library_get_clean_target,ooxml) : ooxml_clean
+
+# vim: set noet ts=4 sw=4:
diff --git a/writerfilter/Library_resourcemodel.mk b/writerfilter/Library_resourcemodel.mk
new file mode 100644
index 0000000..285e76f
--- /dev/null
+++ b/writerfilter/Library_resourcemodel.mk
@@ -0,0 +1,100 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+# David Tardon, Red Hat Inc. <dtardon at redhat.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Library_Library,resourcemodel))
+
+$(eval $(call gb_Library_set_include,resourcemodel,\
+ $$(INCLUDE) \
+ -I$(realpath $(SRCDIR)/writerfilter/inc) \
+ -I$(WORKDIR)/writerfilter/inc \
+ $(if $(filter YES,$(SYSTEM_LIBXML)),$(filter -I%,$(LIBXML_CFLAGS))) \
+ -I$(OUTDIR)/inc \
+ -I$(OUTDIR)/inc/offuh \
+))
+
+include debug_setup.mk
+
+$(eval $(call gb_Library_set_defs,resourcemodel,\
+ $$(DEFS) \
+ -DWRITERFILTER_DLLIMPLEMENTATION \
+ $(writerfilter_debug_flags) \
+ $(if $(filter YES,$(SYSTEM_LIBXML)),$(filter-out -I%,$(LIBXML_CFLAGS))) \
+))
+
+$(eval $(call gb_Library_add_linked_libs,resourcemodel,\
+ comphelper \
+ cppu \
+ cppuhelper \
+ sal \
+ xml2 \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,resourcemodel,\
+ writerfilter/source/resourcemodel/Fraction \
+ writerfilter/source/resourcemodel/LoggedResources \
+ writerfilter/source/resourcemodel/Protocol \
+ writerfilter/source/resourcemodel/resourcemodel \
+ writerfilter/source/resourcemodel/ResourceModelHelper \
+ writerfilter/source/resourcemodel/TagLogger \
+ writerfilter/source/resourcemodel/util \
+ writerfilter/source/resourcemodel/WW8Analyzer \
+ writerfilter/source/resourcemodel/XPathLogger \
+))
+
+$(eval $(call gb_Library_add_generated_exception_objects,resourcemodel,\
+ writerfilter/source/resourcemodel/sprmcodetostr \
+))
+
+$(eval $(call gb_Library_add_generated_cxxobjects,resourcemodel,\
+ writerfilter/source/resourcemodel/qnametostr \
+ , $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \
+))
+
+define resourcemodel_gen_source
+$(call gb_GenCxxObject_get_source,$(1)) : $(2) $(SRCDIR)/$(1)header $(SRCDIR)/$(1)footer
+ mkdir -p $$(dir $$@) && cat $(SRCDIR)/$(1)header $(2) $(SRCDIR)/$(1)footer > $$@
+endef
+
+# the .tmp files are generated in doctok/ooxml library makefiles
+$(eval $(call resourcemodel_gen_source,writerfilter/source/resourcemodel/qnametostr,\
+ $(WORKDIR)/writerfilter/doctok_qnameToStr.tmp \
+ $(WORKDIR)/writerfilter/ooxml_qnameToStr.tmp \
+))
+$(eval $(call resourcemodel_gen_source,writerfilter/source/resourcemodel/sprmcodetostr,\
+ $(WORKDIR)/writerfilter/sprmcodetostr.tmp \
+))
+
+resourcemodel_clean :
+ rm -f \
+ $(call gb_GenCxxObject_get_source,writerfilter/source/resourcemodel/qnametostr) \
+ $(call gb_GenCxxObject_get_source,writerfilter/source/resourcemodel/sprmcodetostr)
+.PHONY : resourcemodel_clean
+
+$(call gb_Library_get_clean_target,resourcemodel) : resourcemodel_clean
+
+# vim: set noet ts=4 sw=4:
diff --git a/writerfilter/Library_rtftok.mk b/writerfilter/Library_rtftok.mk
new file mode 100644
index 0000000..670f4b7
--- /dev/null
+++ b/writerfilter/Library_rtftok.mk
@@ -0,0 +1,63 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+# David Tardon, Red Hat Inc. <dtardon at redhat.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+# Not built
+$(eval $(call gb_Library_Library,rtftok))
+
+$(eval $(call gb_Library_set_include,rtftok,\
+ $$(INCLUDE) \
+ -I$(OUTDIR)/inc \
+))
+
+include debug_setup.mk
+
+$(eval $(call gb_Library_set_defs,rtftok,\
+ $$(DEFS) \
+ -DWRITERFILTER_DLLIMPLEMENTATION \
+ $(writerfilter_debug_flags) \
+))
+
+$(eval $(call gb_Library_add_linked_libs,rtftok,\
+ cppu \
+ cppuhelper \
+ sal \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,rtftok,\
+ writerfilter/source/rtftok/RTFParseException \
+))
+
+$(eval $(call gb_Library_add_generated_exception_objects,rtftok,\
+ writerfilter/source/rtftok/RTFScanner \
+))
+
+$(call gb_GenCxxObject_get_source,writerfilter/source/rtftok/RTFScanner) : $(SRCDIR)/writerfilter/source/rtftok/FlexLexer.h $(SRCDIR)/writerfilter/source/rtftok/RTFScanner.skl $(SRCDIR)/writerfilter/source/rtftok/RTFScanner.lex
+ mkdir -p $(dir $@) && \
+ flex -+ -S$(SRCDIR)/writerfilter/source/rtftok/RTFScanner.skl -o$@ $(SRCDIR)/writerfilter/source/rtftok/RTFScanner.lex
+
+# vim: set noet ts=4 sw=4:
diff --git a/writerfilter/Library_writerfilter.mk b/writerfilter/Library_writerfilter.mk
new file mode 100644
index 0000000..a4ffac5
--- /dev/null
+++ b/writerfilter/Library_writerfilter.mk
@@ -0,0 +1,71 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+# David Tardon, Red Hat Inc. <dtardon at redhat.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Library_Library,writerfilter))
+
+$(eval $(call gb_Library_set_include,writerfilter,\
+ $$(INCLUDE) \
+ -I$(realpath $(SRCDIR)/writerfilter/inc) \
+ $(if $(filter YES,$(SYSTEM_LIBXML)),$(filter -I%,$(LIBXML_CFLAGS))) \
+ -I$(OUTDIR)/inc \
+ -I$(OUTDIR)/inc/offuh \
+))
+
+include debug_setup.mk
+
+$(eval $(call gb_Library_set_defs,writerfilter,\
+ $$(DEFS) \
+ -DWRITERFILTER_DLLIMPLEMENTATION \
+ $(writerfilter_debug_flags) \
+ $(if $(filter YES,$(SYSTEM_LIBXML)),$(filter-out -I%,$(LIBXML_CFLAGS))) \
+))
+
+$(eval $(call gb_Library_add_linked_libs,writerfilter,\
+ comphelper \
+ cppu \
+ cppuhelper \
+ doctok \
+ i18nisolang1 \
+ i18npaper \
+ oox \
+ ooxml \
+ sal \
+ sot \
+ tl \
+ utl \
+ xml2 \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,writerfilter,\
+ writerfilter/source/filter/ImportFilter \
+ writerfilter/source/filter/RtfFilter \
+ writerfilter/source/filter/WriterFilter \
+ writerfilter/source/filter/WriterFilterDetection \
+))
+
+# vim: set noet ts=4 sw=4:
diff --git a/writerfilter/Library_writerfilter_uno.mk b/writerfilter/Library_writerfilter_uno.mk
new file mode 100644
index 0000000..cd5b2fb
--- /dev/null
+++ b/writerfilter/Library_writerfilter_uno.mk
@@ -0,0 +1,70 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+# David Tardon, Red Hat Inc. <dtardon at redhat.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Library_Library,writerfilter_uno))
+
+$(eval $(call gb_Library_set_include,writerfilter_uno,\
+ $$(INCLUDE) \
+ -I$(realpath $(SRCDIR)/writerfilter/inc) \
+ $(if $(filter YES,$(SYSTEM_LIBXML)),$(filter -I%,$(LIBXML_CFLAGS))) \
+ -I$(OUTDIR)/inc \
+ -I$(OUTDIR)/inc/offuh \
+))
+
+$(eval $(call gb_Library_set_defs,writerfilter_uno,\
+ $$(DEFS) \
+ -DWRITERFILTER_DLLIMPLEMENTATION \
+ $(if $(filter YES,$(SYSTEM_LIBXML)),$(filter-out -I%,$(LIBXML_CFLAGS))) \
+))
+
+$(eval $(call gb_Library_add_linked_libs,writerfilter_uno,\
+ comphelper \
+ cppu \
+ cppuhelper \
+ doctok \
+ ooxml \
+ resourcemodel \
+ sal \
+ ucbhelper \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_set_componentfile,writerfilter_uno,writerfilter/util/writerfilter))
+
+$(eval $(call gb_Library_add_exception_objects,writerfilter_uno,\
+ writerfilter/unocomponent/component \
+ writerfilter/unocomponent/debugservices/doctok/DocTokAnalyzeService \
+ writerfilter/unocomponent/debugservices/doctok/DocTokTestService \
+ writerfilter/unocomponent/debugservices/ooxml/OOXMLAnalyzeService \
+ writerfilter/unocomponent/debugservices/ooxml/OOXMLTestService \
+))
+
+# not used
+ # writerfilter/unocomponent/debugservices/rtftok/ScannerTestService \
+ # writerfilter/unocomponent/debugservices/rtftok/XMLScanner \
+
+# vim: set noet ts=4 sw=4:
diff --git a/writerfilter/Makefile b/writerfilter/Makefile
new file mode 100644
index 0000000..a79aff8
--- /dev/null
+++ b/writerfilter/Makefile
@@ -0,0 +1,38 @@
+#*************************************************************************
+#
+# 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.
+#
+#*************************************************************************
+
+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/writerfilter/Module_writerfilter.mk b/writerfilter/Module_writerfilter.mk
new file mode 100644
index 0000000..3e671ef
--- /dev/null
+++ b/writerfilter/Module_writerfilter.mk
@@ -0,0 +1,41 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+# David Tardon, Red Hat Inc. <dtardon at redhat.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Module_Module,writerfilter))
+
+$(eval $(call gb_Module_add_targets,writerfilter,\
+ Library_doctok \
+ Library_ooxml \
+ Library_resourcemodel \
+ Library_writerfilter \
+ Library_writerfilter_uno \
+))
+
+ # not used
+ # Library_rtftok
+
+# vim: set noet ts=4 sw=4:
diff --git a/writerfilter/debug_setup.mk b/writerfilter/debug_setup.mk
new file mode 100644
index 0000000..800c55a
--- /dev/null
+++ b/writerfilter/debug_setup.mk
@@ -0,0 +1,12 @@
+define writerfilter_debug_flags
+$(if $(filter $(strip $(gb_DEBUG)),01),\
+ -DDEBUG_DOMAINMAPPER \
+ -DDEBUG_ELEMENT \
+ -DDEBUG_RESOLVE \
+ -DDEBUG_CONTEXT_STACK \
+ -DDEBUG_ATTRIBUTES \
+ -DDEBUG_PROPERTIES \
+ -DDEBUG_CONTEXT_HANDLER \
+ -DDEBUG_IMPORT \
+)
+endef
diff --git a/writerfilter/inc/resourcemodel/Fraction.hxx b/writerfilter/inc/resourcemodel/Fraction.hxx
index eff2467..092775d 100644
--- a/writerfilter/inc/resourcemodel/Fraction.hxx
+++ b/writerfilter/inc/resourcemodel/Fraction.hxx
@@ -30,10 +30,12 @@
#include <sal/types.h>
+#include <WriterFilterDllApi.hxx>
+
namespace writerfilter {
namespace resourcemodel {
-class Fraction
+class WRITERFILTER_DLLPUBLIC Fraction
{
public:
explicit Fraction(sal_Int32 nNumerator, sal_Int32 nDenominator = 1);
@@ -60,4 +62,4 @@ private:
}}
#endif // INCLUDED_FRACTION_HXX
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/inc/resourcemodel/LoggedResources.hxx b/writerfilter/inc/resourcemodel/LoggedResources.hxx
index fef4cc4..32e7a25 100644
--- a/writerfilter/inc/resourcemodel/LoggedResources.hxx
+++ b/writerfilter/inc/resourcemodel/LoggedResources.hxx
@@ -54,7 +54,7 @@ private:
string msPrefix;
};
-class LoggedStream : public Stream
+class WRITERFILTER_DLLPUBLIC LoggedStream : public Stream
{
public:
explicit LoggedStream(TagLogger::Pointer_t pLogger, const string & sPrefix);
@@ -94,7 +94,7 @@ protected:
LoggedResourcesHelper mHelper;
};
-class LoggedProperties : public Properties
+class WRITERFILTER_DLLPUBLIC LoggedProperties : public Properties
{
public:
explicit LoggedProperties(TagLogger::Pointer_t pLogger, const string & sPrefix);
@@ -110,7 +110,7 @@ protected:
LoggedResourcesHelper mHelper;
};
-class LoggedTable : public Table
+class WRITERFILTER_DLLPUBLIC LoggedTable : public Table
{
public:
explicit LoggedTable(TagLogger::Pointer_t pLogger, const string & sPrefix);
diff --git a/writerfilter/prj/build.lst b/writerfilter/prj/build.lst
index e70b99a..c085993 100644
--- a/writerfilter/prj/build.lst
+++ b/writerfilter/prj/build.lst
@@ -1,11 +1,3 @@
wf writerfilter : soltools sal BOOST:boost cppu cppuhelper ucbhelper tools svx LIBXSLT:libxslt oox NULL
wf writerfilter usr1 - all wf_mkout NULL
-wf writerfilter\source\resourcemodel nmake - all wf_resourcemodel NULL
-wf writerfilter\source\doctok nmake - all wf_doctok wf_resourcemodel NULL
-wf writerfilter\source\ooxml nmake - all wf_ooxml wf_resourcemodel NULL
-wf writerfilter\source\filter nmake - all wf_filter NULL
-wf writerfilter\source\dmapper nmake - all wf_dmapper wf_doctok wf_ooxml wf_resourcemodel NULL
-wf writerfilter\unocomponent\debugservices\doctok nmake - all wf_debugservicesdoctok NULL
-wf writerfilter\unocomponent\debugservices\ooxml nmake - all wf_debugservicesooxml NULL
-wf writerfilter\unocomponent nmake - all wf_unocomponent wf_doctok wf_ooxml wf_resourcemodel wf_debugservicesdoctok wf_debugservicesooxml NULL
-wf writerfilter\util nmake - all wf_util wf_filter wf_dmapper wf_doctok wf_ooxml wf_unocomponent NULL
+wf writerfilter\prj nmake - all wf_prj
diff --git a/writerfilter/prj/d.lst b/writerfilter/prj/d.lst
index 1d09ecf..e69de29 100644
--- a/writerfilter/prj/d.lst
+++ b/writerfilter/prj/d.lst
@@ -1,8 +0,0 @@
-..\%__SRC%\bin\*.exe %_DEST%\bin%_EXT%\*.exe
-..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll
-..\%__SRC%\lib\*.so %_DEST%\lib%_EXT%\*.so
-..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib
-..\%__SRC%\misc\writerfilter.component %_DEST%\xml%_EXT%\writerfilter.component
-
-mkdir: %_DEST%\inc%_EXT%\writerfilter\doctok
-..\%__SRC%\inc\doctok\sprmids.hxx %_DEST%\inc%_EXT%\writerfilter\doctok\sprmids.hxx
diff --git a/writerfilter/prj/makefile.mk b/writerfilter/prj/makefile.mk
new file mode 100755
index 0000000..e312a7c
--- /dev/null
+++ b/writerfilter/prj/makefile.mk
@@ -0,0 +1,40 @@
+#*************************************************************************
+#
+# 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=..
+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/writerfilter/source/dmapper/makefile.mk b/writerfilter/source/dmapper/makefile.mk
deleted file mode 100644
index a4b0004..0000000
--- a/writerfilter/source/dmapper/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=writerfilter
-TARGET=dmapper
-GEN_HID=TRUE
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings ----------------------------------
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/inc$/writerfilter.mk
-
-# --- Files -------------------------------------
-
-SLOFILES= \
- $(SLO)$/BorderHandler.obj \
- $(SLO)$/CellColorHandler.obj \
- $(SLO)$/CellMarginHandler.obj \
- $(SLO)$/ConversionHelper.obj \
- $(SLO)$/DomainMapper.obj \
- $(SLO)$/DomainMapperTableHandler.obj \
- $(SLO)$/DomainMapperTableManager.obj \
- $(SLO)$/DomainMapper_Impl.obj \
- $(SLO)$/FFDataHandler.obj \
- $(SLO)$/FontTable.obj \
- $(SLO)$/FormControlHelper.obj \
- $(SLO)$/GraphicHelpers.obj \
- $(SLO)$/GraphicImport.obj \
- $(SLO)$/MeasureHandler.obj \
- $(SLO)$/ModelEventListener.obj \
- $(SLO)$/NumberingManager.obj \
- $(SLO)$/OLEHandler.obj \
- $(SLO)$/PageBordersHandler.obj \
- $(SLO)$/PropertyIds.obj \
- $(SLO)$/PropertyMap.obj \
- $(SLO)$/PropertyMapHelper.obj \
- $(SLO)$/SectionColumnHandler.obj \
- $(SLO)$/SettingsTable.obj \
- $(SLO)$/StyleSheetTable.obj \
- $(SLO)$/TDefTableHandler.obj \
- $(SLO)$/TablePropertiesHandler.obj \
- $(SLO)$/TblStylePrHandler.obj \
- $(SLO)$/ThemeTable.obj \
- $(SLO)$/WrapPolygonHandler.obj \
-
-
-# --- Targets ----------------------------------
-
-.INCLUDE : target.mk
-
-
-
diff --git a/writerfilter/source/doctok/makefile.mk b/writerfilter/source/doctok/makefile.mk
deleted file mode 100644
index a3327fa..0000000
--- a/writerfilter/source/doctok/makefile.mk
+++ /dev/null
@@ -1,148 +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=writerfilter
-TARGET=doctok
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/inc$/writerfilter.mk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES= \
- $(SLO)$/WW8Annotation.obj \
- $(SLO)$/WW8OutputWithDepth.obj \
- $(SLO)$/WW8Text.obj \
- $(SLO)$/DffImpl.obj \
- $(SLO)$/Dff.obj \
- $(SLO)$/WW8Picture.obj \
- $(SLO)$/WW8Sttbf.obj \
- $(SLO)$/WW8Table.obj \
- $(SLO)$/WW8StyleSheet.obj \
- $(SLO)$/WW8FontTable.obj \
- $(SLO)$/WW8LFOTable.obj \
- $(SLO)$/WW8ListTable.obj \
- $(SLO)$/resources.obj \
- $(SLO)$/WW8CpAndFc.obj \
- $(SLO)$/WW8StructBase.obj \
- $(SLO)$/WW8Clx.obj \
- $(SLO)$/WW8FKPImpl.obj \
- $(SLO)$/WW8BinTableImpl.obj \
- $(SLO)$/WW8StreamImpl.obj \
- $(SLO)$/WW8PropertySetImpl.obj \
- $(SLO)$/WW8DocumentImpl.obj \
- $(SLO)$/WW8PieceTableImpl.obj \
- $(SLO)$/WW8ResourceModelImpl.obj
-
-
-SHL1TARGET=$(TARGET)
-
-.IF "$(GUI)"=="UNX" || "$(GUI)"=="MAC"
-RESOURCEMODELLIB=-lresourcemodel
-.ELIF "$(GUI)"=="OS2"
-RESOURCEMODELLIB=$(LB)$/iresourcemodel.lib
-.ELIF "$(GUI)"=="WNT"
-.IF "$(COM)"=="GCC"
-RESOURCEMODELLIB=-lresourcemodel
-.ELSE
-RESOURCEMODELLIB=$(LB)$/iresourcemodel.lib
-.ENDIF
-.ENDIF
-
-
-SHL1STDLIBS=$(SALLIB)\
- $(CPPULIB)\
- $(CPPUHELPERLIB) \
- $(RESOURCEMODELLIB)
-SHL1IMPLIB=i$(SHL1TARGET)
-SHL1USE_EXPORTS=name
-
-SHL1OBJS=$(SLOFILES)
-
-SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-DEF1NAME=$(SHL1TARGET)
-DEFLIB1NAME=$(TARGET)
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
-
-DOCTOKHXXOUTDIR=$(INCCOM)/doctok
-DOCTOKCXXOUTDIR=$(MISC)
-DOCTOKHXXOUTDIRCREATED=$(DOCTOKHXXOUTDIR)/created
-
-DOCTOKMODEL=resources.xmi
-DOCTOKRESOURCESXSL=resources.xsl
-DOCTOKRESOURCESIMPLXSL=resourcesimpl.xsl
-DOCTOKRESOURCEIDSXSL=resourceids.xsl
-DOCTOKSPRMIDSXSL=sprmids.xsl
-DOCTOKRESOURCETOOLS=resourcetools.xsl
-
-DOCTOKRESOURCEIDSHXX=$(DOCTOKHXXOUTDIR)$/resourceids.hxx
-SPRMIDSHXX=$(DOCTOKHXXOUTDIR)$/sprmids.hxx
-RESOURCESHXX=$(DOCTOKHXXOUTDIR)$/resources.hxx
-RESOURCESCXX=$(DOCTOKCXXOUTDIR)$/resources.cxx
-
-DOCTOKGENHEADERS=$(DOCTOKRESOURCEIDSHXX) $(SPRMIDSHXX) $(RESOURCESHXX)
-DOCTOKGENFILES=$(DOCTOKGENHEADERS) $(RESOURCESCXX)
-
-$(DOCTOKHXXOUTDIRCREATED):
- @$(MKDIRHIER) $(DOCTOKHXXOUTDIR)
- @$(TOUCH) $@
-
-$(DOCTOKGENHEADERS): $(DOCTOKHXXOUTDIRCREATED)
-
-$(RESOURCESHXX): $(DOCTOKRESOURCESXSL) $(DOCTOKMODEL)
- @echo "Making: " $(@:f)
- $(COMMAND_ECHO)$(XSLTPROC) $(DOCTOKRESOURCESXSL) $(DOCTOKMODEL) > $@
-
-$(SPRMIDSHXX): $(DOCTOKSPRMIDSXSL) $(DOCTOKMODEL)
- @echo "Making: " $(@:f)
- $(COMMAND_ECHO)$(XSLTPROC) $(DOCTOKSPRMIDSXSL) $(DOCTOKMODEL) > $@
-
-$(RESOURCESCXX): $(DOCTOKRESOURCESIMPLXSL) $(DOCTOKMODEL) $(DOCTOKRESOURCEIDSHXX) $(DOCTOKRESOURCETOOLS)
- @echo "Making: " $(@:f)
- $(COMMAND_ECHO)$(XSLTPROC) $(DOCTOKRESOURCESIMPLXSL) $(DOCTOKMODEL) > $@
-
-$(DOCTOKRESOURCEIDSHXX): $(DOCTOKRESOURCEIDSXSL) $(DOCTOKMODEL)
- @echo "Making: " $(@:f)
- $(COMMAND_ECHO)$(XSLTPROC) $(DOCTOKRESOURCEIDSXSL) $(DOCTOKMODEL) > $@
-
-$(SLOFILES) : $(DOCTOKGENHEADERS)
-
-.PHONY: genmake genclean
-
-genmake: $(DOCTOKGENFILES)
-
-genclean:
- rm -f $(DOCTOKGENFILES)
-
-genheaders: $(DOCTOKGENHEADERS)
diff --git a/writerfilter/source/filter/makefile.mk b/writerfilter/source/filter/makefile.mk
deleted file mode 100644
index 6b11fd4..0000000
--- a/writerfilter/source/filter/makefile.mk
+++ /dev/null
@@ -1,52 +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=writerfilter
-TARGET=filter
-GEN_HID=TRUE
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings ----------------------------------
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/inc$/writerfilter.mk
-
-# --- Files -------------------------------------
-
-SLOFILES= $(SLO)$/WriterFilter.obj \
- $(SLO)$/WriterFilterDetection.obj \
- $(SLO)$/ImportFilter.obj \
- $(SLO)$/RtfFilter.obj
-
-
-# --- Targets ----------------------------------
-
-.INCLUDE : target.mk
-
-
-
diff --git a/writerfilter/source/ooxml/makefile.mk b/writerfilter/source/ooxml/makefile.mk
deleted file mode 100644
index e0f108a..0000000
--- a/writerfilter/source/ooxml/makefile.mk
+++ /dev/null
@@ -1,251 +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=writerfilter
-TARGET=ooxml
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/inc$/writerfilter.mk
-
-NAMESPACES= \
- wml \
- dml-stylesheet \
- dml-styleDefaults \
- dml-shape3DLighting \
- dml-shape3DScene \
- dml-shape3DStyles \
- dml-shape3DCamera \
- dml-baseStylesheet \
- dml-textCharacter \
- dml-shapeEffects \
- dml-shapeLineProperties \
- dml-shapeProperties \
- dml-baseTypes \
- dml-documentProperties \
- dml-graphicalObject \
- dml-shapeGeometry \
- dml-wordprocessingDrawing \
- sml-customXmlMappings \
- shared-math \
- shared-relationshipReference \
- dml-chartDrawing \
- vml-main \
- vml-officeDrawing \
- vml-wordprocessingDrawing
-
-# --- Files --------------------------------------------------------
-
-SLOFACTORIESNAMESPACES= \
- $(SLO)$/OOXMLFactory_{$(NAMESPACES)}.obj
-
-SLOFILES= \
- $(SLOFACTORIESNAMESPACES) \
- $(SLOFASTNAMESPACES) \
- $(SLO)$/OOXMLFactory_generated.obj \
- $(SLO)$/OOXMLFactory.obj \
- $(SLO)$/OOXMLBinaryObjectReference.obj\
- $(SLO)$/OOXMLFactory_values.obj \
- $(SLO)$/OOXMLPropertySetImpl.obj \
- $(SLO)$/OOXMLParserState.obj \
- $(SLO)$/Handler.obj \
- $(SLO)$/OOXMLDocumentImpl.obj \
- $(SLO)$/OOXMLStreamImpl.obj \
- $(SLO)$/OOXMLFastDocumentHandler.obj \
- $(SLO)$/OOXMLFastContextHandler.obj \
- $(SLO)$/OOXMLFastTokenHandler.obj
-
-SHL1TARGET=$(TARGET)
-
-.IF "$(GUI)"=="UNX" || "$(GUI)"=="MAC"
-RESOURCEMODELLIB=-lresourcemodel
-.ELIF "$(GUI)"=="OS2"
-RESOURCEMODELLIB=$(LB)$/iresourcemodel.lib
-.ELIF "$(GUI)"=="WNT"
-.IF "$(COM)"=="GCC"
-RESOURCEMODELLIB=-lresourcemodel
-.ELSE
-RESOURCEMODELLIB=$(LB)$/iresourcemodel.lib
-.ENDIF
-.ENDIF
-
-SHL1STDLIBS=$(SALLIB)\
- $(CPPULIB)\
- $(CPPUHELPERLIB) \
- $(COMPHELPERLIB) \
- $(RESOURCEMODELLIB)
-SHL1IMPLIB=i$(SHL1TARGET)
-SHL1USE_EXPORTS=name
-
-SHL1OBJS=$(SLOFILES)
-
-SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-DEF1NAME=$(SHL1TARGET)
-DEFLIB1NAME=$(TARGET)
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
-
-.PHONY : check
-
-check:
- echo $(SLOFILES)
-
-OOXMLCXXOUTDIR=$(MISC)
-OOXMLHXXOUTDIR=$(INCCOM)/ooxml
-OOXMLHXXOUTDIRCREATED=$(OOXMLHXXOUTDIR)/created
-
-OOXMLFACTORYCXXS=$(OOXMLCXXOUTDIR)$/OOXMLFactory_{$(NAMESPACES)}.cxx
-OOXMLFACTORYHXXS=$(OOXMLHXXOUTDIR)$/OOXMLFactory_{$(NAMESPACES)}.hxx
-
-OOXMLMODEL=model.xml
-OOXMLPREPROCESSXSL=modelpreprocess.xsl
-OOXMLFACTORYTOOLSXSL=factorytools.xsl
-OOXMLRESORUCETOKENSXSL=resourcestokens.xsl
-OOXMLFASTTOKENSXSL=fasttokens.xsl
-OOXMLRESOURCESIMPLXSL=resourcesimpl.xsl
-OOXMLNAMESPACEIDSXSL=namespaceids.xsl
-OOXMLFACTORYVALUESXSL=factory_values.xsl
-OOXMLFACTORYVALUESIMPLXSL=factoryimpl_values.xsl
-OOXMLRESOURCEIDSXSL=resourceids.xsl
-OOXMLGPERFFASTTOKENXSL=gperffasttokenhandler.xsl
-
-OOXMLRESOURCEIDSHXX=$(OOXMLHXXOUTDIR)$/resourceids.hxx
-
-TOKENXML=$(OOXMLCXXOUTDIR)$/token.xml
-TOKENXMLTMP=$(OOXMLCXXOUTDIR)$/token.tmp
-
-OOXMLFACTORYGENERATEDHXX=$(OOXMLHXXOUTDIR)$/OOXMLFactory_generated.hxx
-OOXMLFACTORYGENERATEDCXX=$(OOXMLCXXOUTDIR)$/OOXMLFactory_generated.cxx
-OOXMLFASTTOKENSHXX=$(OOXMLHXXOUTDIR)$/OOXMLFastTokens.hxx
-OOXMLNAMESPACEIDSHXX=$(OOXMLHXXOUTDIR)$/OOXMLnamespaceids.hxx
-OOXMLFACTORYVALUESHXX=$(OOXMLCXXOUTDIR)$/OOXMLFactory_values.hxx
-OOXMLFACTORYVALUESCXX=$(OOXMLCXXOUTDIR)$/OOXMLFactory_values.cxx
-GPERFFASTTOKENHXX=$(OOXMLHXXOUTDIR)$/gperffasttoken.hxx
-MODELPROCESSED=$(MISC)$/model_preprocessed.xml
-
-OOXMLGENHEADERS= \
- $(OOXMLFACTORYGENERATEDHXX) \
- $(OOXMLFACTORYHXXS) \
- $(OOXMLFASTTOKENSHXX) \
- $(OOXMLFACTORYVALUESHXX) \
- $(GPERFFASTTOKENHXX) \
- $(OOXMLRESOURCEIDSHXX) \
- $(OOXMLNAMESPACEIDSHXX)
-
-GENERATEDFILES= \
- $(OOXMLGENHEADERS) \
- $(OOXMLFACTORYGENERATEDCXX) \
- $(OOXMLFACTORYCXXS) \
- $(OOXMLFACTORYVALUESCXX) \
- $(TOKENXMLTMP) \
- $(TOKENXML)
-
-$(TOKENXMLTMP): $(SOLARVER)$/$(INPATH)$/inc$(UPDMINOREXT)$/oox$/token.txt
- @$(TYPE) $(SOLARVER)$/$(INPATH)$/inc$(UPDMINOREXT)$/oox$/token.txt | $(SED) "s#\(.*\)#<fasttoken>\1</fasttoken>#" > $@
-
-$(TOKENXML): tokenxmlheader $(TOKENXMLTMP) tokenxmlfooter
- @$(TYPE) tokenxmlheader $(TOKENXMLTMP) tokenxmlfooter > $@
-
-$(OOXMLHXXOUTDIRCREATED):
- $(MKDIRHIER) $(OOXMLHXXOUTDIR)
- @$(TOUCH) $@
-
-$(OOXMLGENHEADERS): $(OOXMLHXXOUTDIRCREATED)
-
-$(OOXMLFASTTOKENSHXX): $(OOXMLFASTTOKENSXSL) $(TOKENXML)
- @echo "Making: " $(@:f)
- $(COMMAND_ECHO)$(XSLTPROC) $(OOXMLFASTTOKENSXSL) $(TOKENXML) > $@
-
-$(OOXMLFACTORYGENERATEDHXX): factoryinc.xsl
- @echo "Making: " $(@:f)
- $(COMMAND_ECHO)$(XSLTPROC) $< $(MODELPROCESSED) > $@
-
-$(OOXMLFACTORYGENERATEDCXX): factoryimpl.xsl
- @echo "Making: " $(@:f)
- $(COMMAND_ECHO)$(XSLTPROC) $< $(MODELPROCESSED) > $@
-
-$(OOXMLFACTORYGENERATEDCXX): $(MODELPROCESSED)
-
-$(OOXMLFACTORYGENERATEDHXX): $(MODELPROCESSED)
-
-$(OOXMLFACTORYCXXS): $(MODELPROCESSED)
-
-$(OOXMLFACTORYHXXS): $(MODELPROCESSED)
-
-$(OOXMLCXXOUTDIR)$/OOXMLFactory%.cxx: factoryimpl_ns.xsl
- @echo "Making: " $(@:f)
- $(COMMAND_ECHO)$(XSLTPROC) --stringparam file $@ $< $(MODELPROCESSED) > $@
-
-$(OOXMLHXXOUTDIR)$/OOXMLFactory%.hxx: factory_ns.xsl
- @echo "Making: " $(@:f)
- $(COMMAND_ECHO)$(XSLTPROC) --stringparam file $@ $< $(MODELPROCESSED) > $@
-
-$(OOXMLFACTORYVALUESHXX): $(OOXMLFACTORYVALUESXSL) $(MODELPROCESSED)
- @echo "Making: " $(@:f)
- $(COMMAND_ECHO)$(XSLTPROC) $(OOXMLFACTORYVALUESXSL) $(MODELPROCESSED) > $@
-
-$(OOXMLFACTORYVALUESCXX): $(OOXMLFACTORYVALUESIMPLXSL) $(MODELPROCESSED)
- @echo "Making: " $(@:f)
- $(COMMAND_ECHO)$(XSLTPROC) $(OOXMLFACTORYVALUESIMPLXSL) $(MODELPROCESSED) > $@
-
-$(OOXMLRESOURCEIDSHXX): $(OOXMLHXXOUTDIRCREATED) $(OOXMLRESOURCEIDSXSL) \
- $(MODELPROCESSED)
- @echo "Making: " $(@:f)
- $(COMMAND_ECHO)$(XSLTPROC) $(OOXMLRESOURCEIDSXSL) $(MODELPROCESSED) > $@
-
-$(OOXMLNAMESPACEIDSHXX): $(OOXMLHXXOUTDIRCREATED) $(OOXMLNAMESPACEIDSXSL) \
- $(MODELPROCESSED)
- @echo "Making: " $(@:f)
- $(COMMAND_ECHO)$(XSLTPROC) $(OOXMLNAMESPACEIDSXSL) $(MODELPROCESSED) > $@
-
-$(GPERFFASTTOKENHXX): $(OOXMLGPERFFASTTOKENXSL) $(MODELPROCESSED)
- @echo "Making: " $(@:f)
- $(COMMAND_ECHO)$(XSLTPROC) $(OOXMLGPERFFASTTOKENXSL) $(MODELPROCESSED) | tr -d '\r' | $(GPERF) -I -t -E -S1 -c -G -LC++ > $@
-
-$(SLOFACTORIESNAMESPACES): $(OOXMLFACTORYSCXXS) $(OOXMLGENHEADERS)
-
-$(GENERATEDFILES): $(OOXMLFACTORYTOOLSXSL)
-
-$(SLOFILES): $(OOXMLGENHEADERS)
-
-$(SLO)/OOXMLFactory_values.obj: $(OOXMLFACTORYVALUESCXX) $(OOXMLFACTORYVALUESHXX)
-
-$(SLO)$/OOXMLFactory_generated.obj: $(OOXMLFACTORYGENERATEDCXX) $(OOXMLGENHEADERS)
-
-.PHONY: genclean genmake genheaders
-
-genclean:
- rm -f $(GENERATEDFILES)
-
-genmake: $(GENERATEDFILES)
-
-genheaders: $(GENHEADERS)
diff --git a/writerfilter/source/resourcemodel/makefile.mk b/writerfilter/source/resourcemodel/makefile.mk
deleted file mode 100644
index 73e049f..0000000
--- a/writerfilter/source/resourcemodel/makefile.mk
+++ /dev/null
@@ -1,200 +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=writerfilter
-TARGET=resourcemodel
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/inc$/writerfilter.mk
-
-CDEFS+=-DWRITERFILTER_DLLIMPLEMENTATION
-
-# --- Files --------------------------------------------------------
-
-# work around gcc taking hours and/or OOM'ing on this file
-NOOPTFILES= \
- $(SLO)$/qnametostr.obj
-
-SLOFILES= \
- $(SLO)$/Fraction.obj \
- $(SLO)$/LoggedResources.obj \
- $(SLO)$/Protocol.obj \
- $(SLO)$/ResourceModelHelper.obj \
- $(SLO)$/TagLogger.obj \
- $(SLO)$/WW8Analyzer.obj \
- $(SLO)$/XPathLogger.obj \
- $(SLO)$/qnametostr.obj \
- $(SLO)$/resourcemodel.obj \
- $(SLO)$/sprmcodetostr.obj \
- $(SLO)$/util.obj \
-
-SHL1TARGET=$(TARGET)
-
-.IF "$(GUI)"=="UNX" || "$(GUI)"=="MAC"
-RTFTOKLIB=-lrtftok
-DOCTOKLIB=-ldoctok
-OOXMLLIB=-looxml
-.ELIF "$(GUI)"=="WNT"
-RTFTOKLIB=$(LB)$/irtftok.lib
-DOCTOKLIB=$(LB)$/idoctok.lib
-OOXMLLIB=$(LB)$/iooxml.lib
-.ENDIF
-
-SHL1STDLIBS=$(SALLIB)\
- $(CPPULIB)\
- $(CPPUHELPERLIB) \
- $(COMPHELPERLIB)
-
-# .IF "$(DBG_LEVEL)">="2"
-SHL1STDLIBS+= $(LIBXML2LIB)
-# .ENDIF
-
-SHL1IMPLIB=i$(SHL1TARGET)
-SHL1USE_EXPORTS=name
-
-SHL1OBJS=$(SLOFILES)
-
-SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-DEF1NAME=$(SHL1TARGET)
-DEFLIB1NAME=$(TARGET)
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
-
-RESOURCEMODELCXXOUTDIR=$(MISC)
-DOCTOKHXXOUTDIR=$(INCCOM)$/doctok
-OOXMLHXXOUTDIR=$(INCCOM)$/ooxml
-
-DOCTOKHXXOUTDIRCREATED=$(DOCTOKHXXOUTDIR)$/created
-OOXMLHXXOUTDIRCREATED=$(OOXMLHXXOUTDIR)$/created
-
-OOXMLMODEL=..$/ooxml$/model.xml
-OOXMLPREPROCESSXSL=..$/ooxml$/modelpreprocess.xsl
-OOXMLPREPROCESSXSLCOPIED=$(MISC)$/modelpreprocess.xsl
-OOXMLQNAMETOSTRXSL=..$/ooxml$/qnametostr.xsl
-OOXMLANALYZERXSL=..$/ooxml$/analyzer.xsl
-OOXMLRESOURCEIDSXSL=..$/ooxml$/resourceids.xsl
-OOXMLFACTORYTOOLSXSL=..$/ooxml$/factorytools.xsl
-DOCTOKMODEL=..$/doctok$/resources.xmi
-DOCTOKQNAMETOSTRXSL=..$/doctok$/qnametostr.xsl
-DOCTOKANALYZERXSL=..$/doctok$/analyzer.xsl
-DOCTOKSPRMCODETOSTRXSL=..$/doctok$/sprmcodetostr.xsl
-DOCTOKRESOURCEIDSXSL=..$/doctok$/resourceids.xsl
-DOCTOKSPRMIDSXSL=..$/doctok$/sprmids.xsl
-DOCTOKRESOURCETOOLS=..$/doctok$/resourcetools.xsl
-
-NSPROCESS=namespace_preprocess.pl
-
-MODELPROCESSED=$(MISC)$/model_preprocessed.xml
-
-QNAMETOSTRCXX=$(RESOURCEMODELCXXOUTDIR)$/qnametostr.cxx
-OOXMLQNAMETOSTRTMP=$(RESOURCEMODELCXXOUTDIR)$/OOXMLqnameToStr.tmp
-DOCTOKQNAMETOSTRTMP=$(RESOURCEMODELCXXOUTDIR)$/DOCTOKqnameToStr.tmp
-SPRMCODETOSTRCXX=$(RESOURCEMODELCXXOUTDIR)$/sprmcodetostr.cxx
-SPRMCODETOSTRTMP=$(RESOURCEMODELCXXOUTDIR)$/sprmcodetostr.tmp
-DOCTOKRESOURCEIDSHXX=$(DOCTOKHXXOUTDIR)$/resourceids.hxx
-SPRMIDSHXX=$(DOCTOKHXXOUTDIR)$/sprmids.hxx
-OOXMLRESOURCEIDSHXX=$(OOXMLHXXOUTDIR)$/resourceids.hxx
-
-NSXSL=$(MISC)$/namespacesmap.xsl
-NAMESPACESTXT=$(SOLARVER)$/$(INPATH)$/inc$(UPDMINOREXT)$/oox$/namespaces.txt
-
-GENERATEDHEADERS=$(DOCTOKRESOURCEIDSHXX) $(OOXMLRESOURCEIDSHXX) $(SPRMIDSHXX)
-GENERATEDFILES= \
- $(GENERATEDHEADERS) \
- $(QNAMETOSTRCXX) \
- $(SPRMCODETOSTRCXX) \
- $(MODELPROCESSED) \
- $(OOXMLQNAMETOSTRTMP) \
- $(DOCTOKQNAMETOSTRTMP) \
- $(SPRMCODETOSTRTMP)
-
-$(OOXMLQNAMETOSTRTMP): $(OOXMLQNAMETOSTRXSL) $(MODELPROCESSED)
- @echo "Making: " $(@:f)
- $(XSLTPROC) $(OOXMLQNAMETOSTRXSL:s!\!/!) $(MODELPROCESSED) > $@
-
-$(DOCTOKQNAMETOSTRTMP): $(DOCTOKQNAMETOSTRXSL) $(DOCTOKMODEL)
- @echo "Making: " $(@:f)
- $(XSLTPROC) $(DOCTOKQNAMETOSTRXSL:s!\!/!) $(DOCTOKMODEL) > $@
-
-$(QNAMETOSTRCXX): $(OOXMLQNAMETOSTRTMP) $(DOCTOKQNAMETOSTRTMP) qnametostrheader qnametostrfooter $(OOXMLFACTORYTOOLSXSL) $(DOCTOKRESOURCETOOLS)
- @$(TYPE) qnametostrheader $(OOXMLQNAMETOSTRTMP) $(DOCTOKQNAMETOSTRTMP) qnametostrfooter > $@
-
-$(SPRMCODETOSTRTMP): $(DOCTOKSPRMCODETOSTRXSL) $(DOCTOKMODEL)
- @echo "Making: " $(@:f)
- $(XSLTPROC) $(DOCTOKSPRMCODETOSTRXSL:s!\!/!) $(DOCTOKMODEL) > $@
-
-$(SPRMCODETOSTRCXX): sprmcodetostrheader $(SPRMCODETOSTRTMP) sprmcodetostrfooter
- @$(TYPE) $< > $@
-
-$(SLO)$/sprmcodetostr.obj: $(SPRMCODETOSTRCXX)
-$(SLO)$/qnametostr.obj: $(QNAMETOSTRCXX)
-
-$(SLOFILES): $(GENERATEDHEADERS)
-
-$(DOCTOKHXXOUTDIRCREATED):
- @$(MKDIRHIER) $(DOCTOKHXXOUTDIR)
- @$(TOUCH) $@
-
-$(DOCTOKRESOURCEIDSHXX): $(DOCTOKHXXOUTDIRCREATED) $(DOCTOKRESOURCETOOLS) $(DOCTOKRESOURCEIDSXSL) $(DOCTOKMODEL)
- @echo "Making: " $(@:f)
- $(COMMAND_ECHO)$(XSLTPROC) $(DOCTOKRESOURCEIDSXSL:s!\!/!) $(DOCTOKMODEL) > $@
-
-$(OOXMLHXXOUTDIRCREATED):
- @$(MKDIRHIER) $(OOXMLHXXOUTDIR)
- @$(TOUCH) $@
-
-$(OOXMLPREPROCESSXSLCOPIED): $(OOXMLPREPROCESSXSL)
- @$(COPY) $(OOXMLPREPROCESSXSL) $@
-
-$(NSXSL) : $(OOXMLMODEL) $(NAMESPACESTXT) $(NSPROCESS)
- @$(PERL) $(NSPROCESS) $(NAMESPACESTXT) > $@
-
-$(MODELPROCESSED): $(NSXSL) $(OOXMLPREPROCESSXSLCOPIED) $(OOXMLMODEL)
- @echo "Making: " $(@:f)
- $(COMMAND_ECHO)$(XSLTPROC) $(NSXSL) $(OOXMLMODEL) > $@
-
-$(OOXMLRESOURCEIDSHXX): $(OOXMLHXXOUTDIRCREATED) $(OOXMLFACTORYTOOLSXSL) $(OOXMLRESOURCEIDSXSL) $(MODELPROCESSED)
- @echo "Making: " $(@:f)
- $(COMMAND_ECHO)$(XSLTPROC) $(OOXMLRESOURCEIDSXSL:s!\!/!) $(MODELPROCESSED) > $@
-
-$(SPRMIDSHXX): $(DOCTOKHXXOUTDIRCREATED) $(DOCTOKSPRMIDSXSL) $(DOCTOKMODEL)
- @echo "Making: " $(@:f)
- $(COMMAND_ECHO)$(XSLTPROC) $(DOCTOKSPRMIDSXSL:s!\!/!) $(DOCTOKMODEL) > $@
-
-.PHONY: genclean genmake gendirs
-
-genclean:
- rm -f $(GENERATEDFILES)
-
-genmake: $(GENERATEDFILES)
-
diff --git a/writerfilter/source/rtftok/makefile.mk b/writerfilter/source/rtftok/makefile.mk
deleted file mode 100644
index 6ac8141..0000000
--- a/writerfilter/source/rtftok/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=writerfilter
-TARGET=rtftok
-ENABLE_EXCEPTIONS=TRUE
-EXTERNAL_WARNINGS_NOT_ERRORS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/inc$/writerfilter.mk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES=$(SLO)$/RTFScanner.obj $(SLO)$/RTFParseException.obj
-
-
-SHL1TARGET=$(TARGET)
-
-SHL1STDLIBS=$(SALLIB)\
- $(CPPULIB)\
- $(CPPUHELPERLIB)
-SHL1IMPLIB=i$(SHL1TARGET)
-SHL1USE_EXPORTS=name
-
-SHL1OBJS=$(SLOFILES)
-
-SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-DEF1NAME=$(SHL1TARGET)
-DEFLIB1NAME=$(TARGET)
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
-
-RTFSCANNERCXX=$(MISC)/RTFScanner.cxx
-
-GENERATEDFILES=$(RTFSCANNERCXX)
-
-$(RTFSCANNERCXX): RTFScanner.lex RTFScanner.skl FlexLexer.h
- flex -+ -SRTFScanner.skl -o$@ RTFScanner.lex
-
-$(SLO)/RTFScanner.obj: $(RTFSCANNERCXX)
-
-.PHONY: genmake genclean
-
-genmake: $(GENERATEDFILES)
-
-genclean:
- rm $(GENERATEDFILES)
diff --git a/writerfilter/unocomponent/debugservices/doctok/makefile.mk b/writerfilter/unocomponent/debugservices/doctok/makefile.mk
deleted file mode 100644
index 989be1b..0000000
--- a/writerfilter/unocomponent/debugservices/doctok/makefile.mk
+++ /dev/null
@@ -1,44 +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=writerfilter
-TARGET=debugservices_doctok
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES= \
- $(SLO)$/DocTokTestService.obj \
- $(SLO)$/DocTokAnalyzeService.obj
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
diff --git a/writerfilter/unocomponent/debugservices/ooxml/makefile.mk b/writerfilter/unocomponent/debugservices/ooxml/makefile.mk
deleted file mode 100644
index f7de799..0000000
--- a/writerfilter/unocomponent/debugservices/ooxml/makefile.mk
+++ /dev/null
@@ -1,59 +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=writerfilter
-TARGET=debugservices_ooxml
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/inc$/writerfilter.mk
-
-.IF "$(GUI)"=="UNX" || "$(GUI)"=="MAC"
-RESSOUREMODELLIB=-lresourcemodel
-.ELIF "$(GUI)"=="WNT"
-.IF "$(COM)"=="GCC"
-RESOURCEMODELLIB=-lresourcemodel
-.ELSE
-RESOURCEMODELLIB=$(LB)$/iresourcemodel.lib
-.ENDIF
-.ENDIF
-
-SHL1STDLIBS= \
- $(COMPHELPERLIB) \
- $(RESOURCEMODELLIB)
-
-# --- Files --------------------------------------------------------
-
-SLOFILES= \
- $(SLO)$/OOXMLTestService.obj \
- $(SLO)$/OOXMLAnalyzeService.obj
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
diff --git a/writerfilter/unocomponent/debugservices/rtftok/makefile.mk b/writerfilter/unocomponent/debugservices/rtftok/makefile.mk
deleted file mode 100644
index 66c54a8..0000000
--- a/writerfilter/unocomponent/debugservices/rtftok/makefile.mk
+++ /dev/null
@@ -1,45 +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=writerfilter
-TARGET=debugservices_rtftok
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES=\
- $(SLO)$/ScannerTestService.obj \
- $(SLO)$/XMLScanner.obj
-#$(SLO)$/TestService.obj $(SLO)$/ResolverTestService.obj $(SLO)$/XmlParserTestService.obj $(SLO)$/RngService.obj
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
diff --git a/writerfilter/unocomponent/makefile.mk b/writerfilter/unocomponent/makefile.mk
deleted file mode 100644
index a01d391..0000000
--- a/writerfilter/unocomponent/makefile.mk
+++ /dev/null
@@ -1,90 +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=writerfilter
-TARGET=writerfilter.uno
-LIBTARGET=NO
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-CDEFS+=-DWRITERFILTER_DLLIMPLEMENTATION
-
-# --- Files --------------------------------------------------------
-
-SLOFILES=$(SLO)$/component.obj
-
-SHL1TARGET=$(TARGET)
-
-.IF "$(GUI)"=="UNX" || "$(GUI)"=="MAC"
-DOCTOKLIB=-ldoctok
-OOXMLLIB=-looxml
-RESOURCEMODELLIB=-lresourcemodel
-.ELIF "$(GUI)"=="OS2"
-DOCTOKLIB=$(LB)$/idoctok.lib
-OOXMLLIB=$(LB)$/iooxml.lib
-RESOURCEMODELLIB=$(LB)$/iresourcemodel.lib
-.ELIF "$(GUI)"=="WNT"
-.IF "$(COM)"=="GCC"
-DOCTOKLIB=-ldoctok
-OOXMLLIB=-looxml
-RESOURCEMODELLIB=-lresourcemodel
-.ELSE
-DOCTOKLIB=$(LB)$/idoctok.lib
-OOXMLLIB=$(LB)$/iooxml.lib
-RESOURCEMODELLIB=$(LB)$/iresourcemodel.lib
-.ENDIF
-.ENDIF
-
-SHL1STDLIBS=$(SALLIB)\
- $(CPPULIB)\
- $(COMPHELPERLIB)\
- $(CPPUHELPERLIB)\
- $(UCBHELPERLIB)\
- $(DOCTOKLIB) \
- $(OOXMLLIB) \
- $(RESOURCEMODELLIB)
-
-SHL1LIBS=\
- $(SLB)$/debugservices_doctok.lib \
- $(SLB)$/debugservices_ooxml.lib
-
-SHL1IMPLIB=i$(SHL1TARGET)
-
-SHL1OBJS = $(SLO)$/component.obj
-
-SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-
-DEF1NAME=$(SHL1TARGET)
-DEF1EXPORTFILE=exports.dxp
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
-
diff --git a/writerfilter/util/makefile.mk b/writerfilter/util/makefile.mk
deleted file mode 100644
index 241d00e..0000000
--- a/writerfilter/util/makefile.mk
+++ /dev/null
@@ -1,88 +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=writerfilter
-TARGET=writerfilter
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-CDEFS+=-DWRITERFILTER_DLLIMPLEMENTATION
-
-# --- Files --------------------------------------------------------
-
-LIB1TARGET=$(SLB)$/$(TARGET).lib
-LIB1FILES= \
- $(SLB)$/ooxml.lib \
- $(SLB)$/doctok.lib \
- $(SLB)$/resourcemodel.lib \
- $(SLB)$/dmapper.lib \
- $(SLB)$/filter.lib
-
-SHL1LIBS=$(SLB)$/$(TARGET).lib
-
-
-SHL1TARGET=$(TARGET)$(DLLPOSTFIX)
-SHL1STDLIBS=\
- $(I18NISOLANGLIB) \
- $(I18NPAPERLIB) \
- $(SOTLIB) \
- $(TOOLSLIB) \
- $(UNOTOOLSLIB) \
- $(CPPUHELPERLIB) \
- $(COMPHELPERLIB) \
- $(CPPULIB) \
- $(SALLIB) \
- $(OOXLIB)
-
-# .IF "$(DBG_LEVEL)">="2"
-SHL1STDLIBS+= $(LIBXML2LIB)
-# .ENDIF
-
-
-SHL1DEPN=
-SHL1IMPLIB= i$(SHL1TARGET)
-SHL1DEF= $(MISC)$/$(SHL1TARGET).def
-SHL1VERSIONMAP=$(SOLARENV)/src/component.map
-
-DEF1NAME=$(SHL1TARGET)
-
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
-
-ALLTAR : $(MISC)/writerfilter.component
-
-$(MISC)/writerfilter.component .ERRREMOVE : \
- $(SOLARENV)/bin/createcomponent.xslt writerfilter.component
- $(XSLTPROC) --nonet --stringparam uri \
- '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
- $(SOLARENV)/bin/createcomponent.xslt writerfilter.component
commit a07317ff8898d4f25e73dcdfca848ef174e3dbda
Author: David Tardon <dtardon at redhat.com>
Date: Wed Apr 13 16:07:41 2011 +0200
really deliver namespaces.txt
diff --git a/oox/Library_oox.mk b/oox/Library_oox.mk
index aaf7292..4c3db9a 100644
--- a/oox/Library_oox.mk
+++ b/oox/Library_oox.mk
@@ -366,11 +366,17 @@ $(eval $(call oox_GenTarget_GenTarget,namespaces,namespace,namespaces.txt))
$(eval $(call oox_GenTarget_GenTarget,properties,property,))
$(eval $(call oox_GenTarget_GenTarget,tokens,token,tokenhash.gperf))
+$(call gb_Package_get_target,oox_tokens) :| $(OUTDIR)/inc/oox/namespaces.txt
+$(call gb_Package_get_clean_target,oox_tokens) : oox_ns_clean
$(call gb_Library_get_clean_target,oox) : oox_clean
+
oox_clean :
rm -rf $(WORKDIR)/oox
-.PHONY: oox_clean
+oox_ns_clean :
+ rm -rf $(OUTDIR)/inc/oox/namespaces.txt
+.PHONY: oox_clean oox_ns_clean
-$(eval $(call gb_Deliver_add_deliverable,$(OUTDIR)/inc/oox/namespaces.txt,$(oox_MISC)/namespaces.txt))
+$(OUTDIR)/inc/oox/namespaces.txt : $(oox_MISC)/namespaces.txt
+ cp $< $@
# vim: set noet ts=4 sw=4:
commit 0d6b164d43e5299da295c6f830616cecb7c9a86e
Author: David Tardon <dtardon at redhat.com>
Date: Wed Apr 13 08:49:10 2011 +0200
gbuildize oox
diff --git a/oox/Library_oox.mk b/oox/Library_oox.mk
new file mode 100644
index 0000000..aaf7292
--- /dev/null
+++ b/oox/Library_oox.mk
@@ -0,0 +1,376 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+# David Tardon, Red Hat Inc. <dtardon at redhat.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Library_Library,oox))
+
+$(eval $(call gb_Library_add_package_headers,oox,\
+ oox_inc \
+))
+
+$(eval $(call gb_Library_set_include,oox,\
+ $$(INCLUDE) \
+ -I$(OUTDIR)/inc \
+ -I$(OUTDIR)/inc/offuh \
+ -I$(SRCDIR)/oox/inc \
+ $(if $(filter YES,$(SYSTEM_OPENSSL)),$(filter -I%,$(OPENSSL_CFLAGS))) \
+))
+
+$(eval $(call gb_Library_set_defs,oox,\
+ $$(DEFS) \
+ -DOOX_DLLIMPLEMENTATION \
+ $(if $(filter YES,$(SYSTEM_OPENSSL)),$(filter-out -I%,$(OPENSSL_CFLAGS))) \
+))
+
+$(eval $(call gb_Library_add_linked_libs,oox,\
+ basegfx \
+ comphelper \
+ cppu \
+ cppuhelper \
+ msfilter \
+ sal \
+ sax \
+ svl \
+ svt \
+ svxcore \
+ tl \
+ utl \
+ vcl \
+ xo \
+ xcr \
+ $(if $(filter WNT,$(GUI)),$(if $(filter YES,$(SYSTEM_OPENSSL)),openssl,opensslt)) \
+ $(if $(filter SOLARIS,$(OS)),dl nsl socket) \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_set_ldflags,oox,\
+ $$(LDFLAGS) \
+ $(if $(filter YES,$(SYSTEM_OPENSSL)),$(OPENSSL_LIBS)) \
+))
+
+$(eval $(call gb_Library_set_componentfile,oox,oox/util/oox))
+
+$(eval $(call gb_Library_add_exception_objects,oox,\
+ oox/source/core/binarycodec \
+ oox/source/core/binaryfilterbase \
+ oox/source/core/contexthandler2 \
+ oox/source/core/contexthandler \
+ oox/source/core/fastparser \
+ oox/source/core/fasttokenhandler \
+ oox/source/core/filterbase \
+ oox/source/core/filterdetect \
+ oox/source/core/fragmenthandler2 \
+ oox/source/core/fragmenthandler \
+ 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/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/clrschemecontext \
+ oox/source/drawingml/clrscheme \
+ oox/source/drawingml/colorchoicecontext \
+ oox/source/drawingml/color \
+ 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/linepropertiescontext \
+ oox/source/drawingml/lineproperties \
+ oox/source/drawingml/objectdefaultcontext \
+ oox/source/drawingml/shapecontext \
+ oox/source/drawingml/shape \
+ oox/source/drawingml/shapegroupcontext \
+ oox/source/drawingml/shapepropertiescontext \
+ oox/source/drawingml/shapestylecontext \
+ oox/source/drawingml/spdefcontext \
+ oox/source/drawingml/table/tablebackgroundstylecontext \
+ oox/source/drawingml/table/tablecellcontext \
+ oox/source/drawingml/table/tablecell \
+ oox/source/drawingml/table/tablecontext \
+ oox/source/drawingml/table/tablepartstylecontext \
+ oox/source/drawingml/table/tableproperties \
+ oox/source/drawingml/table/tablerowcontext \
+ oox/source/drawingml/table/tablerow \
+ oox/source/drawingml/table/tablestylecellstylecontext \
+ oox/source/drawingml/table/tablestylecontext \
+ oox/source/drawingml/table/tablestyle \
+ oox/source/drawingml/table/tablestylelist \
+ oox/source/drawingml/table/tablestylelistfragmenthandler \
+ oox/source/drawingml/table/tablestylepart \
+ oox/source/drawingml/table/tablestyletextstylecontext \
+ oox/source/drawingml/textbodycontext \
+ oox/source/drawingml/textbody \
+ oox/source/drawingml/textbodypropertiescontext \
+ oox/source/drawingml/textbodyproperties \
+ oox/source/drawingml/textcharacterpropertiescontext \
+ oox/source/drawingml/textcharacterproperties \
+ oox/source/drawingml/textfieldcontext \
+ oox/source/drawingml/textfield \
+ oox/source/drawingml/textfont \
+ oox/source/drawingml/textliststylecontext \
+ oox/source/drawingml/textliststyle \
+ oox/source/drawingml/textparagraph \
+ oox/source/drawingml/textparagraphpropertiescontext \
+ oox/source/drawingml/textparagraphproperties \
+ 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 \
+ oox/source/dump/oledumper \
+ oox/source/dump/pptxdumper \
+ oox/source/dump/xlsbdumper \
+ oox/source/export/chartexport \
+ oox/source/export/ColorPropertySet \
+ oox/source/export/drawingml \
+ oox/source/export/SchXMLSeriesHelper \
+ oox/source/export/shapes \
+ oox/source/export/vmlexport \
+ oox/source/helper/attributelist \
+ oox/source/helper/binaryinputstream \
+ oox/source/helper/binaryoutputstream \
+ 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/pptgraphicshapecontext \
+ oox/source/ppt/pptimport \
+ oox/source/ppt/pptshapecontext \
+ oox/source/ppt/pptshape \
+ 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/slidetransitioncontext \
+ oox/source/ppt/slidetransition \
+ 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/vmlshapecontainer \
+ oox/source/vml/vmlshapecontext \
+ oox/source/vml/vmlshape \
+ oox/source/vml/vmltextboxcontext \
+ oox/source/vml/vmltextbox \
+ 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/richstringcontext \
+ oox/source/xls/richstring \
+ 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 \
+))
+
+$(eval $(call gb_Library_add_generated_exception_objects,oox,\
+ oox/source/export/vmlexport-shape-types \
+))
+
+$(call gb_GenCxxObject_get_source,oox/source/export/vmlexport-shape-types) : $(SRCDIR)/oox/source/export/preset-definitions-to-shape-types.pl $(SRCDIR)/oox/source/export/presetShapeDefinitions.xml $(SRCDIR)/oox/source/export/presetTextWarpDefinitions.xml
+ mkdir -p $(dir $@)
+ perl $^ > $@.in_progress 2> $@.log && mv $@.in_progress $@
+
+oox_SRC := $(SRCDIR)/oox/source/token
+oox_MISC := $(WORKDIR)/oox/misc
+oox_INC := $(WORKDIR)/oox/inc
+oox_GENHEADERPATH := $(oox_INC)/oox/token
+
+# these three generated headers are included from just about everywhere--might
+# just as well make them before everything else...
+$(call gb_Package_get_target,oox_inc) : $(oox_GENHEADERPATH)/namespaces.hxx
+$(call gb_Package_get_target,oox_inc) : $(oox_GENHEADERPATH)/properties.hxx
+$(call gb_Package_get_target,oox_inc) : $(oox_GENHEADERPATH)/tokens.hxx
+
+$(call gb_CxxObject_get_target,oox/source/token/tokenmap) : $(oox_INC)/tokenhash.inc
+
+$(eval $(call gb_Library_set_include,oox,\
+ $$(INCLUDE) \
+ -I$(oox_INC) \
+))
+
+$(oox_INC)/tokenhash.inc : $(oox_MISC)/tokenhash.gperf
+ gperf --compare-strncmp $< | sed -e 's/(char\*)0/(char\*)0, 0/g' | grep -v '^#line' > $@
+
+oox_GenTarget_get_target = $(oox_MISC)/$(1)
+
+define oox_GenTarget_GenTarget
+$(oox_GENHEADERPATH)/$(1).hxx $(oox_MISC)/$(2)ids.inc $(oox_INC)/$(2)names.inc $(if $(3),$(oox_MISC)/$(3)) : $(call oox_GenTarget_get_target,$(1))
+$(call oox_GenTarget_get_target,$(1)) : $(oox_SRC)/$(1).pl $(oox_SRC)/$(1).txt $(oox_SRC)/$(1).hxx.head $(oox_SRC)/$(1).hxx.tail
+ mkdir -p $(oox_MISC) $(oox_INC) $(oox_GENHEADERPATH)
+ perl $(oox_SRC)/$(1).pl $(oox_SRC)/$(1).txt $(oox_MISC)/$(2)ids.inc $(oox_INC)/$(2)names.inc $(if $(3),$(oox_MISC)/$(3)) \
+ && cat $(oox_SRC)/$(1).hxx.head $(oox_MISC)/$(2)ids.inc $(oox_SRC)/$(1).hxx.tail > $(oox_GENHEADERPATH)/$(1).hxx \
+ && touch $$@
+endef
+
+$(eval $(call oox_GenTarget_GenTarget,namespaces,namespace,namespaces.txt))
+$(eval $(call oox_GenTarget_GenTarget,properties,property,))
+$(eval $(call oox_GenTarget_GenTarget,tokens,token,tokenhash.gperf))
+
+$(call gb_Library_get_clean_target,oox) : oox_clean
+oox_clean :
+ rm -rf $(WORKDIR)/oox
+.PHONY: oox_clean
+
+$(eval $(call gb_Deliver_add_deliverable,$(OUTDIR)/inc/oox/namespaces.txt,$(oox_MISC)/namespaces.txt))
+
+# vim: set noet ts=4 sw=4:
diff --git a/oox/Makefile b/oox/Makefile
new file mode 100644
index 0000000..a79aff8
--- /dev/null
+++ b/oox/Makefile
@@ -0,0 +1,38 @@
+#*************************************************************************
+#
+# 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.
+#
+#*************************************************************************
+
+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..453d9ad
--- /dev/null
+++ b/oox/Module_oox.mk
@@ -0,0 +1,36 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list