[Libreoffice-commits] .: Branch 'feature/gnumake4' - 3 commits - hwpfilter/Library_hwp.mk oox/Library_oox.mk oox/oox.component 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/Module_writerfilter.mk writerfilter/Package_generated.mk writerfilter/Package_inc.mk writerfilter/Package_writerfilter_generated.mk writerfilter/source writerfilter/unocomponent
Bjoern Michaelsen
bmichaelsen at kemper.freedesktop.org
Tue Jun 21 04:15:46 PDT 2011
hwpfilter/Library_hwp.mk | 14
oox/Library_oox.mk | 7
oox/oox.component | 67 -
oox/prj/build.lst | 3
oox/prj/d.lst | 3
oox/source/token/namespacemap.cxx | 2
oox/source/token/namespaces.pl | 79 +
oox/source/token/properties.pl | 52 -
oox/source/token/propertynames.cxx | 3
oox/source/token/tokenmap.cxx | 22
oox/source/token/tokens.pl | 85 -
oox/util/oox.component | 67 +
writerfilter/Library_doctok.mk | 147 ---
writerfilter/Library_ooxml.mk | 290 ------
writerfilter/Library_resourcemodel.mk | 100 --
writerfilter/Library_rtftok.mk | 63 -
writerfilter/Library_writerfilter.mk | 113 ++
writerfilter/Library_writerfilter_uno.mk | 68 -
writerfilter/Module_writerfilter.mk | 11
writerfilter/Package_generated.mk | 32
writerfilter/Package_inc.mk | 35
writerfilter/Package_writerfilter_generated.mk | 4
writerfilter/debug_setup.mk | 12
writerfilter/inc/WriterFilterDllApi.hxx | 35
writerfilter/inc/dmapper/DomainMapper.hxx | 2
writerfilter/inc/doctok/WW8Document.hxx | 14
writerfilter/inc/ooxml/OOXMLDocument.hxx | 6
writerfilter/inc/resourcemodel/Fraction.hxx | 2
writerfilter/inc/resourcemodel/LoggedResources.hxx | 8
writerfilter/inc/resourcemodel/QNameToString.hxx | 4
writerfilter/inc/resourcemodel/ResourceModelHelper.hxx | 4
writerfilter/inc/resourcemodel/TableManager.hxx | 2
writerfilter/inc/resourcemodel/TagLogger.hxx | 3
writerfilter/inc/resourcemodel/WW8ResourceModel.hxx | 38
writerfilter/inc/resourcemodel/XPathLogger.hxx | 2
writerfilter/inc/resourcemodel/exceptions.hxx | 6
writerfilter/inc/resourcemodel/util.hxx | 4
writerfilter/source/Makefile | 5
writerfilter/source/dmapper/DomainMapper.cxx | 16
writerfilter/source/dmapper/DomainMapperTableHandler.cxx | 66 -
writerfilter/source/dmapper/DomainMapperTableHandler.hxx | 29
writerfilter/source/dmapper/DomainMapperTableManager.cxx | 32
writerfilter/source/dmapper/DomainMapper_Impl.cxx | 475 +++-------
writerfilter/source/dmapper/FFDataHandler.cxx | 4
writerfilter/source/dmapper/FormControlHelper.cxx | 1
writerfilter/source/dmapper/GraphicHelpers.cxx | 2
writerfilter/source/dmapper/GraphicImport.cxx | 19
writerfilter/source/dmapper/ModelEventListener.cxx | 3
writerfilter/source/dmapper/NumberingManager.cxx | 25
writerfilter/source/dmapper/NumberingManager.hxx | 4
writerfilter/source/dmapper/OLEHandler.cxx | 12
writerfilter/source/dmapper/PropertyIds.cxx | 674 +++++----------
writerfilter/source/dmapper/PropertyIds.hxx | 50 -
writerfilter/source/dmapper/PropertyMap.cxx | 27
writerfilter/source/dmapper/PropertyMapHelper.cxx | 1
writerfilter/source/dmapper/SettingsTable.cxx | 6
writerfilter/source/dmapper/StyleSheetTable.cxx | 5
writerfilter/source/dmapper/TablePropertiesHandler.cxx | 6
writerfilter/source/dmapper/TblStylePrHandler.cxx | 8
writerfilter/source/dmapper/ThemeTable.cxx | 21
writerfilter/source/dmapper/WrapPolygonHandler.cxx | 4
writerfilter/source/doctok/WW8DocumentImpl.cxx | 61 +
writerfilter/source/doctok/WW8ResourceModelImpl.cxx | 1
writerfilter/source/doctok/WW8StreamImpl.cxx | 3
writerfilter/source/doctok/resourcesimpl.xsl | 3
writerfilter/source/filter/ImportFilter.cxx | 3
writerfilter/source/filter/RtfFilter.hxx | 2
writerfilter/source/filter/WriterFilter.hxx | 2
writerfilter/source/filter/WriterFilterDetection.hxx | 2
writerfilter/source/generated.mk | 55 +
writerfilter/source/ooxml/OOXMLDocumentImpl.cxx | 8
writerfilter/source/ooxml/OOXMLFactory.cxx | 16
writerfilter/source/ooxml/OOXMLFactory.hxx | 12
writerfilter/source/ooxml/OOXMLFastContextHandler.cxx | 83 -
writerfilter/source/ooxml/OOXMLFastContextHandler.hxx | 56 -
writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx | 87 +
writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx | 2
writerfilter/source/ooxml/OOXMLFastTokenHandler.cxx | 24
writerfilter/source/ooxml/OOXMLStreamImpl.cxx | 36
writerfilter/source/ooxml/RefAndPointer.hxx | 12
writerfilter/source/ooxml/analyzemodel.xsl | 1
writerfilter/source/ooxml/factory_ns.xsl | 2
writerfilter/source/ooxml/factoryimpl.xsl | 6
writerfilter/source/ooxml/factoryimpl_ns.xsl | 4
writerfilter/source/ooxml/fasttokens.xsl | 7
writerfilter/source/ooxml/gperffasttokenhandler.xsl | 2
writerfilter/source/ooxml/model.xml | 4
writerfilter/source/ooxml/status.sh | 24
writerfilter/source/ooxml/todo.xsl | 37
writerfilter/source/resourcemodel/LoggedResources.cxx | 1
writerfilter/source/resourcemodel/TagLogger.cxx | 71 -
writerfilter/source/resourcemodel/qnametostrfooter | 2
writerfilter/source/resourcemodel/qnametostrheader | 4
writerfilter/source/resourcemodel/resourcemodel.cxx | 3
writerfilter/unocomponent/component.cxx | 7
95 files changed, 1321 insertions(+), 2226 deletions(-)
New commits:
commit 6df18646dd33ba543c71ca0cffc13a5b66b26905
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Tue Jun 21 13:11:39 2011 +0200
gnumake4: postmerge fixes in hwp
diff --git a/hwpfilter/Library_hwp.mk b/hwpfilter/Library_hwp.mk
index 321d4be..87fef9f 100644
--- a/hwpfilter/Library_hwp.mk
+++ b/hwpfilter/Library_hwp.mk
@@ -43,19 +43,7 @@ $(eval $(call gb_Library_add_linked_libs,hwp,\
$(gb_STDLIBS) \
))
-ifeq ($(SYSTEM_ZLIB),YES)
-$(eval $(call gb_Library_set_cxxflags,hwp,\
- $$(CXXFLAGS) \
- -DSYSTEM_ZLIB \
-))
-$(eval $(call gb_Library_add_linked_libs,hwp,\
- z \
-))
-else
-$(eval $(call gb_Library_add_linked_static_libs,hwp,\
- zlib \
-))
-endif
+$(call gb_Library_use_external,hwp,zlib)
ifeq ($(OS),WNT)
commit aba22372234deefa63ad1e64271d6e7ba8535f2f
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Mon Jun 20 20:38:45 2011 +0200
gnumake4: switching gbuildization
* mostly switching to gnumake4/writerfilter10 gbuild implementation (thanks mst, hb)
diff --git a/writerfilter/Library_doctok.mk b/writerfilter/Library_doctok.mk
deleted file mode 100644
index 2e4afc5..0000000
--- a/writerfilter/Library_doctok.mk
+++ /dev/null
@@ -1,147 +0,0 @@
-# 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 $(realpath $(SRCDIR)/writerfilter/debug_setup.mk)
-
-$(eval $(call gb_Library_set_defs,doctok,\
- $$(DEFS) \
- -DWRITERFILTER_DOCTOK_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
-
-ooxml_BASEDIR := $(realpath $(SRCDIR)/writerfilter)
-
-doctok_QNAMETOSTRXSL := $(ooxml_BASEDIR)/source/doctok/qnametostr.xsl
-doctok_RESOURCEIDSXSL := $(ooxml_BASEDIR)/source/doctok/resourceids.xsl
-doctok_RESOURCESIMPLXSL := $(ooxml_BASEDIR)/source/doctok/resourcesimpl.xsl
-doctok_RESOURCESXSL := $(ooxml_BASEDIR)/source/doctok/resources.xsl
-doctok_RESOURCETOOLSXSL := $(ooxml_BASEDIR)/source/doctok/resourcetools.xsl
-doctok_SPRMCODETOSTRXSL := $(ooxml_BASEDIR)/source/doctok/sprmcodetostr.xsl
-doctok_SPRMIDSXSL := $(ooxml_BASEDIR)/source/doctok/sprmids.xsl
-
-doctok_MODEL := $(ooxml_BASEDIR)/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)) && $$(call gb_Helper_abbreviate_dirs_native,$(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
deleted file mode 100644
index e59c93a..0000000
--- a/writerfilter/Library_ooxml.mk
+++ /dev/null
@@ -1,290 +0,0 @@
-# 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$(realpath $(SRCDIR)/writerfilter/source/dmapper) \
- -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 $(realpath $(SRCDIR)/writerfilter/debug_setup.mk)
-
-$(eval $(call gb_Library_set_defs,ooxml,\
- $$(DEFS) \
- -DWRITERFILTER_OOXML_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_BASEDIR := $(realpath $(SRCDIR)/writerfilter)
-
-ooxml_MODEL := $(ooxml_BASEDIR)/source/ooxml/model.xml
-
-ooxml_FACTORYIMPLNSXSL := $(ooxml_BASEDIR)/source/ooxml/factoryimpl_ns.xsl
-ooxml_FACTORYIMPLXSL := $(ooxml_BASEDIR)/source/ooxml/factoryimpl.xsl
-ooxml_FACTORYINCXSL := $(ooxml_BASEDIR)/source/ooxml/factoryinc.xsl
-ooxml_FACTORYNSXSL := $(ooxml_BASEDIR)/source/ooxml/factory_ns.xsl
-ooxml_FACTORYTOOLSXSL := $(ooxml_BASEDIR)/source/ooxml/factorytools.xsl
-ooxml_FACTORYVALUESIMPLXSL := $(ooxml_BASEDIR)/source/ooxml/factoryimpl_values.xsl
-ooxml_FACTORYVALUESXSL := $(ooxml_BASEDIR)/source/ooxml/factory_values.xsl
-ooxml_FASTTOKENSXSL := $(ooxml_BASEDIR)/source/ooxml/fasttokens.xsl
-ooxml_GPERFFASTTOKENXSL := $(ooxml_BASEDIR)/source/ooxml/gperffasttokenhandler.xsl
-ooxml_NAMESPACEIDSXSL := $(ooxml_BASEDIR)/source/ooxml/namespaceids.xsl
-ooxml_PREPROCESSXSL := $(ooxml_BASEDIR)/source/ooxml/modelpreprocess.xsl
-ooxml_QNAMETOSTRXSL := $(ooxml_BASEDIR)/source/ooxml/qnametostr.xsl
-ooxml_RESORUCETOKENSXSL := $(ooxml_BASEDIR)/source/ooxml/resourcestokens.xsl
-ooxml_RESOURCEIDSXSL := $(ooxml_BASEDIR)/source/ooxml/resourceids.xsl
-ooxml_RESOURCESIMPLXSL := $(ooxml_BASEDIR)/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 := $(OUTDIR)/inc/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 $@) && $(call gb_Helper_abbreviate_dirs_native,$(gb_XSLTPROC) --nonet --stringparam file $@ $(ooxml_FACTORYIMPLNSXSL) $(ooxml_MODELPROCESSED)) > $@
-
-$(call ooxml_factory_header,%) : $(ooxml_FACTORYNSXSL) $(ooxml_MODELPROCESSED)
- mkdir -p $(dir $@) && $(call gb_Helper_abbreviate_dirs_native,$(gb_XSLTPROC) --nonet --stringparam file $@ $(ooxml_FACTORYNSXSL) $(ooxml_MODELPROCESSED)) > $@
-
-define ooxml_xsl_process
-$(1) : $(2) $(3)
- mkdir -p $(dir $(1)) && $$(call gb_Helper_abbreviate_dirs_native,$(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
deleted file mode 100644
index 1ee3c9e..0000000
--- a/writerfilter/Library_resourcemodel.mk
+++ /dev/null
@@ -1,100 +0,0 @@
-# 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 $(SRCDIR)/writerfilter/debug_setup.mk
-
-$(eval $(call gb_Library_set_defs,resourcemodel,\
- $$(DEFS) \
- -DWRITERFILTER_RESOURCEMODEL_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
deleted file mode 100644
index c770e40..0000000
--- a/writerfilter/Library_rtftok.mk
+++ /dev/null
@@ -1,63 +0,0 @@
-# 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 $(realpath $(SRCDIR)/writerfilter/debug_setup.mk)
-
-$(eval $(call gb_Library_set_defs,rtftok,\
- $$(DEFS) \
- -DWRITERFILTER_RTFTOK_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
index 3fe26f6..1de3e78 100644
--- a/writerfilter/Library_writerfilter.mk
+++ b/writerfilter/Library_writerfilter.mk
@@ -25,50 +25,135 @@
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
+include $(SRCDIR)/writerfilter/source/generated.mk
+
$(eval $(call gb_Library_Library,writerfilter))
+$(eval $(call gb_Library_add_package_headers,writerfilter,writerfilter_inc writerfilter_generated))
+
+$(eval $(call gb_Library_add_precompiled_header,writerfilter,$(SRCDIR)/writerfilter/PCH_FILE))
+
+$(eval $(call gb_Library_set_componentfile,writerfilter,writerfilter/util/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 \
+ -I$(realpath $(SRCDIR)/writerfilter/inc) \
+ -I$(WORKDIR)/CustomTarget/writerfilter/source \
+ -I$(WORKDIR)/CustomTarget/writerfilter/source/ooxml \
+ -I$(WORKDIR)/CustomTarget/writerfilter/source/doctok \
+ -I$(realpath $(SRCDIR)/writerfilter/source/doctok) \
+ -I$(realpath $(SRCDIR)/writerfilter/source/ooxml) \
+ -I$(realpath $(SRCDIR)/writerfilter/source/dmapper) \
))
$(eval $(call gb_Library_set_componentfile,writerfilter,writerfilter/util/writerfilter))
-include $(realpath $(SRCDIR)/writerfilter/debug_setup.mk)
-
-$(eval $(call gb_Library_set_defs,writerfilter,\
- $$(DEFS) \
- -DWRITERFILTER_WRITERFILTER_DLLIMPLEMENTATION \
- $(writerfilter_debug_flags) \
- $(if $(filter YES,$(SYSTEM_LIBXML)),$(filter-out -I%,$(LIBXML_CFLAGS))) \
+$(eval $(call gb_Library_add_defs,writerfilter,\
+ -DWRITERFILTER_DLLIMPLEMENTATION \
))
+$(call gb_Library_use_external,writerfilter,libxml2)
+
$(eval $(call gb_Library_add_linked_libs,writerfilter,\
- resourcemodel \
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/dmapper/BorderHandler \
+ writerfilter/source/dmapper/CellColorHandler \
+ writerfilter/source/dmapper/CellMarginHandler \
+ writerfilter/source/dmapper/ConversionHelper \
+ writerfilter/source/dmapper/DomainMapper \
+ writerfilter/source/dmapper/DomainMapperTableHandler \
+ writerfilter/source/dmapper/DomainMapperTableManager \
+ writerfilter/source/dmapper/DomainMapper_Impl \
+ 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/TDefTableHandler \
+ writerfilter/source/dmapper/TablePropertiesHandler \
+ writerfilter/source/dmapper/TblStylePrHandler \
+ writerfilter/source/dmapper/ThemeTable \
+ writerfilter/source/dmapper/WrapPolygonHandler \
+ 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 \
writerfilter/source/filter/ImportFilter \
writerfilter/source/filter/RtfFilter \
writerfilter/source/filter/WriterFilter \
writerfilter/source/filter/WriterFilterDetection \
+ 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 \
+ writerfilter/source/resourcemodel/Fraction \
+ writerfilter/source/resourcemodel/LoggedResources \
+ writerfilter/source/resourcemodel/Protocol \
+ writerfilter/source/resourcemodel/ResourceModelHelper \
+ writerfilter/source/resourcemodel/TagLogger \
+ writerfilter/source/resourcemodel/Token \
+ writerfilter/source/resourcemodel/WW8Analyzer \
+ writerfilter/source/resourcemodel/XPathLogger \
+ writerfilter/source/resourcemodel/resourcemodel \
+ writerfilter/source/resourcemodel/util \
+ writerfilter/source/rtftok/RTFParseException \
))
+$(eval $(call gb_Library_add_generated_exception_objects,writerfilter,\
+ $(patsubst %,CustomTarget/writerfilter/source/OOXMLFactory_%,$(WRITERFILTER_OOXMLNAMESPACES)) \
+ CustomTarget/writerfilter/source/OOXMLFactory_generated \
+ CustomTarget/writerfilter/source/OOXMLFactory_values \
+ CustomTarget/writerfilter/source/qnametostr \
+ CustomTarget/writerfilter/source/resources \
+ CustomTarget/writerfilter/source/sprmcodetostr \
+))
# vim: set noet ts=4 sw=4:
diff --git a/writerfilter/Library_writerfilter_uno.mk b/writerfilter/Library_writerfilter_uno.mk
deleted file mode 100644
index 436cd3a..0000000
--- a/writerfilter/Library_writerfilter_uno.mk
+++ /dev/null
@@ -1,68 +0,0 @@
-# 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_WRITERFILTER_UNO_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_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/Module_writerfilter.mk b/writerfilter/Module_writerfilter.mk
index d199252..d51031d 100644
--- a/writerfilter/Module_writerfilter.mk
+++ b/writerfilter/Module_writerfilter.mk
@@ -28,13 +28,14 @@
$(eval $(call gb_Module_Module,writerfilter))
$(eval $(call gb_Module_add_targets,writerfilter,\
- Library_doctok \
- Library_ooxml \
- Library_resourcemodel \
Library_writerfilter \
- Library_writerfilter_uno \
- Package_generated \
+ Package_inc \
+ Package_writerfilter_generated \
))
+# Library_doctok \
+# Library_ooxml \
+# Library_resourcemodel \
+# Library_writerfilter_uno \
# not used
# Library_rtftok
diff --git a/writerfilter/Package_generated.mk b/writerfilter/Package_generated.mk
deleted file mode 100644
index 682c3c6..0000000
--- a/writerfilter/Package_generated.mk
+++ /dev/null
@@ -1,32 +0,0 @@
-# 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,writerfilter_generated,$(WORKDIR)/writerfilter/inc/doctok))
-
-$(eval $(call gb_Package_add_file,writerfilter_generated,inc/writerfilter/doctok/sprmids.hxx,sprmids.hxx))
-
-# vim: set noet ts=4 sw=4:
diff --git a/writerfilter/Package_inc.mk b/writerfilter/Package_inc.mk
new file mode 100644
index 0000000..57ec0be
--- /dev/null
+++ b/writerfilter/Package_inc.mk
@@ -0,0 +1,35 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2009 by Sun Microsystems, Inc.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org. If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+$(eval $(call gb_Package_Package,writerfilter_inc,$(SRCDIR)/writerfilter/inc))
+
+$(eval $(call gb_Package_add_file,writerfilter_inc,inc/writerfilter/WriterFilterDllApi.hxx,WriterFilterDllApi.hxx))
+$(eval $(call gb_Package_add_file,writerfilter_inc,inc/writerfilter/resourcemodel/OutputWithDepth.hxx,resourcemodel/OutputWithDepth.hxx))
+$(eval $(call gb_Package_add_file,writerfilter_inc,inc/writerfilter/resourcemodel/WW8ResourceModel.hxx,resourcemodel/WW8ResourceModel.hxx))
+$(eval $(call gb_Package_add_file,writerfilter_inc,inc/writerfilter/dmapper/DomainMapper.hxx,dmapper/DomainMapper.hxx))
+
+# vim: set noet sw=4 ts=4:
diff --git a/writerfilter/Package_writerfilter_generated.mk b/writerfilter/Package_writerfilter_generated.mk
index 204e028..6f557e5 100644
--- a/writerfilter/Package_writerfilter_generated.mk
+++ b/writerfilter/Package_writerfilter_generated.mk
@@ -34,8 +34,8 @@ $(eval $(call \
$(eval $(call \
gb_CustomTarget_add_outdir_dependencies,writerfilter/source,\
$(gb_XSLTPROCTARGET) \
- $(OUTDIR)/inc$(UPDMINOREXT)/oox/token/tokens.txt \
- $(OUTDIR)/inc$(UPDMINOREXT)/oox/token/namespaces.txt \
+ $(OUTDIR)/inc/oox/tokens.txt \
+ $(OUTDIR)/inc/oox/namespaces.txt \
))
$(eval $(call \
diff --git a/writerfilter/debug_setup.mk b/writerfilter/debug_setup.mk
deleted file mode 100644
index 811d279..0000000
--- a/writerfilter/debug_setup.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-define writerfilter_debug_flags
-$(if $(filter-out 0 1,$(strip $(gb_DEBUGLEVEL))),\
- -DDEBUG_DOMAINMAPPER \
- -DDEBUG_ELEMENT \
- -DDEBUG_RESOLVE \
- -DDEBUG_CONTEXT_STACK \
- -DDEBUG_ATTRIBUTES \
- -DDEBUG_PROPERTIES \
- -DDEBUG_CONTEXT_HANDLER \
- -DDEBUG_IMPORT \
-)
-endef
diff --git a/writerfilter/inc/WriterFilterDllApi.hxx b/writerfilter/inc/WriterFilterDllApi.hxx
index 1e6afde..3e4f620 100644
--- a/writerfilter/inc/WriterFilterDllApi.hxx
+++ b/writerfilter/inc/WriterFilterDllApi.hxx
@@ -1,4 +1,3 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -31,39 +30,11 @@
#include "sal/types.h"
-#if defined(WRITERFILTER_DOCTOK_DLLIMPLEMENTATION)
-#define WRITERFILTER_DOCTOK_DLLPUBLIC SAL_DLLPUBLIC_EXPORT
+#if defined(WRITERFILTER_DLLIMPLEMENTATION)
+#define WRITERFILTER_DLLPUBLIC SAL_DLLPUBLIC_EXPORT
#else
-#define WRITERFILTER_DOCTOK_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
+#define WRITERFILTER_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
#endif
-
-#if defined(WRITERFILTER_OOXML_DLLIMPLEMENTATION)
-#define WRITERFILTER_OOXML_DLLPUBLIC SAL_DLLPUBLIC_EXPORT
-#else
-#define WRITERFILTER_OOXML_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
-#endif
-
-#if defined(WRITERFILTER_RESOURCEMODEL_DLLIMPLEMENTATION)
-#define WRITERFILTER_RESOURCEMODEL_DLLPUBLIC SAL_DLLPUBLIC_EXPORT
-#else
-#define WRITERFILTER_RESOURCEMODEL_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
-#endif
-
-#if defined(WRITERFILTER_WRITERFILTER_DLLIMPLEMENTATION)
-#define WRITERFILTER_WRITERFILTER_DLLPUBLIC SAL_DLLPUBLIC_EXPORT
-#else
-#define WRITERFILTER_WRITERFILTER_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
-#endif
-
-#if defined(WRITERFILTER_WRITERFILTER_UNO_DLLIMPLEMENTATION)
-#define WRITERFILTER_WRITERFILTER_UNO_DLLPUBLIC SAL_DLLPUBLIC_EXPORT
-#else
-#define WRITERFILTER_WRITERFILTER_UNO_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
-#endif
-
-// This one can be shared
#define WRITERFILTER_DLLPRIVATE SAL_DLLPRIVATE
#endif /* INCLUDED_WRITERFILTERDLLAPI_H */
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/inc/dmapper/DomainMapper.hxx b/writerfilter/inc/dmapper/DomainMapper.hxx
index 526cbed..bbd19cd 100644
--- a/writerfilter/inc/dmapper/DomainMapper.hxx
+++ b/writerfilter/inc/dmapper/DomainMapper.hxx
@@ -78,7 +78,7 @@ enum SourceDocumentType
DOCUMENT_OOXML,
DOCUMENT_RTF
};
-class WRITERFILTER_OOXML_DLLPUBLIC DomainMapper : public LoggedProperties, public LoggedTable,
+class WRITERFILTER_DLLPUBLIC DomainMapper : public LoggedProperties, public LoggedTable,
public BinaryObj, public LoggedStream
{
DomainMapper_Impl *m_pImpl;
diff --git a/writerfilter/inc/doctok/WW8Document.hxx b/writerfilter/inc/doctok/WW8Document.hxx
index 8163402..75ea456 100644
--- a/writerfilter/inc/doctok/WW8Document.hxx
+++ b/writerfilter/inc/doctok/WW8Document.hxx
@@ -53,7 +53,7 @@ using namespace ::com::sun::star;
stream consists of substreams that are identified by string
identifiers.
*/
-class WRITERFILTER_DOCTOK_DLLPUBLIC WW8Stream
+class WRITERFILTER_DLLPUBLIC WW8Stream
{
public:
/**
@@ -107,7 +107,7 @@ public:
A property.
*/
-class WRITERFILTER_DOCTOK_DLLPUBLIC WW8Property
+class WRITERFILTER_DLLPUBLIC WW8Property
{
public:
/**
@@ -154,7 +154,7 @@ public:
}
\endcode
*/
-class WRITERFILTER_DOCTOK_DLLPUBLIC WW8PropertySetIterator
+class WRITERFILTER_DLLPUBLIC WW8PropertySetIterator
{
public:
typedef boost::shared_ptr<WW8PropertySetIterator> Pointer_t;
@@ -191,7 +191,7 @@ bool operator != (const WW8PropertySetIterator & rA,
/**
A set of properties.
*/
-class WRITERFILTER_DOCTOK_DLLPUBLIC WW8PropertySet
+class WRITERFILTER_DLLPUBLIC WW8PropertySet
{
public:
typedef boost::shared_ptr<WW8PropertySet> Pointer_t;
@@ -278,7 +278,7 @@ enum PropertyType {
The use of the iterator is analogous to WW8PropertySetIterator.
*/
-class WRITERFILTER_DOCTOK_DLLPUBLIC WW8DocumentIterator
+class WRITERFILTER_DLLPUBLIC WW8DocumentIterator
{
public:
typedef boost::shared_ptr<WW8DocumentIterator> Pointer_t;
@@ -393,7 +393,7 @@ public:
/**
A Word 8 document.
*/
-class WRITERFILTER_DOCTOK_DLLPUBLIC WW8Document :
+class WRITERFILTER_DLLPUBLIC WW8Document :
public writerfilter::Reference<Stream>
{
public:
@@ -425,7 +425,7 @@ public:
virtual WW8DocumentIterator::Pointer_t end() = 0;
};
-class WRITERFILTER_DOCTOK_DLLPUBLIC WW8DocumentFactory
+class WRITERFILTER_DLLPUBLIC WW8DocumentFactory
{
public:
static WW8Stream::Pointer_t
diff --git a/writerfilter/inc/ooxml/OOXMLDocument.hxx b/writerfilter/inc/ooxml/OOXMLDocument.hxx
index fb4e078..ab25fb5 100644
--- a/writerfilter/inc/ooxml/OOXMLDocument.hxx
+++ b/writerfilter/inc/ooxml/OOXMLDocument.hxx
@@ -80,7 +80,7 @@ namespace ooxml
using namespace com::sun::star;
-class WRITERFILTER_OOXML_DLLPUBLIC OOXMLStream
+class WRITERFILTER_DLLPUBLIC OOXMLStream
{
public:
enum StreamType_t { UNKNOWN, DOCUMENT, STYLES, FONTTABLE, NUMBERING,
@@ -124,7 +124,7 @@ public:
};
-class WRITERFILTER_OOXML_DLLPUBLIC OOXMLDocument : public writerfilter::Reference<Stream>
+class WRITERFILTER_DLLPUBLIC OOXMLDocument : public writerfilter::Reference<Stream>
{
public:
/**
@@ -251,7 +251,7 @@ public:
};
-class WRITERFILTER_OOXML_DLLPUBLIC OOXMLDocumentFactory
+class WRITERFILTER_DLLPUBLIC OOXMLDocumentFactory
{
public:
static OOXMLStream::Pointer_t
diff --git a/writerfilter/inc/resourcemodel/Fraction.hxx b/writerfilter/inc/resourcemodel/Fraction.hxx
index b354696..092775d 100644
--- a/writerfilter/inc/resourcemodel/Fraction.hxx
+++ b/writerfilter/inc/resourcemodel/Fraction.hxx
@@ -35,7 +35,7 @@
namespace writerfilter {
namespace resourcemodel {
-class WRITERFILTER_RESOURCEMODEL_DLLPUBLIC Fraction
+class WRITERFILTER_DLLPUBLIC Fraction
{
public:
explicit Fraction(sal_Int32 nNumerator, sal_Int32 nDenominator = 1);
diff --git a/writerfilter/inc/resourcemodel/LoggedResources.hxx b/writerfilter/inc/resourcemodel/LoggedResources.hxx
index c2340ac..97ca843 100644
--- a/writerfilter/inc/resourcemodel/LoggedResources.hxx
+++ b/writerfilter/inc/resourcemodel/LoggedResources.hxx
@@ -36,7 +36,7 @@
namespace writerfilter
{
-class WRITERFILTER_RESOURCEMODEL_DLLPUBLIC LoggedResourcesHelper
+class WRITERFILTER_DLLPUBLIC LoggedResourcesHelper
{
public:
explicit LoggedResourcesHelper(TagLogger::Pointer_t pLogger, const string & sPrefix);
@@ -56,7 +56,7 @@ private:
string msPrefix;
};
-class WRITERFILTER_RESOURCEMODEL_DLLPUBLIC LoggedStream : public Stream
+class WRITERFILTER_DLLPUBLIC LoggedStream : public Stream
{
public:
explicit LoggedStream(TagLogger::Pointer_t pLogger, const string & sPrefix);
@@ -96,7 +96,7 @@ protected:
LoggedResourcesHelper mHelper;
};
-class WRITERFILTER_RESOURCEMODEL_DLLPUBLIC LoggedProperties : public Properties
+class WRITERFILTER_DLLPUBLIC LoggedProperties : public Properties
{
public:
explicit LoggedProperties(TagLogger::Pointer_t pLogger, const string & sPrefix);
@@ -112,7 +112,7 @@ protected:
LoggedResourcesHelper mHelper;
};
-class WRITERFILTER_RESOURCEMODEL_DLLPUBLIC LoggedTable : public Table
+class WRITERFILTER_DLLPUBLIC LoggedTable : public Table
{
public:
explicit LoggedTable(TagLogger::Pointer_t pLogger, const string & sPrefix);
diff --git a/writerfilter/inc/resourcemodel/QNameToString.hxx b/writerfilter/inc/resourcemodel/QNameToString.hxx
index 293b9d6..67bfdc5 100644
--- a/writerfilter/inc/resourcemodel/QNameToString.hxx
+++ b/writerfilter/inc/resourcemodel/QNameToString.hxx
@@ -39,7 +39,7 @@ namespace writerfilter
{
using namespace ::std;
-class WRITERFILTER_RESOURCEMODEL_DLLPUBLIC QNameToString
+class WRITERFILTER_DLLPUBLIC QNameToString
{
typedef boost::shared_ptr<QNameToString> Pointer_t;
typedef map < Id, string > Map;
@@ -63,7 +63,7 @@ public:
string operator()(Id qName);
};
-class WRITERFILTER_RESOURCEMODEL_DLLPUBLIC SprmIdToString
+class WRITERFILTER_DLLPUBLIC SprmIdToString
{
typedef boost::shared_ptr<SprmIdToString> Pointer_t;
diff --git a/writerfilter/inc/resourcemodel/ResourceModelHelper.hxx b/writerfilter/inc/resourcemodel/ResourceModelHelper.hxx
index c01a1d1..fd90575 100644
--- a/writerfilter/inc/resourcemodel/ResourceModelHelper.hxx
+++ b/writerfilter/inc/resourcemodel/ResourceModelHelper.hxx
@@ -33,8 +33,8 @@
namespace writerfilter {
namespace resourcemodel {
-void WRITERFILTER_RESOURCEMODEL_DLLPUBLIC resolveSprmProps(Properties & rHandler, Sprm & rSprm);
-void WRITERFILTER_RESOURCEMODEL_DLLPUBLIC resolveAttributeProperties(Properties & rHandler, Value & rValue);
+void WRITERFILTER_DLLPUBLIC resolveSprmProps(Properties & rHandler, Sprm & rSprm);
+void WRITERFILTER_DLLPUBLIC resolveAttributeProperties(Properties & rHandler, Value & rValue);
}}
diff --git a/writerfilter/inc/resourcemodel/TableManager.hxx b/writerfilter/inc/resourcemodel/TableManager.hxx
index cee61d9..6ea3da5 100644
--- a/writerfilter/inc/resourcemodel/TableManager.hxx
+++ b/writerfilter/inc/resourcemodel/TableManager.hxx
@@ -53,7 +53,7 @@ template <typename T, typename PropertiesPointer>
/**
Class to handle events generated by TableManager::resolveCurrentTable
*/
-class WRITERFILTER_RESOURCEMODEL_DLLPUBLIC TableDataHandler
+class WRITERFILTER_DLLPUBLIC TableDataHandler
{
public:
typedef boost::shared_ptr<TableDataHandler> Pointer_t;
diff --git a/writerfilter/inc/resourcemodel/TagLogger.hxx b/writerfilter/inc/resourcemodel/TagLogger.hxx
index 97ff43b..ce766b5 100644
--- a/writerfilter/inc/resourcemodel/TagLogger.hxx
+++ b/writerfilter/inc/resourcemodel/TagLogger.hxx
@@ -45,10 +45,9 @@ namespace writerfilter
public:
typedef boost::shared_ptr<IdToString> Pointer_t;
virtual std::string toString(const Id & id) const = 0;
- string toTree(const string & sIndent = "") const;
};
- class WRITERFILTER_RESOURCEMODEL_DLLPUBLIC TagLogger
+ class WRITERFILTER_DLLPUBLIC TagLogger
{
public:
typedef TagLogger* Pointer_t;
diff --git a/writerfilter/inc/resourcemodel/WW8ResourceModel.hxx b/writerfilter/inc/resourcemodel/WW8ResourceModel.hxx
index 683ae60..d70c301 100644
--- a/writerfilter/inc/resourcemodel/WW8ResourceModel.hxx
+++ b/writerfilter/inc/resourcemodel/WW8ResourceModel.hxx
@@ -1,4 +1,3 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -26,8 +25,8 @@
*
************************************************************************/
-#ifndef INCLUDED_WW8RESOURCEMODEL_HXX
-#define INCLUDED_WW8RESOURCEMODEL_HXX
+#ifndef INCLUDED_WW8_EVENT_HANDLER_HXX
+#define INCLUDED_WW8_EVENT_HANDLER_HXX
#include <string>
#include <memory>
@@ -90,7 +89,7 @@ using namespace ::std;
*/
template <class T>
-class WRITERFILTER_RESOURCEMODEL_DLLPUBLIC Reference
+class WRITERFILTER_DLLPUBLIC Reference
{
public:
/**
@@ -125,7 +124,7 @@ class Sprm;
/**
Handler for properties.
*/
-class WRITERFILTER_RESOURCEMODEL_DLLPUBLIC Properties
+class WRITERFILTER_DLLPUBLIC Properties
{
public:
/**
@@ -148,7 +147,7 @@ public:
/**
Handler for tables.
*/
-class WRITERFILTER_RESOURCEMODEL_DLLPUBLIC Table
+class WRITERFILTER_DLLPUBLIC Table
{
public:
typedef boost::shared_ptr<Table> Pointer_t;
@@ -164,7 +163,7 @@ public:
/**
Handler for binary objects.
*/
-class WRITERFILTER_RESOURCEMODEL_DLLPUBLIC BinaryObj
+class WRITERFILTER_DLLPUBLIC BinaryObj
{
public:
/**
@@ -181,7 +180,7 @@ public:
/**
Handler for a stream.
*/
-class WRITERFILTER_RESOURCEMODEL_DLLPUBLIC Stream
+class WRITERFILTER_DLLPUBLIC Stream
{
public:
/**
@@ -285,7 +284,7 @@ public:
makes no sense for a certain value, e.g. the integer value of a
string.
*/
-class WRITERFILTER_RESOURCEMODEL_DLLPUBLIC Value
+class WRITERFILTER_DLLPUBLIC Value
{
public:
/**
@@ -333,7 +332,7 @@ public:
An SPRM.
*/
-class WRITERFILTER_RESOURCEMODEL_DLLPUBLIC Sprm
+class WRITERFILTER_DLLPUBLIC Sprm
{
public:
typedef auto_ptr<Sprm> Pointer_t;
@@ -383,18 +382,18 @@ public:
/**
Creates handler for a stream.
*/
-Stream::Pointer_t WRITERFILTER_RESOURCEMODEL_DLLPUBLIC createStreamHandler();
+Stream::Pointer_t WRITERFILTER_DLLPUBLIC createStreamHandler();
- void WRITERFILTER_RESOURCEMODEL_DLLPUBLIC analyzerIds();
- Stream::Pointer_t WRITERFILTER_RESOURCEMODEL_DLLPUBLIC createAnalyzer();
+void WRITERFILTER_DLLPUBLIC analyzerIds();
+Stream::Pointer_t WRITERFILTER_DLLPUBLIC createAnalyzer();
- void WRITERFILTER_RESOURCEMODEL_DLLPUBLIC logger(string prefix, string message);
+void WRITERFILTER_DLLPUBLIC logger(string prefix, string message);
- void WRITERFILTER_RESOURCEMODEL_DLLPUBLIC dump(OutputWithDepth<string> & o, const char * name, writerfilter::Reference<Properties>::Pointer_t props);
- void WRITERFILTER_RESOURCEMODEL_DLLPUBLIC dump(OutputWithDepth<string> & o, const char * name, sal_uInt32 n);
- void WRITERFILTER_RESOURCEMODEL_DLLPUBLIC dump(OutputWithDepth<string> & /*o*/, const char * /*name*/,
+void WRITERFILTER_DLLPUBLIC dump(OutputWithDepth<string> & o, const char * name, writerfilter::Reference<Properties>::Pointer_t props);
+void WRITERFILTER_DLLPUBLIC dump(OutputWithDepth<string> & o, const char * name, sal_uInt32 n);
+void WRITERFILTER_DLLPUBLIC dump(OutputWithDepth<string> & /*o*/, const char * /*name*/,
const rtl::OUString & /*str*/);
- void WRITERFILTER_RESOURCEMODEL_DLLPUBLIC dump(OutputWithDepth<string> & o, const char * name, writerfilter::Reference<BinaryObj>::Pointer_t binary);
+void WRITERFILTER_DLLPUBLIC dump(OutputWithDepth<string> & o, const char * name, writerfilter::Reference<BinaryObj>::Pointer_t binary);
class Token_t
{
@@ -426,6 +425,5 @@ struct TokenHash
}
-#endif // INCLUDED_WW8RESOURCEMODEL_HXX
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+#endif // INCLUDED_WW8_EVENT_HANDLER_HXX
diff --git a/writerfilter/inc/resourcemodel/XPathLogger.hxx b/writerfilter/inc/resourcemodel/XPathLogger.hxx
index f81f059..c975ac2 100644
--- a/writerfilter/inc/resourcemodel/XPathLogger.hxx
+++ b/writerfilter/inc/resourcemodel/XPathLogger.hxx
@@ -41,7 +41,7 @@ using ::std::stack;
using ::std::string;
using ::std::vector;
-class WRITERFILTER_RESOURCEMODEL_DLLPUBLIC XPathLogger
+class WRITERFILTER_DLLPUBLIC XPathLogger
{
typedef boost::unordered_map<string, unsigned int> TokenMap_t;
typedef boost::shared_ptr<TokenMap_t> TokenMapPointer_t;
diff --git a/writerfilter/inc/resourcemodel/exceptions.hxx b/writerfilter/inc/resourcemodel/exceptions.hxx
index ef70c54..af61db5 100644
--- a/writerfilter/inc/resourcemodel/exceptions.hxx
+++ b/writerfilter/inc/resourcemodel/exceptions.hxx
@@ -35,7 +35,7 @@
namespace writerfilter {
using namespace ::std;
-class WRITERFILTER_RESOURCEMODEL_DLLPUBLIC Exception
+class WRITERFILTER_DLLPUBLIC Exception
{
string mText;
@@ -45,13 +45,13 @@ public:
const string & getText() const { return mText; }
};
-class WRITERFILTER_RESOURCEMODEL_DLLPUBLIC ExceptionNotFound : public Exception
+class WRITERFILTER_DLLPUBLIC ExceptionNotFound : public Exception
{
public:
ExceptionNotFound(string text) : Exception(text) {}
};
-class WRITERFILTER_RESOURCEMODEL_DLLPUBLIC ExceptionOutOfBounds : public Exception
+class WRITERFILTER_DLLPUBLIC ExceptionOutOfBounds : public Exception
{
public:
ExceptionOutOfBounds(string text) : Exception(text) {}
diff --git a/writerfilter/inc/resourcemodel/util.hxx b/writerfilter/inc/resourcemodel/util.hxx
index 5bfd15b..cab0b17 100644
--- a/writerfilter/inc/resourcemodel/util.hxx
+++ b/writerfilter/inc/resourcemodel/util.hxx
@@ -38,10 +38,10 @@ namespace writerfilter
using namespace ::std;
using namespace ::com::sun::star;
- string WRITERFILTER_RESOURCEMODEL_DLLPUBLIC xmlify(const string & str);
+ string WRITERFILTER_DLLPUBLIC xmlify(const string & str);
#if OSL_DEBUG_LEVEL > 1
- string WRITERFILTER_RESOURCEMODEL_DLLPUBLIC propertysetToString
+ string WRITERFILTER_DLLPUBLIC propertysetToString
(uno::Reference<beans::XPropertySet> const & rProps);
string toString(uno::Reference< text::XTextRange > textRange);
diff --git a/writerfilter/source/Makefile b/writerfilter/source/Makefile
index 487888c..7132007 100644
--- a/writerfilter/source/Makefile
+++ b/writerfilter/source/Makefile
@@ -179,7 +179,7 @@ wf_SRC_doctok_QNameToStr_xsl=$(WFDIR)doctok/qnametostr.xsl
wf_SRC_ooxml_QNameToStr_xsl=$(WFDIR)ooxml/qnametostr.xsl
wf_SRC_model_NamespacePreprocess=$(WFDIR)resourcemodel/namespace_preprocess.pl
wf_GEN_ooxml_Namespacesmap_xsl=namespacesmap.xsl
-wf_DEP_ooxml_namespaces_txt=$(OUTDIR)/inc$(UPDMINOREXT)/oox/token/namespaces.txt
+wf_DEP_ooxml_namespaces_txt=$(OUTDIR)/inc/oox/namespaces.txt
wf_GEN_ooxml_preprocess_xsl=modelpreprocess.xsl
$(wf_GEN_ooxml_QNameToStr_tmp): $(wf_SRC_ooxml_QNameToStr_xsl) $(wf_GEN_ooxml_Model_processed)
@@ -223,8 +223,9 @@ all : \
$(wf_GEN_ooxml_FastTokens_hxx) \
$(wf_GEN_ooxml_GperfFastToken_hxx) \
$(wf_GEN_ooxml_NamespaceIds_hxx) \
- $(wf_GEN_ooxml_Status_efforts) \
$(wf_GEN_model_QNameToStr_cxx) \
$(wf_GEN_model_SprmCodeToStr_cxx) \
$(patsubst %,OOXMLFactory_%.hxx,$(WRITERFILTER_OOXMLNAMESPACES)) \
$(patsubst %,OOXMLFactory_%.cxx,$(WRITERFILTER_OOXMLNAMESPACES)) \
+
+# $(wf_GEN_ooxml_Status_efforts) \
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx
index 1b14e23..b1f1a95 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -2780,9 +2780,8 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext, SprmType
xLineNumberingPropSet->setPropertyValue(rNameSupplier.GetName( PROP_DISTANCE ), uno::makeAny(aSettings.nDistance) );
xLineNumberingPropSet->setPropertyValue(rNameSupplier.GetName( PROP_RESTART_AT_EACH_PAGE ), uno::makeAny(aSettings.bRestartAtEachPage) );
}
- catch( const uno::Exception& e)
+ catch( const uno::Exception& )
{
- (void) e;
}
}
@@ -3049,9 +3048,8 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext, SprmType
uno::makeAny( nNumType ));
}
}
- catch( const uno::Exception& e)
+ catch( const uno::Exception& )
{
- (void) e;
}
}
break;
@@ -3315,12 +3313,7 @@ void DomainMapper::lcl_text(const sal_uInt8 * data_, size_t len)
}
catch( const uno::RuntimeException& )
{
-#ifdef DEBUG_DOMAINMAPPER
- dmapper_logger->startElement("exception");
- dmapper_logger->attribute("file", __FILE__);
- dmapper_logger->attribute("line", __LINE__);
- dmapper_logger->endElement("exception");
-#endif
+ std::clog << __FILE__ << "(l" << __LINE__ << ")" << std::endl;
}
}
@@ -3372,9 +3365,8 @@ void DomainMapper::lcl_utext(const sal_uInt8 * data_, size_t len)
}
}
- catch( const uno::RuntimeException& e)
+ catch( const uno::RuntimeException& )
{
- (void) e;
}
}
diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
index 06e2cdd..91c3c75 100644
--- a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
@@ -52,58 +52,6 @@ using namespace ::std;
#define DEFAULT_CELL_MARGIN 108 //default cell margin, not documented
#ifdef DEBUG_DMAPPER_TABLE_HANDLER
-XMLTag::Pointer_t handleToTag(Handle_t & rHandle)
-{
- XMLTag::Pointer_t pTag(new XMLTag("handle"));
-
- pTag->chars(rHandle->getString());
-
- return pTag;
-}
-
-void cellSequenceToTags(XMLTag::Pointer_t pTag, CellSequence_t & rCellSequence)
-{
- sal_Int32 nCount = rCellSequence.getLength();
- pTag->addAttr("count", nCount);
-
- for (sal_Int32 n = 0; n < nCount; n++)
- {
- Handle_t aHandle = rCellSequence[n];
- pTag->addTag(handleToTag(aHandle));
- }
-}
-
-void rowSequenceToTags(XMLTag::Pointer_t pTag, RowSequence_t & rRowSequence)
-{
- sal_Int32 nCount = rRowSequence.getLength();
- pTag->addAttr("count", nCount);
-
- for (sal_Int32 n = 0; n < nCount; n++)
- {
- CellSequence_t & rCells = rRowSequence[n];
- XMLTag::Pointer_t pCellTag(new XMLTag("cell"));
- cellSequenceToTags(pCellTag, rCells);
- pTag->addTag(pCellTag);
- }
-}
-
-XMLTag::Pointer_t tableSequenceToTag(TableSequence_t & rTableSequence)
-{
- XMLTag::Pointer_t pTag(new XMLTag("table"));
- sal_Int32 nCount = rTableSequence.getLength();
- pTag->addAttr("count", nCount);
-
- for (sal_Int32 n = 0; n < nCount; n++)
- {
- RowSequence_t & rRowSequence = rTableSequence[n];
- XMLTag::Pointer_t pRowTag(new XMLTag("row"));
- rowSequenceToTags(pRowTag, rRowSequence);
- pTag->addTag(pRowTag);
- }
-
- return pTag;
-}
-
static void lcl_printProperties( PropertyMapPtr pProps )
{
if( pProps.get() )
@@ -116,9 +64,8 @@ static void lcl_printProperties( PropertyMapPtr pProps )
for( ; aMapIter != aEndIter; ++aMapIter )
{
rtl::OUString aOUStr = rPropSupplier.GetName( aMapIter->first.eId );
- dmapper_logger->startElement("entry");
- dmapper_logger->chars(aOUStr);
- dmapper_logger->endElement("entry");
+ rtl::OString aOStr(aOUStr.getStr(), aOUStr.getLength(), RTL_TEXTENCODING_ASCII_US );
+ clog << aOStr.getStr();
table::BorderLine2 aLine;
sal_Int32 nColor;
@@ -761,12 +708,6 @@ void DomainMapperTableHandler::endTable()
{
try
{
-#ifdef DEBUG_DMAPPER_TABLE_HANDLER
- XMLTag::Pointer_t pTag = tableSequenceToTag(*m_pTableSeq);
- dmapper_logger->addTag(pTag);
-
- ::std::clog << pTag->toTree() << ::std::endl;
-#endif
uno::Reference<text::XTextTable> xTable = m_xText->convertToTable(*m_pTableSeq,
aCellProperties,
aRowProperties,
@@ -776,14 +717,12 @@ void DomainMapperTableHandler::endTable()
}
catch (lang::IllegalArgumentException)
{
- (void) e;
#ifdef DEBUG_DMAPPER_TABLE_HANDLER
dmapper_logger->chars("failed to import table!");
#endif
}
catch ( uno::Exception &e )
{
- (void) e;
#ifdef DEBUG_DMAPPER_TABLE_HANDLER
dmapper_logger->startElement("exception");
dmapper_logger->chars(rtl::OUStringToOString( e.Message, RTL_TEXTENCODING_UTF8 ).getStr( ));
@@ -865,6 +804,7 @@ void DomainMapperTableHandler::endCell(const Handle_t & end)
dmapper_logger->chars(toString(end));
dmapper_logger->endElement();
dmapper_logger->endElement();
+ clog << "</table.cell>" << endl;
#endif
if (!end.get())
diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.hxx b/writerfilter/source/dmapper/DomainMapperTableHandler.hxx
index 5156efc..2d38dc7 100644
--- a/writerfilter/source/dmapper/DomainMapperTableHandler.hxx
+++ b/writerfilter/source/dmapper/DomainMapperTableHandler.hxx
@@ -36,33 +36,24 @@
namespace writerfilter {
namespace dmapper {
-using namespace ::com::sun::star;
-
-typedef text::XTextRange TextRange_t;
-typedef uno::Reference< TextRange_t > Handle_t;
-typedef uno::Sequence< Handle_t> CellSequence_t;
+typedef ::com::sun::star::text::XTextRange TextRange_t;
+typedef ::com::sun::star::uno::Reference< TextRange_t > Handle_t;
+typedef ::com::sun::star::uno::Sequence< Handle_t> CellSequence_t;
typedef boost::shared_ptr<CellSequence_t> CellSequencePointer_t;
-typedef uno::Sequence< CellSequence_t > RowSequence_t;
+typedef ::com::sun::star::uno::Sequence< CellSequence_t > RowSequence_t;
typedef boost::shared_ptr<RowSequence_t> RowSequencePointer_t;
-typedef uno::Sequence< RowSequence_t> TableSequence_t;
+typedef ::com::sun::star::uno::Sequence< RowSequence_t> TableSequence_t;
typedef boost::shared_ptr<TableSequence_t> TableSequencePointer_t;
-typedef text::XTextAppendAndConvert Text_t;
-typedef uno::Reference<Text_t> TextReference_t;
+typedef ::com::sun::star::text::XTextAppendAndConvert Text_t;
+typedef ::com::sun::star::uno::Reference<Text_t> TextReference_t;
-typedef beans::PropertyValues TablePropertyValues_t;
-typedef uno::Sequence< TablePropertyValues_t > RowPropertyValuesSeq_t;
-typedef uno::Sequence< RowPropertyValuesSeq_t> CellPropertyValuesSeq_t;
+typedef ::com::sun::star::beans::PropertyValues TablePropertyValues_t;
+typedef ::com::sun::star::uno::Sequence< TablePropertyValues_t > RowPropertyValuesSeq_t;
+typedef ::com::sun::star::uno::Sequence< RowPropertyValuesSeq_t> CellPropertyValuesSeq_t;
typedef std::vector<PropertyMapPtr> PropertyMapVector1;
typedef std::vector<PropertyMapVector1> PropertyMapVector2;
-#ifdef DEBUG_DMAPPER_TABLE_HANDLER
-XMLTag::Pointer_t handleToTag(Handle_t & rHandle);
-void cellSequenceToTag(XMLTag::Pointer_t pTag, CellSequence_t & pCellSequence);
-void rowSequenceToTag(XMLTag::Pointer_t pTag, RowSequence_t & pRowSequence);
-XMLTag::Pointer_t tableSequenceToTag(TableSequence_t & rTableSequence);
-#endif
-
class DomainMapper_Impl;
class TableStyleSheetEntry;
struct TableInfo;
diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.cxx b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
index c2c57ea..cc13001 100644
--- a/writerfilter/source/dmapper/DomainMapperTableManager.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
@@ -60,7 +60,7 @@ DomainMapperTableManager::DomainMapperTableManager(bool bOOXML) :
{
m_pTablePropsHandler->SetTableManager( this );
-#ifdef DEBUG_DMAPPER_TABLE_HANDLER
+#ifdef DEBUG_DOMAINMAPPER
#ifdef DEBUG_TABLE
setTagLogger(dmapper_logger);
#endif
@@ -70,14 +70,14 @@ DomainMapperTableManager::DomainMapperTableManager(bool bOOXML) :
DomainMapperTableManager::~DomainMapperTableManager()
{
- delete m_pTablePropsHandler;
- m_pTablePropsHandler = NULL;
+ if ( m_pTablePropsHandler )
+ delete m_pTablePropsHandler, m_pTablePropsHandler = NULL;
}
bool DomainMapperTableManager::sprm(Sprm & rSprm)
{
-#ifdef DEBUG_DMAPPER_TABLE_HANDLER
+#ifdef DEBUG_DOMAINMAPPER
dmapper_logger->startElement("tablemanager.sprm");
string sSprm = rSprm.toString();
dmapper_logger->chars(sSprm);
@@ -119,7 +119,7 @@ bool DomainMapperTableManager::sprm(Sprm & rSprm)
if( m_nTableWidth )
pPropMap->setValue( TablePropertyMap::TABLE_WIDTH, m_nTableWidth );
}
-#ifdef DEBUG_DMAPPER_TABLE_HANDLER
+#ifdef DEBUG_DOMAINMAPPER
pPropMap->dumpXml( dmapper_logger );
#endif
insertTableProps(pPropMap);
@@ -239,7 +239,7 @@ bool DomainMapperTableManager::sprm(Sprm & rSprm)
break;
case NS_ooxml::LN_CT_TcPrBase_gridSpan: //number of grid positions spanned by this cell
{
-#if DEBUG_DMAPPER_TABLE_HANDLER
+#if DEBUG_DOMAINMAPPER
dmapper_logger->startElement("tablemanager.GridSpan");
dmapper_logger->attribute("gridSpan", nIntValue);
dmapper_logger->endElement();
@@ -309,7 +309,7 @@ bool DomainMapperTableManager::sprm(Sprm & rSprm)
bRet = false;
#ifdef DEBUG_DOMAINMAPPER
- dmapper_logger->element("TableManager.unhandled");
+ dmapper_logger->element("unhandled");
#endif
}
}
@@ -344,7 +344,7 @@ void DomainMapperTableManager::endLevel( )
m_nTableWidth = 0;
DomainMapperTableManager_Base_t::endLevel( );
-#ifdef DEBUG_DMAPPER_TABLE_HANDLER
+#ifdef DEBUG_DOMAINMAPPER
dmapper_logger->startElement("dmappertablemanager.endLevel");
PropertyMapPtr pProps = getTableProps();
if (pProps.get() != NULL)
@@ -358,7 +358,7 @@ void DomainMapperTableManager::endLevel( )
void DomainMapperTableManager::endOfCellAction()
{
-#ifdef DEBUG_DMAPPER_TABLE_HANDLER
+#ifdef DEBUG_DOMAINMAPPER
dmapper_logger->element("endOFCellAction");
#endif
@@ -370,7 +370,7 @@ void DomainMapperTableManager::endOfCellAction()
void DomainMapperTableManager::endOfRowAction()
{
-#ifdef DEBUG_DMAPPER_TABLE_HANDLER
+#ifdef DEBUG_DOMAINMAPPER
dmapper_logger->startElement("endOfRowAction");
#endif
@@ -379,13 +379,13 @@ void DomainMapperTableManager::endOfRowAction()
{
::std::vector<sal_Int32>::const_iterator aCellIter = pTableGrid->begin();
-#ifdef DEBUG_DMAPPER_TABLE_HANDLER
+#ifdef DEBUG_DOMAINMAPPER
dmapper_logger->startElement("tableWidth");
#endif
while( aCellIter != pTableGrid->end() )
{
-#ifdef DEBUG_DMAPPER_TABLE_HANDLER
+#ifdef DEBUG_DOMAINMAPPER
dmapper_logger->startElement("col");
dmapper_logger->attribute("width", *aCellIter);
dmapper_logger->endElement();
@@ -401,7 +401,7 @@ void DomainMapperTableManager::endOfRowAction()
insertTableProps(pPropMap);
}
-#ifdef DEBUG_DMAPPER_TABLE_HANDLER
+#ifdef DEBUG_DOMAINMAPPER
dmapper_logger->endElement();
#endif
}
@@ -413,7 +413,7 @@ void DomainMapperTableManager::endOfRowAction()
pCurrentSpans->insert( pCurrentSpans->end( ), m_nCell - pCurrentSpans->size(), 1 );
}
-#ifdef DEBUG_DMAPPER_TABLE_HANDLER
+#ifdef DEBUG_DOMAINMAPPER
dmapper_logger->startElement("gridSpans");
{
::std::vector<sal_Int32>::const_iterator aGridSpanIter = pCurrentSpans->begin();
@@ -469,7 +469,7 @@ void DomainMapperTableManager::endOfRowAction()
TablePropertyMapPtr pPropMap( new TablePropertyMap );
pPropMap->Insert( PROP_TABLE_COLUMN_SEPARATORS, false, uno::makeAny( aSeparators ) );
-#ifdef DEBUG_DMAPPER_TABLE_HANDLER
+#ifdef DEBUG_DOMAINMAPPER
dmapper_logger->startElement("rowProperties");
pPropMap->dumpXml( dmapper_logger );
dmapper_logger->endElement();
@@ -482,7 +482,7 @@ void DomainMapperTableManager::endOfRowAction()
m_nCellBorderIndex = 0;
pCurrentSpans->clear();
-#ifdef DEBUG_DMAPPER_TABLE_HANDLER
+#ifdef DEBUG_DOMAINMAPPER
dmapper_logger->endElement();
#endif
}
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 23910b9..759f8e7 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -278,9 +278,8 @@ void DomainMapper_Impl::SetDocumentSettingsProperty( const ::rtl::OUString& rPro
{
xSettings->setPropertyValue( rPropName, rValue );
}
- catch( const uno::Exception& e)
+ catch( const uno::Exception& )
{
- (void) e;
}
}
}
@@ -310,22 +309,9 @@ void DomainMapper_Impl::SetIsLastParagraphInSection( bool bIsLast )
void DomainMapper_Impl::PushProperties(ContextType eId)
{
- PropertyMapPtr pInsert;
+ PropertyMapPtr pInsert(eId == CONTEXT_SECTION ?
(new SectionPropertyMap( m_bIsFirstSection )) :
- switch (eId)
- {
- case CONTEXT_SECTION:
- pSectionContext = new SectionPropertyMap( m_bIsFirstSection );
- pInsert.reset(pSectionContext);
- break;
- case CONTEXT_PARAGRAPH:
- pInsert.reset(new ParagraphPropertyMap);
- break;
- default:
- pInsert.reset(new PropertyMap);
- break;
- }
-
+ eId == CONTEXT_PARAGRAPH ? new ParagraphPropertyMap : new PropertyMap);
if(eId == CONTEXT_SECTION)
{
if( m_bIsFirstSection )
@@ -625,6 +611,7 @@ bool lcl_removeShape( const uno::Reference< text::XTextDocument >& rDoc, const
}
+
void lcl_MoveBorderPropertiesToFrame(uno::Sequence<beans::PropertyValue>& rFrameProperties,
uno::Reference<text::XTextRange> xStartTextRange,
uno::Reference<text::XTextRange> xEndTextRange )
@@ -650,16 +637,22 @@ void lcl_MoveBorderPropertiesToFrame(uno::Sequence<beans::PropertyValue>& rFrame
PROP_BOTTOM_BORDER_DISTANCE
};
+ sal_uInt32 nStart = rFrameProperties.getLength();
sal_uInt32 nBorderPropertyCount = sizeof( aBorderProperties ) / sizeof(PropertyIds);
+ rFrameProperties.realloc(nStart + nBorderPropertyCount);
+ beans::PropertyValue* pFrameProperties = rFrameProperties.getArray();
PropertyNameSupplier& rPropNameSupplier = PropertyNameSupplier::GetPropertyNameSupplier();
for( sal_uInt32 nProperty = 0; nProperty < nBorderPropertyCount; ++nProperty)
{
::rtl::OUString sPropertyName = rPropNameSupplier.GetName(aBorderProperties[nProperty]);
- aPropSequence.set(aBorderProperties[nProperty], xTextRangeProperties->getPropertyValue(sPropertyName));
+ pFrameProperties[nStart].Name = sPropertyName;
+ pFrameProperties[nStart].Value = xTextRangeProperties->getPropertyValue(sPropertyName);
if( nProperty < 4 )
xTextRangeProperties->setPropertyValue( sPropertyName, uno::makeAny(table::BorderLine2()));
+ ++nStart;
}
+ rFrameProperties.realloc(nStart);
}
catch( const uno::Exception& rEx )
{
@@ -667,79 +660,6 @@ void lcl_MoveBorderPropertiesToFrame(uno::Sequence<beans::PropertyValue>& rFrame
}
}
-void lcl_CorrectIndents(PropertySequence & aPropSeq)
-{
- try
- {
- uno::Any aAny;
-
- sal_Int32 nLeftMargin = 0;
-
-#ifdef DEBUG
- ::std::string aStr(aPropSeq.toString());
-#endif
-
- aAny = aPropSeq.get(PROP_PARA_LEFT_MARGIN);
- if (aAny.hasValue())
- aAny >>= nLeftMargin;
-
- aAny = aPropSeq.get(PROP_LEFT_BORDER_DISTANCE);
-
- if (aAny.hasValue())
- {
- sal_Int32 nLeftBorderDistance = 0;
- aAny >>= nLeftBorderDistance;
- nLeftMargin -= nLeftBorderDistance;
- aPropSeq.set(PROP_PARA_LEFT_MARGIN, nLeftMargin);
- }
-
- aAny = aPropSeq.get(PROP_LEFT_BORDER);
-
- if (aAny.hasValue())
- {
- table::BorderLine aBorderLine;
- aAny >>= aBorderLine;
- nLeftMargin -= aBorderLine.OuterLineWidth;
- aPropSeq.set(PROP_PARA_LEFT_MARGIN, nLeftMargin);
- }
-
- sal_Int32 nRightMargin = 0;
- aAny = aPropSeq.get(PROP_PARA_RIGHT_MARGIN);
- if (aAny.hasValue())
- aAny >>= nRightMargin;
-
- aAny = aPropSeq.get(PROP_RIGHT_BORDER_DISTANCE);
-
- if (aAny.hasValue())
- {
- sal_Int32 nRightBorderDistance = 0;
- aAny >>= nRightBorderDistance;
- nRightMargin -= nRightBorderDistance;
- aPropSeq.set(PROP_PARA_RIGHT_MARGIN, nRightMargin);
- }
-
- aAny = aPropSeq.get(PROP_RIGHT_BORDER);
-
- if (aAny.hasValue())
- {
- table::BorderLine aBorderLine;
- aAny >>= aBorderLine;
- nRightMargin -= aBorderLine.OuterLineWidth;
- aPropSeq.set(PROP_PARA_RIGHT_MARGIN, nRightMargin);
- }
- }
- catch (const uno::Exception& rEx)
- {
- (void) rEx;
- }
- catch (const dmapper::Exception & rEx)
- {
- (void) rEx;
- }
-
-}
-
-
void lcl_AddRangeAndStyle(
ParagraphPropertiesPtr& pToBeSavedProperties,
@@ -847,207 +767,120 @@ void DomainMapper_Impl::finishParagraph( PropertyMapPtr pPropertyMap )
{
//handles (8)(9) and completes (6)
try
- {
- //
- StyleSheetEntryPtr pParaStyle =
- m_pStyleSheetTable->FindStyleSheetByConvertedStyleName(rAppendContext.pLastParagraphProperties->GetParaStyleName());
-
- PropertySequence aPropSequence;
- if ( pParaStyle.get( ) )
- {
- const ParagraphProperties* pStyleProperties = dynamic_cast<const ParagraphProperties*>( pParaStyle->pProperties.get() );
- sal_Int32 nWidth =
- rAppendContext.pLastParagraphProperties->Getw() > 0 ?
- rAppendContext.pLastParagraphProperties->Getw() :
- pStyleProperties->Getw();
- bool bAutoWidth = nWidth < 1;
- if( bAutoWidth )
- nWidth = DEFAULT_FRAME_MIN_WIDTH;
- aPropSequence.set(PROP_WIDTH, nWidth);
-
- if (rAppendContext.pLastParagraphProperties->Geth())
- {
- aPropSequence.set(PROP_HEIGHT, rAppendContext.pLastParagraphProperties->Geth());
- }
- else
- {
- aPropSequence.set(PROP_HEIGHT, pStyleProperties->Geth());
- }
-
- if (rAppendContext.pLastParagraphProperties->GethRule() >= 0)
- {
- aPropSequence.set(PROP_SIZE_TYPE, rAppendContext.pLastParagraphProperties->GethRule());
- }
- else if (pStyleProperties->GethRule() >=0)
- {
- aPropSequence.set(PROP_SIZE_TYPE, pStyleProperties->GethRule());
- }
- else
- {
- aPropSequence.set(PROP_SIZE_TYPE, text::SizeType::VARIABLE);
- }
-
- if (bAutoWidth)
- {
- aPropSequence.set(PROP_WIDTH_TYPE, text::SizeType::MIN);
- }
- else
- {
- aPropSequence.set(PROP_WIDTH_TYPE, text::SizeType::FIX);
- }
-
- sal_Int16 nHoriOrient = text::HoriOrientation::NONE;
- if ( rAppendContext.pLastParagraphProperties->GetxAlign() >= 0)
- {
- nHoriOrient = static_cast<sal_Int16>(rAppendContext.pLastParagraphProperties->GetxAlign());
- }
- else if (pStyleProperties->GetxAlign() >= 0)
- {
- nHoriOrient = static_cast<sal_Int16>(pStyleProperties->GetxAlign());
- }
-
- aPropSequence.set(PROP_HORI_ORIENT, nHoriOrient);
+ {
+ //
+ StyleSheetEntryPtr pParaStyle =
+ m_pStyleSheetTable->FindStyleSheetByConvertedStyleName(rAppendContext.pLastParagraphProperties->GetParaStyleName());
- if (rAppendContext.pLastParagraphProperties->IsxValid())
- {
- aPropSequence.set(PROP_HORI_ORIENT_POSITION,
- rAppendContext.pLastParagraphProperties->Getx());
- }
- else
- {
- aPropSequence.set(PROP_HORI_ORIENT_POSITION,
- pStyleProperties->Getx());
- }
-
- if (rAppendContext.pLastParagraphProperties->GethAnchor() >= 0)
+ uno::Sequence< beans::PropertyValue > aFrameProperties(pParaStyle ? 15: 0);
+ if ( pParaStyle.get( ) )
{
- aPropSequence.set(PROP_HORI_ORIENT_RELATION,
- rAppendContext.pLastParagraphProperties->GethAnchor());
+ const ParagraphProperties* pStyleProperties = dynamic_cast<const ParagraphProperties*>( pParaStyle->pProperties.get() );
+ beans::PropertyValue* pFrameProperties = aFrameProperties.getArray();
+ pFrameProperties[0].Name = rPropNameSupplier.GetName(PROP_WIDTH);
+ pFrameProperties[1].Name = rPropNameSupplier.GetName(PROP_HEIGHT);
+ pFrameProperties[2].Name = rPropNameSupplier.GetName(PROP_SIZE_TYPE);
+ pFrameProperties[3].Name = rPropNameSupplier.GetName(PROP_WIDTH_TYPE);
+ pFrameProperties[4].Name = rPropNameSupplier.GetName(PROP_HORI_ORIENT);
+ pFrameProperties[5].Name = rPropNameSupplier.GetName(PROP_HORI_ORIENT_POSITION);
+ pFrameProperties[6].Name = rPropNameSupplier.GetName(PROP_HORI_ORIENT_RELATION);
+ pFrameProperties[7].Name = rPropNameSupplier.GetName(PROP_VERT_ORIENT);
+ pFrameProperties[8].Name = rPropNameSupplier.GetName(PROP_VERT_ORIENT_POSITION);
+ pFrameProperties[9].Name = rPropNameSupplier.GetName(PROP_VERT_ORIENT_RELATION);
+ pFrameProperties[10].Name = rPropNameSupplier.GetName(PROP_SURROUND);
+ pFrameProperties[11].Name = rPropNameSupplier.GetName(PROP_LEFT_MARGIN);
+ pFrameProperties[12].Name = rPropNameSupplier.GetName(PROP_RIGHT_MARGIN);
+ pFrameProperties[13].Name = rPropNameSupplier.GetName(PROP_TOP_MARGIN);
+ pFrameProperties[14].Name = rPropNameSupplier.GetName(PROP_BOTTOM_MARGIN);
+ sal_Int32 nWidth =
+ rAppendContext.pLastParagraphProperties->Getw() > 0 ?
+ rAppendContext.pLastParagraphProperties->Getw() :
+ pStyleProperties->Getw();
+ bool bAutoWidth = nWidth < 1;
+ if( bAutoWidth )
+ nWidth = DEFAULT_FRAME_MIN_WIDTH;
+ pFrameProperties[0].Value <<= nWidth;
+ pFrameProperties[1].Value <<=
+ rAppendContext.pLastParagraphProperties->Geth() > 0 ?
+ rAppendContext.pLastParagraphProperties->Geth() :
+ pStyleProperties->Geth();
+ pFrameProperties[2].Value <<= sal_Int16(
+ rAppendContext.pLastParagraphProperties->GethRule() >= 0 ?
+ rAppendContext.pLastParagraphProperties->GethRule() :
+ pStyleProperties->GethRule() >=0 ? pStyleProperties->GethRule() : text::SizeType::VARIABLE);
+
+ pFrameProperties[3].Value <<= bAutoWidth ? text::SizeType::MIN : text::SizeType::FIX;
+
+ sal_Int16 nHoriOrient = sal_Int16(
+ rAppendContext.pLastParagraphProperties->GetxAlign() >= 0 ?
+ rAppendContext.pLastParagraphProperties->GetxAlign() :
+ pStyleProperties->GetxAlign() >= 0 ? pStyleProperties->GetxAlign() : text::HoriOrientation::NONE );
+ pFrameProperties[4].Value <<= nHoriOrient;
+
+ pFrameProperties[5].Value <<=
+ rAppendContext.pLastParagraphProperties->IsxValid() ?
+ rAppendContext.pLastParagraphProperties->Getx() : pStyleProperties->Getx();
+ pFrameProperties[6].Value <<= sal_Int16(
+ rAppendContext.pLastParagraphProperties->GethAnchor() >= 0 ?
+ rAppendContext.pLastParagraphProperties->GethAnchor() :
+ pStyleProperties->GethAnchor() );
+
+ sal_Int16 nVertOrient = sal_Int16(
+ rAppendContext.pLastParagraphProperties->GetyAlign() >= 0 ?
+ rAppendContext.pLastParagraphProperties->GetyAlign() :
+ pStyleProperties->GetyAlign() >= 0 ? pStyleProperties->GetyAlign() : text::VertOrientation::NONE );
+ pFrameProperties[7].Value <<= nVertOrient;
+
+ pFrameProperties[8].Value <<=
+ rAppendContext.pLastParagraphProperties->IsyValid() ?
+ rAppendContext.pLastParagraphProperties->Gety() : pStyleProperties->Gety();
+ pFrameProperties[9].Value <<= sal_Int16(
+ rAppendContext.pLastParagraphProperties->GetvAnchor() >= 0 ?
+ rAppendContext.pLastParagraphProperties->GetvAnchor() :
+ pStyleProperties->GetvAnchor() );
+
+ pFrameProperties[10].Value <<= text::WrapTextMode(
+ rAppendContext.pLastParagraphProperties->GetWrap() >= 0 ?
+ rAppendContext.pLastParagraphProperties->GetWrap() :
+ pStyleProperties->GetWrap());
+
+ sal_Int32 nBottomDist;
+ sal_Int32 nTopDist = nBottomDist =
+ rAppendContext.pLastParagraphProperties->GethSpace() >= 0 ?
+ rAppendContext.pLastParagraphProperties->GethSpace() :
+ pStyleProperties->GethSpace();
+
+ pFrameProperties[11].Value <<= nVertOrient == text::VertOrientation::TOP ? 0 : nTopDist;
+ pFrameProperties[12].Value <<= nVertOrient == text::VertOrientation::BOTTOM ? 0 : nBottomDist;
+
+ sal_Int32 nRightDist;
+ sal_Int32 nLeftDist = nRightDist =
+ rAppendContext.pLastParagraphProperties->GetvSpace() >= 0 ?
+ rAppendContext.pLastParagraphProperties->GetvSpace() :
+ pStyleProperties->GetvSpace() >= 0 ? pStyleProperties->GetvSpace() : 0;
+ pFrameProperties[13].Value <<= nHoriOrient == text::HoriOrientation::LEFT ? 0 : nLeftDist;
+ pFrameProperties[14].Value <<= nHoriOrient == text::HoriOrientation::RIGHT ? 0 : nRightDist;
+
+ lcl_MoveBorderPropertiesToFrame(aFrameProperties,
+ rAppendContext.pLastParagraphProperties->GetStartingRange(),
+ rAppendContext.pLastParagraphProperties->GetEndingRange());
}
- else
+ //frame conversion has to be executed after table conversion
+ RegisterFrameConversion(
+ rAppendContext.pLastParagraphProperties->GetStartingRange(),
+ rAppendContext.pLastParagraphProperties->GetEndingRange(),
+ aFrameProperties );
+ // next frame follows directly
+ if( pParaContext->IsFrameMode() )
{
- aPropSequence.set(PROP_HORI_ORIENT_RELATION, pStyleProperties->GethAnchor());
+ pToBeSavedProperties.reset( new ParagraphProperties(*pParaContext) );
+ lcl_AddRangeAndStyle(pToBeSavedProperties, xTextAppend, pPropertyMap);
}
-
- sal_Int16 nVertOrient = text::VertOrientation::NONE;
- if ( rAppendContext.pLastParagraphProperties->GetyAlign() >= 0)
- {
- nVertOrient = static_cast<sal_Int16>(rAppendContext.pLastParagraphProperties->GetyAlign());
- }
- else if ( pStyleProperties->GetyAlign() >= 0)
- {
- nVertOrient = static_cast<sal_Int16>(pStyleProperties->GetyAlign());
- }
-
- aPropSequence.set(PROP_VERT_ORIENT, nVertOrient);
-
- if ( rAppendContext.pLastParagraphProperties->IsyValid())
- {
- aPropSequence.set(PROP_VERT_ORIENT_POSITION, rAppendContext.pLastParagraphProperties->Gety()); }
- else
- {
- aPropSequence.set(PROP_VERT_ORIENT_POSITION, pStyleProperties->Gety());
- }
-
- if (rAppendContext.pLastParagraphProperties->GetvAnchor() >= 0)
- {
- aPropSequence.set(PROP_VERT_ORIENT_RELATION,
- rAppendContext.pLastParagraphProperties->GetvAnchor());
- }
- else
- {
- aPropSequence.set(PROP_VERT_ORIENT_RELATION,
- pStyleProperties->GetvAnchor());
- }
-
- if (rAppendContext.pLastParagraphProperties->GetWrap() >= 0)
- {
- aPropSequence.set(PROP_SURROUND,
- rAppendContext.pLastParagraphProperties->GetWrap());
- }
- else
- {
- aPropSequence.set(PROP_SURROUND,
- pStyleProperties->GetWrap());
- }
-
- sal_Int32 nTopDist;
-
- if (nVertOrient == text::VertOrientation::TOP)
- {
- nTopDist = 0;
- }
- else
- {
- if (rAppendContext.pLastParagraphProperties->GethSpace() >= 0)
- {
- nTopDist = rAppendContext.pLastParagraphProperties->GethSpace();
- }
- else
- {
- nTopDist = pStyleProperties->GethSpace();
- }
- }
-
- aPropSequence.set(PROP_TOP_MARGIN, nTopDist);
-
- sal_Int32 nBottomDist = nTopDist;
- if (nVertOrient == text::VertOrientation::BOTTOM)
- {
- nBottomDist = 0;
- }
-
- aPropSequence.set(PROP_BOTTOM_MARGIN, nBottomDist);
-
- sal_Int32 nLeftDist = 0;
- if (nHoriOrient == text::HoriOrientation::LEFT)
- {
- nLeftDist = 0;
- }
- else if (rAppendContext.pLastParagraphProperties->GetvSpace() >= 0)
- {
- nLeftDist = rAppendContext.pLastParagraphProperties->GetvSpace();
- }
- else if (pStyleProperties->GetvSpace() >= 0)
- {
- nLeftDist = pStyleProperties->GetvSpace();
- }
- else
- {
- nLeftDist = 0;
- }
-
- aPropSequence.set(PROP_LEFT_MARGIN, nLeftDist);
-
- sal_Int32 nRightDist = nLeftDist;
-
- if ( nHoriOrient == text::HoriOrientation::RIGHT)
- {
- nRightDist = 0;
- }
-
- aPropSequence.set(PROP_RIGHT_MARGIN, nRightDist);
-
- lcl_MoveBorderPropertiesToFrame(aPropSequence,
- rAppendContext.pLastParagraphProperties->GetStartingRange(),
- rAppendContext.pLastParagraphProperties->GetEndingRange());
- lcl_CorrectIndents(aPropSequence);
- }
- //frame conversion has to be executed after table conversion
- RegisterFrameConversion(rAppendContext.pLastParagraphProperties->GetStartingRange(),
- rAppendContext.pLastParagraphProperties->GetEndingRange(),
- aPropSequence.getSequence() );
- // next frame follows directly
- if( pParaContext->IsFrameMode() )
- {
- pToBeSavedProperties.reset( new ParagraphProperties(*pParaContext) );
- lcl_AddRangeAndStyle(pToBeSavedProperties, xTextAppend, pPropertyMap);
- }
- }
- catch( const uno::Exception& rEx )
- {
- (void)rEx;
- }
+ }
+ catch( const uno::Exception& rEx )
+ {
+ (void)rEx;
+ }
}
}
@@ -1061,27 +894,22 @@ void DomainMapper_Impl::finishParagraph( PropertyMapPtr pPropertyMap )
lcl_AddRangeAndStyle(pToBeSavedProperties, xTextAppend, pPropertyMap);
}
}
-
- PropertySequence::Pointer_t pPropSeq(new PropertySequence());
-
+ uno::Sequence< beans::PropertyValue > aProperties;
if( pPropertyMap.get() )
{
- pPropSeq.reset(new PropertySequence(pPropertyMap->GetPropertyValues()));
+ aProperties = pPropertyMap->GetPropertyValues();
}
-
if( !bIsDropCap )
{
if( aDrop.Lines > 1 )
{
- uno::Any aAny(aDrop);
-
- pPropSeq->set(PROP_DROP_CAP_FORMAT, aAny);
+ sal_uInt32 nLength = aProperties.getLength();
+ aProperties.realloc( nLength + 1 );
+ aProperties[nLength].Value <<= aDrop;
+ aProperties[nLength].Name = rPropNameSupplier.GetName(PROP_DROP_CAP_FORMAT);
}
-
- lcl_CorrectIndents(*pPropSeq);
-
uno::Reference< text::XTextRange > xTextRange =
- xTextAppend->finishParagraph( pPropSeq->getSequence() );
+ xTextAppend->finishParagraph( aProperties );
getTableManager( ).handle(xTextRange);
// Set the anchor of the objects to the created paragraph
@@ -1095,10 +923,9 @@ void DomainMapper_Impl::finishParagraph( PropertyMapPtr pPropertyMap )
#endif
xObj->attach( xTextRange );
}
- catch ( uno::RuntimeException& e)
+ catch ( uno::RuntimeException& )
{
// this is normal: the shape is already attached
- (void) e;
}
m_aAnchoredStack.pop( );
}
@@ -1202,13 +1029,11 @@ void DomainMapper_Impl::appendTextContent(
{
xTextAppendAndConvert->appendTextContent( xContent, xPropertyValues );
}
- catch(const lang::IllegalArgumentException& e)
+ catch(const lang::IllegalArgumentException& )
{
- (void) e;
}
- catch(const uno::Exception& e)
+ catch(const uno::Exception& )
{
- (void) e;
}
}
}
@@ -1282,9 +1107,8 @@ uno::Reference< beans::XPropertySet > DomainMapper_Impl::appendTextSectionAfter(
xSection->attach( uno::Reference< text::XTextRange >( xCursor, uno::UNO_QUERY_THROW) );
xRet = uno::Reference< beans::XPropertySet > (xSection, uno::UNO_QUERY );
}
- catch(const uno::Exception& e)
+ catch(const uno::Exception& )
{
- (void) e;
}
}
@@ -1323,9 +1147,8 @@ void DomainMapper_Impl::PushPageHeader(SectionPropertyMap::PageType eType)
xPageStyle->getPropertyValue(rPropNameSupplier.GetName( bLeft ? PROP_HEADER_TEXT_LEFT : PROP_HEADER_TEXT) ) >>= xHeaderText;
m_aTextAppendStack.push( uno::Reference< text::XTextAppend >( xHeaderText, uno::UNO_QUERY_THROW));
}
- catch( uno::Exception& e)
+ catch( uno::Exception& )
{
- (void) e;
}
}
}
@@ -1360,9 +1183,8 @@ void DomainMapper_Impl::PushPageFooter(SectionPropertyMap::PageType eType)
xPageStyle->getPropertyValue(rPropNameSupplier.GetName( bLeft ? PROP_FOOTER_TEXT_LEFT : PROP_FOOTER_TEXT) ) >>= xFooterText;
m_aTextAppendStack.push(uno::Reference< text::XTextAppend >( xFooterText, uno::UNO_QUERY_THROW ));
}
- catch( uno::Exception& e)
+ catch( uno::Exception& )
{
- (void) e;
}
}
}
@@ -1558,9 +1380,10 @@ void DomainMapper_Impl::PushShapeContext( const uno::Reference< drawing::XShape
}
catch ( const uno::Exception& e )
{
- (void) e;
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list