summaryrefslogtreecommitdiff
path: root/writerfilter
diff options
context:
space:
mode:
authorBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-06-20 20:38:45 +0200
committerBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-06-20 20:38:45 +0200
commitff2f7926a5f818981e77869bf41a45e4fa56f521 (patch)
tree3bbccec1edbe9d8c90603e2f0eff921ff29b27a2 /writerfilter
parent68ef83dbd75b7f25466e007140aedb9ed3694e50 (diff)
gnumake4: switching gbuildization
* mostly switching to gnumake4/writerfilter10 gbuild implementation (thanks mst, hb)
Diffstat (limited to 'writerfilter')
-rw-r--r--writerfilter/Library_doctok.mk147
-rw-r--r--writerfilter/Library_ooxml.mk290
-rw-r--r--writerfilter/Library_resourcemodel.mk100
-rw-r--r--writerfilter/Library_rtftok.mk63
-rw-r--r--writerfilter/Library_writerfilter.mk113
-rw-r--r--writerfilter/Library_writerfilter_uno.mk68
-rw-r--r--writerfilter/Module_writerfilter.mk11
-rw-r--r--writerfilter/Package_generated.mk32
-rw-r--r--writerfilter/Package_inc.mk35
-rw-r--r--writerfilter/Package_writerfilter_generated.mk4
-rw-r--r--writerfilter/debug_setup.mk12
-rw-r--r--writerfilter/inc/WriterFilterDllApi.hxx35
-rw-r--r--writerfilter/inc/dmapper/DomainMapper.hxx2
-rw-r--r--writerfilter/inc/doctok/WW8Document.hxx14
-rw-r--r--writerfilter/inc/ooxml/OOXMLDocument.hxx6
-rw-r--r--writerfilter/inc/resourcemodel/Fraction.hxx2
-rw-r--r--writerfilter/inc/resourcemodel/LoggedResources.hxx8
-rw-r--r--writerfilter/inc/resourcemodel/QNameToString.hxx4
-rw-r--r--writerfilter/inc/resourcemodel/ResourceModelHelper.hxx4
-rw-r--r--writerfilter/inc/resourcemodel/TableManager.hxx2
-rw-r--r--writerfilter/inc/resourcemodel/TagLogger.hxx3
-rw-r--r--writerfilter/inc/resourcemodel/WW8ResourceModel.hxx38
-rw-r--r--writerfilter/inc/resourcemodel/XPathLogger.hxx2
-rw-r--r--writerfilter/inc/resourcemodel/exceptions.hxx6
-rw-r--r--writerfilter/inc/resourcemodel/util.hxx4
-rw-r--r--writerfilter/source/Makefile5
-rw-r--r--writerfilter/source/dmapper/DomainMapper.cxx16
-rw-r--r--writerfilter/source/dmapper/DomainMapperTableHandler.cxx66
-rw-r--r--writerfilter/source/dmapper/DomainMapperTableHandler.hxx29
-rw-r--r--writerfilter/source/dmapper/DomainMapperTableManager.cxx32
-rw-r--r--writerfilter/source/dmapper/DomainMapper_Impl.cxx475
-rw-r--r--writerfilter/source/dmapper/FFDataHandler.cxx4
-rw-r--r--writerfilter/source/dmapper/FormControlHelper.cxx1
-rw-r--r--writerfilter/source/dmapper/GraphicHelpers.cxx2
-rw-r--r--writerfilter/source/dmapper/GraphicImport.cxx19
-rw-r--r--writerfilter/source/dmapper/ModelEventListener.cxx3
-rw-r--r--writerfilter/source/dmapper/NumberingManager.cxx25
-rw-r--r--writerfilter/source/dmapper/NumberingManager.hxx4
-rw-r--r--writerfilter/source/dmapper/OLEHandler.cxx12
-rw-r--r--writerfilter/source/dmapper/PropertyIds.cxx674
-rw-r--r--writerfilter/source/dmapper/PropertyIds.hxx50
-rw-r--r--writerfilter/source/dmapper/PropertyMap.cxx27
-rw-r--r--writerfilter/source/dmapper/PropertyMapHelper.cxx1
-rw-r--r--writerfilter/source/dmapper/SettingsTable.cxx6
-rw-r--r--writerfilter/source/dmapper/StyleSheetTable.cxx5
-rw-r--r--writerfilter/source/dmapper/TablePropertiesHandler.cxx6
-rw-r--r--writerfilter/source/dmapper/TblStylePrHandler.cxx8
-rw-r--r--writerfilter/source/dmapper/ThemeTable.cxx21
-rw-r--r--writerfilter/source/dmapper/WrapPolygonHandler.cxx4
-rw-r--r--writerfilter/source/doctok/WW8DocumentImpl.cxx59
-rw-r--r--writerfilter/source/doctok/WW8ResourceModelImpl.cxx1
-rw-r--r--writerfilter/source/doctok/WW8StreamImpl.cxx3
-rw-r--r--writerfilter/source/doctok/resourcesimpl.xsl3
-rw-r--r--writerfilter/source/filter/ImportFilter.cxx3
-rw-r--r--writerfilter/source/filter/RtfFilter.hxx2
-rw-r--r--writerfilter/source/filter/WriterFilter.hxx2
-rw-r--r--writerfilter/source/filter/WriterFilterDetection.hxx2
-rw-r--r--writerfilter/source/generated.mk55
-rw-r--r--writerfilter/source/ooxml/OOXMLDocumentImpl.cxx8
-rw-r--r--writerfilter/source/ooxml/OOXMLFactory.cxx16
-rw-r--r--writerfilter/source/ooxml/OOXMLFactory.hxx12
-rw-r--r--writerfilter/source/ooxml/OOXMLFastContextHandler.cxx83
-rw-r--r--writerfilter/source/ooxml/OOXMLFastContextHandler.hxx56
-rw-r--r--writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx87
-rw-r--r--writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx2
-rw-r--r--writerfilter/source/ooxml/OOXMLFastTokenHandler.cxx24
-rw-r--r--writerfilter/source/ooxml/OOXMLStreamImpl.cxx36
-rw-r--r--writerfilter/source/ooxml/RefAndPointer.hxx12
-rw-r--r--writerfilter/source/ooxml/analyzemodel.xsl1
-rw-r--r--writerfilter/source/ooxml/factory_ns.xsl2
-rw-r--r--writerfilter/source/ooxml/factoryimpl.xsl6
-rw-r--r--writerfilter/source/ooxml/factoryimpl_ns.xsl4
-rw-r--r--writerfilter/source/ooxml/fasttokens.xsl7
-rw-r--r--writerfilter/source/ooxml/gperffasttokenhandler.xsl2
-rw-r--r--writerfilter/source/ooxml/model.xml4
-rwxr-xr-x[-rw-r--r--]writerfilter/source/ooxml/stage1.sh0
-rw-r--r--writerfilter/source/ooxml/status.sh24
-rw-r--r--writerfilter/source/ooxml/todo.xsl37
-rw-r--r--writerfilter/source/resourcemodel/LoggedResources.cxx1
-rw-r--r--writerfilter/source/resourcemodel/TagLogger.cxx71
-rw-r--r--writerfilter/source/resourcemodel/qnametostrfooter2
-rw-r--r--writerfilter/source/resourcemodel/qnametostrheader4
-rw-r--r--writerfilter/source/resourcemodel/resourcemodel.cxx3
-rw-r--r--writerfilter/unocomponent/component.cxx7
84 files changed, 1080 insertions, 2061 deletions
diff --git a/writerfilter/Library_doctok.mk b/writerfilter/Library_doctok.mk
deleted file mode 100644
index 2e4afc58e1a0..000000000000
--- 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@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 e59c93a1144a..000000000000
--- 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@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 1ee3c9e2a248..000000000000
--- 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@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 c770e4028aad..000000000000
--- 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@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 3fe26f625e99..1de3e786fd0e 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 436cd3a0fb69..000000000000
--- 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@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 d1992523672d..d51031d8b881 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 682c3c6bbacc..000000000000
--- 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@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 000000000000..57ec0bea2c98
--- /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 204e028210d0..6f557e56e78b 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 811d279497ea..000000000000
--- 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 98cb5d3776e0..dff806017c8a 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 31f5a667e4e3..d9d40aa32ad9 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 8fc3d1aca1f3..5ae1e5890c57 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 7ce8052da2a5..6a8d7df80a7d 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 152e6a694d6d..9fc07b316946 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 23129b8b4c93..8b5aadb3e3a1 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 7a8932b13bcb..580dade8a423 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 0289085dbe79..f581dad2a49c 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 a0525d1b45d9..ad43cd998de5 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 cbee3a8ae05d..ffe3daca71e0 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 32cffdd35490..9acec7f4fee8 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 d5e97a2be563..0173e9c8cdde 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 c6d3b5821758..d09e23bf1e6f 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 d89a4c063a91..be7dae0150a7 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 487888cf413f..7132007be04d 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 abe47c6abc67..4e3624405b9a 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 466fcb7237e7..407b119e8a5f 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 a68fae198ce3..e4e770cfd1d1 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 37e85bcaa651..3bfb4632e6a3 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 74bcc2bde72c..bdaf3eb2d1fc 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);
- }
+ {
+ //
+ StyleSheetEntryPtr pParaStyle =
+ m_pStyleSheetTable->FindStyleSheetByConvertedStyleName(rAppendContext.pLastParagraphProperties->GetParaStyleName());
- if (bAutoWidth)
+ uno::Sequence< beans::PropertyValue > aFrameProperties(pParaStyle ? 15: 0);
+ if ( pParaStyle.get( ) )
{
- aPropSequence.set(PROP_WIDTH_TYPE, text::SizeType::MIN);
+ 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
- {
- 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);
-
- 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)
- {
- aPropSequence.set(PROP_HORI_ORIENT_RELATION,
- rAppendContext.pLastParagraphProperties->GethAnchor());
- }
- 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;
-#if DEBUG_DOMAINMAPPER
- dmapper_logger->element("exception");
+#if DEBUG
+ clog << "Exception when adding shape: ";
+ clog << rtl::OUStringToOString( e.Message, RTL_TEXTENCODING_UTF8 ).getStr( );
+ clog << endl;
#endif
}
}
@@ -1830,9 +1653,8 @@ void DomainMapper_Impl::SetNumberFormat( const ::rtl::OUString& rCommand,
xPropertySet->getPropertyValue(
PropertyNameSupplier::GetPropertyNameSupplier().GetName(PROP_NUMBER_FORMAT ) ) >>= nKey;
}
- catch(const uno::Exception& e)
+ catch(const uno::Exception&)
{
- (void) e;
}
}
@@ -3019,16 +2841,15 @@ void DomainMapper_Impl::SetFieldResult( ::rtl::OUString& rResult )
uno::makeAny( rResult ));
}
}
- catch( const beans::UnknownPropertyException& e)
+ catch( const beans::UnknownPropertyException& )
{
- (void) e;
//some fields don't have a CurrentPresentation (DateTime)
}
}
}
- catch( uno::Exception& e)
+ catch( uno::Exception& )
{
- (void) e;
+
}
}
}
@@ -3178,9 +2999,8 @@ void DomainMapper_Impl::AddBookmark( const ::rtl::OUString& rBookmarkName, const
m_aBookmarkMap.insert(BookmarkMap_t::value_type( rId, BookmarkInsertPosition( bIsStart, rBookmarkName, xCurrent ) ));
}
}
- catch( const uno::Exception& e)
+ catch( const uno::Exception& )
{
- (void) e;
//TODO: What happens to bookmarks where start and end are at different XText objects?
}
}
@@ -3245,10 +3065,10 @@ void DomainMapper_Impl::SetLineNumbering( sal_Int32 nLnnMod, sal_Int32 nLnc, sal
xProperties->setPropertyValue( rPropNameSupplier.GetName( PROP_NUMBERING_TYPE ), uno::makeAny( style::NumberingType::ARABIC));
xProperties->setPropertyValue( rPropNameSupplier.GetName( PROP_RESTART_AT_EACH_PAGE ), uno::makeAny( nLnc == 0 ));
}
- catch( const uno::Exception& e)
- {
- (void) e;
- }
+ catch( const uno::Exception& )
+ {}
+
+
/*
{ SW_PROP_NAME(UNO_NAME_CHAR_STYLE_NAME
@@ -3428,9 +3248,8 @@ void DomainMapper_Impl::ApplySettingsTable()
sal_Int32 nDefTab = m_pSettingsTable->GetDefaultTabStop();
xTextDefaults->setPropertyValue( PropertyNameSupplier::GetPropertyNameSupplier().GetName( PROP_TAB_STOP_DISTANCE ), uno::makeAny(nDefTab) );
}
- catch(const uno::Exception& e)
+ catch(const uno::Exception& )
{
- (void) e;
}
}
}
diff --git a/writerfilter/source/dmapper/FFDataHandler.cxx b/writerfilter/source/dmapper/FFDataHandler.cxx
index e6d5916095a1..0b42591b9a5c 100644
--- a/writerfilter/source/dmapper/FFDataHandler.cxx
+++ b/writerfilter/source/dmapper/FFDataHandler.cxx
@@ -349,7 +349,7 @@ void FFDataHandler::lcl_sprm(Sprm & r_Sprm)
break;
default:
#ifdef DEBUG_DOMAINMAPPER
- dmapper_logger->element("FFDataHandler.unhandled");
+ dmapper_logger->element("unhandled");
#endif
break;
}
@@ -388,7 +388,7 @@ void FFDataHandler::lcl_attribute(Id name, Value & val)
break;
default:
#ifdef DEBUG_DOMAINMAPPER
- dmapper_logger->element("FFDataHandler.unhandled");
+ dmapper_logger->element("unhandled");
#endif
break;
}
diff --git a/writerfilter/source/dmapper/FormControlHelper.cxx b/writerfilter/source/dmapper/FormControlHelper.cxx
index f6a069302aea..9998a2da2f9e 100644
--- a/writerfilter/source/dmapper/FormControlHelper.cxx
+++ b/writerfilter/source/dmapper/FormControlHelper.cxx
@@ -195,7 +195,6 @@ bool FormControlHelper::createCheckbox(uno::Reference<text::XTextRange> xTextRan
}
catch (beans::UnknownPropertyException & rException)
{
- (void) rException;
}
}
diff --git a/writerfilter/source/dmapper/GraphicHelpers.cxx b/writerfilter/source/dmapper/GraphicHelpers.cxx
index 82bd7cbc4a91..cdafb8e9f05a 100644
--- a/writerfilter/source/dmapper/GraphicHelpers.cxx
+++ b/writerfilter/source/dmapper/GraphicHelpers.cxx
@@ -107,7 +107,7 @@ void PositionHandler::lcl_attribute( Id aName, Value& rVal )
break;
default:
#ifdef DEBUG_DOMAINMAPPER
- dmapper_logger->element("PositionHandler.unhandled");
+ dmapper_logger->element("unhandled");
#endif
break;
}
diff --git a/writerfilter/source/dmapper/GraphicImport.cxx b/writerfilter/source/dmapper/GraphicImport.cxx
index 0a6d2d91cd1b..744361dfc494 100644
--- a/writerfilter/source/dmapper/GraphicImport.cxx
+++ b/writerfilter/source/dmapper/GraphicImport.cxx
@@ -911,7 +911,6 @@ void GraphicImport::lcl_attribute(Id nName, Value & val)
}
catch( const beans::UnknownPropertyException )
{
- (void) e;
// It isn't a graphic image
}
@@ -962,8 +961,8 @@ void GraphicImport::lcl_attribute(Id nName, Value & val)
//TODO: does it need to be handled?
break;
default:
-#ifdef DEBUG_DOMAINMAPPER
- dmapper_logger->element("GraphicImport.unhandled");
+#ifdef DEBUG_DMAPPER_GRAPHIC_IMPORT
+ dmapper_logger->element("unhandled");
#endif
;
}
@@ -1495,24 +1494,16 @@ uno::Reference< text::XTextContent > GraphicImport::createGraphicObject( const b
xNamed->setName( m_pImpl->sName );
}
}
- catch( const uno::Exception& e)
+ catch( const uno::Exception& )
{
- (void) e;
}
}
}
}
catch( const uno::Exception& e )
{
- (void) e;
-
-#ifdef DEBUG_DMAPPER_GRAPHIC_IMPORT
- dmapper_logger->startElement("exception");
- dmapper_logger->attribute("file", __FILE__);
- dmapper_logger->attribute("line", __LINE__);
- dmapper_logger->chars(e.Message);
- dmapper_logger->endElement("exceptiion");
-#endif
+ clog << __FILE__ << ":" << __LINE__ << " failed. Message :" ;
+ clog << rtl::OUStringToOString( e.Message, RTL_TEXTENCODING_UTF8 ).getStr( ) << endl;
}
return xGraphicObject;
}
diff --git a/writerfilter/source/dmapper/ModelEventListener.cxx b/writerfilter/source/dmapper/ModelEventListener.cxx
index 25a14e8fc018..c151c5056335 100644
--- a/writerfilter/source/dmapper/ModelEventListener.cxx
+++ b/writerfilter/source/dmapper/ModelEventListener.cxx
@@ -84,9 +84,8 @@ void ModelEventListener::disposing( const lang::EventObject& rEvent ) throw (uno
uno::Reference<document::XEventBroadcaster>(rEvent.Source, uno::UNO_QUERY )->removeEventListener(
uno::Reference<document::XEventListener>(this));
}
- catch( const uno::Exception& e)
+ catch( const uno::Exception& )
{
- (void) e;
}
}
diff --git a/writerfilter/source/dmapper/NumberingManager.cxx b/writerfilter/source/dmapper/NumberingManager.cxx
index 3c0ca8570f51..fb2cd53f0190 100644
--- a/writerfilter/source/dmapper/NumberingManager.cxx
+++ b/writerfilter/source/dmapper/NumberingManager.cxx
@@ -41,6 +41,26 @@ namespace dmapper {
//--------------------------------------------------- Utility functions
+void lcl_printProperties( uno::Sequence< beans::PropertyValue > aProps )
+{
+ sal_Int32 nLen = aProps.getLength( );
+ for ( sal_Int32 i = 0; i < nLen; i++ )
+ {
+ uno::Any aValue = aProps[i].Value;
+ sal_Int32 nValue = 0;
+ OUString sValue;
+
+ if ( !( aValue >>= sValue ) && ( aValue >>= nValue ) )
+ sValue = OUString::valueOf( nValue );
+
+#if DEBUG
+ fprintf( stderr, "Property %s: %s\n",
+ OUSTR_TO_C( aProps[i].Name ),
+ OUSTR_TO_C( sValue ) );
+#endif
+ }
+}
+
sal_Int32 lcl_findProperty( uno::Sequence< beans::PropertyValue > aProps, OUString sName )
{
sal_Int32 i = 0;
@@ -465,9 +485,8 @@ uno::Reference< container::XNameContainer > lcl_getUnoNumberingStyles(
oFamily >>= xStyles;
}
- catch ( const uno::Exception e)
+ catch ( const uno::Exception )
{
- (void) e;
}
return xStyles;
@@ -515,6 +534,8 @@ void ListDef::CreateNumberingRules( DomainMapper& rDMapper,
// Get the merged level properties
uno::Sequence< beans::PropertyValue > aLvlProps = aProps[sal_Int32( nLevel )];
+ lcl_printProperties( aLvlProps );
+
// Get the char style
uno::Sequence< beans::PropertyValue > aAbsCharStyleProps = pAbsLevel->GetCharStyleProperties( );
uno::Sequence< beans::PropertyValue >& rAbsCharStyleProps = aAbsCharStyleProps;
diff --git a/writerfilter/source/dmapper/NumberingManager.hxx b/writerfilter/source/dmapper/NumberingManager.hxx
index 4220e408fdc2..d001805f4333 100644
--- a/writerfilter/source/dmapper/NumberingManager.hxx
+++ b/writerfilter/source/dmapper/NumberingManager.hxx
@@ -119,13 +119,13 @@ public:
void AddRGISTD( rtl::OUString sValue ) { m_sRGISTD += sValue; };
// Accessors
- sal_Int32 GetId( ) const { return m_nId; };
+ sal_Int32 GetId( ) { return m_nId; };
sal_Int16 Size( ) { return sal_Int16( m_aLevels.size( ) ); };
ListLevel::Pointer GetLevel( sal_uInt16 nLvl );
void AddLevel( );
- ListLevel::Pointer GetCurrentLevel( ) const { return m_pCurrentLevel; };
+ ListLevel::Pointer GetCurrentLevel( ) { return m_pCurrentLevel; };
virtual com::sun::star::uno::Sequence<
com::sun::star::uno::Sequence<
diff --git a/writerfilter/source/dmapper/OLEHandler.cxx b/writerfilter/source/dmapper/OLEHandler.cxx
index 9b6b1ff82f5a..1e89825550f0 100644
--- a/writerfilter/source/dmapper/OLEHandler.cxx
+++ b/writerfilter/source/dmapper/OLEHandler.cxx
@@ -124,11 +124,9 @@ void OLEHandler::lcl_attribute(Id rName, Value & rVal)
}
catch( const uno::Exception& e )
{
- (void) e;
#if DEBUG
- dmapper_logger->startElement("exception");
- dmapper_logger->chars(e.Message);
- dmapper_logger->endElement("exception");
+ clog << "Exception in OLE Handler: ";
+ clog << rtl::OUStringToOString( e.Message, RTL_TEXTENCODING_UTF8 ).getStr( ) << endl;
#endif
}
}
@@ -175,11 +173,9 @@ void OLEHandler::lcl_sprm(Sprm & rSprm)
}
catch( const uno::Exception& e )
{
- (void) e;
#if DEBUG
- dmapper_logger->startElement("exception");
- dmapper_logger->chars(e.Message);
- dmapper_logger->endElement("exception");
+ clog << "Exception in OLE Handler: ";
+ clog << rtl::OUStringToOString( e.Message, RTL_TEXTENCODING_UTF8 ).getStr( ) << endl;
#endif
}
}
diff --git a/writerfilter/source/dmapper/PropertyIds.cxx b/writerfilter/source/dmapper/PropertyIds.cxx
index 115b057bd6b0..5373c005ee55 100644
--- a/writerfilter/source/dmapper/PropertyIds.cxx
+++ b/writerfilter/source/dmapper/PropertyIds.cxx
@@ -32,281 +32,13 @@
namespace writerfilter {
namespace dmapper{
-typedef ::std::map< PropertyIds, rtl::OUString> PropertyNameMap_t;
-typedef ::std::map< rtl::OUString, PropertyIds> PropertyBackwardNameMap_t;
+typedef ::std::map< PropertyIds, ::rtl::OUString> PropertyNameMap_t;
struct PropertyNameSupplier_Impl
{
PropertyNameMap_t aNameMap;
- PropertyBackwardNameMap_t aNameBackwardMap;
-
- void add(PropertyIds aId, const rtl::OUString & aStr);
-
- PropertyNameSupplier_Impl();
};
-PropertyNameSupplier_Impl::PropertyNameSupplier_Impl()
-{
- add(PROP_CHAR_WEIGHT, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharWeight")));
- add(PROP_CHAR_POSTURE, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharPosture")));
- add(PROP_CHAR_STRIKEOUT, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharStrikeout")));
- add(PROP_CHAR_CONTOURED, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharContoured")));
- add(PROP_CHAR_SHADOWED, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharShadowed")));
- add(PROP_CHAR_CASE_MAP, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharCaseMap")));
- add(PROP_CHAR_COLOR, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharColor")));
- add(PROP_CHAR_RELIEF, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharRelief")));
- add(PROP_CHAR_UNDERLINE, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharUnderline")));
- add(PROP_CHAR_UNDERLINE_COLOR, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharUnderlineColor")));
- add(PROP_CHAR_UNDERLINE_HAS_COLOR, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharUnderlineHasColor")));
- add(PROP_CHAR_WORD_MODE, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharWordMode")));
- add(PROP_CHAR_ESCAPEMENT, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharEscapement")));
- add(PROP_CHAR_ESCAPEMENT_HEIGHT, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharEscapementHeight")));
- add(PROP_CHAR_HEIGHT, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharHeight")));
- add(PROP_CHAR_HEIGHT_COMPLEX, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharHeightComplex")));
- add(PROP_CHAR_LOCALE, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharLocale")));
- add(PROP_CHAR_LOCALE_ASIAN, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharLocaleAsian")));
- add(PROP_CHAR_LOCALE_COMPLEX, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharLocaleComplex")));
- add(PROP_CHAR_WEIGHT_COMPLEX, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharWeightComplex")));
- add(PROP_CHAR_POSTURE_COMPLEX, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharPostureComplex")));
- add(PROP_CHAR_CHAR_KERNING, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharKerning")));
- add(PROP_CHAR_AUTO_KERNING, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharAutoKerning")));
- add(PROP_CHAR_SCALE_WIDTH, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharScaleWidth")));
- add(PROP_CHAR_STYLE_NAME, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharStyleName")));
- add(PROP_CHAR_FONT_NAME, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharFontName")));
- add(PROP_CHAR_FONT_STYLE, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharFontStyle")));
- add(PROP_CHAR_FONT_FAMILY, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharFontFamily")));
- add(PROP_CHAR_FONT_CHAR_SET, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharFontCharSet")));
- add(PROP_CHAR_FONT_PITCH, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharFontPitch")));
- add(PROP_CHAR_FONT_NAME_ASIAN, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharFontNameAsian")));
- add(PROP_CHAR_HEIGHT_ASIAN, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharHeightAsian")));
- add(PROP_CHAR_FONT_STYLE_ASIAN, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharFontStyleAsian")));
- add(PROP_CHAR_FONT_FAMILY_ASIAN, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharFontFamilyAsian")));
- add(PROP_CHAR_FONT_CHAR_SET_ASIAN, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharFontCharSetAsian")));
- add(PROP_CHAR_FONT_PITCH_ASIAN, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharFontPitchAsian")));
- add(PROP_CHAR_FONT_NAME_COMPLEX, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharFontNameComplex")));
- add(PROP_CHAR_FONT_STYLE_COMPLEX, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharFontStyleComplex")));
- add(PROP_CHAR_FONT_FAMILY_COMPLEX, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharFontFamilyComplex")));
- add(PROP_CHAR_FONT_CHAR_SET_COMPLEX, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharFontCharSetComplex")));
- add(PROP_CHAR_FONT_PITCH_COMPLEX, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharFontPitchComplex")));
- add(PROP_CHAR_HIDDEN, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharHidden")));
- add(PROP_CHAR_WEIGHT_ASIAN, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharWeightAsian")));
- add(PROP_CHAR_POSTURE_ASIAN, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharPostureAsian")));
- add(PROP_CHAR_BACK_COLOR, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharBackColor")));
- add(PROP_CHAR_EMPHASIS, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharEmphasis")));
- add(PROP_CHAR_COMBINE_IS_ON, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharCombineIsOn")));
- add(PROP_CHAR_COMBINE_PREFIX, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharCombinePrefix")));
- add(PROP_CHAR_COMBINE_SUFFIX, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharCombineSuffix")));
- add(PROP_CHAR_ROTATION, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharRotation")));
- add(PROP_CHAR_ROTATION_IS_FIT_TO_LINE, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharRotationIsFitToLine")));
- add(PROP_CHAR_FLASH, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharFlash")));
- add(PROP_PARA_STYLE_NAME, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ParaStyleName")));
- add(PROP_PARA_ADJUST, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ParaAdjust")));
- add(PROP_PARA_LAST_LINE_ADJUST, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ParaLastLineAdjust")));
- add(PROP_PARA_RIGHT_MARGIN, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ParaRightMargin")));
- add(PROP_PARA_LEFT_MARGIN, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ParaLeftMargin")));
- add(PROP_PARA_FIRST_LINE_INDENT, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ParaFirstLineIndent")));
- add(PROP_PARA_KEEP_TOGETHER, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ParaKeepTogether")));
- add(PROP_PARA_TOP_MARGIN, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ParaTopMargin")));
- add(PROP_PARA_BOTTOM_MARGIN, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ParaBottomMargin")));
- add(PROP_PARA_IS_HYPHENATION, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ParaIsHyphenation")));
- add(PROP_PARA_LINE_NUMBER_COUNT, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ParaLineNumberCount")));
- add(PROP_PARA_IS_HANGING_PUNCTUATION, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ParaIsHangingPunctuation")));
- add(PROP_PARA_LINE_SPACING, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ParaLineSpacing")));
- add(PROP_PARA_TAB_STOPS, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ParaTabStops")));
- add(PROP_PARA_WIDOWS, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ParaWidows")));
- add(PROP_PARA_ORPHANS, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ParaOrphans")));
- add(PROP_PARA_LINE_NUMBER_START_VALUE, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ParaLineNumberStartValue")));
- add(PROP_NUMBERING_LEVEL, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NumberingLevel")));
- add(PROP_NUMBERING_RULES, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NumberingRules")));
- add(PROP_NUMBERING_TYPE, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NumberingType")));
- add(PROP_START_WITH, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("StartWith")));
- add(PROP_ADJUST, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Adjust")));
- add(PROP_PARENT_NUMBERING, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ParentNumbering")));
- add(PROP_RIGHT_MARGIN, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RightMargin")));
- add(PROP_LEFT_MARGIN, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LeftMargin")));
- add(PROP_TOP_MARGIN, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TopMargin")));
- add(PROP_BOTTOM_MARGIN, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BottomMargin")));
- add(PROP_FIRST_LINE_OFFSET, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FirstLineOffset")));
- add(PROP_LEFT_BORDER, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LeftBorder")));
- add(PROP_RIGHT_BORDER, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RightBorder")));
- add(PROP_TOP_BORDER, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TopBorder")));
- add(PROP_BOTTOM_BORDER, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BottomBorder")));
- add(PROP_TABLE_BORDER, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TableBorder")));
- add(PROP_LEFT_BORDER_DISTANCE, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LeftBorderDistance")));
- add(PROP_RIGHT_BORDER_DISTANCE, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RightBorderDistance")));
- add(PROP_TOP_BORDER_DISTANCE, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TopBorderDistance")));
- add(PROP_BOTTOM_BORDER_DISTANCE, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BottomBorderDistance")));
- add(PROP_CURRENT_PRESENTATION, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CurrentPresentation")));
- add(PROP_IS_FIXED, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsFixed")));
- add(PROP_SUB_TYPE, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SubType")));
- add(PROP_FILE_FORMAT, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FileFormat")));
- add(PROP_HYPER_LINK_U_R_L, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HyperLinkURL")));
- add(PROP_NUMBER_FORMAT, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NumberFormat")));
- add(PROP_NAME, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Name")));
- add(PROP_IS_INPUT, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsInput")));
- add(PROP_HINT, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Hint")));
- add(PROP_FULL_NAME, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FullName")));
- add(PROP_KEYWORDS, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Keywords")));
- add(PROP_DESCRIPTION, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Description")));
- add(PROP_MACRO_NAME, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MacroName")));
- add(PROP_SUBJECT, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Subject")));
- add(PROP_USER_DATA_TYPE, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UserDataType")));
- add(PROP_TITLE, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Title")));
- add(PROP_CONTENT, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Content")));
- add(PROP_DATA_COLUMN_NAME, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DataColumnName")));
- add(PROP_INPUT_STREAM, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("InputStream")));
- add(PROP_GRAPHIC, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Graphic")));
- add(PROP_ANCHOR_TYPE, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AnchorType")));
- add(PROP_SIZE, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Size")));
- add(PROP_HORI_ORIENT, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HoriOrient")));
- add(PROP_HORI_ORIENT_POSITION, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HoriOrientPosition")));
- add(PROP_HORI_ORIENT_RELATION, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HoriOrientRelation")));
- add(PROP_VERT_ORIENT, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VertOrient")));
- add(PROP_VERT_ORIENT_POSITION, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VertOrientPosition")));
- add(PROP_VERT_ORIENT_RELATION, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VertOrientRelation")));
- add(PROP_GRAPHIC_CROP, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("GraphicCrop")));
- add(PROP_SIZE100th_M_M, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Size100thMM")));
- add(PROP_SIZE_PIXEL, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SizePixel")));
- add(PROP_SURROUND, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Surround")));
- add(PROP_SURROUND_CONTOUR, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SurroundContour")));
- add(PROP_ADJUST_CONTRAST, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AdjustContrast")));
- add(PROP_ADJUST_LUMINANCE, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AdjustLuminance")));
- add(PROP_GRAPHIC_COLOR_MODE, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("GraphicColorMode")));
- add(PROP_GAMMA, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Gamma")));
- add(PROP_HORI_MIRRORED_ON_EVEN_PAGES, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HoriMirroredOnEvenPages")));
- add(PROP_HORI_MIRRORED_ON_ODD_PAGES, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HoriMirroredOnOddPages")));
- add(PROP_VERT_MIRRORED, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VertMirrored")));
- add(PROP_CONTOUR_OUTSIDE, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ContourOutside")));
- add(PROP_CONTOUR_POLY_POLYGON, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ContourPolyPolygon")));
- add(PROP_PAGE_TOGGLE, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PageToggle")));
- add(PROP_BACK_COLOR, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BackColor")));
- add(PROP_ALTERNATIVE_TEXT, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AlternativeText")));
- add(PROP_HEADER_TEXT_LEFT, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HeaderTextLeft")));
- add(PROP_HEADER_TEXT, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HeaderText")));
- add(PROP_HEADER_IS_SHARED, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HeaderIsShared")));
- add(PROP_HEADER_IS_ON, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HeaderIsOn")));
- add(PROP_FOOTER_TEXT_LEFT, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FooterTextLeft")));
- add(PROP_FOOTER_TEXT, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FooterText")));
- add(PROP_FOOTER_IS_SHARED, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FooterIsShared")));
- add(PROP_FOOTER_IS_ON, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FooterIsOn")));
- add(PROP_WIDTH, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Width")));
- add(PROP_HEIGHT, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Height")));
- add(PROP_SEPARATOR_LINE_IS_ON, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SeparatorLineIsOn")));
- add(PROP_TEXT_COLUMNS, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TextColumns")));
- add(PROP_AUTOMATIC_DISTANCE, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AutomaticDistance")));
- add(PROP_IS_LANDSCAPE, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsLandscape")));
- add(PROP_PRINTER_PAPER_TRAY_INDEX, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PrinterPaperTrayIndex")));
- add(PROP_FIRST_PAGE, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("First Page")));
- add(PROP_DEFAULT, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Default")));
- add(PROP_PAGE_DESC_NAME, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PageDescName")));
- add(PROP_PAGE_NUMBER_OFFSET, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PageNumberOffset")));
- add(PROP_BREAK_TYPE, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BreakType")));
- add(PROP_FOOTER_IS_DYNAMIC_HEIGHT, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FooterIsDynamicHeight")));
- add(PROP_FOOTER_DYNAMIC_SPACING, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FooterDynamicSpacing")));
- add(PROP_FOOTER_HEIGHT, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FooterHeight")));
- add(PROP_FOOTER_BODY_DISTANCE, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FooterBodyDistance")));
- add(PROP_HEADER_IS_DYNAMIC_HEIGHT, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HeaderIsDynamicHeight")));
- add(PROP_HEADER_DYNAMIC_SPACING, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HeaderDynamicSpacing")));
- add(PROP_HEADER_HEIGHT, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HeaderHeight")));
- add(PROP_HEADER_BODY_DISTANCE, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HeaderBodyDistance")));
- add(PROP_WRITING_MODE, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("WritingMode")));
- add(PROP_GRID_MODE, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("GridMode")));
- add(PROP_GRID_DISPLAY, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("GridDisplay")));
- add(PROP_GRID_PRINT, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("GridPrint")));
- add(PROP_ADD_EXTERNAL_LEADING, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AddExternalLeading")));
- add(PROP_GRID_LINES, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("GridLines")));
- add(PROP_GRID_BASE_HEIGHT, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("GridBaseHeight")));
- add(PROP_GRID_RUBY_HEIGHT, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("GridRubyHeight")));
- add(PROP_IS_ON, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsOn")));
- add(PROP_RESTART_AT_EACH_PAGE, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RestartAtEachPage")));
- add(PROP_COUNT_EMPTY_LINES, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CountEmptyLines")));
- add(PROP_COUNT_LINES_IN_FRAMES, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CountLinesInFrames")));
- add(PROP_INTERVAL, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Interval")));
- add(PROP_DISTANCE, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Distance")));
- add(PROP_NUMBER_POSITION, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NumberPosition")));
- add(PROP_LEVEL, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Level")));
- add(PROP_LEVEL_PARAGRAPH_STYLES, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LevelParagraphStyles")));
- add(PROP_LEVEL_FORMAT, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LevelFormat")));
- add(PROP_TOKEN_TYPE, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TokenType")));
- add(PROP_TOKEN_HYPERLINK_START, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TokenHyperlinkStart")));
- add(PROP_TOKEN_HYPERLINK_END, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TokenHyperlinkEnd")));
- add(PROP_TOKEN_CHAPTER_INFO, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TokenChapterInfo")));
- add(PROP_CHAPTER_FORMAT, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ChapterFormat")));
- add(PROP_TOKEN_TEXT, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TokenText")));
- add(PROP_TEXT, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Text")));
- add(PROP_CREATE_FROM_OUTLINE, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CreateFromOutline")));
- add(PROP_CREATE_FROM_MARKS, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CreateFromMarks")));
- add(PROP_STANDARD, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Standard")));
- add(PROP_IS_SPLIT_ALLOWED, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsSplitAllowed")));
- add(META_PROP_VERTICAL_BORDER, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VerticalBorder")));
- add(META_PROP_HORIZONTAL_BORDER, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HorizontalBorder")));
- add(PROP_HEADER_ROW_COUNT, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HeaderRowCount")));
- add(PROP_IS_AUTO_HEIGHT, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsAutoHeight")));
- add(PROP_SIZE_TYPE, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SizeType")));
- add(PROP_TABLE_COLUMN_SEPARATORS, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TableColumnSeparators")));
- add(META_PROP_TABLE_STYLE_NAME, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TableStyleName")));
- add(PROP_REDLINE_AUTHOR, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RedlineAuthor")));
- add(PROP_REDLINE_DATE_TIME, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RedlineDateTime")));
- add(PROP_REDLINE_COMMENT, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RedlineComment")));
- add(PROP_REDLINE_TYPE, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RedlineType")));
- add(PROP_REDLINE_SUCCESSOR_DATA, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RedlineSuccessorData")));
- add(PROP_REDLINE_IDENTIFIER, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RedlineIdentifier")));
- add(PROP_SIZE_PROTECTED, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SizeProtected")));
- add(PROP_POSITION_PROTECTED, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PositionProtected")));
- add(PROP_OPAQUE, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Opaque")));
- add(PROP_VERTICAL_MERGE, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VerticalMerge")));
- add(PROP_BULLET_CHAR, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BulletChar")));
- add(PROP_BULLET_FONT_NAME, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BulletFontName")));
- add(PROP_PARA_BACK_COLOR, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ParaBackColor")));
- add(PROP_TABS_RELATIVE_TO_INDENT, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TabsRelativeToIndent")));
- add(PROP_PREFIX, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Prefix")));
- add(PROP_SUFFIX, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Suffix")));
- add(PROP_CREATE_FROM_LEVEL_PARAGRAPH_STYLES, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CreateFromLevelParagraphStyles")));
- add(PROP_DROP_CAP_FORMAT, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DropCapFormat")));
- add(PROP_REFERENCE_FIELD_PART, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ReferenceFieldPart")));
- add(PROP_SOURCE_NAME, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SourceName")));
- add(PROP_REFERENCE_FIELD_SOURCE, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ReferenceFieldSource")));
- add(PROP_WIDTH_TYPE, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("WidthType")));
- add( PROP_TEXT_RANGE, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TextRange")));
- add(PROP_SERVICE_CHAR_STYLE, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.style.CharacterStyle")));
- add(PROP_SERVICE_PARA_STYLE, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.style.ParagraphStyle")));
- add(PROP_CHARACTER_STYLES, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharacterStyles")));
- add(PROP_PARAGRAPH_STYLES, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ParagraphStyles")));
- add(PROP_TABLE_BORDER_DISTANCES, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TableBorderDistances")));
- add(META_PROP_CELL_MAR_TOP, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MetaPropCellMarTop")));
- add(META_PROP_CELL_MAR_BOTTOM, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MetaPropCellMarBottom")));
- add(META_PROP_CELL_MAR_LEFT, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MetaPropCellMarLeft")));
- add(META_PROP_CELL_MAR_RIGHT, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MetaPropCellMarRight")));
- add(PROP_START_AT, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("StartAt")));
- add(PROP_ADD_PARA_TABLE_SPACING, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AddParaTableSpacing")));
- add(PROP_CHAR_PROP_HEIGHT, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharPropHeight")));
- add(PROP_CHAR_PROP_HEIGHT_ASIAN, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharPropHeightAsian")));
- add(PROP_CHAR_PROP_HEIGHT_COMPLEX, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharPropHeightComplex")));
- add(PROP_FORMAT, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Format")));
- add(PROP_INSERT, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Insert")));
- add(PROP_DELETE, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Delete")));
- add(PROP_STREAM_NAME, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("StreamName")));
- add(PROP_BITMAP, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Bitmap")));
- add(PROP_IS_DATE, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsDate")));
- add(PROP_TAB_STOP_DISTANCE, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TabStopDistance")));
- add(PROP_CNF_STYLE, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CnfStyle")));
- add(PROP_INDENT_AT, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IndentAt")));
- add(PROP_FIRST_LINE_INDENT, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FirstLineIndent")));
- add(PROP_NUMBERING_STYLE_NAME, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NumberingStyleName")));
- add(PROP_OUTLINE_LEVEL, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("OutlineLevel")));
- add(PROP_LISTTAB_STOP_POSITION, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ListtabStopPosition")));
- add(PROP_POSITION_AND_SPACE_MODE, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PositionAndSpaceMode")));
- add(PROP_PARA_SPLIT, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ParaSplit")));
- add(PROP_HELP, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Help")));
- add(PROP_HEADING_STYLE_NAME, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HeadingStyleName")));
-}
-
-void PropertyNameSupplier_Impl::add(PropertyIds aId, const ::rtl::OUString & aStr)
-{
- aNameMap[aId] = aStr;
- aNameBackwardMap[aStr] = aId;
-}
-
PropertyNameSupplier::PropertyNameSupplier() :
@@ -323,154 +55,280 @@ PropertyNameSupplier::~PropertyNameSupplier()
const rtl::OUString& PropertyNameSupplier::GetName( PropertyIds eId ) const
{
- PropertyNameMap_t::const_iterator aIt = m_pImpl->aNameMap.find(eId);
-
- return aIt->second;
+ PropertyNameMap_t::iterator aIt = m_pImpl->aNameMap.find(eId);
+ if(aIt == m_pImpl->aNameMap.end())
+ {
+ ::rtl::OUString sName;
+ switch(eId)
+ {
+ case PROP_CHAR_WEIGHT: sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharWeight")); break;
+ case PROP_CHAR_POSTURE: sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharPosture")); break;
+ case PROP_CHAR_STRIKEOUT: sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharStrikeout")); break;
+ case PROP_CHAR_CONTOURED: sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharContoured")); break;
+ case PROP_CHAR_SHADOWED: sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharShadowed")); break;
+ case PROP_CHAR_CASE_MAP: sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharCaseMap")); break;
+ case PROP_CHAR_COLOR: sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharColor")); break;
+ case PROP_CHAR_RELIEF: sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharRelief")); break;
+ case PROP_CHAR_UNDERLINE: sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharUnderline")); break;
+ case PROP_CHAR_UNDERLINE_COLOR: sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharUnderlineColor")); break;
+ case PROP_CHAR_UNDERLINE_HAS_COLOR: sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharUnderlineHasColor")); break;
+ case PROP_CHAR_WORD_MODE: sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharWordMode")); break;
+ case PROP_CHAR_ESCAPEMENT : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharEscapement")); break;
+ case PROP_CHAR_ESCAPEMENT_HEIGHT: sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharEscapementHeight")); break;
+ case PROP_CHAR_HEIGHT: sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharHeight")); break;
+ case PROP_CHAR_HEIGHT_COMPLEX: sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharHeightComplex")); break;
+ case PROP_CHAR_LOCALE: sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharLocale")); break;
+ case PROP_CHAR_LOCALE_ASIAN: sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharLocaleAsian")); break;
+ case PROP_CHAR_LOCALE_COMPLEX: sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharLocaleComplex")); break;
+ case PROP_CHAR_WEIGHT_COMPLEX : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharWeightComplex")); break;
+ case PROP_CHAR_POSTURE_COMPLEX: sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharPostureComplex")); break;
+ case PROP_CHAR_CHAR_KERNING: sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharKerning")); break;
+ case PROP_CHAR_AUTO_KERNING: sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharAutoKerning")); break;
+ case PROP_CHAR_SCALE_WIDTH: sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharScaleWidth")); break;
+ case PROP_CHAR_STYLE_NAME: sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharStyleName")); break;
+ case PROP_CHAR_FONT_NAME: sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharFontName")); break;
+ case PROP_CHAR_FONT_STYLE: sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharFontStyle")); break;
+ case PROP_CHAR_FONT_FAMILY: sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharFontFamily")); break;
+ case PROP_CHAR_FONT_CHAR_SET: sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharFontCharSet")); break;
+ case PROP_CHAR_FONT_PITCH: sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharFontPitch")); break;
+ case PROP_CHAR_FONT_NAME_ASIAN : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharFontNameAsian")); break;
+ case PROP_CHAR_HEIGHT_ASIAN : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharHeightAsian")); break;
+ case PROP_CHAR_FONT_STYLE_ASIAN : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharFontStyleAsian")); break;
+ case PROP_CHAR_FONT_FAMILY_ASIAN : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharFontFamilyAsian")); break;
+ case PROP_CHAR_FONT_CHAR_SET_ASIAN : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharFontCharSetAsian")); break;
+ case PROP_CHAR_FONT_PITCH_ASIAN : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharFontPitchAsian")); break;
+ case PROP_CHAR_FONT_NAME_COMPLEX : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharFontNameComplex")); break;
+ case PROP_CHAR_FONT_STYLE_COMPLEX : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharFontStyleComplex")); break;
+ case PROP_CHAR_FONT_FAMILY_COMPLEX: sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharFontFamilyComplex")); break;
+ case PROP_CHAR_FONT_CHAR_SET_COMPLEX: sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharFontCharSetComplex")); break;
+ case PROP_CHAR_FONT_PITCH_COMPLEX: sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharFontPitchComplex")); break;
+ case PROP_CHAR_HIDDEN : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharHidden")); break;
+ case PROP_CHAR_WEIGHT_ASIAN : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharWeightAsian")); break;
+ case PROP_CHAR_POSTURE_ASIAN : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharPostureAsian")); break;
+ case PROP_CHAR_BACK_COLOR: sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharBackColor")); break;
+ case PROP_CHAR_EMPHASIS: sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharEmphasis")); break;
+ case PROP_CHAR_COMBINE_IS_ON: sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharCombineIsOn")); break;
+ case PROP_CHAR_COMBINE_PREFIX: sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharCombinePrefix")); break;
+ case PROP_CHAR_COMBINE_SUFFIX: sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharCombineSuffix")); break;
+ case PROP_CHAR_ROTATION: sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharRotation")); break;
+ case PROP_CHAR_ROTATION_IS_FIT_TO_LINE: sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharRotationIsFitToLine")); break;
+ case PROP_CHAR_FLASH: sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharFlash")); break;
+
+ case PROP_PARA_STYLE_NAME: sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ParaStyleName")); break;
+ case PROP_PARA_ADJUST: sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ParaAdjust")); break;
+ case PROP_PARA_LAST_LINE_ADJUST: sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ParaLastLineAdjust")); break;
+ case PROP_PARA_RIGHT_MARGIN : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ParaRightMargin")); break;
+ case PROP_PARA_LEFT_MARGIN : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ParaLeftMargin")); break;
+ case PROP_PARA_FIRST_LINE_INDENT: sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ParaFirstLineIndent")); break;
+ case PROP_PARA_KEEP_TOGETHER: sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ParaKeepTogether")); break;
+ case PROP_PARA_TOP_MARGIN: sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ParaTopMargin")); break;
+ case PROP_PARA_BOTTOM_MARGIN: sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ParaBottomMargin")); break;
+ case PROP_PARA_IS_HYPHENATION: sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ParaIsHyphenation")); break;
+ case PROP_PARA_LINE_NUMBER_COUNT: sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ParaLineNumberCount")); break;
+ case PROP_PARA_IS_HANGING_PUNCTUATION: sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ParaIsHangingPunctuation")); break;
+ case PROP_PARA_LINE_SPACING: sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ParaLineSpacing")); break;
+ case PROP_PARA_TAB_STOPS: sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ParaTabStops")); break;
+ case PROP_PARA_WIDOWS: sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ParaWidows")); break;
+ case PROP_PARA_ORPHANS: sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ParaOrphans")); break;
+ case PROP_PARA_LINE_NUMBER_START_VALUE: sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ParaLineNumberStartValue")); break;
+ case PROP_NUMBERING_LEVEL: sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NumberingLevel")); break;
+ case PROP_NUMBERING_RULES: sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NumberingRules")); break;
+ case PROP_NUMBERING_TYPE: sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NumberingType")); break;
+ case PROP_START_WITH: sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("StartWith")); break;
+ case PROP_ADJUST: sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Adjust")); break;
+ case PROP_PARENT_NUMBERING: sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ParentNumbering")); break;
+ case PROP_RIGHT_MARGIN : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RightMargin")); break;
+ case PROP_LEFT_MARGIN : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LeftMargin")); break;
+ case PROP_TOP_MARGIN : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TopMargin")); break;
+ case PROP_BOTTOM_MARGIN : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BottomMargin")); break;
+ case PROP_FIRST_LINE_OFFSET: sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FirstLineOffset")); break;
+ case PROP_LEFT_BORDER : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LeftBorder"));break;
+ case PROP_RIGHT_BORDER : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RightBorder"));break;
+ case PROP_TOP_BORDER : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TopBorder"));break;
+ case PROP_BOTTOM_BORDER : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BottomBorder"));break;
+ case PROP_TABLE_BORDER : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TableBorder"));break;
+ case PROP_LEFT_BORDER_DISTANCE : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LeftBorderDistance")); break;
+ case PROP_RIGHT_BORDER_DISTANCE : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RightBorderDistance")); break;
+ case PROP_TOP_BORDER_DISTANCE : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TopBorderDistance"));break;
+ case PROP_BOTTOM_BORDER_DISTANCE: sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BottomBorderDistance")); break;
+ case PROP_CURRENT_PRESENTATION : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CurrentPresentation")); break;
+ case PROP_IS_FIXED : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsFixed")); break;
+ case PROP_SUB_TYPE : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SubType")); break;
+ case PROP_FILE_FORMAT : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FileFormat")); break;
+ case PROP_HYPER_LINK_U_R_L : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HyperLinkURL")); break;
+ case PROP_NUMBER_FORMAT : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NumberFormat")); break;
+ case PROP_NAME : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Name")); break;
+ case PROP_IS_INPUT : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsInput")); break;
+ case PROP_HINT : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Hint")); break;
+ case PROP_FULL_NAME : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FullName")); break;
+ case PROP_KEYWORDS : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Keywords")); break;
+ case PROP_DESCRIPTION : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Description")); break;
+ case PROP_MACRO_NAME : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MacroName")); break;
+ case PROP_SUBJECT : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Subject")); break;
+ case PROP_USER_DATA_TYPE : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UserDataType")); break;
+ case PROP_TITLE : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Title")); break;
+ case PROP_CONTENT : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Content")); break;
+ case PROP_DATA_COLUMN_NAME : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DataColumnName")); break;
+ case PROP_INPUT_STREAM : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("InputStream")); break;
+ case PROP_GRAPHIC : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Graphic")); break;
+ case PROP_ANCHOR_TYPE : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AnchorType")); break;
+ case PROP_SIZE : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Size")); break;
+ case PROP_HORI_ORIENT : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HoriOrient")); break;
+ case PROP_HORI_ORIENT_POSITION : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HoriOrientPosition")); break;
+ case PROP_HORI_ORIENT_RELATION : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HoriOrientRelation")); break;
+ case PROP_VERT_ORIENT : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VertOrient")); break;
+ case PROP_VERT_ORIENT_POSITION : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VertOrientPosition")); break;
+ case PROP_VERT_ORIENT_RELATION : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VertOrientRelation")); break;
+ case PROP_GRAPHIC_CROP : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("GraphicCrop")); break;
+ case PROP_SIZE100th_M_M : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Size100thMM")); break;
+ case PROP_SIZE_PIXEL : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SizePixel")); break;
+ case PROP_SURROUND : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Surround")); break;
+ case PROP_SURROUND_CONTOUR : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SurroundContour")); break;
+ case PROP_ADJUST_CONTRAST : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AdjustContrast")); break;
+ case PROP_ADJUST_LUMINANCE : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AdjustLuminance")); break;
+ case PROP_GRAPHIC_COLOR_MODE : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("GraphicColorMode")); break;
+ case PROP_GAMMA : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Gamma")); break;
+ case PROP_HORI_MIRRORED_ON_EVEN_PAGES: sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HoriMirroredOnEvenPages")); break;
+ case PROP_HORI_MIRRORED_ON_ODD_PAGES : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HoriMirroredOnOddPages")); break;
+ case PROP_VERT_MIRRORED : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VertMirrored")); break;
+ case PROP_CONTOUR_OUTSIDE : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ContourOutside")); break;
+ case PROP_CONTOUR_POLY_POLYGON : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ContourPolyPolygon")); break;
+ case PROP_PAGE_TOGGLE : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PageToggle")); break;
+ case PROP_BACK_COLOR : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BackColor")); break;
+ case PROP_ALTERNATIVE_TEXT : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AlternativeText")); break;
+ case PROP_HEADER_TEXT_LEFT : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HeaderTextLeft")); break;
+ case PROP_HEADER_TEXT : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HeaderText")); break;
+ case PROP_HEADER_IS_SHARED : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HeaderIsShared")); break;
+ case PROP_HEADER_IS_ON : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HeaderIsOn")); break;
+ case PROP_FOOTER_TEXT_LEFT : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FooterTextLeft")); break;
+ case PROP_FOOTER_TEXT : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FooterText")); break;
+ case PROP_FOOTER_IS_SHARED : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FooterIsShared")); break;
+ case PROP_FOOTER_IS_ON : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FooterIsOn")); break;
+ case PROP_WIDTH : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Width")); break;
+ case PROP_HEIGHT : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Height")); break;
+ case PROP_SEPARATOR_LINE_IS_ON : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SeparatorLineIsOn")); break;
+ case PROP_TEXT_COLUMNS : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TextColumns")); break;
+ case PROP_AUTOMATIC_DISTANCE : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AutomaticDistance")); break;
+ case PROP_IS_LANDSCAPE : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsLandscape")); break;
+ case PROP_PRINTER_PAPER_TRAY_INDEX: sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PrinterPaperTrayIndex")); break;
+ case PROP_FIRST_PAGE : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("First Page")); break;
+ case PROP_DEFAULT : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Default")); break;
+ case PROP_PAGE_DESC_NAME : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PageDescName")); break;
+ case PROP_PAGE_NUMBER_OFFSET: sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PageNumberOffset")); break;
+ case PROP_BREAK_TYPE : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BreakType")); break;
+ case PROP_FOOTER_IS_DYNAMIC_HEIGHT: sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FooterIsDynamicHeight")); break;
+ case PROP_FOOTER_DYNAMIC_SPACING: sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FooterDynamicSpacing")); break;
+ case PROP_FOOTER_HEIGHT : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FooterHeight")); break;
+ case PROP_FOOTER_BODY_DISTANCE : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FooterBodyDistance")); break;
+ case PROP_HEADER_IS_DYNAMIC_HEIGHT: sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HeaderIsDynamicHeight")); break;
+ case PROP_HEADER_DYNAMIC_SPACING: sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HeaderDynamicSpacing")); break;
+ case PROP_HEADER_HEIGHT : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HeaderHeight")); break;
+ case PROP_HEADER_BODY_DISTANCE : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HeaderBodyDistance")); break;
+ case PROP_WRITING_MODE : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("WritingMode")); break;
+ case PROP_GRID_MODE : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("GridMode")); break;
+ case PROP_GRID_DISPLAY : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("GridDisplay")); break;
+ case PROP_GRID_PRINT : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("GridPrint")); break;
+ case PROP_ADD_EXTERNAL_LEADING : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AddExternalLeading")); break;
+ case PROP_GRID_LINES : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("GridLines")); break;
+ case PROP_GRID_BASE_HEIGHT : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("GridBaseHeight")); break;
+ case PROP_GRID_RUBY_HEIGHT : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("GridRubyHeight")); break;
+ case PROP_IS_ON : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsOn")); break;
+ case PROP_RESTART_AT_EACH_PAGE : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RestartAtEachPage")); break;
+ case PROP_COUNT_EMPTY_LINES : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CountEmptyLines")); break;
+ case PROP_COUNT_LINES_IN_FRAMES : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CountLinesInFrames")); break;
+ case PROP_INTERVAL : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Interval")); break;
+ case PROP_DISTANCE : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Distance")); break;
+ case PROP_NUMBER_POSITION : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NumberPosition")); break;
+ case PROP_LEVEL : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Level")); break;
+ case PROP_LEVEL_PARAGRAPH_STYLES : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LevelParagraphStyles")); break;
+ case PROP_LEVEL_FORMAT : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LevelFormat")); break;
+ case PROP_TOKEN_TYPE : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TokenType")); break;
+ case PROP_TOKEN_HYPERLINK_START : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TokenHyperlinkStart")); break;
+ case PROP_TOKEN_HYPERLINK_END : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TokenHyperlinkEnd")); break;
+ case PROP_TOKEN_CHAPTER_INFO : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TokenChapterInfo")); break;
+ case PROP_CHAPTER_FORMAT : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ChapterFormat")); break;
+ case PROP_TOKEN_TEXT : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TokenText")); break;
+ case PROP_TEXT : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Text")); break;
+ case PROP_CREATE_FROM_OUTLINE : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CreateFromOutline")); break;
+ case PROP_CREATE_FROM_MARKS : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CreateFromMarks")); break;
+ case PROP_STANDARD : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Standard")); break;
+ case PROP_IS_SPLIT_ALLOWED : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsSplitAllowed")); break;
+ case META_PROP_VERTICAL_BORDER : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VerticalBorder")); break;
+ case META_PROP_HORIZONTAL_BORDER : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HorizontalBorder")); break;
+ case PROP_HEADER_ROW_COUNT : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HeaderRowCount")); break;
+ case PROP_IS_AUTO_HEIGHT : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsAutoHeight")); break;
+ case PROP_SIZE_TYPE : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SizeType")); break;
+ case PROP_TABLE_COLUMN_SEPARATORS: sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TableColumnSeparators")); break;
+ case META_PROP_TABLE_STYLE_NAME : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TableStyleName")); break;
+ case PROP_REDLINE_AUTHOR : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RedlineAuthor")); break;
+ case PROP_REDLINE_DATE_TIME : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RedlineDateTime")); break;
+ case PROP_REDLINE_COMMENT : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RedlineComment")); break;
+ case PROP_REDLINE_TYPE : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RedlineType")); break;
+ case PROP_REDLINE_SUCCESSOR_DATA: sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RedlineSuccessorData")); break;
+ case PROP_REDLINE_IDENTIFIER : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RedlineIdentifier")); break;
+ case PROP_SIZE_PROTECTED : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SizeProtected")); break;
+ case PROP_POSITION_PROTECTED : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PositionProtected")); break;
+ case PROP_OPAQUE : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Opaque")); break;
+ case PROP_VERTICAL_MERGE : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VerticalMerge")); break;
+ case PROP_BULLET_CHAR : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BulletChar")); break;
+ case PROP_BULLET_FONT_NAME : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BulletFontName")); break;
+ case PROP_PARA_BACK_COLOR : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ParaBackColor")); break;
+ case PROP_TABS_RELATIVE_TO_INDENT: sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TabsRelativeToIndent")); break;
+ case PROP_PREFIX : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Prefix")); break;
+ case PROP_SUFFIX : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Suffix")); break;
+ case PROP_CREATE_FROM_LEVEL_PARAGRAPH_STYLES: sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CreateFromLevelParagraphStyles")); break;
+ case PROP_DROP_CAP_FORMAT : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DropCapFormat")); break;
+ case PROP_REFERENCE_FIELD_PART : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ReferenceFieldPart")); break;
+ case PROP_SOURCE_NAME: sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SourceName")); break;
+ case PROP_REFERENCE_FIELD_SOURCE : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ReferenceFieldSource")); break;
+ case PROP_WIDTH_TYPE : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("WidthType")); break;
+ case PROP_TEXT_RANGE: sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TextRange")); break;
+ case PROP_SERVICE_CHAR_STYLE : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.style.CharacterStyle")); break;
+ case PROP_SERVICE_PARA_STYLE : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.style.ParagraphStyle")); break;
+ case PROP_CHARACTER_STYLES : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharacterStyles")); break;
+ case PROP_PARAGRAPH_STYLES : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ParagraphStyles")); break;
+ case PROP_TABLE_BORDER_DISTANCES: sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TableBorderDistances")); break;
+ case META_PROP_CELL_MAR_TOP : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MetaPropCellMarTop")); break;
+ case META_PROP_CELL_MAR_BOTTOM : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MetaPropCellMarBottom")); break;
+ case META_PROP_CELL_MAR_LEFT : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MetaPropCellMarLeft")); break;
+ case META_PROP_CELL_MAR_RIGHT : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MetaPropCellMarRight")); break;
+ case PROP_START_AT : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("StartAt")); break;
+ case PROP_ADD_PARA_TABLE_SPACING : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AddParaTableSpacing")); break;
+ case PROP_CHAR_PROP_HEIGHT : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharPropHeight")); break;
+ case PROP_CHAR_PROP_HEIGHT_ASIAN : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharPropHeightAsian")); break;
+ case PROP_CHAR_PROP_HEIGHT_COMPLEX: sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharPropHeightComplex")); break;
+ case PROP_FORMAT : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Format")); break;
+ case PROP_INSERT : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Insert")); break;
+ case PROP_DELETE : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Delete")); break;
+ case PROP_STREAM_NAME: sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("StreamName")); break;
+ case PROP_BITMAP : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Bitmap")); break;
+ case PROP_IS_DATE : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsDate")); break;
+ case PROP_TAB_STOP_DISTANCE : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TabStopDistance")); break;
+ case PROP_CNF_STYLE : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CnfStyle")); break;
+ case PROP_INDENT_AT : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IndentAt")); break;
+ case PROP_FIRST_LINE_INDENT : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FirstLineIndent")); break;
+ case PROP_NUMBERING_STYLE_NAME : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NumberingStyleName")); break;
+ case PROP_OUTLINE_LEVEL : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("OutlineLevel")); break;
+ case PROP_LISTTAB_STOP_POSITION : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ListtabStopPosition")); break;
+ case PROP_POSITION_AND_SPACE_MODE : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PositionAndSpaceMode")); break;
+ case PROP_PARA_SPLIT: sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ParaSplit")); break;
+ case PROP_HELP: sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Help")); break;
+ case PROP_HEADING_STYLE_NAME: sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HeadingStyleName")); break;
case PROP_FRM_DIRECTION: sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FRMDirection")); break;
-}
-
-PropertyIds PropertyNameSupplier::GetId(const ::rtl::OUString & rStr) const
-{
- PropertyBackwardNameMap_t::const_iterator aIt= m_pImpl->aNameBackwardMap.find(rStr);
-
+ }
+ ::std::pair<PropertyNameMap_t::iterator,bool> aInsertIt =
+ m_pImpl->aNameMap.insert( PropertyNameMap_t::value_type( eId, sName ));
+ if(aInsertIt.second)
+ aIt = aInsertIt.first;
+ }
return aIt->second;
}
-
PropertyNameSupplier& PropertyNameSupplier::GetPropertyNameSupplier()
{
static PropertyNameSupplier aNameSupplier;
return aNameSupplier;
}
-PropertySequence::PropertySequence()
- : m_rPropNameSupplier(PropertyNameSupplier::GetPropertyNameSupplier())
-{
-}
-
-PropertySequence::PropertySequence(const uno::Sequence<beans::PropertyValue> & rSeq)
- : m_sequence(rSeq), m_rPropNameSupplier(PropertyNameSupplier::GetPropertyNameSupplier())
-{
- sal_Int32 nLength = rSeq.getLength();
-
- for (sal_Int32 n = 0; n < nLength; n++)
- {
- PropertyIds aId = m_rPropNameSupplier.GetId(m_sequence[n].Name);
- m_indexMap[aId] = n;
- }
-}
-
-PropertySequence::~PropertySequence()
-{
-}
-
-uno::Any PropertySequence::get(PropertyIds aPropId)
-{
- Map_t::const_iterator aIt = m_indexMap.find(aPropId);
-
- if (aIt != m_indexMap.end())
- {
- return m_sequence[aIt->second].Value;
- }
-
- return uno::Any();
-}
-
-int PropertySequence::getOrCreateIndex(PropertyIds aPropId)
-{
- Map_t::const_iterator aIt = m_indexMap.find(aPropId);
-
- sal_Int32 nIndex = 0;
- if (aIt == m_indexMap.end())
- {
- sal_uInt32 nCount = m_sequence.getLength() + 1;
- m_sequence.realloc(nCount);
- nIndex = nCount - 1;
- m_indexMap[aPropId] = nIndex;
- }
- else
- {
- nIndex = aIt->second;
- }
-
- return nIndex;
-}
-
-void PropertySequence::set(PropertyIds aPropId, const uno::Any & rValue)
-{
- sal_Int32 nIndex = getOrCreateIndex(aPropId);
-
- m_sequence[nIndex].Name = m_rPropNameSupplier.GetName(aPropId);
- m_sequence[nIndex].Value = rValue;
-}
-
-void PropertySequence::set(PropertyIds aPropId, sal_uInt32 nValue)
-{
- uno::Any aAny;
-
- aAny <<= nValue;
- set(aPropId, aAny);
-}
-
-void PropertySequence::set(PropertyIds aPropId, sal_Int32 nValue)
-{
- uno::Any aAny;
-
- aAny <<= nValue;
- set(aPropId, aAny);
-}
-
-void PropertySequence::set(PropertyIds aPropId, sal_uInt16 nValue)
-{
- uno::Any aAny;
-
- aAny <<= nValue;
- set(aPropId, aAny);
-}
-
-void PropertySequence::set(PropertyIds aPropId, sal_Int16 nValue)
-{
- uno::Any aAny;
-
- aAny <<= nValue;
- set(aPropId, aAny);
-}
-
-uno::Sequence<beans::PropertyValue> & PropertySequence::getSequence()
-{
- return m_sequence;
-}
-
-#ifdef DEBUG
-::std::string PropertySequence::toString() const
-{
- ::std::string sResult = "";
-
- sal_Int32 nCount = m_sequence.getLength();
-
- for (sal_Int32 n = 0; n < nCount; n++)
- {
- if (n > 0)
- sResult +=", ";
-
- ::std::string sTmp = ::rtl::OUStringToOString(m_sequence[n].Name, RTL_TEXTENCODING_ASCII_US).getStr();
-
- sResult += sTmp;
-
- if (m_sequence[n].Value.hasValue())
- {
- sal_Int32 nValue = 0;
- m_sequence[n].Value >>= nValue;
-
- static char buffer[256];
- snprintf(buffer, sizeof(buffer), " = %" SAL_PRIdINT32, nValue);
- sResult += buffer;
- }
- }
-
- return sResult;
-}
-#endif
-
} //namespace dmapper
} //namespace writerfilter
diff --git a/writerfilter/source/dmapper/PropertyIds.hxx b/writerfilter/source/dmapper/PropertyIds.hxx
index 7c4f6af2d88f..6ddd1d86a16b 100644
--- a/writerfilter/source/dmapper/PropertyIds.hxx
+++ b/writerfilter/source/dmapper/PropertyIds.hxx
@@ -28,18 +28,10 @@
#ifndef INCLUDED_DMAPPER_PROPERTYIDS_HXX
#define INCLUDED_DMAPPER_PROPERTYIDS_HXX
-#include <hash_map>
-#include <boost/shared_ptr.hpp>
-#include <com/sun/star/uno/Sequence.hxx>
-#include <com/sun/star/beans/PropertyValue.hpp>
-
namespace rtl{ class OUString;}
namespace writerfilter {
namespace dmapper{
-
-using namespace ::com::sun::star;
-
enum PropertyIds
{
PROP_ID_START = 1
@@ -298,56 +290,16 @@ enum PropertyIds
/*253*/ ,PROP_FRM_DIRECTION
};
struct PropertyNameSupplier_Impl;
-
-struct PropertyIdsHash
-{
- size_t operator()(const PropertyIds a) const { return a; }
-};
-
class PropertyNameSupplier
{
PropertyNameSupplier_Impl* m_pImpl;
- PropertyNameSupplier();
-
public:
+ PropertyNameSupplier();
~PropertyNameSupplier();
const rtl::OUString& GetName( PropertyIds eId ) const;
- PropertyIds GetId(const ::rtl::OUString & rString) const;
static PropertyNameSupplier& GetPropertyNameSupplier();
};
-
-class PropertySequence
-{
- typedef ::std::hash_map<PropertyIds, sal_Int32, PropertyIdsHash> Map_t;
- Map_t m_indexMap;
- uno::Sequence<beans::PropertyValue>m_sequence;
- PropertyNameSupplier & m_rPropNameSupplier;
-
- int getOrCreateIndex(PropertyIds aId);
-
-public:
- typedef boost::shared_ptr<PropertySequence> Pointer_t;
-
- PropertySequence();
- PropertySequence(const uno::Sequence<beans::PropertyValue> & rSeq);
- virtual ~PropertySequence();
-
- uno::Any get(PropertyIds aId);
-
- void set(PropertyIds aId, const uno::Any & rValue);
- void set(PropertyIds aId, sal_uInt32 nValue);
- void set(PropertyIds aId, sal_Int32 nValue);
- void set(PropertyIds aId, sal_uInt16 nValue);
- void set(PropertyIds aId, sal_Int16 nValue);
-
- uno::Sequence<beans::PropertyValue> & getSequence();
-
-#ifdef DEBUG
- ::std::string toString() const;
-#endif
-};
-
} //namespace dmapper
} // namespace writerfilter
#endif
diff --git a/writerfilter/source/dmapper/PropertyMap.cxx b/writerfilter/source/dmapper/PropertyMap.cxx
index 77cc4c4a3796..9ae05891e072 100644
--- a/writerfilter/source/dmapper/PropertyMap.cxx
+++ b/writerfilter/source/dmapper/PropertyMap.cxx
@@ -132,7 +132,6 @@ static void lcl_AnyToTag(const uno::Any & rAny)
dmapper_logger->attribute("stringValue", aStr);
}
catch (...) {
- pTag->addAttr("exception", "true");
}
}
#endif
@@ -200,7 +199,6 @@ void PropertyMap::dumpXml( const TagLogger::Pointer_t pLogger ) const
pLogger->attribute("stringValue", aStr);
}
catch (...) {
- pTag->addAttr("exception", "true");
}
}
break;
@@ -254,7 +252,7 @@ const uno::Reference< text::XFootnote>& PropertyMap::GetFootnote() const
void PropertyMap::insertTableProperties( const PropertyMap* )
{
-#ifdef DEBUG_DMAPPER_PROPERTY_MAP
+#ifdef DEBUG_DOMAINMAPPER
dmapper_logger->element("PropertyMap.insertTableProperties");
#endif
}
@@ -419,9 +417,8 @@ uno::Reference< beans::XPropertySet > SectionPropertyMap::GetPageStyle(
}
}
- catch( const uno::Exception& e)
+ catch( const uno::Exception& )
{
- (void) e;
}
return xRet;
@@ -646,8 +643,8 @@ bool SectionPropertyMap::HasFooter(bool bFirstPage) const
void SectionPropertyMap::CopyLastHeaderFooter( bool bFirstPage, DomainMapper_Impl& rDM_Impl )
{
-#if DEBUG_DMAPPER_PROPERTY_MAP
- dmapper_logger->startElement(__FUNCTION__);
+#if DEBUG
+ clog << "START>>> SectionPropertyMap::CopyLastHeaderFooter()" << endl;
#endif
SectionPropertyMap* pLastContext = rDM_Impl.GetLastSectionContext( );
if ( pLastContext )
@@ -702,10 +699,9 @@ void SectionPropertyMap::CopyLastHeaderFooter( bool bFirstPage, DomainMapper_Imp
if ( ( bIsHeader && bCopyHeader ) || ( !bIsHeader && bCopyFooter ) )
{
-#if DEBUG_DMAPPER_PROPERTY_MAP
- dmapper_logger->startElement("copy");
- dmapper_logger->chars(sName);
- dmapper_logger->endElement("copy");
+#if DEBUG
+ clog << "Copying ";
+ clog << rtl::OUStringToOString( sName, RTL_TEXTENCODING_UTF8 ).getStr( ) << endl;
#endif
// TODO has to be copied
uno::Reference< text::XTextCopy > xTxt(
@@ -722,11 +718,12 @@ void SectionPropertyMap::CopyLastHeaderFooter( bool bFirstPage, DomainMapper_Imp
{
#if DEBUG
clog << "An exception occurred in SectionPropertyMap::CopyLastHeaderFooter( ) - ";
+ clog << rtl::OUStringToOString( e.Message, RTL_TEXTENCODING_UTF8 ).getStr( ) << endl;
#endif
}
}
-#if DEBUG_DMAPPER_PROPERTY_MAP
- dmapper_logger->endElement(__FUNCTION__);
+#if DEBUG
+ clog << "END>>> SectionPropertyMap::CopyLastHeaderFooter()" << endl;
#endif
}
@@ -1198,7 +1195,7 @@ void TablePropertyMap::setValue( TablePropertyMapTarget eWhich, sal_Int32 nSet )
void TablePropertyMap::insertTableProperties( const PropertyMap* pMap )
{
-#ifdef DEBUG_DMAPPER_PROPERTY_MAP
+#ifdef DEBUG_DOMAINMAPPER
dmapper_logger->startElement("TablePropertyMap.insertTableProperties");
pMap->dumpXml(dmapper_logger);
#endif
@@ -1216,7 +1213,7 @@ void TablePropertyMap::insertTableProperties( const PropertyMap* pMap )
}
}
}
-#ifdef DEBUG_DMAPPER_PROPERTY_MAP
+#ifdef DEBUG_DOMAINMAPPER
dumpXml( dmapper_logger );
dmapper_logger->endElement();
#endif
diff --git a/writerfilter/source/dmapper/PropertyMapHelper.cxx b/writerfilter/source/dmapper/PropertyMapHelper.cxx
index 93a128af2d38..aa4996a5c4a8 100644
--- a/writerfilter/source/dmapper/PropertyMapHelper.cxx
+++ b/writerfilter/source/dmapper/PropertyMapHelper.cxx
@@ -79,7 +79,6 @@ void lcl_DumpPropertyValues(const TagLogger::Pointer_t pLogger, beans::PropertyV
}
catch (...)
{
- pTag->addAttr("exception", "true");
}
if (pValues[n].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("TableColumnSeparators")))
diff --git a/writerfilter/source/dmapper/SettingsTable.cxx b/writerfilter/source/dmapper/SettingsTable.cxx
index 0783b52e9cb2..10a4e2568229 100644
--- a/writerfilter/source/dmapper/SettingsTable.cxx
+++ b/writerfilter/source/dmapper/SettingsTable.cxx
@@ -100,6 +100,7 @@ SettingsTable::SettingsTable(DomainMapper& rDMapper, const uno::Reference< lang:
, LoggedTable(dmapper_logger, "SettingsTable")
, m_pImpl( new SettingsTable_Impl(rDMapper, xTextFactory) )
{
+
}
SettingsTable::~SettingsTable()
@@ -114,6 +115,7 @@ void SettingsTable::lcl_attribute(Id nName, Value & val)
(void)nIntValue;
::rtl::OUString sValue = val.getString();
(void)sValue;
+
#if 0 //no values known, yet
switch(Name)
@@ -195,8 +197,8 @@ void SettingsTable::lcl_sprm(Sprm& rSprm)
break;
default:
{
-#ifdef DEBUG_DOMAINMAPPER
- dmapper_logger->element("SettingsTable.unhandled");
+#ifdef DEBUG_DMAPPER_SETTINGS_TABLE
+ dmapper_logger->element("unhandled");
#endif
}
}
diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx b/writerfilter/source/dmapper/StyleSheetTable.cxx
index 146c8b618253..85b5d3f108df 100644
--- a/writerfilter/source/dmapper/StyleSheetTable.cxx
+++ b/writerfilter/source/dmapper/StyleSheetTable.cxx
@@ -459,7 +459,7 @@ void StyleSheetTable::lcl_attribute(Id Name, Value & val)
default:
{
#ifdef DEBUG_DOMAINMAPPER
- dmapper_logger->element("StyleSheetTable.unhandled");
+ dmapper_logger->element("unhandled");
#endif
}
break;
@@ -1222,9 +1222,8 @@ void StyleSheetTable::applyDefaults(bool bParaProperties)
}
}
}
- catch( const uno::Exception& e)
+ catch( const uno::Exception& )
{
- (void) e;
}
}
diff --git a/writerfilter/source/dmapper/TablePropertiesHandler.cxx b/writerfilter/source/dmapper/TablePropertiesHandler.cxx
index f38cd3e56c85..4e7e1d2d22cb 100644
--- a/writerfilter/source/dmapper/TablePropertiesHandler.cxx
+++ b/writerfilter/source/dmapper/TablePropertiesHandler.cxx
@@ -33,7 +33,7 @@ namespace dmapper {
bool TablePropertiesHandler::sprm(Sprm & rSprm)
{
-#ifdef DEBUG_DMAPPER_TABLE_PROPERTIES_HANDLER
+#ifdef DEBUG_DOMAINMAPPER
dmapper_logger->startElement("TablePropertiesHandler.sprm");
dmapper_logger->attribute("sprm", rSprm.toString());
#endif
@@ -130,7 +130,7 @@ namespace dmapper {
TablePropertyMapPtr pTablePropMap( new TablePropertyMap );
pTablePropMap->insert( pBorderHandler->getProperties() );
-#ifdef DEBUG_DMAPPER_TABLE_PROPERTIES_HANDLER
+#ifdef DEBUG_DOMAINMAPPER
pTablePropMap->dumpXml( dmapper_logger );
#endif
insertTableProps( pTablePropMap );
@@ -221,7 +221,7 @@ namespace dmapper {
default: bRet = false;
}
-#ifdef DEBUG_DMAPPER_TABLE_PROPERTIES_HANDLER
+#ifdef DEBUG_DOMAINMAPPER
dmapper_logger->endElement();
#endif
diff --git a/writerfilter/source/dmapper/TblStylePrHandler.cxx b/writerfilter/source/dmapper/TblStylePrHandler.cxx
index 21878f84c877..cf8bda4a85cc 100644
--- a/writerfilter/source/dmapper/TblStylePrHandler.cxx
+++ b/writerfilter/source/dmapper/TblStylePrHandler.cxx
@@ -3,9 +3,7 @@
#include <PropertyMap.hxx>
#include <ooxml/resourceids.hxx>
#include <dmapperLoggers.hxx>
-#ifdef DEBUG_DMAPPER_TBL_STYLE_HANDLER
#include <resourcemodel/QNameToString.hxx>
-#endif
#include "dmapperLoggers.hxx"
@@ -28,7 +26,7 @@ TblStylePrHandler::~TblStylePrHandler( )
void TblStylePrHandler::lcl_attribute(Id rName, Value & rVal)
{
-#ifdef DEBUG_DMAPPER_TBL_STYLE_HANDLER
+#ifdef DEBUG_DOMAINMAPPER
dmapper_logger->startElement("TblStylePrHandler.attribute");
dmapper_logger->attribute("name", (*QNameToString::Instance())(rName));
dmapper_logger->chars(rVal.toString());
@@ -49,7 +47,7 @@ void TblStylePrHandler::lcl_attribute(Id rName, Value & rVal)
void TblStylePrHandler::lcl_sprm(Sprm & rSprm)
{
-#ifdef DEBUG_DMAPPER_TBL_STYLE_HANDLER
+#ifdef DEBUG_DOMAINMAPPER
dmapper_logger->startElement("TblStylePrHandler.sprm");
dmapper_logger->attribute("sprm", rSprm.toString());
#endif
@@ -78,7 +76,7 @@ void TblStylePrHandler::lcl_sprm(Sprm & rSprm)
}
}
-#ifdef DEBUG_DMAPPER_TBL_STYLE_HANDLER
+#ifdef DEBUG_DOMAINMAPPER
dmapper_logger->endElement();
#endif
}
diff --git a/writerfilter/source/dmapper/ThemeTable.cxx b/writerfilter/source/dmapper/ThemeTable.cxx
index 9a3907ca47ba..c3e2790882c3 100644
--- a/writerfilter/source/dmapper/ThemeTable.cxx
+++ b/writerfilter/source/dmapper/ThemeTable.cxx
@@ -31,9 +31,6 @@
#include <doctok/resourceids.hxx>
#include <ooxml/resourceids.hxx>
#endif
-#ifdef DEBUG_DMAPPER_THEME_TABLE
-#include <resourcemodel/QNameToString.hxx>
-#endif
#include "dmapperLoggers.hxx"
#if DEBUG_DOMAINMAPPER
@@ -69,7 +66,7 @@ ThemeTable::~ThemeTable()
void ThemeTable::lcl_attribute(Id Name, Value & val)
{
-#ifdef DEBUG_DMAPPER_THEME_TABLE
+#ifdef DEBUG_DOMAINMAPPER
dmapper_logger->startElement("ThemeTable.attribute");
dmapper_logger->attribute("name", (*QNameToString::Instance())(Name));
dmapper_logger->attribute("value", val.toString());
@@ -84,18 +81,18 @@ void ThemeTable::lcl_attribute(Id Name, Value & val)
default:
{
#ifdef DEBUG_DOMAINMAPPER
- dmapper_logger->element("ThemeTable.unhandled");
+ dmapper_logger->element("unhandled");
#endif
}
}
-#ifdef DEBUG_DMAPPER_THEME_TABLE
+#ifdef DEBUG_DOMAINMAPPER
dmapper_logger->endElement();
#endif
}
void ThemeTable::lcl_sprm(Sprm& rSprm)
{
-#ifdef DEBUG_DMAPPER_THEME_TABLE
+#ifdef DEBUG_DOMAINMAPPER
dmapper_logger->startElement("ThemeTable.sprm");
dmapper_logger->chars(rSprm.toString());
#endif
@@ -139,25 +136,25 @@ void ThemeTable::lcl_sprm(Sprm& rSprm)
break;
default:
{
-#ifdef DEBUG_DMAPPER_THEME_TABLE
- dmapper_logger->element("ThemeTable.unhandled");
+#ifdef DEBUG_DOMAINMAPPER
+ dmapper_logger->element("unhandled");
#endif
}
}
-#ifdef DEBUG_DMAPPER_THEME_TABLE
+#ifdef DEBUG_DOMAINMAPPER
dmapper_logger->endElement();
#endif
}
void ThemeTable::lcl_entry(int /*pos*/, writerfilter::Reference<Properties>::Pointer_t ref)
{
-#ifdef DEBUG_DMAPPER_THEME_TABLE
+#ifdef DEBUG_DOMAINMAPPER
dmapper_logger->startElement("ThemeTable.entry");
#endif
ref->resolve(*this);
-#ifdef DEBUG_DMAPPER_THEME_TABLE
+#ifdef DEBUG_DOMAINMAPPER
dmapper_logger->endElement();
#endif
}
diff --git a/writerfilter/source/dmapper/WrapPolygonHandler.cxx b/writerfilter/source/dmapper/WrapPolygonHandler.cxx
index ccaa419e846d..e298e85cc140 100644
--- a/writerfilter/source/dmapper/WrapPolygonHandler.cxx
+++ b/writerfilter/source/dmapper/WrapPolygonHandler.cxx
@@ -180,7 +180,7 @@ void WrapPolygonHandler::lcl_attribute(Id Name, Value & val)
break;
default:
#ifdef DEBUG_WRAP_POLYGON_HANDLER
- dmapper_logger->element("WrapPolygonHandler.unhandled");
+ dmapper_logger->element("unhandled");
#endif
break;
}
@@ -202,7 +202,7 @@ void WrapPolygonHandler::lcl_sprm(Sprm & _sprm)
break;
default:
#ifdef DEBUG_WRAP_POLYGON_HANDLER
- dmapper_logger->element("WrapPolygonHandler.unhandled");
+ dmapper_logger->element("unhandled");
#endif
break;
}
diff --git a/writerfilter/source/doctok/WW8DocumentImpl.cxx b/writerfilter/source/doctok/WW8DocumentImpl.cxx
index 2dd265789382..f7b79a31882a 100644
--- a/writerfilter/source/doctok/WW8DocumentImpl.cxx
+++ b/writerfilter/source/doctok/WW8DocumentImpl.cxx
@@ -198,7 +198,6 @@ mbInSection(false), mbInParagraphGroup(false), mbInCharacterGroup(false)
}
catch (ExceptionNotFound)
{
- (void) e;
}
try
@@ -208,7 +207,6 @@ mbInSection(false), mbInParagraphGroup(false), mbInCharacterGroup(false)
}
catch (ExceptionNotFound)
{
- (void) e;
}
mpCHPFKPCache =
@@ -300,6 +298,8 @@ mbInSection(false), mbInParagraphGroup(false), mbInCharacterGroup(false)
mpFib->get_fcPlcfbtePapx(),
mpFib->get_lcbPlcfbtePapx()));
+ //clog << "BinTable(PAP):" << mpBinTablePAPX->toString();
+
parseBinTableCpAndFcs(*mpBinTablePAPX, PROP_PAP);
mpBinTableCHPX =
@@ -648,13 +648,13 @@ void WW8DocumentImpl::parseBinTableCpAndFcs(WW8BinTable & rTable,
}
catch (ExceptionNotFound &e)
{
- (void) e;
+ clog << e.getText() << endl;
}
}
}
catch (ExceptionNotFound &e)
{
- (void) e;
+ clog << e.getText() << endl;
}
}
}
@@ -861,7 +861,6 @@ writerfilter::Reference<Properties>::Pointer_t WW8DocumentImpl::getProperties
}
catch (ExceptionOutOfBounds)
{
- (void) e;
}
}
@@ -1001,8 +1000,6 @@ writerfilter::Reference<Table>::Pointer_t WW8DocumentImpl::getListTable() const
pResult = writerfilter::Reference<Table>::Pointer_t(pList);
}
catch (ExceptionOutOfBounds) {
- {
- (void) aException;
}
}
@@ -1028,7 +1025,7 @@ writerfilter::Reference<Table>::Pointer_t WW8DocumentImpl::getLFOTable() const
}
catch (Exception &e)
{
- (void) e;
+ clog << e.getText() << endl;
}
}
@@ -1648,6 +1645,7 @@ void WW8DocumentImpl::resolve(Stream & rStream)
{
if (! bSubDocument)
{
+#if 1
output.addItem("<substream-names>");
output.addItem(mpStream->getSubStreamNames());
output.addItem("</substream-names>");
@@ -1661,6 +1659,7 @@ void WW8DocumentImpl::resolve(Stream & rStream)
{
mpSummaryInformationStream->dump(output);
}
+#endif
writerfilter::Reference<Properties>::Pointer_t pFib
(new WW8Fib(*mpFib));
@@ -1673,11 +1672,24 @@ void WW8DocumentImpl::resolve(Stream & rStream)
rStream.props(pFibRgFcLcb2000);
}
+#if 0
+ if (mpTextBoxStories.get() != NULL)
+ {
+ output.addItem("<textbox.boxes>");
+ mpTextBoxStories->dump(output);
+ output.addItem("</textbox.boxes>");
+ }
+#endif
if (mpFib->get_lcbPlcftxbxBkd() > 0)
{
PLCF<WW8BKD> aPLCF(*mpTableStream,
mpFib->get_fcPlcftxbxBkd(),
mpFib->get_lcbPlcftxbxBkd());
+#if 0
+ output.addItem("<textbox.breaks>");
+ aPLCF.dump(output);
+ output.addItem("</textbox.breaks>");
+#endif
}
if (mpDffBlock.get() != NULL)
@@ -1699,6 +1711,33 @@ void WW8DocumentImpl::resolve(Stream & rStream)
rStream.info("/headers");
}
+#if 0
+ {
+ sal_uInt32 nFootnoteCount = getFootnoteCount();
+ for (sal_uInt32 n = 0; n < nFootnoteCount; ++n)
+ {
+ //clog << "<footnote num=\"" << n << "\"/>" << endl;
+
+ writerfilter::Reference<Stream>::Pointer_t pFootnote(getFootnote(n));
+
+ if (pFootnote.get() != NULL)
+ rStream.substream(NS_rtf::LN_footnote, pFootnote);
+ }
+ }
+ {
+ sal_uInt32 nEndnoteCount = getEndnoteCount();
+ for (sal_uInt32 n = 0; n < nEndnoteCount; ++n)
+ {
+ //clog << "<endnote num=\"" << n << "\"/>" << endl;
+
+ writerfilter::Reference<Stream>::Pointer_t pEndnote(getEndnote(n));
+
+ if (pEndnote.get() != NULL)
+ rStream.substream(NS_rtf::LN_endnote, pEndnote);
+ }
+ }
+#endif
+
writerfilter::Reference<Table>::Pointer_t pSttbRgtplc = getListTplcs();
if (pSttbRgtplc.get() != NULL)
@@ -1718,7 +1757,7 @@ void WW8DocumentImpl::resolve(Stream & rStream)
}
catch (Exception &e)
{
- (void) e;
+ clog << e.getText() << endl;
}
writerfilter::Reference<Table>::Pointer_t pAssocTable = getAssocTable();
@@ -2166,7 +2205,7 @@ BookmarkHelper::getBookmark(const CpAndFc & rCpAndFc)
}
catch (ExceptionNotFound &e)
{
- (void) e;
+ clog << e.getText() << endl;
}
return pResult;
diff --git a/writerfilter/source/doctok/WW8ResourceModelImpl.cxx b/writerfilter/source/doctok/WW8ResourceModelImpl.cxx
index df3fc677b4b8..d23ca33d8f31 100644
--- a/writerfilter/source/doctok/WW8ResourceModelImpl.cxx
+++ b/writerfilter/source/doctok/WW8ResourceModelImpl.cxx
@@ -191,7 +191,6 @@ void WW8PropertiesReference::resolve(Properties & rHandler)
}
catch (ExceptionOutOfBounds)
{
- (void) e;
}
}
}
diff --git a/writerfilter/source/doctok/WW8StreamImpl.cxx b/writerfilter/source/doctok/WW8StreamImpl.cxx
index 741857015d3b..23cecbbe6118 100644
--- a/writerfilter/source/doctok/WW8StreamImpl.cxx
+++ b/writerfilter/source/doctok/WW8StreamImpl.cxx
@@ -123,9 +123,10 @@ WW8Stream::Pointer_t WW8StreamImpl::getSubStream(const ::rtl::OUString & sId)
}
catch (...)
{
- throw ExceptionNotFound("Stream not found");
}
+ if (pResult.get() == NULL)
+ throw ExceptionNotFound("Stream not found");
return pResult;
}
diff --git a/writerfilter/source/doctok/resourcesimpl.xsl b/writerfilter/source/doctok/resourcesimpl.xsl
index 6b3bbd71cb88..256ac2b3ced0 100644
--- a/writerfilter/source/doctok/resourcesimpl.xsl
+++ b/writerfilter/source/doctok/resourcesimpl.xsl
@@ -484,8 +484,7 @@ using namespace ::std;
rHandler.entry(n, pEntry);
}
catch (const ExceptionOutOfBounds&amp;)
- {
- (void) e;
+ {
}
}
}
diff --git a/writerfilter/source/filter/ImportFilter.cxx b/writerfilter/source/filter/ImportFilter.cxx
index f94d65590f48..2950f9f521a8 100644
--- a/writerfilter/source/filter/ImportFilter.cxx
+++ b/writerfilter/source/filter/ImportFilter.cxx
@@ -79,9 +79,8 @@ sal_Bool WriterFilter::filter( const uno::Sequence< beans::PropertyValue >& aDes
::oox::core::FilterDetect aDetector( m_xContext );
xInputStream = aDetector.extractUnencryptedPackage( aMediaDesc );
}
- catch( uno::Exception& e)
+ catch( uno::Exception& )
{
- (void) e;
}
if ( !xInputStream.is() )
diff --git a/writerfilter/source/filter/RtfFilter.hxx b/writerfilter/source/filter/RtfFilter.hxx
index 03488db64ff1..aada3c609f72 100644
--- a/writerfilter/source/filter/RtfFilter.hxx
+++ b/writerfilter/source/filter/RtfFilter.hxx
@@ -39,7 +39,7 @@
#include <WriterFilterDllApi.hxx>
/// Common RTF filter, calls RtfImportFilter and RtfExportFilter via UNO.
-class WRITERFILTER_WRITERFILTER_DLLPUBLIC RtfFilter : public cppu::WeakImplHelper5
+class WRITERFILTER_DLLPUBLIC RtfFilter : public cppu::WeakImplHelper5
<
com::sun::star::document::XFilter,
com::sun::star::document::XImporter,
diff --git a/writerfilter/source/filter/WriterFilter.hxx b/writerfilter/source/filter/WriterFilter.hxx
index a2b2fb7a4b5b..b883ca1e91d7 100644
--- a/writerfilter/source/filter/WriterFilter.hxx
+++ b/writerfilter/source/filter/WriterFilter.hxx
@@ -39,7 +39,7 @@
#include <WriterFilterDllApi.hxx>
/// Common DOC/DOCX filter, calls DocxExportFilter via UNO or does the DOC (currently unused) / DOCX import.
-class WRITERFILTER_WRITERFILTER_DLLPUBLIC WriterFilter : public cppu::WeakImplHelper5
+class WRITERFILTER_DLLPUBLIC WriterFilter : public cppu::WeakImplHelper5
<
com::sun::star::document::XFilter,
com::sun::star::document::XImporter,
diff --git a/writerfilter/source/filter/WriterFilterDetection.hxx b/writerfilter/source/filter/WriterFilterDetection.hxx
index f7caa549d6d8..f84252e05d1a 100644
--- a/writerfilter/source/filter/WriterFilterDetection.hxx
+++ b/writerfilter/source/filter/WriterFilterDetection.hxx
@@ -35,7 +35,7 @@
#include <WriterFilterDllApi.hxx>
/// File format detection service for DOC (unused) / DOCX.
-class WRITERFILTER_WRITERFILTER_DLLPUBLIC WriterFilterDetection : public cppu::WeakImplHelper2
+class WRITERFILTER_DLLPUBLIC WriterFilterDetection : public cppu::WeakImplHelper2
<
com::sun::star::document::XExtendedFilterDetection,
com::sun::star::lang::XServiceInfo
diff --git a/writerfilter/source/generated.mk b/writerfilter/source/generated.mk
new file mode 100644
index 000000000000..39895d59f5b6
--- /dev/null
+++ b/writerfilter/source/generated.mk
@@ -0,0 +1,55 @@
+#*************************************************************************
+#
+# 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.
+#
+#*************************************************************************
+
+# this namespace list is needed both in the library and the custom makefile
+WRITERFILTER_OOXMLNAMESPACES= \
+ 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 \
+
+
diff --git a/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx b/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
index 3bbf5bce4180..acf84f9ab68f 100644
--- a/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
+++ b/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
@@ -150,7 +150,7 @@ writerfilter::Reference<Stream>::Pointer_t
OOXMLDocumentImpl::getXNoteStream(OOXMLStream::StreamType_t nType, const Id & rType,
const sal_Int32 nId)
{
-#ifdef DEBUG_DOCUMENT
+#ifdef DEBUG_ELEMENT
debug_logger->startElement("getXNoteStream");
debug_logger->attribute("id", nId);
debug_logger->endElement();
@@ -310,7 +310,7 @@ void OOXMLDocumentImpl::resolveFooter(Stream & rStream,
void OOXMLDocumentImpl::resolve(Stream & rStream)
{
-#ifdef DEBUG_DOCUMENT
+#ifdef DEBUG_RESOLVE
debug_logger->startElement("OOXMLDocumentImpl.resolve");
#endif
@@ -348,13 +348,13 @@ void OOXMLDocumentImpl::resolve(Stream & rStream)
xParser->parseStream(aParserInput);
}
catch (...) {
-#ifdef DEBUG_DOCUMENT
+#ifdef DEBUG_ELEMENT
debug_logger->element("exception");
#endif
}
}
-#ifdef DEBUG_DOCUMENT
+#ifdef DEBUG_RESOLVE
debug_logger->endElement();
#endif
}
diff --git a/writerfilter/source/ooxml/OOXMLFactory.cxx b/writerfilter/source/ooxml/OOXMLFactory.cxx
index 440aee65164b..0dc29db2f0de 100644
--- a/writerfilter/source/ooxml/OOXMLFactory.cxx
+++ b/writerfilter/source/ooxml/OOXMLFactory.cxx
@@ -260,7 +260,7 @@ void OOXMLFactory::attributes(OOXMLFastContextHandler * pHandler,
uno::Reference< xml::sax::XFastContextHandler>
OOXMLFactory::createFastChildContext(OOXMLFastContextHandler * pHandler,
- sal_Int32 Element)
+ Token_t Element)
{
#ifdef DEBUG_FACTORY
debug_logger->startElement("factory.createFastChildContext");
@@ -305,35 +305,35 @@ void OOXMLFactory::characters(OOXMLFastContextHandler * pHandler,
#endif
}
-void OOXMLFactory::startAction(OOXMLFastContextHandler * pHandler, sal_Int32 /*nToken*/)
+void OOXMLFactory::startAction(OOXMLFastContextHandler * pHandler, Token_t /*nToken*/)
{
Id nDefine = pHandler->getDefine();
OOXMLFactory_ns::Pointer_t pFactory = getFactoryForNamespace(nDefine);
if (pFactory.get() != NULL)
{
-#ifdef DEBUG_FACTORY
+#ifdef DEBUG_ELEMENT
debug_logger->startElement("factory.startAction");
#endif
pFactory->startAction(pHandler);
-#ifdef DEBUG_FACTORY
+#ifdef DEBUG_ELEMENT
debug_logger->endElement();
#endif
}
}
-void OOXMLFactory::endAction(OOXMLFastContextHandler * pHandler, sal_Int32 /*nToken*/)
+void OOXMLFactory::endAction(OOXMLFastContextHandler * pHandler, Token_t /*nToken*/)
{
Id nDefine = pHandler->getDefine();
OOXMLFactory_ns::Pointer_t pFactory = getFactoryForNamespace(nDefine);
if (pFactory.get() != NULL)
{
-#ifdef DEBUG_FACTORY
+#ifdef DEBUG_ELEMENT
debug_logger->startElement("factory.endAction");
#endif
pFactory->endAction(pHandler);
-#ifdef DEBUG_FACTORY
+#ifdef DEBUG_ELEMENT
debug_logger->endElement();
#endif
}
@@ -351,7 +351,7 @@ void OOXMLFactory_ns::charactersAction(OOXMLFastContextHandler *, const ::rtl::O
{
}
-void OOXMLFactory_ns::attributeAction(OOXMLFastContextHandler *, sal_Int32, OOXMLValue::Pointer_t)
+void OOXMLFactory_ns::attributeAction(OOXMLFastContextHandler *, Token_t, OOXMLValue::Pointer_t)
{
}
diff --git a/writerfilter/source/ooxml/OOXMLFactory.hxx b/writerfilter/source/ooxml/OOXMLFactory.hxx
index 628c99a376f3..28dda006ec43 100644
--- a/writerfilter/source/ooxml/OOXMLFactory.hxx
+++ b/writerfilter/source/ooxml/OOXMLFactory.hxx
@@ -108,7 +108,7 @@ public:
virtual void startAction(OOXMLFastContextHandler * pHandler);
virtual void charactersAction(OOXMLFastContextHandler * pHandler, const ::rtl::OUString & rString);
virtual void endAction(OOXMLFastContextHandler * pHandler);
- virtual void attributeAction(OOXMLFastContextHandler * pHandler, sal_Int32 nToken, OOXMLValue::Pointer_t pValue);
+ virtual void attributeAction(OOXMLFastContextHandler * pHandler, Token_t nToken, OOXMLValue::Pointer_t pValue);
virtual string getDefineName(Id nId) const;
#ifdef DEBUG_FACTORY
virtual string getName() const;
@@ -141,10 +141,10 @@ public:
static Pointer_t getInstance();
uno::Reference< xml::sax::XFastContextHandler> createFastChildContext
- (OOXMLFastContextHandler * pHandler, sal_Int32 Element);
+ (OOXMLFastContextHandler * pHandler, Token_t Element);
uno::Reference< xml::sax::XFastContextHandler> createFastChildContextFromStart
- (OOXMLFastContextHandler * pHandler, sal_Int32 Element);
+ (OOXMLFastContextHandler * pHandler, Token_t Element);
void attributes(OOXMLFastContextHandler * pHandler,
const uno::Reference< xml::sax::XFastAttributeList > & Attribs);
@@ -152,8 +152,8 @@ public:
void characters(OOXMLFastContextHandler * pHandler,
const ::rtl::OUString & rString);
- void startAction(OOXMLFastContextHandler * pHandler, sal_Int32 nToken);
- void endAction(OOXMLFastContextHandler * pHandler, sal_Int32 nToken);
+ void startAction(OOXMLFastContextHandler * pHandler, Token_t nToken);
+ void endAction(OOXMLFastContextHandler * pHandler, Token_t nToken);
virtual ~OOXMLFactory();
@@ -166,7 +166,7 @@ private:
uno::Reference< xml::sax::XFastContextHandler>
createFastChildContextFromFactory(OOXMLFastContextHandler * pHandler,
OOXMLFactory_ns::Pointer_t pFactory,
- sal_Int32 Element);
+ Token_t Element);
};
}
diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
index a0e7ab0f5db7..3e1464dbac0e 100644
--- a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
+++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
@@ -181,7 +181,7 @@ OOXMLFastContextHandler::~OOXMLFastContextHandler()
// ::com::sun::star::xml::sax::XFastContextHandler:
void SAL_CALL OOXMLFastContextHandler::startFastElement
-(sal_Int32 Element,
+(Token_t Element,
const uno::Reference< xml::sax::XFastAttributeList > & Attribs)
throw (uno::RuntimeException, xml::sax::SAXException)
{
@@ -216,7 +216,7 @@ throw (uno::RuntimeException, xml::sax::SAXException)
#endif
}
-void SAL_CALL OOXMLFastContextHandler::endFastElement(sal_Int32 Element)
+void SAL_CALL OOXMLFastContextHandler::endFastElement(Token_t Element)
throw (uno::RuntimeException, xml::sax::SAXException)
{
#ifdef DEBUG_CONTEXT_HANDLER
@@ -236,7 +236,7 @@ throw (uno::RuntimeException, xml::sax::SAXException)
}
void OOXMLFastContextHandler::lcl_startFastElement
-(sal_Int32 Element,
+(Token_t Element,
const uno::Reference< xml::sax::XFastAttributeList > & /*Attribs*/)
throw (uno::RuntimeException, xml::sax::SAXException)
{
@@ -249,7 +249,7 @@ void OOXMLFastContextHandler::lcl_startFastElement
}
void OOXMLFastContextHandler::lcl_endFastElement
-(sal_Int32 Element)
+(Token_t Element)
throw (uno::RuntimeException, xml::sax::SAXException)
{
OOXMLFactory::getInstance()->endAction(this, Element);
@@ -267,7 +267,7 @@ throw (uno::RuntimeException, xml::sax::SAXException)
uno::Reference< xml::sax::XFastContextHandler > SAL_CALL
OOXMLFastContextHandler::createFastChildContext
-(sal_Int32 Element,
+(Token_t Element,
const uno::Reference< xml::sax::XFastAttributeList > & Attribs)
throw (uno::RuntimeException, xml::sax::SAXException)
{
@@ -289,7 +289,7 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL
uno::Reference< xml::sax::XFastContextHandler >
OOXMLFastContextHandler::lcl_createFastChildContext
-(sal_Int32 Element,
+(Token_t Element,
const uno::Reference< xml::sax::XFastAttributeList > & /*Attribs*/)
throw (uno::RuntimeException, xml::sax::SAXException)
{
@@ -346,7 +346,7 @@ sal_Int64 SAL_CALL OOXMLFastContextHandler::getSomething( const uno::Sequence< s
{
if( rId.getLength() == 16
&& 0 == rtl_compareMemory( getUnoTunnelId().getConstArray(),
- rId.getConstArray(), 16 ) )
+ rId.getConstArray(), 16 ) )
{
return sal::static_int_cast<sal_Int64>
(reinterpret_cast<sal_IntPtr>(this));
@@ -372,7 +372,7 @@ void OOXMLFastContextHandler::attributes
OOXMLFactory::getInstance()->attributes(this, Attribs);
}
-void OOXMLFastContextHandler::startAction(sal_Int32 Element)
+void OOXMLFastContextHandler::startAction(Token_t Element)
{
#ifdef DEBUG_CONTEXT_HANDLER
debug_logger->startElement("contexthandler.startAction");
@@ -383,12 +383,12 @@ void OOXMLFastContextHandler::startAction(sal_Int32 Element)
#endif
}
-void OOXMLFastContextHandler::lcl_startAction(sal_Int32 Element)
+void OOXMLFastContextHandler::lcl_startAction(Token_t Element)
{
OOXMLFactory::getInstance()->startAction(this, Element);
}
-void OOXMLFastContextHandler::endAction(sal_Int32 Element)
+void OOXMLFastContextHandler::endAction(Token_t Element)
{
#ifdef DEBUG_CONTEXT_HANDLER
debug_logger->startElement("contexthandler.endAction");
@@ -399,7 +399,7 @@ void OOXMLFastContextHandler::endAction(sal_Int32 Element)
#endif
}
-void OOXMLFastContextHandler::lcl_endAction(sal_Int32 Element)
+void OOXMLFastContextHandler::lcl_endAction(Token_t Element)
{
OOXMLFactory::getInstance()->endAction(this, Element);
}
@@ -479,6 +479,10 @@ OOXMLParserState::Pointer_t OOXMLFastContextHandler::getParserState() const
void OOXMLFastContextHandler::setToken(Token_t nToken)
{
mnToken = nToken;
+
+#ifdef DEBUG_CONTEXT_HANDLER
+ msTokenString = fastTokenToId(mnToken);
+#endif
}
Token_t OOXMLFastContextHandler::getToken() const
@@ -819,7 +823,6 @@ void OOXMLFastContextHandler::text(const ::rtl::OUString & sText)
debug_logger->chars(sText);
debug_logger->endElement();
#endif
-
if (isForwardEvents())
mpStream->utext(reinterpret_cast < const sal_uInt8 * >
(sText.getStr()),
@@ -1281,7 +1284,7 @@ OOXMLFastContextHandlerProperties::~OOXMLFastContextHandlerProperties()
}
void OOXMLFastContextHandlerProperties::lcl_endFastElement
-(sal_Int32 Element)
+(Token_t Element)
throw (uno::RuntimeException, xml::sax::SAXException)
{
endAction(Element);
@@ -1392,7 +1395,7 @@ void OOXMLFastContextHandlerProperties::handleHdrFtr()
void OOXMLFastContextHandlerProperties::handleComment()
{
-#ifdef DEBUG_CONTEXT_HANDLER
+#ifdef DEBUG_ELEMENT
debug_logger->element("handleComment");
#endif
@@ -1402,7 +1405,7 @@ void OOXMLFastContextHandlerProperties::handleComment()
void OOXMLFastContextHandlerProperties::handlePicture()
{
-#ifdef DEBUG_CONTEXT_HANDLER
+#ifdef DEBUG_ELEMENT
debug_logger->element("handlePicture");
#endif
@@ -1412,7 +1415,7 @@ void OOXMLFastContextHandlerProperties::handlePicture()
void OOXMLFastContextHandlerProperties::handleBreak()
{
-#ifdef DEBUG_CONTEXT_HANDLER
+#ifdef DEBUG_ELEMENT
debug_logger->element("handleBreak");
#endif
@@ -1422,7 +1425,7 @@ void OOXMLFastContextHandlerProperties::handleBreak()
void OOXMLFastContextHandlerProperties::handleOLE()
{
-#ifdef DEBUG_CONTEXT_HANDLER
+#ifdef DEBUG_ELEMENT
debug_logger->element("handleOLE");
#endif
@@ -1433,7 +1436,7 @@ void OOXMLFastContextHandlerProperties::handleOLE()
void OOXMLFastContextHandlerProperties::setParent
(OOXMLFastContextHandler * pParent)
{
-#ifdef DEBUG_CONTEXT_HANDLER
+#ifdef DEBUG_ELEMENT
debug_logger->startElement("setParent");
debug_logger->chars("OOXMLFastContextHandlerProperties");
debug_logger->endElement();
@@ -1473,7 +1476,7 @@ OOXMLFastContextHandlerPropertyTable::~OOXMLFastContextHandlerPropertyTable()
}
void OOXMLFastContextHandlerPropertyTable::lcl_endFastElement
-(sal_Int32 Element)
+(Token_t Element)
throw (uno::RuntimeException, xml::sax::SAXException)
{
OOXMLPropertySet::Pointer_t pPropSet(mpPropertySet->clone());
@@ -1529,7 +1532,7 @@ OOXMLValue::Pointer_t OOXMLFastContextHandlerValue::getValue() const
}
void OOXMLFastContextHandlerValue::lcl_endFastElement
-(sal_Int32 Element)
+(Token_t Element)
throw (uno::RuntimeException, xml::sax::SAXException)
{
sendPropertyToParent();
@@ -1539,7 +1542,7 @@ throw (uno::RuntimeException, xml::sax::SAXException)
void OOXMLFastContextHandlerValue::setDefaultBooleanValue()
{
-#ifdef DEBUG_CONTEXT_HANDLER
+#ifdef DEBUG_ELEMENT
debug_logger->element("setDefaultBooleanValue");
#endif
@@ -1552,7 +1555,7 @@ void OOXMLFastContextHandlerValue::setDefaultBooleanValue()
void OOXMLFastContextHandlerValue::setDefaultIntegerValue()
{
-#ifdef DEBUG_CONTEXT_HANDLER
+#ifdef DEBUG_ELEMENT
debug_logger->element("setDefaultIntegerValue");
#endif
@@ -1565,7 +1568,7 @@ void OOXMLFastContextHandlerValue::setDefaultIntegerValue()
void OOXMLFastContextHandlerValue::setDefaultHexValue()
{
-#ifdef DEBUG_CONTEXT_HANDLER
+#ifdef DEBUG_ELEMENT
debug_logger->element("setDefaultHexValue");
#endif
@@ -1578,7 +1581,7 @@ void OOXMLFastContextHandlerValue::setDefaultHexValue()
void OOXMLFastContextHandlerValue::setDefaultStringValue()
{
-#ifdef DEBUG_CONTEXT_HANDLER
+#ifdef DEBUG_ELEMENT
debug_logger->element("setDefaultStringValue");
#endif
@@ -1604,7 +1607,7 @@ OOXMLFastContextHandlerTable::~OOXMLFastContextHandlerTable()
uno::Reference< xml::sax::XFastContextHandler > SAL_CALL
OOXMLFastContextHandlerTable::createFastChildContext
-(sal_Int32 Element,
+(Token_t Element,
const uno::Reference< xml::sax::XFastAttributeList > & Attribs)
throw (uno::RuntimeException, xml::sax::SAXException)
{
@@ -1617,7 +1620,7 @@ OOXMLFastContextHandlerTable::createFastChildContext
}
void OOXMLFastContextHandlerTable::lcl_endFastElement
-(sal_Int32 /*Element*/)
+(Token_t /*Element*/)
throw (uno::RuntimeException, xml::sax::SAXException)
{
addCurrentChild();
@@ -1672,7 +1675,7 @@ OOXMLFastContextHandlerXNote::~OOXMLFastContextHandlerXNote()
}
void OOXMLFastContextHandlerXNote::lcl_startFastElement
-(sal_Int32 Element,
+(Token_t Element,
const uno::Reference< xml::sax::XFastAttributeList > & /*Attribs*/)
throw (uno::RuntimeException, xml::sax::SAXException)
{
@@ -1687,7 +1690,7 @@ void OOXMLFastContextHandlerXNote::lcl_startFastElement
}
void OOXMLFastContextHandlerXNote::lcl_endFastElement
-(sal_Int32 Element)
+(Token_t Element)
throw (uno::RuntimeException, xml::sax::SAXException)
{
endAction(Element);
@@ -1697,7 +1700,7 @@ void OOXMLFastContextHandlerXNote::lcl_endFastElement
void OOXMLFastContextHandlerXNote::checkId(OOXMLValue::Pointer_t pValue)
{
-#ifdef DEBUG_CONTEXT_HANDLER
+#ifdef DEBUG_ELEMENT
debug_logger->startElement("checkId");
debug_logger->attribute("myId", sal_Int32(pValue->getInt()));
debug_logger->attribute("id", getXNoteId());
@@ -1844,7 +1847,7 @@ OOXMLFastContextHandlerTextTable::~OOXMLFastContextHandlerTextTable()
}
void OOXMLFastContextHandlerTextTable::lcl_startFastElement
-(sal_Int32 Element,
+(Token_t Element,
const uno::Reference< xml::sax::XFastAttributeList > & /*Attribs*/)
throw (uno::RuntimeException, xml::sax::SAXException)
{
@@ -1865,7 +1868,7 @@ void OOXMLFastContextHandlerTextTable::lcl_startFastElement
}
void OOXMLFastContextHandlerTextTable::lcl_endFastElement
-(sal_Int32 Element)
+(Token_t Element)
throw (uno::RuntimeException, xml::sax::SAXException)
{
endAction(Element);
@@ -1909,7 +1912,7 @@ OOXMLFastContextHandlerShape::OOXMLFastContextHandlerShape
mrShapeContext->setDrawPage(getDocument()->getDrawPage());
mrShapeContext->setInputStream(getDocument()->getStorageStream());
-#ifdef DEBUG_CONTEXT_HANDLER
+#ifdef DEBUG_ELEMENT
debug_logger->startElement("setRelationFragmentPath");
debug_logger->attribute("path", mpParserState->getTarget());
debug_logger->endElement();
@@ -1917,7 +1920,7 @@ OOXMLFastContextHandlerShape::OOXMLFastContextHandlerShape
mrShapeContext->setRelationFragmentPath
(mpParserState->getTarget());
}
-#ifdef DEBUG_CONTEXT_HANDLER
+#ifdef DEBUG_CONTEXT_STACK
else
{
debug_logger->startElement("error");
@@ -1933,7 +1936,7 @@ OOXMLFastContextHandlerShape::~OOXMLFastContextHandlerShape()
}
void OOXMLFastContextHandlerShape::lcl_startFastElement
-(sal_Int32 Element,
+(Token_t Element,
const uno::Reference< xml::sax::XFastAttributeList > & Attribs)
throw (uno::RuntimeException, xml::sax::SAXException)
{
@@ -1988,7 +1991,7 @@ void OOXMLFastContextHandlerShape::sendShape( Token_t Element )
}
void OOXMLFastContextHandlerShape::lcl_endFastElement
-(sal_Int32 Element)
+(Token_t Element)
throw (uno::RuntimeException, xml::sax::SAXException)
{
if (mrShapeContext.is())
@@ -2016,7 +2019,7 @@ void SAL_CALL OOXMLFastContextHandlerShape::endUnknownElement
uno::Reference< xml::sax::XFastContextHandler >
OOXMLFastContextHandlerShape::lcl_createFastChildContext
-(sal_Int32 Element,
+(Token_t Element,
const uno::Reference< xml::sax::XFastAttributeList > & Attribs)
throw (uno::RuntimeException, xml::sax::SAXException)
{
@@ -2167,7 +2170,7 @@ void OOXMLFastContextHandlerWrapper::addToken( Token_t Token )
}
void OOXMLFastContextHandlerWrapper::lcl_startFastElement
-(sal_Int32 Element,
+(Token_t Element,
const uno::Reference< xml::sax::XFastAttributeList > & Attribs)
throw (uno::RuntimeException, xml::sax::SAXException)
{
@@ -2176,7 +2179,7 @@ void OOXMLFastContextHandlerWrapper::lcl_startFastElement
}
void OOXMLFastContextHandlerWrapper::lcl_endFastElement
-(sal_Int32 Element)
+(Token_t Element)
throw (uno::RuntimeException, xml::sax::SAXException)
{
if (mxContext.is())
@@ -2185,7 +2188,7 @@ void OOXMLFastContextHandlerWrapper::lcl_endFastElement
uno::Reference< xml::sax::XFastContextHandler >
OOXMLFastContextHandlerWrapper::lcl_createFastChildContext
-(sal_Int32 Element,
+(Token_t Element,
const uno::Reference< xml::sax::XFastAttributeList > & Attribs)
throw (uno::RuntimeException, xml::sax::SAXException)
{
@@ -2193,7 +2196,7 @@ OOXMLFastContextHandlerWrapper::lcl_createFastChildContext
Id nNameSpace = Element & 0xffff0000;
-#ifdef DEBUG_CONTEXT_HANDLER
+#ifdef DEBUG_ELEMENT
debug_logger->startElement("Wrapper-createChildContext");
debug_logger->attribute("token", fastTokenToId(Element));
diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx b/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx
index 3f6d5e291fa6..68a69bd78248 100644
--- a/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx
+++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx
@@ -74,7 +74,7 @@ public:
// ::com::sun::star::xml::sax::XFastContextHandler:
virtual void SAL_CALL startFastElement
- (sal_Int32 Element,
+ (Token_t Element,
const uno::Reference< xml::sax::XFastAttributeList > & Attribs)
throw (uno::RuntimeException, xml::sax::SAXException);
@@ -84,7 +84,7 @@ public:
const uno::Reference< xml::sax::XFastAttributeList > & Attribs)
throw (uno::RuntimeException, xml::sax::SAXException);
- virtual void SAL_CALL endFastElement(sal_Int32 Element)
+ virtual void SAL_CALL endFastElement(Token_t Element)
throw (uno::RuntimeException, xml::sax::SAXException);
virtual void SAL_CALL endUnknownElement
@@ -93,7 +93,7 @@ public:
virtual uno::Reference< xml::sax::XFastContextHandler > SAL_CALL
createFastChildContext
- (sal_Int32 Element,
+ (Token_t Element,
const uno::Reference< xml::sax::XFastAttributeList > & Attribs)
throw (uno::RuntimeException, xml::sax::SAXException);
@@ -160,7 +160,7 @@ public:
uno::Reference < xml::sax::XFastContextHandler >
createFromStart
- (sal_uInt32 Element,
+ (Token_t Element,
const uno::Reference< xml::sax::XFastAttributeList > & Attribs);
void setDocument(OOXMLDocument * pDocument);
@@ -239,6 +239,10 @@ protected:
Id mnDefine;
Token_t mnToken;
+#ifdef DEBUG_CONTEXT_HANDLER
+ string msTokenString;
+#endif
+
// the stream to send the stream events to.
Stream * mpStream;
@@ -249,26 +253,26 @@ protected:
unsigned int mnTableDepth;
virtual void lcl_startFastElement
- (sal_Int32 Element,
+ (Token_t Element,
const uno::Reference< xml::sax::XFastAttributeList > & Attribs)
throw (uno::RuntimeException, xml::sax::SAXException);
- virtual void lcl_endFastElement(sal_Int32 Element)
+ virtual void lcl_endFastElement(Token_t Element)
throw (uno::RuntimeException, xml::sax::SAXException);
virtual uno::Reference< xml::sax::XFastContextHandler >
lcl_createFastChildContext
- (sal_Int32 Element,
+ (Token_t Element,
const uno::Reference< xml::sax::XFastAttributeList > & Attribs)
throw (uno::RuntimeException, xml::sax::SAXException);
virtual void lcl_characters(const ::rtl::OUString & aChars)
throw (uno::RuntimeException, xml::sax::SAXException);
- void startAction(sal_Int32 Element);
- virtual void lcl_startAction(sal_Int32 Element);
- void endAction(sal_Int32 Element);
- virtual void lcl_endAction(sal_Int32 Element);
+ void startAction(Token_t Element);
+ virtual void lcl_startAction(Token_t Element);
+ void endAction(Token_t Element);
+ virtual void lcl_endAction(Token_t Element);
// Returns string for resource of this context. (debug)
@@ -346,7 +350,7 @@ protected:
/// the properties
OOXMLPropertySet::Pointer_t mpPropertySet;
- virtual void lcl_endFastElement(sal_Int32 Element)
+ virtual void lcl_endFastElement(Token_t Element)
throw (uno::RuntimeException, xml::sax::SAXException);
virtual void setParent(OOXMLFastContextHandler * pParent);
@@ -365,7 +369,7 @@ public:
protected:
OOXMLTableImpl mTable;
- virtual void lcl_endFastElement(sal_Int32 Element)
+ virtual void lcl_endFastElement(Token_t Element)
throw (uno::RuntimeException, xml::sax::SAXException);
};
@@ -380,7 +384,7 @@ public:
virtual void setValue(OOXMLValue::Pointer_t pValue);
virtual OOXMLValue::Pointer_t getValue() const;
- virtual void lcl_endFastElement(sal_Int32 Element)
+ virtual void lcl_endFastElement(Token_t Element)
throw (uno::RuntimeException, xml::sax::SAXException);
virtual string getType() const { return "Value"; }
@@ -402,7 +406,7 @@ public:
virtual uno::Reference< xml::sax::XFastContextHandler > SAL_CALL
createFastChildContext
- (sal_Int32 Element,
+ (Token_t Element,
const uno::Reference< xml::sax::XFastAttributeList > & Attribs)
throw (uno::RuntimeException, xml::sax::SAXException);
@@ -412,7 +416,7 @@ protected:
RefAndPointer_t mCurrentChild;
- virtual void lcl_endFastElement(sal_Int32 Element)
+ virtual void lcl_endFastElement(Token_t Element)
throw (uno::RuntimeException, xml::sax::SAXException);
virtual ResourceEnum_t getResource() const { return TABLE; }
@@ -437,11 +441,11 @@ private:
sal_Int32 mnMyXNoteId;
virtual void lcl_startFastElement
- (sal_Int32 Element,
+ (Token_t Element,
const uno::Reference< xml::sax::XFastAttributeList > & Attribs)
throw (uno::RuntimeException, xml::sax::SAXException);
- virtual void lcl_endFastElement(sal_Int32 Element)
+ virtual void lcl_endFastElement(Token_t Element)
throw (uno::RuntimeException, xml::sax::SAXException);
virtual ResourceEnum_t getResource() const { return STREAM; }
@@ -485,11 +489,11 @@ public:
protected:
virtual void lcl_startFastElement
- (sal_Int32 Element,
+ (Token_t Element,
const uno::Reference< xml::sax::XFastAttributeList > & Attribs)
throw (uno::RuntimeException, xml::sax::SAXException);
- virtual void lcl_endFastElement(sal_Int32 Element)
+ virtual void lcl_endFastElement(Token_t Element)
throw (uno::RuntimeException, xml::sax::SAXException);
};
@@ -536,16 +540,16 @@ protected:
ShapeContextRef mrShapeContext;
virtual void lcl_startFastElement
- (sal_Int32 Element,
+ (Token_t Element,
const uno::Reference< xml::sax::XFastAttributeList > & Attribs)
throw (uno::RuntimeException, xml::sax::SAXException);
- virtual void lcl_endFastElement(sal_Int32 Element)
+ virtual void lcl_endFastElement(Token_t Element)
throw (uno::RuntimeException, xml::sax::SAXException);
virtual uno::Reference< xml::sax::XFastContextHandler >
lcl_createFastChildContext
- (sal_Int32 Element,
+ (Token_t Element,
const uno::Reference< xml::sax::XFastAttributeList > & Attribs)
throw (uno::RuntimeException, xml::sax::SAXException);
@@ -605,16 +609,16 @@ public:
protected:
virtual void lcl_startFastElement
- (sal_Int32 Element,
+ (Token_t Element,
const uno::Reference< xml::sax::XFastAttributeList > & Attribs)
throw (uno::RuntimeException, xml::sax::SAXException);
- virtual void lcl_endFastElement(sal_Int32 Element)
+ virtual void lcl_endFastElement(Token_t Element)
throw (uno::RuntimeException, xml::sax::SAXException);
virtual uno::Reference< xml::sax::XFastContextHandler >
lcl_createFastChildContext
- (sal_Int32 Element,
+ (Token_t Element,
const uno::Reference< xml::sax::XFastAttributeList > & Attribs)
throw (uno::RuntimeException, xml::sax::SAXException);
diff --git a/writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx b/writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx
index b962b0539f96..fa9f45d6849d 100644
--- a/writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx
+++ b/writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx
@@ -28,10 +28,8 @@
#include <iostream>
#include <boost/shared_ptr.hpp>
-#ifdef DEBUG_CONTEXT_HANDLER
+#ifdef DEBUG_ELEMENT
#include "ooxmlLoggers.hxx"
-#endif
-#ifdef DEBUG_PROTOCOL
#include <resourcemodel/Protocol.hxx>
#endif
#include "OOXMLFastDocumentHandler.hxx"
@@ -53,27 +51,75 @@ OOXMLFastDocumentHandler::OOXMLFastDocumentHandler
// ::com::sun::star::xml::sax::XFastContextHandler:
void SAL_CALL OOXMLFastDocumentHandler::startFastElement
-(::sal_Int32 /*Element*/, const uno::Reference< xml::sax::XFastAttributeList > & /*Attribs*/)
+(::sal_Int32
+#ifdef DEBUG_CONTEXT_STACK
+Element
+#endif
+, const uno::Reference< xml::sax::XFastAttributeList > & /*Attribs*/)
throw (uno::RuntimeException, xml::sax::SAXException)
{
+#ifdef DEBUG_CONTEXT_STACK
+ clog << this << ":start element:"
+ << fastTokenToId(Element)
+ << endl;
+#endif
}
void SAL_CALL OOXMLFastDocumentHandler::startUnknownElement
-(const ::rtl::OUString & /*Namespace*/, const ::rtl::OUString & /*Name*/,
+(const ::rtl::OUString &
+#ifdef DEBUG_CONTEXT_STACK
+Namespace
+#endif
+, const ::rtl::OUString &
+#ifdef DEBUG_CONTEXT_STACK
+Name
+#endif
+,
const uno::Reference< xml::sax::XFastAttributeList > & /*Attribs*/)
throw (uno::RuntimeException, xml::sax::SAXException)
{
+#ifdef DEBUG_CONTEXT_STACK
+ clog << this << ":start unknown element:"
+ << OUStringToOString(Namespace, RTL_TEXTENCODING_ASCII_US).getStr()
+ << ":"
+ << OUStringToOString(Name, RTL_TEXTENCODING_ASCII_US).getStr()
+ << endl;
+#endif
}
-void SAL_CALL OOXMLFastDocumentHandler::endFastElement(::sal_Int32 /*Element*/)
+void SAL_CALL OOXMLFastDocumentHandler::endFastElement(::sal_Int32
+#ifdef DEBUG_CONTEXT_STACK
+Element
+#endif
+)
throw (uno::RuntimeException, xml::sax::SAXException)
{
+#ifdef DEBUG_CONTEXT_STACK
+ clog << this << ":end element:"
+ << fastTokenToId(Element)
+ << endl;
+#endif
}
void SAL_CALL OOXMLFastDocumentHandler::endUnknownElement
-(const ::rtl::OUString & /*Namespace*/, const ::rtl::OUString & /*Name*/)
+(const ::rtl::OUString &
+#ifdef DEBUG_CONTEXT_STACK
+Namespace
+#endif
+, const ::rtl::OUString &
+#ifdef DEBUG_CONTEXT_STACK
+Name
+#endif
+)
throw (uno::RuntimeException, xml::sax::SAXException)
{
+#ifdef DEBUG_CONTEXT_STACK
+ clog << this << ":end unknown element:"
+ << OUStringToOString(Namespace, RTL_TEXTENCODING_ASCII_US).getStr()
+ << ":"
+ << OUStringToOString(Name, RTL_TEXTENCODING_ASCII_US).getStr()
+ << endl;
+#endif
}
OOXMLFastContextHandler::Pointer_t
@@ -98,16 +144,37 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL
const uno::Reference< xml::sax::XFastAttributeList > & /*Attribs*/)
throw (uno::RuntimeException, xml::sax::SAXException)
{
+#ifdef DEBUG_CONTEXT_STACK
+ clog << this << ":createFastChildContext:"
+ << fastTokenToId(Element)
+ << endl;
+#endif
+
return OOXMLFactory::getInstance()->createFastChildContextFromStart(getContextHandler().get(), Element);
}
uno::Reference< xml::sax::XFastContextHandler > SAL_CALL
OOXMLFastDocumentHandler::createUnknownChildContext
-(const ::rtl::OUString & /*Namespace*/,
- const ::rtl::OUString & /*Name*/,
- const uno::Reference< xml::sax::XFastAttributeList > & /*Attribs*/)
+(const ::rtl::OUString &
+#ifdef DEBUG_CONTEXT_STACK
+Namespace
+#endif
+,
+ const ::rtl::OUString &
+#ifdef DEBUG_CONTEXT_STACK
+Name
+#endif
+, const uno::Reference< xml::sax::XFastAttributeList > & /*Attribs*/)
throw (uno::RuntimeException, xml::sax::SAXException)
{
+#ifdef DEBUG_CONTEXT_STACK
+ clog << this << ":createUnknownChildContext:"
+ << OUStringToOString(Namespace, RTL_TEXTENCODING_ASCII_US).getStr()
+ << ":"
+ << OUStringToOString(Name, RTL_TEXTENCODING_ASCII_US).getStr()
+ << endl;
+#endif
+
return uno::Reference< xml::sax::XFastContextHandler >
(new OOXMLFastDocumentHandler(m_xContext));
}
diff --git a/writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx b/writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx
index eeb4ef6e1c59..eaa508a810c3 100644
--- a/writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx
+++ b/writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx
@@ -105,7 +105,7 @@ private:
uno::Reference< uno::XComponentContext > m_xContext;
Stream * mpStream;
-#ifdef DEBUG_PROTOCOL
+#ifdef DEBUG_ELEMENT
Stream::Pointer_t mpTmpStream;
#endif
OOXMLDocument * mpDocument;
diff --git a/writerfilter/source/ooxml/OOXMLFastTokenHandler.cxx b/writerfilter/source/ooxml/OOXMLFastTokenHandler.cxx
index f1df92340993..c89fd90c200e 100644
--- a/writerfilter/source/ooxml/OOXMLFastTokenHandler.cxx
+++ b/writerfilter/source/ooxml/OOXMLFastTokenHandler.cxx
@@ -32,10 +32,6 @@
#include "OOXMLFastTokenHandler.hxx"
#include "gperffasttoken.hxx"
-#ifdef DEBUG_TOKEN
-#include "ooxmlLoggers.hxx"
-#endif
-
namespace writerfilter {
namespace ooxml
{
@@ -62,10 +58,10 @@ OOXMLFastTokenHandler::OOXMLFastTokenHandler
nResult = pToken->nToken;
#ifdef DEBUG_TOKEN
- debug_logger->startElement(__FUNCTION__);
- debug_logger->attribute("identifier", Identifier);
- debug_logger->attribute("result", nResult);
- debug_logger->endElement(__FUNCTION__);
+ clog << "getToken: "
+ << OUStringToOString(Identifier, RTL_TEXTENCODING_ASCII_US).getStr()
+ << ", " << nResult
+ << endl;
#endif
return nResult;
@@ -111,13 +107,11 @@ css::uno::Sequence< ::sal_Int8 > SAL_CALL OOXMLFastTokenHandler::getUTF8Identifi
nResult = pToken->nToken;
#ifdef DEBUG_TOKEN
- debug_logger->startElement(__FUNCTION__);
- debug_logger->attribute
- ("utf8", string(reinterpret_cast<const char *>
- (Identifier.getConstArray()),
- Identifier.getLength()));
- debug_logger->attribute("result", nResult);
- debug_logger->endElement(__FUNCTION__);
+ clog << "getTokenFromUTF8: "
+ << string(reinterpret_cast<const char *>
+ (Identifier.getConstArray()), Identifier.getLength())
+ << ", " << nResult
+ << (pToken == NULL ? ", failed" : "") << endl;
#endif
return nResult;
diff --git a/writerfilter/source/ooxml/OOXMLStreamImpl.cxx b/writerfilter/source/ooxml/OOXMLStreamImpl.cxx
index fb5bd8296a9d..e96ab69d6c77 100644
--- a/writerfilter/source/ooxml/OOXMLStreamImpl.cxx
+++ b/writerfilter/source/ooxml/OOXMLStreamImpl.cxx
@@ -94,42 +94,6 @@ const ::rtl::OUString & OOXMLStreamImpl::getTarget() const
return msTarget;
}
-::rtl::OUString lcl_normalizeTarget(const ::rtl::OUString & s)
-{
- const int nStringsToCut = 2;
- const ::rtl::OUString aStringToCut[] = {
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("./")),
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"))
- };
-
- bool bDone = false;
- sal_Int32 nIndex = 0;
- while (!bDone)
- {
- for (int n = 0; n <= nStringsToCut; n++)
- {
- if (n == nStringsToCut)
- {
- bDone = true;
- }
- else
- {
- sal_Int32 nNewIndex = s.indexOf(aStringToCut[n], nIndex);
-
- if (nIndex == nNewIndex)
- {
- sal_Int32 nLength = aStringToCut[n].getLength();
- nIndex += nLength;
-
- break;
- }
- }
- }
- }
-
- return s.copy(nIndex);
-}
-
bool OOXMLStreamImpl::lcl_getTarget(uno::Reference<embed::XRelationshipAccess>
xRelationshipAccess,
StreamType_t nStreamType,
diff --git a/writerfilter/source/ooxml/RefAndPointer.hxx b/writerfilter/source/ooxml/RefAndPointer.hxx
index 6ccc6f419517..9472c350365d 100644
--- a/writerfilter/source/ooxml/RefAndPointer.hxx
+++ b/writerfilter/source/ooxml/RefAndPointer.hxx
@@ -53,6 +53,10 @@ public:
RefAndPointer(ChildClass * pHandler)
: mpHandler(pHandler), mRef(pHandler)
{
+#ifdef DEBUG_MEMORY
+ clog << "MEMORY:" << mpHandler->getInstanceNumber() << ":RefAndPointer"
+ << endl;
+#endif
}
RefAndPointer(uno::Reference<Interface> xRef)
@@ -60,11 +64,19 @@ public:
{
mpHandler = dynamic_cast<ChildClass *>(xRef.get());
#ifdef DEBUG_MEMORY
+ if (mpHandler != NULL)
+ clog << "MEMORY:" << mpHandler->getInstanceNumber()
+ << ":RefAndPointer" << endl;
#endif
}
virtual ~RefAndPointer()
{
+#ifdef DEBUG_MEMORY
+ if (mpHandler != NULL)
+ clog << "MEMORY:" << mpHandler->getInstanceNumber()
+ << ":~RefAndPointer" << endl;
+#endif
}
void set(ChildClass * pHandler)
diff --git a/writerfilter/source/ooxml/analyzemodel.xsl b/writerfilter/source/ooxml/analyzemodel.xsl
index 326e438f7af5..3cce9795a947 100644
--- a/writerfilter/source/ooxml/analyzemodel.xsl
+++ b/writerfilter/source/ooxml/analyzemodel.xsl
@@ -99,7 +99,6 @@
</xsl:when>
</xsl:choose>
<xsl:copy-of select="@tag"/>
- <xsl:copy-of select="@supported"/>
</xsl:for-each>
</xsl:template>
</xsl:stylesheet> \ No newline at end of file
diff --git a/writerfilter/source/ooxml/factory_ns.xsl b/writerfilter/source/ooxml/factory_ns.xsl
index e7bc85e53370..d0dd1ab503fd 100644
--- a/writerfilter/source/ooxml/factory_ns.xsl
+++ b/writerfilter/source/ooxml/factory_ns.xsl
@@ -100,7 +100,7 @@ public:
virtual TokenToIdMapPointer createTokenToIdMap(Id nId);
virtual string getDefineName(Id nId) const;</xsl:text>
<xsl:call-template name="factoryactiondecls"/>
- virtual void attributeAction(OOXMLFastContextHandler * pHandler, sal_Int32 nToken, OOXMLValue::Pointer_t pValue);
+ virtual void attributeAction(OOXMLFastContextHandler * pHandler, Token_t nToken, OOXMLValue::Pointer_t pValue);
#ifdef DEBUG_FACTORY
virtual string getName() const;
diff --git a/writerfilter/source/ooxml/factoryimpl.xsl b/writerfilter/source/ooxml/factoryimpl.xsl
index 20f578109026..e555ae1b7d6f 100644
--- a/writerfilter/source/ooxml/factoryimpl.xsl
+++ b/writerfilter/source/ooxml/factoryimpl.xsl
@@ -69,7 +69,7 @@
<xsl:template name="factorycreatecontextfromfactory">
<xsl:text>
uno::Reference&lt; xml::sax::XFastContextHandler &gt; OOXMLFactory::createFastChildContextFromFactory
-(OOXMLFastContextHandler * pHandler, OOXMLFactory_ns::Pointer_t pFactory, sal_Int32 Element)
+(OOXMLFastContextHandler * pHandler, OOXMLFactory_ns::Pointer_t pFactory, Token_t Element)
{
uno::Reference &lt; xml::sax::XFastContextHandler &gt; aResult;
Id nDefine = pHandler->getDefine();
@@ -178,7 +178,7 @@ OOXMLFactory_ns::Pointer_t OOXMLFactory::getFactoryForNamespace(Id nId)
<xsl:template name="factorycreatefromstart">
<xsl:text>
uno::Reference&lt; xml::sax::XFastContextHandler &gt; OOXMLFactory::createFastChildContextFromStart
-(OOXMLFastContextHandler * pHandler, sal_Int32 Element)
+(OOXMLFastContextHandler * pHandler, Token_t Element)
{
#ifdef DEBUG_FACTORY
debug_logger->startElement("factory.createFastChildContextFromStart");
@@ -211,7 +211,7 @@ uno::Reference&lt; xml::sax::XFastContextHandler &gt; OOXMLFactory::createFastCh
<xsl:template name="fasttokentoid">
<xsl:text>
namespace tokenmap {
-struct token { const char * name; sal_Int32 nToken; };
+struct token { const char * name; Token_t nToken; };
class Perfect_Hash
{
private:
diff --git a/writerfilter/source/ooxml/factoryimpl_ns.xsl b/writerfilter/source/ooxml/factoryimpl_ns.xsl
index de0e9ddd4cbe..b96f24f04833 100644
--- a/writerfilter/source/ooxml/factoryimpl_ns.xsl
+++ b/writerfilter/source/ooxml/factoryimpl_ns.xsl
@@ -873,7 +873,7 @@ TokenToIdMapPointer </xsl:text>
<xsl:text>
void </xsl:text>
<xsl:call-template name="factoryclassname"/>
-<xsl:text>::attributeAction(OOXMLFastContextHandler * _pHandler, sal_Int32 nToken, OOXMLValue::Pointer_t pValue)
+<xsl:text>::attributeAction(OOXMLFastContextHandler * _pHandler, Token_t nToken, OOXMLValue::Pointer_t pValue)
{
switch(_pHandler->getDefine())
{</xsl:text>
@@ -889,7 +889,7 @@ void </xsl:text>
<xsl:text>
void </xsl:text>
<xsl:call-template name="factoryclassname"/>
-<xsl:text>::attributeAction(OOXMLFastContextHandler *, sal_Int32, OOXMLValue::Pointer_t)
+<xsl:text>::attributeAction(OOXMLFastContextHandler *, Token_t, OOXMLValue::Pointer_t)
{
}
</xsl:text>
diff --git a/writerfilter/source/ooxml/fasttokens.xsl b/writerfilter/source/ooxml/fasttokens.xsl
index f8621a6a1b95..4014df0eec91 100644
--- a/writerfilter/source/ooxml/fasttokens.xsl
+++ b/writerfilter/source/ooxml/fasttokens.xsl
@@ -64,16 +64,19 @@
<xsl:include href="factorytools.xsl"/>
<xsl:template name="fasttokens">
+ <xsl:text>
+typedef sal_Int32 Token_t;
+ </xsl:text>
<xsl:for-each select="/model/fasttoken">
<xsl:text>
-const sal_Int32 OOXML_</xsl:text>
+const Token_t OOXML_</xsl:text>
<xsl:value-of select="translate(., '-', '_')"/>
<xsl:text> = </xsl:text>
<xsl:value-of select="position() - 1"/>
<xsl:text>;</xsl:text>
</xsl:for-each>
<xsl:text>
-const sal_Int32 OOXML_FAST_TOKENS_END = </xsl:text>
+const Token_t OOXML_FAST_TOKENS_END =</xsl:text>
<xsl:value-of select="count(/model/fasttoken)"/>
<xsl:text>;&#xa;</xsl:text>
</xsl:template>
diff --git a/writerfilter/source/ooxml/gperffasttokenhandler.xsl b/writerfilter/source/ooxml/gperffasttokenhandler.xsl
index f6a987e8fbd3..d14db0486b5d 100644
--- a/writerfilter/source/ooxml/gperffasttokenhandler.xsl
+++ b/writerfilter/source/ooxml/gperffasttokenhandler.xsl
@@ -75,7 +75,7 @@
namespace writerfilter { namespace ooxml { namespace tokenmap {
%}
-struct token { const char * name; sal_Int32 nToken; };
+struct token { const char * name; Token_t nToken; };
%%</xsl:text>
<xsl:for-each select=".//rng:element|.//rng:attribute">
<xsl:if test="generate-id(.) = generate-id(key('same-token-name', @localname)[1])">
diff --git a/writerfilter/source/ooxml/model.xml b/writerfilter/source/ooxml/model.xml
index 815a371853ca..742d5b3637b5 100644
--- a/writerfilter/source/ooxml/model.xml
+++ b/writerfilter/source/ooxml/model.xml
@@ -21546,7 +21546,7 @@
<attribute name="val" tokenid="ooxml:CT_VerticalAlignRun_val" action="setValue"/>
<action name="start" action="setDefaultStringValue"/>
</resource>
- <resource name="CT_FitText" resource="Properties" tag="paragraph" supported="no">
+ <resource name="CT_FitText" resource="Properties" tag="paragraph">
<attribute name="val" tokenid="ooxml:CT_FitText_val"/>
<attribute name="id" tokenid="ooxml:CT_FitText_id"/>
</resource>
@@ -21669,7 +21669,7 @@
<value name="exact" tokenid="ooxml:Value_wordprocessingml_ST_LineSpacingRule_exact">exact</value>
<value name="atLeast" tokenid="ooxml:Value_wordprocessingml_ST_LineSpacingRule_atLeast">atLeast</value>
</resource>
- <resource name="CT_Spacing" resource="Properties" tag="paragraph">
+ <resource name="CT_Spacing" resource="Properties" tag="paragraĆ¼h">
<attribute name="before" tokenid="ooxml:CT_Spacing_before"/>
<attribute name="beforeLines" tokenid="ooxml:CT_Spacing_beforeLines"/>
<attribute name="beforeAutospacing" tokenid="ooxml:CT_Spacing_beforeAutospacing"/>
diff --git a/writerfilter/source/ooxml/stage1.sh b/writerfilter/source/ooxml/stage1.sh
index 9c8355db5b7b..9c8355db5b7b 100644..100755
--- a/writerfilter/source/ooxml/stage1.sh
+++ b/writerfilter/source/ooxml/stage1.sh
diff --git a/writerfilter/source/ooxml/status.sh b/writerfilter/source/ooxml/status.sh
new file mode 100644
index 000000000000..c36ad0d65a37
--- /dev/null
+++ b/writerfilter/source/ooxml/status.sh
@@ -0,0 +1,24 @@
+#!/bin/bash
+
+SEARCHIN=$SRC_ROOT/writerfilter/source/dmapper
+
+(
+echo '<?xml version="1.0"?>'
+echo "<stage1>"
+
+xsltproc analyzemodel.xsl model.xml | tail -n +2
+
+find $SEARCHIN -name "*.cxx" -exec grep -nH -A 1 "case NS_" {} \; |
+grep -v "//.*case NS_" |
+sed 's#'$SEARCHIN'##' |
+sed 's#\(^[^:]*\):\([0-9]*\):#<qname file="\1" line="\2"#' |
+sed 's#[/* ]*case \(NS_.*\):.*# qname="\1"/>#' |
+sed 's#.*WRITERFILTERSTATUS: done: \([0-9]*\), planned: \([0-9.]*\), spent: \([0-9.]*\).*#<status done="\1" planned="\2" spent="\3"/>#' |
+sed 's#.*WRITERFILTERSTATUS:.*#<status done="100"/>#' |
+sed 's#^.*-[0-9][0-9]*-.*$#<nostatus/>#' |
+grep -v "^--"
+
+echo "</stage1>"
+) |
+xsltproc analyzestage2.xsl - |
+xsltproc analyzestage3.xsl -
diff --git a/writerfilter/source/ooxml/todo.xsl b/writerfilter/source/ooxml/todo.xsl
index 0c76229e8c2e..80431ea90487 100644
--- a/writerfilter/source/ooxml/todo.xsl
+++ b/writerfilter/source/ooxml/todo.xsl
@@ -1,30 +1,29 @@
<?xml version="1.0" encoding="UTF-8"?>
<xsl:stylesheet version="1.0"
- xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
- xmlns:rng="http://relaxng.org/ns/structure/1.0">
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ xmlns:rng="http://relaxng.org/ns/structure/1.0">
- <xsl:output method="xml" indent="yes"/>
+<xsl:output method="xml" indent="yes"/>
- <xsl:template match="/">
+<xsl:template match="/">
<todo>
- <xsl:for-each select="/stage3">
+ <xsl:for-each select="/stage3">
<xsl:for-each select="attribute|element">
- <xsl:choose>
- <xsl:when test="@supported = 'no'"/>
- <xsl:when test="@qname and @resource='Properties' and not(file)">
- <xsl:copy-of select="."/>
- </xsl:when>
- <xsl:when test="@qname and file/status[number(@done) &lt; 100 and number(@planned) &gt; 0]">
- <xsl:copy>
- <xsl:copy-of select="@*"/>
- <xsl:copy-of select="file[status[number(@done) &lt; 100 and number(@planned) &gt; 0]]"/>
- </xsl:copy>
- </xsl:when>
- </xsl:choose>
+ <xsl:choose>
+ <xsl:when test="@qname and @resource='Properties' and not(file)">
+ <xsl:copy-of select="."/>
+ </xsl:when>
+ <xsl:when test="@qname and file/status[number(@done) &lt; 100 and number(@planned) &gt; 0]">
+ <xsl:copy>
+ <xsl:copy-of select="@*"/>
+ <xsl:copy-of select="file[status[number(@done) &lt; 100 and number(@planned) &gt; 0]]"/>
+ </xsl:copy>
+ </xsl:when>
+ </xsl:choose>
</xsl:for-each>
- </xsl:for-each>
+ </xsl:for-each>
</todo>
- </xsl:template>
+</xsl:template>
</xsl:stylesheet> \ No newline at end of file
diff --git a/writerfilter/source/resourcemodel/LoggedResources.cxx b/writerfilter/source/resourcemodel/LoggedResources.cxx
index 8e49e9bf4f5b..bafce66ada72 100644
--- a/writerfilter/source/resourcemodel/LoggedResources.cxx
+++ b/writerfilter/source/resourcemodel/LoggedResources.cxx
@@ -26,7 +26,6 @@
************************************************************************/
#include <rtl/ustrbuf.hxx>
-#include <resourcemodel/WW8ResourceModel.hxx>
#include <resourcemodel/LoggedResources.hxx>
#include <resourcemodel/QNameToString.hxx>
diff --git a/writerfilter/source/resourcemodel/TagLogger.cxx b/writerfilter/source/resourcemodel/TagLogger.cxx
index db9308c48467..2d4aa11336e7 100644
--- a/writerfilter/source/resourcemodel/TagLogger.cxx
+++ b/writerfilter/source/resourcemodel/TagLogger.cxx
@@ -43,77 +43,6 @@ namespace writerfilter
{
}
-string XMLTag::toTree(const string & sIndent) const
-{
- if (mChars.length() > 0)
- return sIndent + mChars;
-
- string sResult;
-
- {
- size_t nSize = sIndent.size();
- if (nSize > 1)
- {
- sResult += sIndent.substr(0, nSize - 2) + "+-\\" + mTag;
- }
- else
- {
- sResult += "\\" + mTag;
- }
- }
-
- XMLAttributes_t::const_iterator aIt = mAttrs.begin();
- while (aIt != mAttrs.end())
- {
- if (aIt == mAttrs.begin())
- {
- sResult += "(";
- }
- else
- {
- sResult += sIndent + ", ";
- }
-
- sResult += aIt->mName;
- sResult += "=";
- sResult += aIt->mValue;
-
- aIt++;
-
- if (aIt == mAttrs.end())
- {
- sResult += ")";
- }
- }
-
- sResult += "\n";
-
- if (mTags.size() > 0)
- {
- XMLTags_t::const_iterator aItTags = mTags.begin();
- size_t nSize = mTags.size();
- while (aItTags != mTags.end())
- {
- if ((*aItTags).get() != NULL)
- {
- if (nSize == 1)
- {
- sResult += (*aItTags)->toTree(sIndent + " ");
- }
- else
- {
- sResult += (*aItTags)->toTree(sIndent + "| ");
- }
- }
-
- aItTags++;
- nSize--;
- }
- }
-
- return sResult;
-}
-
TagLogger::~TagLogger()
{
pWriter = NULL;
diff --git a/writerfilter/source/resourcemodel/qnametostrfooter b/writerfilter/source/resourcemodel/qnametostrfooter
index 4cba68b6f852..d0af0f6fa30f 100644
--- a/writerfilter/source/resourcemodel/qnametostrfooter
+++ b/writerfilter/source/resourcemodel/qnametostrfooter
@@ -4,7 +4,7 @@ QNameToString::QNameToString()
init_ooxml();
}
-void WRITERFILTER_RESOURCEMODEL_DLLPUBLIC analyzerIds()
+void WRITERFILTER_DLLPUBLIC analyzerIds()
{
cout << "<ids type=\"sprm\">" << endl;
diff --git a/writerfilter/source/resourcemodel/qnametostrheader b/writerfilter/source/resourcemodel/qnametostrheader
index 2705bb30cc73..6cbd0b3fec10 100644
--- a/writerfilter/source/resourcemodel/qnametostrheader
+++ b/writerfilter/source/resourcemodel/qnametostrheader
@@ -35,7 +35,7 @@ namespace writerfilter
QNameToString::Pointer_t QNameToString::pInstance;
-QNameToString::Pointer_t WRITERFILTER_RESOURCEMODEL_DLLPUBLIC QNameToString::Instance()
+QNameToString::Pointer_t WRITERFILTER_DLLPUBLIC QNameToString::Instance()
{
if (pInstance.get() == NULL)
pInstance = QNameToString::Pointer_t(new QNameToString());
@@ -43,7 +43,7 @@ QNameToString::Pointer_t WRITERFILTER_RESOURCEMODEL_DLLPUBLIC QNameToString::Ins
return pInstance;
}
-string WRITERFILTER_RESOURCEMODEL_DLLPUBLIC QNameToString::operator()(Id qName)
+string WRITERFILTER_DLLPUBLIC QNameToString::operator()(Id qName)
{
string sResult;
diff --git a/writerfilter/source/resourcemodel/resourcemodel.cxx b/writerfilter/source/resourcemodel/resourcemodel.cxx
index 2c482a2877a9..bd230ad09f06 100644
--- a/writerfilter/source/resourcemodel/resourcemodel.cxx
+++ b/writerfilter/source/resourcemodel/resourcemodel.cxx
@@ -444,7 +444,6 @@ void WW8PropertiesHandler::attribute(Id name, Value & val)
}
catch (ExceptionOutOfBounds)
{
- output.addItem("<exception/>");
}
output.addItem("</properties>");
@@ -462,7 +461,6 @@ void WW8PropertiesHandler::attribute(Id name, Value & val)
}
catch (ExceptionOutOfBounds)
{
- output.addItem("<exception>Out Of Bounds</exception>");
}
}
@@ -478,7 +476,6 @@ void WW8PropertiesHandler::attribute(Id name, Value & val)
}
catch (ExceptionOutOfBounds)
{
- output.addItem("<exception>Out Of Bounds</exception>");
}
}
diff --git a/writerfilter/unocomponent/component.cxx b/writerfilter/unocomponent/component.cxx
index 75f4dc377f9d..d715a70a9ae1 100644
--- a/writerfilter/unocomponent/component.cxx
+++ b/writerfilter/unocomponent/component.cxx
@@ -26,9 +26,14 @@
*
************************************************************************/
-#include <com/sun/star/lang/XSingleServiceFactory.hpp>
+#ifndef _CPPUHELPTER_FACTORY_
#include <cppuhelper/factory.hxx>
+#endif
+#include <com/sun/star/lang/XSingleServiceFactory.hpp>
+
+#ifndef _CPPUHELPER_IMPLEMENTATIONENTRY_
#include <cppuhelper/implementationentry.hxx>
+#endif
#include <debugservices/doctok/DocTokTestService.hxx>
#include <debugservices/doctok/DocTokAnalyzeService.hxx>
#include <debugservices/ooxml/OOXMLTestService.hxx>