[Libreoffice-commits] .: Module_tail_build.mk Repository.mk scp2/source writerfilter/CppunitTest_writerfilter_doctok.mk writerfilter/CppunitTest_writerfilter_rtftok.mk writerfilter/Library_doctok.mk writerfilter/Library_ooxml.mk writerfilter/Library_resourcemodel.mk writerfilter/Library_rtftok.mk writerfilter/Library_writerfilter.mk writerfilter/Library_writerfilter_uno.mk writerfilter/Module_writerfilter.mk writerfilter/source
Tor Lillqvist
tml at kemper.freedesktop.org
Fri May 18 04:37:11 PDT 2012
Module_tail_build.mk | 2
Repository.mk | 4
scp2/source/ooo/file_library_ooo.scp | 8 -
writerfilter/CppunitTest_writerfilter_doctok.mk | 2
writerfilter/CppunitTest_writerfilter_rtftok.mk | 4
writerfilter/Library_doctok.mk | 91 ----------------
writerfilter/Library_ooxml.mk | 117 ---------------------
writerfilter/Library_resourcemodel.mk | 94 -----------------
writerfilter/Library_rtftok.mk | 79 --------------
writerfilter/Library_writerfilter.mk | 131 ++++++++++++++++++++++--
writerfilter/Library_writerfilter_uno.mk | 4
writerfilter/Module_writerfilter.mk | 4
writerfilter/source/ooxml/factory_ns.xsl | 2
13 files changed, 130 insertions(+), 412 deletions(-)
New commits:
commit 1230e361804d4f24b1fd1613fef9494e6d61ea81
Author: Tor Lillqvist <tlillqvist at suse.com>
Date: Fri May 18 14:24:45 2012 +0300
Merge the libraries in writerfilter
Change-Id: If77543855fe34f70d248fe8a4644d293f693f190
diff --git a/Module_tail_build.mk b/Module_tail_build.mk
index 3c4c39a..56ad548 100644
--- a/Module_tail_build.mk
+++ b/Module_tail_build.mk
@@ -122,6 +122,6 @@ $(if $(strip $(1)),\
$(call tailbuild_serialize,$(wordlist 2,$(words $(1)),$(1))))
endef
-$(eval $(call tailbuild_serialize,scfilt sc sw sd $(if $(filter DBCONNECTIVITY,$(BUILD_TYPE)),dbu) ooxml oox svxcore vcl xo))
+$(eval $(call tailbuild_serialize,scfilt sc sw sd $(if $(filter DBCONNECTIVITY,$(BUILD_TYPE)),dbu) oox svxcore vcl xo))
# vim: set noet sw=4 ts=4:
diff --git a/Repository.mk b/Repository.mk
index 0ab52c9..44b4f17 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -222,7 +222,6 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
odbc \
odbcbase \
oox \
- ooxml \
sdbc \
AppleRemote \
avmedia \
@@ -243,7 +242,6 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
dbu \
deploymentmisc \
desktop_detector \
- doctok \
drawinglayer \
editeng \
egi \
@@ -300,11 +298,9 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
protocolhandler \
qstart_gtk \
res \
- resourcemodel \
rpt \
rptui \
rptxml \
- rtftok \
sax \
sb \
sc \
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index e46f50f..f229e84 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -921,14 +921,6 @@ STD_LIB_FILE(gid_File_Lib_Wlwp,lwpft)
STD_LIB_FILE(gid_File_Lib_Writerfilter,writerfilter)
-STD_LIB_FILE(gid_File_Lib_Resource,resourcemodel)
-
-STD_LIB_FILE(gid_File_Lib_Doctok,doctok)
-
-STD_LIB_FILE(gid_File_Lib_ooxml,ooxml)
-
-STD_LIB_FILE(gid_File_Lib_Rtftok,rtftok)
-
STD_LIB_FILE(gid_File_Lib_Mysql,mysql)
STD_LIB_FILE(gid_File_Lib_Odbc,odbc)
diff --git a/writerfilter/CppunitTest_writerfilter_doctok.mk b/writerfilter/CppunitTest_writerfilter_doctok.mk
index af137ec..23110ee 100644
--- a/writerfilter/CppunitTest_writerfilter_doctok.mk
+++ b/writerfilter/CppunitTest_writerfilter_doctok.mk
@@ -35,8 +35,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,writerfilter_doctok, \
$(eval $(call gb_CppunitTest_use_libraries,writerfilter_doctok, \
cppu \
cppuhelper \
- doctok \
- resourcemodel \
sal \
ucbhelper \
writerfilter \
diff --git a/writerfilter/CppunitTest_writerfilter_rtftok.mk b/writerfilter/CppunitTest_writerfilter_rtftok.mk
index 8307091..af0aa6a 100644
--- a/writerfilter/CppunitTest_writerfilter_rtftok.mk
+++ b/writerfilter/CppunitTest_writerfilter_rtftok.mk
@@ -63,8 +63,8 @@ $(eval $(call gb_CppunitTest_use_components,writerfilter_rtftok,\
$(eval $(call gb_CppunitTest_use_configuration,writerfilter_rtftok))
-# we need to explicitly depend on library rtftok and writerfilter because it is not implied
+# we need to explicitly depend on library writerfilter because it is not implied
# by a link relation
-$(call gb_CppunitTest_get_target,writerfilter_rtftok) : $(call gb_Library_get_target,rtftok) $(call gb_Library_get_target,writerfilter)
+$(call gb_CppunitTest_get_target,writerfilter_rtftok) : $(call gb_Library_get_target,writerfilter)
# vim: set noet sw=4 ts=4:
diff --git a/writerfilter/Library_doctok.mk b/writerfilter/Library_doctok.mk
deleted file mode 100644
index 501bc29..0000000
--- a/writerfilter/Library_doctok.mk
+++ /dev/null
@@ -1,91 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-# 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.
-#
-# Major Contributor(s):
-# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon at redhat.com>
-# (initial developer)
-#
-# All Rights Reserved.
-#
-# 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$(SRCDIR)/writerfilter/inc \
- -I$(SRCDIR)/writerfilter/source \
- -I$(SRCDIR)/writerfilter/source/doctok \
- -I$(WORKDIR)/CustomTarget/writerfilter/source \
- -I$(WORKDIR)/CustomTarget/writerfilter/source/ooxml \
- -I$(WORKDIR)/CustomTarget/writerfilter/source/doctok \
-))
-
-include $(SRCDIR)/writerfilter/debug_setup.mk
-
-$(eval $(call gb_Library_add_defs,doctok,\
- -DWRITERFILTER_DOCTOK_DLLIMPLEMENTATION \
- $(writerfilter_debug_flags) \
-))
-
-$(eval $(call gb_Library_use_api,doctok,\
- offapi \
- udkapi \
-))
-
-$(eval $(call gb_Library_use_libraries,doctok,\
- cppu \
- cppuhelper \
- resourcemodel \
- sal \
- $(gb_STDLIBS) \
-))
-
-$(eval $(call gb_Library_use_external,doctok,libxml2))
-
-$(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,\
- CustomTarget/writerfilter/source/resources \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/writerfilter/Library_ooxml.mk b/writerfilter/Library_ooxml.mk
deleted file mode 100644
index aae025f..0000000
--- a/writerfilter/Library_ooxml.mk
+++ /dev/null
@@ -1,117 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-# 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.
-#
-# Major Contributor(s):
-# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon at redhat.com>
-# (initial developer)
-#
-# All Rights Reserved.
-#
-# 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.
-
-include $(SRCDIR)/writerfilter/debug_setup.mk
-include $(SRCDIR)/writerfilter/source/generated.mk
-
-$(eval $(call gb_Library_Library,ooxml))
-
-$(eval $(call gb_Library_set_include,ooxml,\
- $$(INCLUDE) \
- -I$(SRCDIR)/writerfilter/inc \
- -I$(SRCDIR)/writerfilter/source/ooxml \
- -I$(SRCDIR)/writerfilter/source/dmapper \
- -I$(WORKDIR)/CustomTarget/writerfilter/source \
- -I$(WORKDIR)/CustomTarget/writerfilter/source/ooxml \
- -I$(WORKDIR)/CustomTarget/writerfilter/source/doctok \
-))
-
-$(eval $(call gb_Library_add_defs,ooxml,\
- -DWRITERFILTER_OOXML_DLLIMPLEMENTATION \
- $(writerfilter_debug_flags) \
-))
-
-$(eval $(call gb_Library_use_api,ooxml,\
- offapi \
- udkapi \
-))
-
-$(eval $(call gb_Library_use_libraries,ooxml,\
- comphelper \
- cppu \
- cppuhelper \
- doctok \
- i18nisolang1 \
- i18nutil \
- oox \
- resourcemodel \
- sal \
- tl \
- $(gb_STDLIBS) \
-))
-
-$(eval $(call gb_Library_use_external,ooxml,libxml2))
-
-$(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 \
-))
-
-$(eval $(call gb_Library_add_generated_exception_objects,ooxml,\
- $(patsubst %,CustomTarget/writerfilter/source/OOXMLFactory_%,$(WRITERFILTER_OOXMLNAMESPACES)) \
- CustomTarget/writerfilter/source/OOXMLFactory_generated \
- CustomTarget/writerfilter/source/OOXMLFactory_values \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/writerfilter/Library_resourcemodel.mk b/writerfilter/Library_resourcemodel.mk
deleted file mode 100644
index aa3d284..0000000
--- a/writerfilter/Library_resourcemodel.mk
+++ /dev/null
@@ -1,94 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-# 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.
-#
-# Major Contributor(s):
-# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon at redhat.com>
-# (initial developer)
-#
-# All Rights Reserved.
-#
-# 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_use_custom_headers,resourcemodel,writerfilter/source))
-
-$(eval $(call gb_Library_set_include,resourcemodel,\
- $$(INCLUDE) \
- -I$(SRCDIR)/writerfilter/inc \
-))
-
-include $(SRCDIR)/writerfilter/debug_setup.mk
-
-$(eval $(call gb_Library_add_defs,resourcemodel,\
- -DWRITERFILTER_RESOURCEMODEL_DLLIMPLEMENTATION \
- $(writerfilter_debug_flags) \
-))
-
-$(eval $(call gb_Library_use_api,resourcemodel,\
- offapi \
- udkapi \
-))
-
-$(eval $(call gb_Library_use_libraries,resourcemodel,\
- comphelper \
- cppu \
- cppuhelper \
- sal \
- $(gb_STDLIBS) \
-))
-
-$(eval $(call gb_Library_use_external,resourcemodel,libxml2))
-
-$(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,\
- CustomTarget/writerfilter/source/sprmcodetostr \
-))
-
-
-ifneq ($(COM)-$(OS)-$(CPUNAME),GCC-LINUX-POWERPC64)
-#Apparently some compilers, according to the original .mk this was converted
-#from, require this to be noopt or they fail to compile it, probably good to
-#revisit that and narrow this down to where it's necessary
-$(eval $(call gb_Library_add_generated_cxxobjects,resourcemodel,\
- CustomTarget/writerfilter/source/qnametostr \
- , $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \
-))
-else
-#Ironically, on RHEL-6 PPC64 with no-opt the output is too large for the
-#toolchain, "Error: operand out of range", but it build fine with
-#normal flags
-$(eval $(call gb_Library_add_generated_cxxobjects,resourcemodel,\
- CustomTarget/writerfilter/source/qnametostr \
- , $(gb_LinkTarget_EXCEPTIONFLAGS) \
-))
-endif
-
-# vim: set noet sw=4 ts=4:
diff --git a/writerfilter/Library_rtftok.mk b/writerfilter/Library_rtftok.mk
deleted file mode 100644
index 7354306..0000000
--- a/writerfilter/Library_rtftok.mk
+++ /dev/null
@@ -1,79 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-# 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.
-#
-# Major Contributor(s):
-# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon at redhat.com>
-# (initial developer)
-#
-# All Rights Reserved.
-#
-# 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$(SRCDIR)/writerfilter/inc \
- -I$(WORKDIR)/CustomTarget/writerfilter/source \
-))
-
-$(eval $(call gb_Library_use_api,rtftok,\
- offapi \
- udkapi \
-))
-
-include $(SRCDIR)/writerfilter/debug_setup.mk
-
-$(eval $(call gb_Library_add_defs,rtftok,\
- -DWRITERFILTER_RTFTOK_DLLIMPLEMENTATION \
- $(writerfilter_debug_flags) \
-))
-
-$(eval $(call gb_Library_use_libraries,rtftok,\
- comphelper \
- cppu \
- cppuhelper \
- msfilter \
- oox \
- sal \
- svt \
- ucbhelper \
- utl \
- tl \
- resourcemodel \
- vcl \
- $(gb_STDLIBS) \
-))
-
-$(eval $(call gb_Library_add_exception_objects,rtftok,\
- writerfilter/source/rtftok/rtfdocumentfactory \
- writerfilter/source/rtftok/rtfdocumentimpl \
- writerfilter/source/rtftok/rtfsdrimport \
- writerfilter/source/rtftok/rtftokenizer \
- writerfilter/source/rtftok/rtfskipdestination \
- writerfilter/source/rtftok/rtfcontrolwords \
- writerfilter/source/rtftok/rtfcharsets \
- writerfilter/source/rtftok/rtfreferenceproperties \
- writerfilter/source/rtftok/rtfreferencetable \
- writerfilter/source/rtftok/rtfvalue \
- writerfilter/source/rtftok/rtfsprm \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/writerfilter/Library_writerfilter.mk b/writerfilter/Library_writerfilter.mk
index ce15f01..0964cac 100644
--- a/writerfilter/Library_writerfilter.mk
+++ b/writerfilter/Library_writerfilter.mk
@@ -25,11 +25,21 @@
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
+include $(SRCDIR)/writerfilter/debug_setup.mk
+include $(SRCDIR)/writerfilter/source/generated.mk
+
$(eval $(call gb_Library_Library,writerfilter))
$(eval $(call gb_Library_set_include,writerfilter,\
$$(INCLUDE) \
-I$(SRCDIR)/writerfilter/inc \
+ -I$(SRCDIR)/writerfilter/source \
+ -I$(SRCDIR)/writerfilter/source/dmapper \
+ -I$(SRCDIR)/writerfilter/source/doctok \
+ -I$(SRCDIR)/writerfilter/source/ooxml \
+ -I$(WORKDIR)/CustomTarget/writerfilter/source \
+ -I$(WORKDIR)/CustomTarget/writerfilter/source/doctok \
+ -I$(WORKDIR)/CustomTarget/writerfilter/source/ooxml \
))
$(eval $(call gb_Library_use_api,writerfilter,\
@@ -39,38 +49,147 @@ $(eval $(call gb_Library_use_api,writerfilter,\
$(eval $(call gb_Library_set_componentfile,writerfilter,writerfilter/util/writerfilter))
-include $(SRCDIR)/writerfilter/debug_setup.mk
-
$(eval $(call gb_Library_add_defs,writerfilter,\
+ -DWRITERFILTER_DOCTOK_DLLIMPLEMENTATION \
+ -DWRITERFILTER_OOXML_DLLIMPLEMENTATION \
+ -DWRITERFILTER_RESOURCEMODEL_DLLIMPLEMENTATION \
+ -DWRITERFILTER_RTFTOK_DLLIMPLEMENTATION \
-DWRITERFILTER_WRITERFILTER_DLLIMPLEMENTATION \
$(writerfilter_debug_flags) \
))
$(eval $(call gb_Library_use_libraries,writerfilter,\
- resourcemodel \
comphelper \
cppu \
cppuhelper \
- doctok \
i18nisolang1 \
i18nutil \
+ msfilter \
oox \
- ooxml \
- rtftok \
sal \
sot \
+ svt \
tl \
+ ucbhelper \
utl \
+ vcl \
$(gb_STDLIBS) \
))
$(eval $(call gb_Library_use_external,writerfilter,libxml2))
$(eval $(call gb_Library_add_exception_objects,writerfilter,\
+ writerfilter/source/rtftok/rtfcharsets \
+ writerfilter/source/rtftok/rtfcontrolwords \
+ writerfilter/source/rtftok/rtfdocumentfactory \
+ writerfilter/source/rtftok/rtfdocumentimpl \
+ writerfilter/source/rtftok/rtfreferenceproperties \
+ writerfilter/source/rtftok/rtfreferencetable \
+ writerfilter/source/rtftok/rtfsdrimport \
+ writerfilter/source/rtftok/rtfskipdestination \
+ writerfilter/source/rtftok/rtfsprm \
+ writerfilter/source/rtftok/rtftokenizer \
+ writerfilter/source/rtftok/rtfvalue \
+ 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/WW8Analyzer \
+ writerfilter/source/resourcemodel/XPathLogger \
+ writerfilter/source/resourcemodel/resourcemodel \
+ writerfilter/source/resourcemodel/util \
+))
+
+$(eval $(call gb_Library_add_generated_exception_objects,writerfilter,\
+ CustomTarget/writerfilter/source/resources \
+ $(patsubst %,CustomTarget/writerfilter/source/OOXMLFactory_%,$(WRITERFILTER_OOXMLNAMESPACES)) \
+ CustomTarget/writerfilter/source/OOXMLFactory_generated \
+ CustomTarget/writerfilter/source/OOXMLFactory_values \
+ CustomTarget/writerfilter/source/sprmcodetostr \
+))
+
+ifneq ($(COM)-$(OS)-$(CPUNAME),GCC-LINUX-POWERPC64)
+#Apparently some compilers, according to the original .mk this was converted
+#from, require this to be noopt or they fail to compile it, probably good to
+#revisit that and narrow this down to where it's necessary
+$(eval $(call gb_Library_add_generated_cxxobjects,writerfilter,\
+ CustomTarget/writerfilter/source/qnametostr \
+ , $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \
+))
+else
+#Ironically, on RHEL-6 PPC64 with no-opt the output is too large for the
+#toolchain, "Error: operand out of range", but it build fine with
+#normal flags
+$(eval $(call gb_Library_add_generated_cxxobjects,writerfilter,\
+ CustomTarget/writerfilter/source/qnametostr \
+ , $(gb_LinkTarget_EXCEPTIONFLAGS) \
))
+endif
# vim: set noet sw=4 ts=4:
diff --git a/writerfilter/Library_writerfilter_uno.mk b/writerfilter/Library_writerfilter_uno.mk
index 714d6a7..9ad3021 100644
--- a/writerfilter/Library_writerfilter_uno.mk
+++ b/writerfilter/Library_writerfilter_uno.mk
@@ -45,11 +45,9 @@ $(eval $(call gb_Library_use_libraries,writerfilter_uno,\
comphelper \
cppu \
cppuhelper \
- doctok \
- ooxml \
- resourcemodel \
sal \
ucbhelper \
+ writerfilter \
$(gb_STDLIBS) \
))
diff --git a/writerfilter/Module_writerfilter.mk b/writerfilter/Module_writerfilter.mk
index a4711bf..4daf029 100644
--- a/writerfilter/Module_writerfilter.mk
+++ b/writerfilter/Module_writerfilter.mk
@@ -29,10 +29,6 @@ $(eval $(call gb_Module_Module,writerfilter))
$(eval $(call gb_Module_add_targets,writerfilter,\
CustomTarget_source \
- Library_doctok \
- Library_ooxml \
- Library_resourcemodel \
- Library_rtftok \
Library_writerfilter \
Library_writerfilter_uno \
Package_sprmids \
diff --git a/writerfilter/source/ooxml/factory_ns.xsl b/writerfilter/source/ooxml/factory_ns.xsl
index d0dd1ab..5cdf782 100644
--- a/writerfilter/source/ooxml/factory_ns.xsl
+++ b/writerfilter/source/ooxml/factory_ns.xsl
@@ -139,7 +139,7 @@ protected:
#include "OOXMLFactory.hxx"
#include "OOXMLFactory_generated.hxx"
#include "OOXMLnamespaceids.hxx"
-#include "resourceids.hxx"
+#include "ooxml/resourceids.hxx"
namespace writerfilter {
namespace ooxml {
More information about the Libreoffice-commits
mailing list