[Libreoffice-commits] core.git: sw/CppunitTest_sw_odfexport.mk sw/CppunitTest_sw_odfimport.mk sw/CppunitTest_sw_ooxmlexport.mk sw/CppunitTest_sw_ooxmlimport.mk sw/CppunitTest_sw_rtfexport.mk sw/CppunitTest_sw_rtfimport.mk sw/CppunitTest_sw_subsequent_odfexport.mk sw/CppunitTest_sw_subsequent_odfimport.mk sw/CppunitTest_sw_subsequent_ooxmlexport.mk sw/CppunitTest_sw_subsequent_ooxmlimport.mk sw/CppunitTest_sw_subsequent_rtfexport.mk sw/CppunitTest_sw_subsequent_rtfimport.mk sw/CppunitTest_sw_subsequent_ww8export.mk sw/CppunitTest_sw_subsequent_ww8import.mk sw/CppunitTest_sw_ww8export.mk sw/CppunitTest_sw_ww8import.mk sw/Module_sw.mk
Miklos Vajna
vmiklos at suse.cz
Mon Mar 18 01:36:35 PDT 2013
sw/CppunitTest_sw_odfexport.mk | 103 ++++++++++++++++++++++++++
sw/CppunitTest_sw_odfimport.mk | 102 ++++++++++++++++++++++++++
sw/CppunitTest_sw_ooxmlexport.mk | 107 ++++++++++++++++++++++++++++
sw/CppunitTest_sw_ooxmlimport.mk | 104 +++++++++++++++++++++++++++
sw/CppunitTest_sw_rtfexport.mk | 104 +++++++++++++++++++++++++++
sw/CppunitTest_sw_rtfimport.mk | 104 +++++++++++++++++++++++++++
sw/CppunitTest_sw_subsequent_odfexport.mk | 103 --------------------------
sw/CppunitTest_sw_subsequent_odfimport.mk | 102 --------------------------
sw/CppunitTest_sw_subsequent_ooxmlexport.mk | 107 ----------------------------
sw/CppunitTest_sw_subsequent_ooxmlimport.mk | 104 ---------------------------
sw/CppunitTest_sw_subsequent_rtfexport.mk | 104 ---------------------------
sw/CppunitTest_sw_subsequent_rtfimport.mk | 104 ---------------------------
sw/CppunitTest_sw_subsequent_ww8export.mk | 106 ---------------------------
sw/CppunitTest_sw_subsequent_ww8import.mk | 98 -------------------------
sw/CppunitTest_sw_ww8export.mk | 106 +++++++++++++++++++++++++++
sw/CppunitTest_sw_ww8import.mk | 98 +++++++++++++++++++++++++
sw/Module_sw.mk | 16 ++--
17 files changed, 836 insertions(+), 836 deletions(-)
New commits:
commit c4ac5fedf288628e8ce60f668eb6c14454e980c2
Author: Miklos Vajna <vmiklos at suse.cz>
Date: Mon Mar 18 09:35:01 2013 +0100
sw: rename odf/ooxml/rtf/ww8 filter tests
The subsequent part of their name was misleading, as they are
slowchecks, not subsequentchecks anymore.
Change-Id: I2e5c1506d88b017e563adee9134905dc2b4e7d68
diff --git a/sw/CppunitTest_sw_odfexport.mk b/sw/CppunitTest_sw_odfexport.mk
new file mode 100644
index 0000000..36fad9b
--- /dev/null
+++ b/sw/CppunitTest_sw_odfexport.mk
@@ -0,0 +1,103 @@
+# -*- 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.
+#
+# The Initial Developer of the Original Code is
+# Miklos Vajna <vmiklos at suse.cz> (SUSE, Inc.)
+# Portions created by the Initial Developer are Copyright (C) 2012 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_CppunitTest_CppunitTest,sw_subsequent_odfexport))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,sw_subsequent_odfexport, \
+ sw/qa/extras/odfexport/odfexport \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_odfexport, \
+ comphelper \
+ cppu \
+ cppuhelper \
+ sal \
+ sw \
+ test \
+ tl \
+ unotest \
+ utl \
+ vcl \
+ $(gb_UWINAPI) \
+))
+
+$(eval $(call gb_CppunitTest_use_externals,sw_subsequent_odfexport,\
+ boost_headers \
+ libxml2 \
+))
+
+$(eval $(call gb_CppunitTest_set_include,sw_subsequent_odfexport,\
+ -I$(SRCDIR)/sw/inc \
+ -I$(SRCDIR)/sw/source/core/inc \
+ -I$(SRCDIR)/sw/qa/extras/inc \
+ $$(INCLUDE) \
+))
+
+$(eval $(call gb_CppunitTest_use_api,sw_subsequent_odfexport,\
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_CppunitTest_use_ure,sw_subsequent_odfexport))
+
+$(eval $(call gb_CppunitTest_use_components,sw_subsequent_odfexport,\
+ basic/util/sb \
+ comphelper/util/comphelp \
+ configmgr/source/configmgr \
+ fileaccess/source/fileacc \
+ filter/source/config/cache/filterconfig1 \
+ framework/util/fwk \
+ i18npool/util/i18npool \
+ linguistic/source/lng \
+ package/util/package2 \
+ package/source/xstor/xstor \
+ sw/util/sw \
+ sw/util/swd \
+ sax/source/expatwrap/expwrap \
+ sfx2/util/sfx \
+ svl/source/fsstor/fsstorage \
+ svtools/util/svt \
+ toolkit/util/tk \
+ ucb/source/core/ucb1 \
+ ucb/source/ucp/file/ucpfile1 \
+ unotools/util/utl \
+ unoxml/source/service/unoxml \
+ uui/util/uui \
+ $(if $(filter DESKTOP,$(BUILD_TYPE)),xmlhelp/util/ucpchelp1) \
+ xmloff/util/xo \
+))
+
+$(eval $(call gb_CppunitTest_use_configuration,sw_subsequent_odfexport))
+
+$(eval $(call gb_CppunitTest_use_filter_configuration,sw_subsequent_odfexport))
+
+$(eval $(call gb_CppunitTest_use_unittest_configuration,sw_subsequent_odfexport))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sw/CppunitTest_sw_odfimport.mk b/sw/CppunitTest_sw_odfimport.mk
new file mode 100644
index 0000000..30c2e47
--- /dev/null
+++ b/sw/CppunitTest_sw_odfimport.mk
@@ -0,0 +1,102 @@
+# -*- 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.
+#
+# The Initial Developer of the Original Code is
+# Miklos Vajna <vmiklos at suse.cz> (SUSE, Inc.)
+# Portions created by the Initial Developer are Copyright (C) 2012 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_CppunitTest_CppunitTest,sw_subsequent_odfimport))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,sw_subsequent_odfimport, \
+ sw/qa/extras/odfimport/odfimport \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_odfimport, \
+ comphelper \
+ cppu \
+ cppuhelper \
+ sal \
+ sw \
+ test \
+ unotest \
+ vcl \
+ tl \
+ $(gb_UWINAPI) \
+))
+
+$(eval $(call gb_CppunitTest_use_externals,sw_subsequent_odfimport,\
+ boost_headers \
+ libxml2 \
+))
+
+$(eval $(call gb_CppunitTest_set_include,sw_subsequent_odfimport,\
+ -I$(SRCDIR)/sw/inc \
+ -I$(SRCDIR)/sw/source/core/inc \
+ -I$(SRCDIR)/sw/qa/extras/inc \
+ $$(INCLUDE) \
+))
+
+$(eval $(call gb_CppunitTest_use_api,sw_subsequent_odfimport,\
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_CppunitTest_use_ure,sw_subsequent_odfimport))
+
+$(eval $(call gb_CppunitTest_use_components,sw_subsequent_odfimport,\
+ basic/util/sb \
+ comphelper/util/comphelp \
+ configmgr/source/configmgr \
+ fileaccess/source/fileacc \
+ filter/source/config/cache/filterconfig1 \
+ framework/util/fwk \
+ i18npool/util/i18npool \
+ linguistic/source/lng \
+ package/util/package2 \
+ package/source/xstor/xstor \
+ sw/util/sw \
+ sw/util/swd \
+ sax/source/expatwrap/expwrap \
+ sfx2/util/sfx \
+ svl/source/fsstor/fsstorage \
+ svtools/util/svt \
+ toolkit/util/tk \
+ ucb/source/core/ucb1 \
+ ucb/source/ucp/file/ucpfile1 \
+ unotools/util/utl \
+ unoxml/source/service/unoxml \
+ uui/util/uui \
+ $(if $(filter DESKTOP,$(BUILD_TYPE)),xmlhelp/util/ucpchelp1) \
+ xmloff/util/xo \
+))
+
+$(eval $(call gb_CppunitTest_use_configuration,sw_subsequent_odfimport))
+
+$(eval $(call gb_CppunitTest_use_filter_configuration,sw_subsequent_odfimport))
+
+$(eval $(call gb_CppunitTest_use_unittest_configuration,sw_subsequent_odfimport))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sw/CppunitTest_sw_ooxmlexport.mk b/sw/CppunitTest_sw_ooxmlexport.mk
new file mode 100644
index 0000000..bc58ee9
--- /dev/null
+++ b/sw/CppunitTest_sw_ooxmlexport.mk
@@ -0,0 +1,107 @@
+# -*- 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.
+#
+# The Initial Developer of the Original Code is
+# Miklos Vajna <vmiklos at suse.cz> (SUSE, Inc.)
+# Portions created by the Initial Developer are Copyright (C) 2012 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_CppunitTest_CppunitTest,sw_subsequent_ooxmlexport))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,sw_subsequent_ooxmlexport, \
+ sw/qa/extras/ooxmlexport/ooxmlexport \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_ooxmlexport, \
+ comphelper \
+ cppu \
+ cppuhelper \
+ sal \
+ sw \
+ test \
+ tl \
+ unotest \
+ utl \
+ vcl \
+ $(gb_UWINAPI) \
+))
+
+$(eval $(call gb_CppunitTest_use_externals,sw_subsequent_ooxmlexport,\
+ boost_headers \
+ libxml2 \
+))
+
+$(eval $(call gb_CppunitTest_set_include,sw_subsequent_ooxmlexport,\
+ -I$(SRCDIR)/sw/inc \
+ -I$(SRCDIR)/sw/source/core/inc \
+ -I$(SRCDIR)/sw/qa/extras/inc \
+ $$(INCLUDE) \
+))
+
+$(eval $(call gb_CppunitTest_use_api,sw_subsequent_ooxmlexport,\
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_CppunitTest_use_ure,sw_subsequent_ooxmlexport))
+
+$(eval $(call gb_CppunitTest_use_components,sw_subsequent_ooxmlexport,\
+ basic/util/sb \
+ comphelper/util/comphelp \
+ configmgr/source/configmgr \
+ embeddedobj/util/embobj \
+ fileaccess/source/fileacc \
+ filter/source/config/cache/filterconfig1 \
+ framework/util/fwk \
+ i18npool/util/i18npool \
+ linguistic/source/lng \
+ oox/util/oox \
+ package/source/xstor/xstor \
+ package/util/package2 \
+ sax/source/expatwrap/expwrap \
+ sax/source/fastparser/fastsax \
+ sw/util/sw \
+ sw/util/swd \
+ sw/util/msword \
+ sfx2/util/sfx \
+ starmath/util/sm \
+ svl/source/fsstor/fsstorage \
+ svtools/util/svt \
+ toolkit/util/tk \
+ ucb/source/core/ucb1 \
+ ucb/source/ucp/file/ucpfile1 \
+ unotools/util/utl \
+ unoxml/source/service/unoxml \
+ writerfilter/util/writerfilter \
+ xmloff/util/xo \
+))
+
+$(eval $(call gb_CppunitTest_use_configuration,sw_subsequent_ooxmlexport))
+
+$(eval $(call gb_CppunitTest_use_filter_configuration,sw_subsequent_ooxmlexport))
+
+$(eval $(call gb_CppunitTest_use_unittest_configuration,sw_subsequent_ooxmlexport))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sw/CppunitTest_sw_ooxmlimport.mk b/sw/CppunitTest_sw_ooxmlimport.mk
new file mode 100644
index 0000000..016aba3
--- /dev/null
+++ b/sw/CppunitTest_sw_ooxmlimport.mk
@@ -0,0 +1,104 @@
+# -*- 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.
+#
+# The Initial Developer of the Original Code is
+# Miklos Vajna <vmiklos at suse.cz> (SUSE, Inc.)
+# Portions created by the Initial Developer are Copyright (C) 2012 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_CppunitTest_CppunitTest,sw_subsequent_ooxmlimport))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,sw_subsequent_ooxmlimport, \
+ sw/qa/extras/ooxmlimport/ooxmlimport \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_ooxmlimport, \
+ comphelper \
+ cppu \
+ cppuhelper \
+ sal \
+ test \
+ unotest \
+ sw \
+ vcl \
+ $(gb_UWINAPI) \
+))
+
+$(eval $(call gb_CppunitTest_use_externals,sw_subsequent_ooxmlimport,\
+ boost_headers \
+ libxml2 \
+))
+
+$(eval $(call gb_CppunitTest_set_include,sw_subsequent_ooxmlimport,\
+ -I$(SRCDIR)/sw/inc \
+ -I$(SRCDIR)/sw/source/core/inc \
+ -I$(SRCDIR)/sw/qa/extras/inc \
+ $$(INCLUDE) \
+))
+
+$(eval $(call gb_CppunitTest_use_api,sw_subsequent_ooxmlimport,\
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_CppunitTest_use_ure,sw_subsequent_ooxmlimport))
+
+$(eval $(call gb_CppunitTest_use_components,sw_subsequent_ooxmlimport,\
+ basic/util/sb \
+ comphelper/util/comphelp \
+ configmgr/source/configmgr \
+ embeddedobj/util/embobj \
+ fileaccess/source/fileacc \
+ filter/source/config/cache/filterconfig1 \
+ framework/util/fwk \
+ i18npool/util/i18npool \
+ linguistic/source/lng \
+ oox/util/oox \
+ package/source/xstor/xstor \
+ package/util/package2 \
+ sax/source/expatwrap/expwrap \
+ sax/source/fastparser/fastsax \
+ sw/util/sw \
+ sw/util/swd \
+ sw/util/msword \
+ sfx2/util/sfx \
+ svl/source/fsstor/fsstorage \
+ svtools/util/svt \
+ toolkit/util/tk \
+ ucb/source/core/ucb1 \
+ ucb/source/ucp/file/ucpfile1 \
+ unotools/util/utl \
+ unoxml/source/service/unoxml \
+ writerfilter/util/writerfilter \
+ xmloff/util/xo \
+))
+
+$(eval $(call gb_CppunitTest_use_configuration,sw_subsequent_ooxmlimport))
+
+$(eval $(call gb_CppunitTest_use_filter_configuration,sw_subsequent_ooxmlimport))
+
+$(eval $(call gb_CppunitTest_use_unittest_configuration,sw_subsequent_ooxmlimport))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sw/CppunitTest_sw_rtfexport.mk b/sw/CppunitTest_sw_rtfexport.mk
new file mode 100644
index 0000000..6017d14
--- /dev/null
+++ b/sw/CppunitTest_sw_rtfexport.mk
@@ -0,0 +1,104 @@
+# -*- 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.
+#
+# The Initial Developer of the Original Code is
+# Miklos Vajna <vmiklos at suse.cz> (SUSE, Inc.)
+# Portions created by the Initial Developer are Copyright (C) 2012 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_CppunitTest_CppunitTest,sw_subsequent_rtfexport))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,sw_subsequent_rtfexport, \
+ sw/qa/extras/rtfexport/rtfexport \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_rtfexport, \
+ comphelper \
+ cppu \
+ cppuhelper \
+ sal \
+ sw \
+ test \
+ unotest \
+ utl \
+ tl \
+ $(gb_UWINAPI) \
+))
+
+$(eval $(call gb_CppunitTest_use_externals,sw_subsequent_rtfexport,\
+ boost_headers \
+ libxml2 \
+))
+
+$(eval $(call gb_CppunitTest_set_include,sw_subsequent_rtfexport,\
+ -I$(SRCDIR)/sw/inc \
+ -I$(SRCDIR)/sw/source/core/inc \
+ -I$(SRCDIR)/sw/qa/extras/inc \
+ $$(INCLUDE) \
+))
+
+$(eval $(call gb_CppunitTest_use_api,sw_subsequent_rtfexport,\
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_CppunitTest_use_ure,sw_subsequent_rtfexport))
+
+$(eval $(call gb_CppunitTest_use_components,sw_subsequent_rtfexport,\
+ basic/util/sb \
+ comphelper/util/comphelp \
+ configmgr/source/configmgr \
+ embeddedobj/util/embobj \
+ fileaccess/source/fileacc \
+ filter/source/config/cache/filterconfig1 \
+ framework/util/fwk \
+ i18npool/util/i18npool \
+ linguistic/source/lng \
+ package/source/xstor/xstor \
+ package/util/package2 \
+ sax/source/expatwrap/expwrap \
+ sfx2/util/sfx \
+ starmath/util/sm \
+ svl/source/fsstor/fsstorage \
+ svtools/util/svt \
+ sw/util/msword \
+ sw/util/sw \
+ sw/util/swd \
+ toolkit/util/tk \
+ ucb/source/core/ucb1 \
+ ucb/source/ucp/file/ucpfile1 \
+ unotools/util/utl \
+ unoxml/source/service/unoxml \
+ writerfilter/util/writerfilter \
+ xmloff/util/xo \
+))
+
+$(eval $(call gb_CppunitTest_use_configuration,sw_subsequent_rtfexport))
+
+$(eval $(call gb_CppunitTest_use_filter_configuration,sw_subsequent_rtfexport))
+
+$(eval $(call gb_CppunitTest_use_unittest_configuration,sw_subsequent_rtfexport))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sw/CppunitTest_sw_rtfimport.mk b/sw/CppunitTest_sw_rtfimport.mk
new file mode 100644
index 0000000..88fad7e
--- /dev/null
+++ b/sw/CppunitTest_sw_rtfimport.mk
@@ -0,0 +1,104 @@
+# -*- 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.
+#
+# The Initial Developer of the Original Code is
+# Miklos Vajna <vmiklos at suse.cz> (SUSE, Inc.)
+# Portions created by the Initial Developer are Copyright (C) 2012 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_CppunitTest_CppunitTest,sw_subsequent_rtfimport))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,sw_subsequent_rtfimport, \
+ sw/qa/extras/rtfimport/rtfimport \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_rtfimport, \
+ comphelper \
+ cppu \
+ cppuhelper \
+ sal \
+ i18nisolang1 \
+ sw \
+ test \
+ unotest \
+ vcl \
+ tl \
+ utl \
+ $(gb_UWINAPI) \
+))
+
+$(eval $(call gb_CppunitTest_use_externals,sw_subsequent_rtfimport,\
+ boost_headers \
+ libxml2 \
+))
+
+$(eval $(call gb_CppunitTest_set_include,sw_subsequent_rtfimport,\
+ -I$(SRCDIR)/sw/inc \
+ -I$(SRCDIR)/sw/source/core/inc \
+ -I$(SRCDIR)/sw/qa/extras/inc \
+ $$(INCLUDE) \
+))
+
+$(eval $(call gb_CppunitTest_use_api,sw_subsequent_rtfimport,\
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_CppunitTest_use_ure,sw_subsequent_rtfimport))
+
+$(eval $(call gb_CppunitTest_use_components,sw_subsequent_rtfimport,\
+ basic/util/sb \
+ comphelper/util/comphelp \
+ configmgr/source/configmgr \
+ embeddedobj/util/embobj \
+ fileaccess/source/fileacc \
+ filter/source/config/cache/filterconfig1 \
+ framework/util/fwk \
+ i18npool/util/i18npool \
+ linguistic/source/lng \
+ package/util/package2 \
+ package/source/xstor/xstor \
+ sax/source/expatwrap/expwrap \
+ sw/util/sw \
+ sw/util/swd \
+ sfx2/util/sfx \
+ starmath/util/sm \
+ svl/source/fsstor/fsstorage \
+ svtools/util/svt \
+ toolkit/util/tk \
+ ucb/source/core/ucb1 \
+ ucb/source/ucp/file/ucpfile1 \
+ unotools/util/utl \
+ unoxml/source/service/unoxml \
+ writerfilter/util/writerfilter \
+))
+
+$(eval $(call gb_CppunitTest_use_configuration,sw_subsequent_rtfimport))
+
+$(eval $(call gb_CppunitTest_use_filter_configuration,sw_subsequent_rtfimport))
+
+$(eval $(call gb_CppunitTest_use_unittest_configuration,sw_subsequent_rtfimport))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sw/CppunitTest_sw_subsequent_odfexport.mk b/sw/CppunitTest_sw_subsequent_odfexport.mk
deleted file mode 100644
index 36fad9b..0000000
--- a/sw/CppunitTest_sw_subsequent_odfexport.mk
+++ /dev/null
@@ -1,103 +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.
-#
-# The Initial Developer of the Original Code is
-# Miklos Vajna <vmiklos at suse.cz> (SUSE, Inc.)
-# Portions created by the Initial Developer are Copyright (C) 2012 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_CppunitTest_CppunitTest,sw_subsequent_odfexport))
-
-$(eval $(call gb_CppunitTest_add_exception_objects,sw_subsequent_odfexport, \
- sw/qa/extras/odfexport/odfexport \
-))
-
-$(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_odfexport, \
- comphelper \
- cppu \
- cppuhelper \
- sal \
- sw \
- test \
- tl \
- unotest \
- utl \
- vcl \
- $(gb_UWINAPI) \
-))
-
-$(eval $(call gb_CppunitTest_use_externals,sw_subsequent_odfexport,\
- boost_headers \
- libxml2 \
-))
-
-$(eval $(call gb_CppunitTest_set_include,sw_subsequent_odfexport,\
- -I$(SRCDIR)/sw/inc \
- -I$(SRCDIR)/sw/source/core/inc \
- -I$(SRCDIR)/sw/qa/extras/inc \
- $$(INCLUDE) \
-))
-
-$(eval $(call gb_CppunitTest_use_api,sw_subsequent_odfexport,\
- offapi \
- udkapi \
-))
-
-$(eval $(call gb_CppunitTest_use_ure,sw_subsequent_odfexport))
-
-$(eval $(call gb_CppunitTest_use_components,sw_subsequent_odfexport,\
- basic/util/sb \
- comphelper/util/comphelp \
- configmgr/source/configmgr \
- fileaccess/source/fileacc \
- filter/source/config/cache/filterconfig1 \
- framework/util/fwk \
- i18npool/util/i18npool \
- linguistic/source/lng \
- package/util/package2 \
- package/source/xstor/xstor \
- sw/util/sw \
- sw/util/swd \
- sax/source/expatwrap/expwrap \
- sfx2/util/sfx \
- svl/source/fsstor/fsstorage \
- svtools/util/svt \
- toolkit/util/tk \
- ucb/source/core/ucb1 \
- ucb/source/ucp/file/ucpfile1 \
- unotools/util/utl \
- unoxml/source/service/unoxml \
- uui/util/uui \
- $(if $(filter DESKTOP,$(BUILD_TYPE)),xmlhelp/util/ucpchelp1) \
- xmloff/util/xo \
-))
-
-$(eval $(call gb_CppunitTest_use_configuration,sw_subsequent_odfexport))
-
-$(eval $(call gb_CppunitTest_use_filter_configuration,sw_subsequent_odfexport))
-
-$(eval $(call gb_CppunitTest_use_unittest_configuration,sw_subsequent_odfexport))
-
-# vim: set noet sw=4 ts=4:
diff --git a/sw/CppunitTest_sw_subsequent_odfimport.mk b/sw/CppunitTest_sw_subsequent_odfimport.mk
deleted file mode 100644
index 30c2e47..0000000
--- a/sw/CppunitTest_sw_subsequent_odfimport.mk
+++ /dev/null
@@ -1,102 +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.
-#
-# The Initial Developer of the Original Code is
-# Miklos Vajna <vmiklos at suse.cz> (SUSE, Inc.)
-# Portions created by the Initial Developer are Copyright (C) 2012 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_CppunitTest_CppunitTest,sw_subsequent_odfimport))
-
-$(eval $(call gb_CppunitTest_add_exception_objects,sw_subsequent_odfimport, \
- sw/qa/extras/odfimport/odfimport \
-))
-
-$(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_odfimport, \
- comphelper \
- cppu \
- cppuhelper \
- sal \
- sw \
- test \
- unotest \
- vcl \
- tl \
- $(gb_UWINAPI) \
-))
-
-$(eval $(call gb_CppunitTest_use_externals,sw_subsequent_odfimport,\
- boost_headers \
- libxml2 \
-))
-
-$(eval $(call gb_CppunitTest_set_include,sw_subsequent_odfimport,\
- -I$(SRCDIR)/sw/inc \
- -I$(SRCDIR)/sw/source/core/inc \
- -I$(SRCDIR)/sw/qa/extras/inc \
- $$(INCLUDE) \
-))
-
-$(eval $(call gb_CppunitTest_use_api,sw_subsequent_odfimport,\
- offapi \
- udkapi \
-))
-
-$(eval $(call gb_CppunitTest_use_ure,sw_subsequent_odfimport))
-
-$(eval $(call gb_CppunitTest_use_components,sw_subsequent_odfimport,\
- basic/util/sb \
- comphelper/util/comphelp \
- configmgr/source/configmgr \
- fileaccess/source/fileacc \
- filter/source/config/cache/filterconfig1 \
- framework/util/fwk \
- i18npool/util/i18npool \
- linguistic/source/lng \
- package/util/package2 \
- package/source/xstor/xstor \
- sw/util/sw \
- sw/util/swd \
- sax/source/expatwrap/expwrap \
- sfx2/util/sfx \
- svl/source/fsstor/fsstorage \
- svtools/util/svt \
- toolkit/util/tk \
- ucb/source/core/ucb1 \
- ucb/source/ucp/file/ucpfile1 \
- unotools/util/utl \
- unoxml/source/service/unoxml \
- uui/util/uui \
- $(if $(filter DESKTOP,$(BUILD_TYPE)),xmlhelp/util/ucpchelp1) \
- xmloff/util/xo \
-))
-
-$(eval $(call gb_CppunitTest_use_configuration,sw_subsequent_odfimport))
-
-$(eval $(call gb_CppunitTest_use_filter_configuration,sw_subsequent_odfimport))
-
-$(eval $(call gb_CppunitTest_use_unittest_configuration,sw_subsequent_odfimport))
-
-# vim: set noet sw=4 ts=4:
diff --git a/sw/CppunitTest_sw_subsequent_ooxmlexport.mk b/sw/CppunitTest_sw_subsequent_ooxmlexport.mk
deleted file mode 100644
index bc58ee9..0000000
--- a/sw/CppunitTest_sw_subsequent_ooxmlexport.mk
+++ /dev/null
@@ -1,107 +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.
-#
-# The Initial Developer of the Original Code is
-# Miklos Vajna <vmiklos at suse.cz> (SUSE, Inc.)
-# Portions created by the Initial Developer are Copyright (C) 2012 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_CppunitTest_CppunitTest,sw_subsequent_ooxmlexport))
-
-$(eval $(call gb_CppunitTest_add_exception_objects,sw_subsequent_ooxmlexport, \
- sw/qa/extras/ooxmlexport/ooxmlexport \
-))
-
-$(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_ooxmlexport, \
- comphelper \
- cppu \
- cppuhelper \
- sal \
- sw \
- test \
- tl \
- unotest \
- utl \
- vcl \
- $(gb_UWINAPI) \
-))
-
-$(eval $(call gb_CppunitTest_use_externals,sw_subsequent_ooxmlexport,\
- boost_headers \
- libxml2 \
-))
-
-$(eval $(call gb_CppunitTest_set_include,sw_subsequent_ooxmlexport,\
- -I$(SRCDIR)/sw/inc \
- -I$(SRCDIR)/sw/source/core/inc \
- -I$(SRCDIR)/sw/qa/extras/inc \
- $$(INCLUDE) \
-))
-
-$(eval $(call gb_CppunitTest_use_api,sw_subsequent_ooxmlexport,\
- offapi \
- udkapi \
-))
-
-$(eval $(call gb_CppunitTest_use_ure,sw_subsequent_ooxmlexport))
-
-$(eval $(call gb_CppunitTest_use_components,sw_subsequent_ooxmlexport,\
- basic/util/sb \
- comphelper/util/comphelp \
- configmgr/source/configmgr \
- embeddedobj/util/embobj \
- fileaccess/source/fileacc \
- filter/source/config/cache/filterconfig1 \
- framework/util/fwk \
- i18npool/util/i18npool \
- linguistic/source/lng \
- oox/util/oox \
- package/source/xstor/xstor \
- package/util/package2 \
- sax/source/expatwrap/expwrap \
- sax/source/fastparser/fastsax \
- sw/util/sw \
- sw/util/swd \
- sw/util/msword \
- sfx2/util/sfx \
- starmath/util/sm \
- svl/source/fsstor/fsstorage \
- svtools/util/svt \
- toolkit/util/tk \
- ucb/source/core/ucb1 \
- ucb/source/ucp/file/ucpfile1 \
- unotools/util/utl \
- unoxml/source/service/unoxml \
- writerfilter/util/writerfilter \
- xmloff/util/xo \
-))
-
-$(eval $(call gb_CppunitTest_use_configuration,sw_subsequent_ooxmlexport))
-
-$(eval $(call gb_CppunitTest_use_filter_configuration,sw_subsequent_ooxmlexport))
-
-$(eval $(call gb_CppunitTest_use_unittest_configuration,sw_subsequent_ooxmlexport))
-
-# vim: set noet sw=4 ts=4:
diff --git a/sw/CppunitTest_sw_subsequent_ooxmlimport.mk b/sw/CppunitTest_sw_subsequent_ooxmlimport.mk
deleted file mode 100644
index 016aba3..0000000
--- a/sw/CppunitTest_sw_subsequent_ooxmlimport.mk
+++ /dev/null
@@ -1,104 +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.
-#
-# The Initial Developer of the Original Code is
-# Miklos Vajna <vmiklos at suse.cz> (SUSE, Inc.)
-# Portions created by the Initial Developer are Copyright (C) 2012 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_CppunitTest_CppunitTest,sw_subsequent_ooxmlimport))
-
-$(eval $(call gb_CppunitTest_add_exception_objects,sw_subsequent_ooxmlimport, \
- sw/qa/extras/ooxmlimport/ooxmlimport \
-))
-
-$(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_ooxmlimport, \
- comphelper \
- cppu \
- cppuhelper \
- sal \
- test \
- unotest \
- sw \
- vcl \
- $(gb_UWINAPI) \
-))
-
-$(eval $(call gb_CppunitTest_use_externals,sw_subsequent_ooxmlimport,\
- boost_headers \
- libxml2 \
-))
-
-$(eval $(call gb_CppunitTest_set_include,sw_subsequent_ooxmlimport,\
- -I$(SRCDIR)/sw/inc \
- -I$(SRCDIR)/sw/source/core/inc \
- -I$(SRCDIR)/sw/qa/extras/inc \
- $$(INCLUDE) \
-))
-
-$(eval $(call gb_CppunitTest_use_api,sw_subsequent_ooxmlimport,\
- offapi \
- udkapi \
-))
-
-$(eval $(call gb_CppunitTest_use_ure,sw_subsequent_ooxmlimport))
-
-$(eval $(call gb_CppunitTest_use_components,sw_subsequent_ooxmlimport,\
- basic/util/sb \
- comphelper/util/comphelp \
- configmgr/source/configmgr \
- embeddedobj/util/embobj \
- fileaccess/source/fileacc \
- filter/source/config/cache/filterconfig1 \
- framework/util/fwk \
- i18npool/util/i18npool \
- linguistic/source/lng \
- oox/util/oox \
- package/source/xstor/xstor \
- package/util/package2 \
- sax/source/expatwrap/expwrap \
- sax/source/fastparser/fastsax \
- sw/util/sw \
- sw/util/swd \
- sw/util/msword \
- sfx2/util/sfx \
- svl/source/fsstor/fsstorage \
- svtools/util/svt \
- toolkit/util/tk \
- ucb/source/core/ucb1 \
- ucb/source/ucp/file/ucpfile1 \
- unotools/util/utl \
- unoxml/source/service/unoxml \
- writerfilter/util/writerfilter \
- xmloff/util/xo \
-))
-
-$(eval $(call gb_CppunitTest_use_configuration,sw_subsequent_ooxmlimport))
-
-$(eval $(call gb_CppunitTest_use_filter_configuration,sw_subsequent_ooxmlimport))
-
-$(eval $(call gb_CppunitTest_use_unittest_configuration,sw_subsequent_ooxmlimport))
-
-# vim: set noet sw=4 ts=4:
diff --git a/sw/CppunitTest_sw_subsequent_rtfexport.mk b/sw/CppunitTest_sw_subsequent_rtfexport.mk
deleted file mode 100644
index 6017d14..0000000
--- a/sw/CppunitTest_sw_subsequent_rtfexport.mk
+++ /dev/null
@@ -1,104 +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.
-#
-# The Initial Developer of the Original Code is
-# Miklos Vajna <vmiklos at suse.cz> (SUSE, Inc.)
-# Portions created by the Initial Developer are Copyright (C) 2012 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_CppunitTest_CppunitTest,sw_subsequent_rtfexport))
-
-$(eval $(call gb_CppunitTest_add_exception_objects,sw_subsequent_rtfexport, \
- sw/qa/extras/rtfexport/rtfexport \
-))
-
-$(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_rtfexport, \
- comphelper \
- cppu \
- cppuhelper \
- sal \
- sw \
- test \
- unotest \
- utl \
- tl \
- $(gb_UWINAPI) \
-))
-
-$(eval $(call gb_CppunitTest_use_externals,sw_subsequent_rtfexport,\
- boost_headers \
- libxml2 \
-))
-
-$(eval $(call gb_CppunitTest_set_include,sw_subsequent_rtfexport,\
- -I$(SRCDIR)/sw/inc \
- -I$(SRCDIR)/sw/source/core/inc \
- -I$(SRCDIR)/sw/qa/extras/inc \
- $$(INCLUDE) \
-))
-
-$(eval $(call gb_CppunitTest_use_api,sw_subsequent_rtfexport,\
- offapi \
- udkapi \
-))
-
-$(eval $(call gb_CppunitTest_use_ure,sw_subsequent_rtfexport))
-
-$(eval $(call gb_CppunitTest_use_components,sw_subsequent_rtfexport,\
- basic/util/sb \
- comphelper/util/comphelp \
- configmgr/source/configmgr \
- embeddedobj/util/embobj \
- fileaccess/source/fileacc \
- filter/source/config/cache/filterconfig1 \
- framework/util/fwk \
- i18npool/util/i18npool \
- linguistic/source/lng \
- package/source/xstor/xstor \
- package/util/package2 \
- sax/source/expatwrap/expwrap \
- sfx2/util/sfx \
- starmath/util/sm \
- svl/source/fsstor/fsstorage \
- svtools/util/svt \
- sw/util/msword \
- sw/util/sw \
- sw/util/swd \
- toolkit/util/tk \
- ucb/source/core/ucb1 \
- ucb/source/ucp/file/ucpfile1 \
- unotools/util/utl \
- unoxml/source/service/unoxml \
- writerfilter/util/writerfilter \
- xmloff/util/xo \
-))
-
-$(eval $(call gb_CppunitTest_use_configuration,sw_subsequent_rtfexport))
-
-$(eval $(call gb_CppunitTest_use_filter_configuration,sw_subsequent_rtfexport))
-
-$(eval $(call gb_CppunitTest_use_unittest_configuration,sw_subsequent_rtfexport))
-
-# vim: set noet sw=4 ts=4:
diff --git a/sw/CppunitTest_sw_subsequent_rtfimport.mk b/sw/CppunitTest_sw_subsequent_rtfimport.mk
deleted file mode 100644
index 88fad7e..0000000
--- a/sw/CppunitTest_sw_subsequent_rtfimport.mk
+++ /dev/null
@@ -1,104 +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.
-#
-# The Initial Developer of the Original Code is
-# Miklos Vajna <vmiklos at suse.cz> (SUSE, Inc.)
-# Portions created by the Initial Developer are Copyright (C) 2012 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_CppunitTest_CppunitTest,sw_subsequent_rtfimport))
-
-$(eval $(call gb_CppunitTest_add_exception_objects,sw_subsequent_rtfimport, \
- sw/qa/extras/rtfimport/rtfimport \
-))
-
-$(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_rtfimport, \
- comphelper \
- cppu \
- cppuhelper \
- sal \
- i18nisolang1 \
- sw \
- test \
- unotest \
- vcl \
- tl \
- utl \
- $(gb_UWINAPI) \
-))
-
-$(eval $(call gb_CppunitTest_use_externals,sw_subsequent_rtfimport,\
- boost_headers \
- libxml2 \
-))
-
-$(eval $(call gb_CppunitTest_set_include,sw_subsequent_rtfimport,\
- -I$(SRCDIR)/sw/inc \
- -I$(SRCDIR)/sw/source/core/inc \
- -I$(SRCDIR)/sw/qa/extras/inc \
- $$(INCLUDE) \
-))
-
-$(eval $(call gb_CppunitTest_use_api,sw_subsequent_rtfimport,\
- offapi \
- udkapi \
-))
-
-$(eval $(call gb_CppunitTest_use_ure,sw_subsequent_rtfimport))
-
-$(eval $(call gb_CppunitTest_use_components,sw_subsequent_rtfimport,\
- basic/util/sb \
- comphelper/util/comphelp \
- configmgr/source/configmgr \
- embeddedobj/util/embobj \
- fileaccess/source/fileacc \
- filter/source/config/cache/filterconfig1 \
- framework/util/fwk \
- i18npool/util/i18npool \
- linguistic/source/lng \
- package/util/package2 \
- package/source/xstor/xstor \
- sax/source/expatwrap/expwrap \
- sw/util/sw \
- sw/util/swd \
- sfx2/util/sfx \
- starmath/util/sm \
- svl/source/fsstor/fsstorage \
- svtools/util/svt \
- toolkit/util/tk \
- ucb/source/core/ucb1 \
- ucb/source/ucp/file/ucpfile1 \
- unotools/util/utl \
- unoxml/source/service/unoxml \
- writerfilter/util/writerfilter \
-))
-
-$(eval $(call gb_CppunitTest_use_configuration,sw_subsequent_rtfimport))
-
-$(eval $(call gb_CppunitTest_use_filter_configuration,sw_subsequent_rtfimport))
-
-$(eval $(call gb_CppunitTest_use_unittest_configuration,sw_subsequent_rtfimport))
-
-# vim: set noet sw=4 ts=4:
diff --git a/sw/CppunitTest_sw_subsequent_ww8export.mk b/sw/CppunitTest_sw_subsequent_ww8export.mk
deleted file mode 100644
index 9513b8f..0000000
--- a/sw/CppunitTest_sw_subsequent_ww8export.mk
+++ /dev/null
@@ -1,106 +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.
-#
-# The Initial Developer of the Original Code is
-# Miklos Vajna <vmiklos at suse.cz> (SUSE, Inc.)
-# Portions created by the Initial Developer are Copyright (C) 2012 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_CppunitTest_CppunitTest,sw_subsequent_ww8export))
-
-$(eval $(call gb_CppunitTest_add_exception_objects,sw_subsequent_ww8export, \
- sw/qa/extras/ww8export/ww8export \
-))
-
-$(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_ww8export, \
- comphelper \
- cppu \
- cppuhelper \
- emboleobj \
- sal \
- test \
- unotest \
- utl \
- sw \
- tl \
- $(gb_UWINAPI) \
-))
-
-$(eval $(call gb_CppunitTest_use_externals,sw_subsequent_ww8export,\
- boost_headers \
- libxml2 \
-))
-
-$(eval $(call gb_CppunitTest_set_include,sw_subsequent_ww8export,\
- -I$(SRCDIR)/sw/inc \
- -I$(SRCDIR)/sw/source/core/inc \
- -I$(SRCDIR)/sw/qa/extras/inc \
- $$(INCLUDE) \
-))
-
-$(eval $(call gb_CppunitTest_use_api,sw_subsequent_ww8export,\
- offapi \
- udkapi \
-))
-
-$(eval $(call gb_CppunitTest_use_ure,sw_subsequent_ww8export))
-
-$(eval $(call gb_CppunitTest_use_components,sw_subsequent_ww8export,\
- basic/util/sb \
- comphelper/util/comphelp \
- configmgr/source/configmgr \
- dbaccess/util/dba \
- embeddedobj/util/embobj \
- fileaccess/source/fileacc \
- filter/source/config/cache/filterconfig1 \
- forms/util/frm \
- framework/util/fwk \
- i18npool/util/i18npool \
- linguistic/source/lng \
- package/source/xstor/xstor \
- package/util/package2 \
- sax/source/expatwrap/expwrap \
- sw/util/msword \
- sw/util/sw \
- sw/util/swd \
- sfx2/util/sfx \
- svl/source/fsstor/fsstorage \
- svtools/util/svt \
- toolkit/util/tk \
- ucb/source/core/ucb1 \
- ucb/source/ucp/file/ucpfile1 \
- unotools/util/utl \
- unoxml/source/service/unoxml \
- $(if $(filter DESKTOP,$(BUILD_TYPE)),xmlhelp/util/ucpchelp1) \
- xmloff/util/xo \
-))
-
-$(eval $(call gb_CppunitTest_use_configuration,sw_subsequent_ww8export))
-
-$(eval $(call gb_CppunitTest_use_filter_configuration,sw_subsequent_ww8export))
-
-$(eval $(call gb_CppunitTest_use_unittest_configuration,sw_subsequent_ww8export))
-
-# vim: set noet sw=4 ts=4:
diff --git a/sw/CppunitTest_sw_subsequent_ww8import.mk b/sw/CppunitTest_sw_subsequent_ww8import.mk
deleted file mode 100644
index cb2031f..0000000
--- a/sw/CppunitTest_sw_subsequent_ww8import.mk
+++ /dev/null
@@ -1,98 +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.
-#
-# The Initial Developer of the Original Code is
-# Miklos Vajna <vmiklos at suse.cz> (SUSE, Inc.)
-# Portions created by the Initial Developer are Copyright (C) 2012 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_CppunitTest_CppunitTest,sw_subsequent_ww8import))
-
-$(eval $(call gb_CppunitTest_add_exception_objects,sw_subsequent_ww8import, \
- sw/qa/extras/ww8import/ww8import \
-))
-
-$(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_ww8import, \
- comphelper \
- cppu \
- cppuhelper \
- sal \
- test \
- unotest \
- sw \
- $(gb_UWINAPI) \
-))
-
-$(eval $(call gb_CppunitTest_use_externals,sw_subsequent_ww8import,\
- boost_headers \
- libxml2 \
-))
-
-$(eval $(call gb_CppunitTest_set_include,sw_subsequent_ww8import,\
- -I$(SRCDIR)/sw/inc \
- -I$(SRCDIR)/sw/source/core/inc \
- -I$(SRCDIR)/sw/qa/extras/inc \
- $$(INCLUDE) \
-))
-
-$(eval $(call gb_CppunitTest_use_api,sw_subsequent_ww8import,\
- offapi \
- udkapi \
-))
-
-$(eval $(call gb_CppunitTest_use_ure,sw_subsequent_ww8import))
-
-$(eval $(call gb_CppunitTest_use_components,sw_subsequent_ww8import,\
- basic/util/sb \
- comphelper/util/comphelp \
- configmgr/source/configmgr \
- dbaccess/util/dba \
- fileaccess/source/fileacc \
- filter/source/config/cache/filterconfig1 \
- forms/util/frm \
- framework/util/fwk \
- i18npool/util/i18npool \
- linguistic/source/lng \
- package/util/package2 \
- sw/util/msword \
- sw/util/sw \
- sw/util/swd \
- sfx2/util/sfx \
- svl/source/fsstor/fsstorage \
- svtools/util/svt \
- toolkit/util/tk \
- ucb/source/core/ucb1 \
- ucb/source/ucp/file/ucpfile1 \
- unoxml/source/service/unoxml \
- $(if $(filter DESKTOP,$(BUILD_TYPE)),xmlhelp/util/ucpchelp1) \
-))
-
-$(eval $(call gb_CppunitTest_use_configuration,sw_subsequent_ww8import))
-
-$(eval $(call gb_CppunitTest_use_filter_configuration,sw_subsequent_ww8import))
-
-$(eval $(call gb_CppunitTest_use_unittest_configuration,sw_subsequent_ww8import))
-
-# vim: set noet sw=4 ts=4:
diff --git a/sw/CppunitTest_sw_ww8export.mk b/sw/CppunitTest_sw_ww8export.mk
new file mode 100644
index 0000000..9513b8f
--- /dev/null
+++ b/sw/CppunitTest_sw_ww8export.mk
@@ -0,0 +1,106 @@
+# -*- 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.
+#
+# The Initial Developer of the Original Code is
+# Miklos Vajna <vmiklos at suse.cz> (SUSE, Inc.)
+# Portions created by the Initial Developer are Copyright (C) 2012 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_CppunitTest_CppunitTest,sw_subsequent_ww8export))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,sw_subsequent_ww8export, \
+ sw/qa/extras/ww8export/ww8export \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_ww8export, \
+ comphelper \
+ cppu \
+ cppuhelper \
+ emboleobj \
+ sal \
+ test \
+ unotest \
+ utl \
+ sw \
+ tl \
+ $(gb_UWINAPI) \
+))
+
+$(eval $(call gb_CppunitTest_use_externals,sw_subsequent_ww8export,\
+ boost_headers \
+ libxml2 \
+))
+
+$(eval $(call gb_CppunitTest_set_include,sw_subsequent_ww8export,\
+ -I$(SRCDIR)/sw/inc \
+ -I$(SRCDIR)/sw/source/core/inc \
+ -I$(SRCDIR)/sw/qa/extras/inc \
+ $$(INCLUDE) \
+))
+
+$(eval $(call gb_CppunitTest_use_api,sw_subsequent_ww8export,\
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_CppunitTest_use_ure,sw_subsequent_ww8export))
+
+$(eval $(call gb_CppunitTest_use_components,sw_subsequent_ww8export,\
+ basic/util/sb \
+ comphelper/util/comphelp \
+ configmgr/source/configmgr \
+ dbaccess/util/dba \
+ embeddedobj/util/embobj \
+ fileaccess/source/fileacc \
+ filter/source/config/cache/filterconfig1 \
+ forms/util/frm \
+ framework/util/fwk \
+ i18npool/util/i18npool \
+ linguistic/source/lng \
+ package/source/xstor/xstor \
+ package/util/package2 \
+ sax/source/expatwrap/expwrap \
+ sw/util/msword \
+ sw/util/sw \
+ sw/util/swd \
+ sfx2/util/sfx \
+ svl/source/fsstor/fsstorage \
+ svtools/util/svt \
+ toolkit/util/tk \
+ ucb/source/core/ucb1 \
+ ucb/source/ucp/file/ucpfile1 \
+ unotools/util/utl \
+ unoxml/source/service/unoxml \
+ $(if $(filter DESKTOP,$(BUILD_TYPE)),xmlhelp/util/ucpchelp1) \
+ xmloff/util/xo \
+))
+
+$(eval $(call gb_CppunitTest_use_configuration,sw_subsequent_ww8export))
+
+$(eval $(call gb_CppunitTest_use_filter_configuration,sw_subsequent_ww8export))
+
+$(eval $(call gb_CppunitTest_use_unittest_configuration,sw_subsequent_ww8export))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sw/CppunitTest_sw_ww8import.mk b/sw/CppunitTest_sw_ww8import.mk
new file mode 100644
index 0000000..cb2031f
--- /dev/null
+++ b/sw/CppunitTest_sw_ww8import.mk
@@ -0,0 +1,98 @@
+# -*- 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.
+#
+# The Initial Developer of the Original Code is
+# Miklos Vajna <vmiklos at suse.cz> (SUSE, Inc.)
+# Portions created by the Initial Developer are Copyright (C) 2012 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_CppunitTest_CppunitTest,sw_subsequent_ww8import))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,sw_subsequent_ww8import, \
+ sw/qa/extras/ww8import/ww8import \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_ww8import, \
+ comphelper \
+ cppu \
+ cppuhelper \
+ sal \
+ test \
+ unotest \
+ sw \
+ $(gb_UWINAPI) \
+))
+
+$(eval $(call gb_CppunitTest_use_externals,sw_subsequent_ww8import,\
+ boost_headers \
+ libxml2 \
+))
+
+$(eval $(call gb_CppunitTest_set_include,sw_subsequent_ww8import,\
+ -I$(SRCDIR)/sw/inc \
+ -I$(SRCDIR)/sw/source/core/inc \
+ -I$(SRCDIR)/sw/qa/extras/inc \
+ $$(INCLUDE) \
+))
+
+$(eval $(call gb_CppunitTest_use_api,sw_subsequent_ww8import,\
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_CppunitTest_use_ure,sw_subsequent_ww8import))
+
+$(eval $(call gb_CppunitTest_use_components,sw_subsequent_ww8import,\
+ basic/util/sb \
+ comphelper/util/comphelp \
+ configmgr/source/configmgr \
+ dbaccess/util/dba \
+ fileaccess/source/fileacc \
+ filter/source/config/cache/filterconfig1 \
+ forms/util/frm \
+ framework/util/fwk \
+ i18npool/util/i18npool \
+ linguistic/source/lng \
+ package/util/package2 \
+ sw/util/msword \
+ sw/util/sw \
+ sw/util/swd \
+ sfx2/util/sfx \
+ svl/source/fsstor/fsstorage \
+ svtools/util/svt \
+ toolkit/util/tk \
+ ucb/source/core/ucb1 \
+ ucb/source/ucp/file/ucpfile1 \
+ unoxml/source/service/unoxml \
+ $(if $(filter DESKTOP,$(BUILD_TYPE)),xmlhelp/util/ucpchelp1) \
+))
+
+$(eval $(call gb_CppunitTest_use_configuration,sw_subsequent_ww8import))
+
+$(eval $(call gb_CppunitTest_use_filter_configuration,sw_subsequent_ww8import))
+
+$(eval $(call gb_CppunitTest_use_unittest_configuration,sw_subsequent_ww8import))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk
index d4ea0ac..d11f167 100644
--- a/sw/Module_sw.mk
+++ b/sw/Module_sw.mk
@@ -43,14 +43,14 @@ $(eval $(call gb_Module_add_check_targets,sw,\
$(eval $(call gb_Module_add_slowcheck_targets,sw,\
CppunitTest_sw_macros_test \
- CppunitTest_sw_subsequent_ooxmlexport \
- CppunitTest_sw_subsequent_ooxmlimport \
- CppunitTest_sw_subsequent_ww8export \
- CppunitTest_sw_subsequent_ww8import \
- CppunitTest_sw_subsequent_rtfexport \
- CppunitTest_sw_subsequent_rtfimport \
- CppunitTest_sw_subsequent_odfexport \
- CppunitTest_sw_subsequent_odfimport \
+ CppunitTest_sw_ooxmlexport \
+ CppunitTest_sw_ooxmlimport \
+ CppunitTest_sw_ww8export \
+ CppunitTest_sw_ww8import \
+ CppunitTest_sw_rtfexport \
+ CppunitTest_sw_rtfimport \
+ CppunitTest_sw_odfexport \
+ CppunitTest_sw_odfimport \
))
ifneq ($(DISABLE_CVE_TESTS),TRUE)
More information about the Libreoffice-commits
mailing list