strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sw: no reason why SwModelTestBase can be used only by "extras" tests

Browse source 
So move it one level up, this way more tests can share code in the
future.

Change-Id: I35300b3c88ac9a5c39916f53b1b1743aa85869a0
Reviewed-on: https://gerrit.libreoffice.org/82252
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
This commit is contained in:
Miklos Vajna 2019-11-07 21:47:22 +01:00
parent 666142d72d
commit 423e1ce9c1
36 changed files with 40 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
solenv/clang-format/blacklist
View file

@ -14836,8 +14836,6 @@ sw/qa/extras/docbookexport/docbookexport.cxx
sw/qa/extras/globalfilter/globalfilter.cxx
sw/qa/extras/htmlexport/htmlexport.cxx
sw/qa/extras/htmlimport/htmlimport.cxx
sw/qa/extras/inc/bordertest.hxx
sw/qa/extras/inc/swmodeltestbase.hxx
sw/qa/extras/mailmerge/mailmerge.cxx
sw/qa/extras/odfexport/odfexport.cxx
sw/qa/extras/odfimport/odfimport.cxx
@ -14866,6 +14864,8 @@ sw/qa/extras/ww8export/ww8export.cxx
sw/qa/extras/ww8export/ww8export2.cxx
sw/qa/extras/ww8export/ww8export3.cxx
sw/qa/extras/ww8import/ww8import.cxx
sw/qa/inc/bordertest.hxx
sw/qa/inc/swmodeltestbase.hxx
sw/qa/unit/sw-dialogs-test.cxx
sw/qa/unit/sw-dialogs-test_2.cxx
sw/source/core/SwNumberTree/SwNodeNum.cxx

2
sw/CppunitTest_sw_accessible_relation_set.mk
View file

@ -42,7 +42,7 @@ $(eval $(call gb_CppunitTest_set_include,sw_htmlexport,\
-I$(SRCDIR)/sw/inc \
-I$(SRCDIR)/sw/source/core/inc \
-I$(SRCDIR)/sw/source/uibase/inc \
-I$(SRCDIR)/sw/qa/extras/inc \
-I$(SRCDIR)/sw/qa/inc \
$$(INCLUDE) \
))

2
sw/CppunitTest_sw_docbookexport.mk
View file

@ -41,7 +41,7 @@ $(eval $(call gb_CppunitTest_set_include,sw_docbookexport,\
-I$(SRCDIR)/sw/inc \
-I$(SRCDIR)/sw/source/core/inc \
-I$(SRCDIR)/sw/source/uibase/inc \
-I$(SRCDIR)/sw/qa/extras/inc \
-I$(SRCDIR)/sw/qa/inc \
$$(INCLUDE) \
))

2
sw/CppunitTest_sw_fodfexport.mk
View file

@ -39,7 +39,7 @@ $(eval $(call gb_CppunitTest_use_externals,sw_fodfexport,\
$(eval $(call gb_CppunitTest_set_include,sw_fodfexport,\
-I$(SRCDIR)/sw/inc \
-I$(SRCDIR)/sw/source/core/inc \
-I$(SRCDIR)/sw/qa/extras/inc \
-I$(SRCDIR)/sw/qa/inc \
$$(INCLUDE) \
))

2
sw/CppunitTest_sw_globalfilter.mk
View file

@ -40,7 +40,7 @@ $(eval $(call gb_CppunitTest_use_externals,sw_globalfilter,\
$(eval $(call gb_CppunitTest_set_include,sw_globalfilter,\
-I$(SRCDIR)/sw/inc \
-I$(SRCDIR)/sw/source/core/inc \
-I$(SRCDIR)/sw/qa/extras/inc \
-I$(SRCDIR)/sw/qa/inc \
$$(INCLUDE) \
))

2
sw/CppunitTest_sw_htmlexport.mk
View file

@ -41,7 +41,7 @@ $(eval $(call gb_CppunitTest_set_include,sw_htmlexport,\
-I$(SRCDIR)/sw/inc \
-I$(SRCDIR)/sw/source/core/inc \
-I$(SRCDIR)/sw/source/uibase/inc \
-I$(SRCDIR)/sw/qa/extras/inc \
-I$(SRCDIR)/sw/qa/inc \
$$(INCLUDE) \
))

2
sw/CppunitTest_sw_htmlimport.mk
View file

@ -44,7 +44,7 @@ $(eval $(call gb_CppunitTest_set_include,sw_htmlimport,\
-I$(SRCDIR)/sw/inc \
-I$(SRCDIR)/sw/source/core/inc \
-I$(SRCDIR)/sw/source/uibase/inc \
-I$(SRCDIR)/sw/qa/extras/inc \
-I$(SRCDIR)/sw/qa/inc \
$$(INCLUDE) \
))

2
sw/CppunitTest_sw_layoutwriter.mk
View file

@ -48,7 +48,7 @@ $(eval $(call gb_CppunitTest_set_include,sw_layoutwriter,\
-I$(SRCDIR)/sw/inc \
-I$(SRCDIR)/sw/source/core/inc \
-I$(SRCDIR)/sw/source/uibase/inc \
-I$(SRCDIR)/sw/qa/extras/inc \
-I$(SRCDIR)/sw/qa/inc \
$$(INCLUDE) \
))

2
sw/CppunitTest_sw_mailmerge.mk
View file

@ -49,7 +49,7 @@ $(eval $(call gb_CppunitTest_use_vcl,sw_mailmerge))
$(eval $(call gb_CppunitTest_set_include,sw_mailmerge,\
-I$(SRCDIR)/sw/inc \
-I$(SRCDIR)/sw/source/core/inc \
-I$(SRCDIR)/sw/qa/extras/inc \
-I$(SRCDIR)/sw/qa/inc \
-I$(SRCDIR)/sw/source/uibase/inc \
$$(INCLUDE) \
))

2
sw/CppunitTest_sw_odfexport.mk
View file

@ -40,7 +40,7 @@ $(eval $(call gb_CppunitTest_use_externals,sw_odfexport,\
$(eval $(call gb_CppunitTest_set_include,sw_odfexport,\
-I$(SRCDIR)/sw/inc \
-I$(SRCDIR)/sw/source/core/inc \
-I$(SRCDIR)/sw/qa/extras/inc \
-I$(SRCDIR)/sw/qa/inc \
$$(INCLUDE) \
))

2
sw/CppunitTest_sw_odfimport.mk
View file

@ -41,7 +41,7 @@ $(eval $(call gb_CppunitTest_set_include,sw_odfimport,\
-I$(SRCDIR)/sw/inc \
-I$(SRCDIR)/sw/source/core/inc \
-I$(SRCDIR)/sw/source/uibase/inc \
-I$(SRCDIR)/sw/qa/extras/inc \
-I$(SRCDIR)/sw/qa/inc \
$$(INCLUDE) \
))

2
sw/CppunitTest_sw_ooxmlencryption.mk
View file

@ -29,7 +29,7 @@ $(eval $(call gb_CppunitTest_use_externals,sw_ooxmlencryption,\
$(eval $(call gb_CppunitTest_set_include,sw_ooxmlencryption,\
-I$(SRCDIR)/sw/inc \
-I$(SRCDIR)/sw/source/core/inc \
-I$(SRCDIR)/sw/qa/extras/inc \
-I$(SRCDIR)/sw/qa/inc \
$$(INCLUDE) \
))

2
sw/CppunitTest_sw_ooxmlexport8.mk
View file

@ -41,7 +41,7 @@ $(eval $(call gb_CppunitTest_use_externals,sw_ooxmlexport8,\
$(eval $(call gb_CppunitTest_set_include,sw_ooxmlexport8,\
-I$(SRCDIR)/sw/inc \
-I$(SRCDIR)/sw/source/core/inc \
-I$(SRCDIR)/sw/qa/extras/inc \
-I$(SRCDIR)/sw/qa/inc \
$$(INCLUDE) \
))

2
sw/CppunitTest_sw_ooxmlfieldexport.mk
View file

@ -29,7 +29,7 @@ $(eval $(call gb_CppunitTest_use_externals,sw_ooxmlfieldexport,\
$(eval $(call gb_CppunitTest_set_include,sw_ooxmlfieldexport,\
-I$(SRCDIR)/sw/inc \
-I$(SRCDIR)/sw/source/core/inc \
-I$(SRCDIR)/sw/qa/extras/inc \
-I$(SRCDIR)/sw/qa/inc \
$$(INCLUDE) \
))

2
sw/CppunitTest_sw_ooxmlimport.mk
View file

@ -41,7 +41,7 @@ $(eval $(call gb_CppunitTest_use_externals,sw_ooxmlimport,\
$(eval $(call gb_CppunitTest_set_include,sw_ooxmlimport,\
-I$(SRCDIR)/sw/inc \
-I$(SRCDIR)/sw/source/core/inc \
-I$(SRCDIR)/sw/qa/extras/inc \
-I$(SRCDIR)/sw/qa/inc \
$$(INCLUDE) \
))

2
sw/CppunitTest_sw_ooxmlimport2.mk
View file

@ -42,7 +42,7 @@ $(eval $(call gb_CppunitTest_set_include,sw_ooxmlimport2,\
-I$(SRCDIR)/sw/inc \
-I$(SRCDIR)/sw/source/core/inc \
-I$(SRCDIR)/sw/source/uibase/inc \
-I$(SRCDIR)/sw/qa/extras/inc \
-I$(SRCDIR)/sw/qa/inc \
$$(INCLUDE) \
))

2
sw/CppunitTest_sw_ooxmllinks.mk
View file

@ -29,7 +29,7 @@ $(eval $(call gb_CppunitTest_use_externals,sw_ooxmllinks,\
$(eval $(call gb_CppunitTest_set_include,sw_ooxmllinks,\
-I$(SRCDIR)/sw/inc \
-I$(SRCDIR)/sw/source/core/inc \
-I$(SRCDIR)/sw/qa/extras/inc \
-I$(SRCDIR)/sw/qa/inc \
$$(INCLUDE) \
))

2
sw/CppunitTest_sw_ooxmlw14export.mk
View file

@ -29,7 +29,7 @@ $(eval $(call gb_CppunitTest_use_externals,sw_ooxmlw14export,\
$(eval $(call gb_CppunitTest_set_include,sw_ooxmlw14export,\
-I$(SRCDIR)/sw/inc \
-I$(SRCDIR)/sw/source/core/inc \
-I$(SRCDIR)/sw/qa/extras/inc \
-I$(SRCDIR)/sw/qa/inc \
$$(INCLUDE) \
))

2
sw/CppunitTest_sw_rtfexport.mk
View file

@ -38,7 +38,7 @@ $(eval $(call gb_CppunitTest_use_externals,sw_rtfexport,\
$(eval $(call gb_CppunitTest_set_include,sw_rtfexport,\
-I$(SRCDIR)/sw/inc \
-I$(SRCDIR)/sw/source/core/inc \
-I$(SRCDIR)/sw/qa/extras/inc \
-I$(SRCDIR)/sw/qa/inc \
$$(INCLUDE) \
))

2
sw/CppunitTest_sw_rtfexport2.mk
View file

@ -40,7 +40,7 @@ $(eval $(call gb_CppunitTest_use_externals,sw_rtfexport2,\
$(eval $(call gb_CppunitTest_set_include,sw_rtfexport2,\
-I$(SRCDIR)/sw/inc \
-I$(SRCDIR)/sw/source/core/inc \
-I$(SRCDIR)/sw/qa/extras/inc \
-I$(SRCDIR)/sw/qa/inc \
$$(INCLUDE) \
))

2
sw/CppunitTest_sw_rtfexport3.mk
View file

@ -38,7 +38,7 @@ $(eval $(call gb_CppunitTest_use_externals,sw_rtfexport3,\
$(eval $(call gb_CppunitTest_set_include,sw_rtfexport3,\
-I$(SRCDIR)/sw/inc \
-I$(SRCDIR)/sw/source/core/inc \
-I$(SRCDIR)/sw/qa/extras/inc \
-I$(SRCDIR)/sw/qa/inc \
$$(INCLUDE) \
))

2
sw/CppunitTest_sw_rtfexport4.mk
View file

@ -38,7 +38,7 @@ $(eval $(call gb_CppunitTest_use_externals,sw_rtfexport4,\
$(eval $(call gb_CppunitTest_set_include,sw_rtfexport4,\
-I$(SRCDIR)/sw/inc \
-I$(SRCDIR)/sw/source/core/inc \
-I$(SRCDIR)/sw/qa/extras/inc \
-I$(SRCDIR)/sw/qa/inc \
$$(INCLUDE) \
))

2
sw/CppunitTest_sw_rtfexport5.mk
View file

@ -40,7 +40,7 @@ $(eval $(call gb_CppunitTest_use_externals,sw_rtfexport5,\
$(eval $(call gb_CppunitTest_set_include,sw_rtfexport5,\
-I$(SRCDIR)/sw/inc \
-I$(SRCDIR)/sw/source/core/inc \
-I$(SRCDIR)/sw/qa/extras/inc \
-I$(SRCDIR)/sw/qa/inc \
$$(INCLUDE) \
))

2
sw/CppunitTest_sw_rtfimport.mk
View file

@ -40,7 +40,7 @@ $(eval $(call gb_CppunitTest_use_externals,sw_rtfimport,\
$(eval $(call gb_CppunitTest_set_include,sw_rtfimport,\
-I$(SRCDIR)/sw/inc \
-I$(SRCDIR)/sw/source/core/inc \
-I$(SRCDIR)/sw/qa/extras/inc \
-I$(SRCDIR)/sw/qa/inc \
$$(INCLUDE) \
))

2
sw/CppunitTest_sw_tiledrendering.mk
View file

@ -44,7 +44,7 @@ $(eval $(call gb_CppunitTest_set_include,sw_tiledrendering,\
-I$(SRCDIR)/sw/inc \
-I$(SRCDIR)/sw/source/core/inc \
-I$(SRCDIR)/sw/source/uibase/inc \
-I$(SRCDIR)/sw/qa/extras/inc \
-I$(SRCDIR)/sw/qa/inc \
$$(INCLUDE) \
))

2
sw/CppunitTest_sw_txtexport.mk
View file

@ -42,7 +42,7 @@ $(eval $(call gb_CppunitTest_set_include,sw_txtexport,\
-I$(SRCDIR)/sw/inc \
-I$(SRCDIR)/sw/source/core/inc \
-I$(SRCDIR)/sw/source/uibase/inc \
-I$(SRCDIR)/sw/qa/extras/inc \
-I$(SRCDIR)/sw/qa/inc \
$$(INCLUDE) \
))

2
sw/CppunitTest_sw_uiwriter.mk
View file

@ -52,7 +52,7 @@ $(eval $(call gb_CppunitTest_set_include,sw_uiwriter,\
-I$(SRCDIR)/sw/source/uibase/inc \
-I$(SRCDIR)/sw/source/filter/inc \
-I$(SRCDIR)/sw/source/filter/html \
-I$(SRCDIR)/sw/qa/extras/inc \
-I$(SRCDIR)/sw/qa/inc \
$$(INCLUDE) \
))

2
sw/CppunitTest_sw_unowriter.mk
View file

@ -48,7 +48,7 @@ $(eval $(call gb_CppunitTest_set_include,sw_unowriter,\
-I$(SRCDIR)/sw/inc \
-I$(SRCDIR)/sw/source/core/inc \
-I$(SRCDIR)/sw/source/uibase/inc \
-I$(SRCDIR)/sw/qa/extras/inc \
-I$(SRCDIR)/sw/qa/inc \
$$(INCLUDE) \
))

2
sw/CppunitTest_sw_ww8export.mk
View file

@ -41,7 +41,7 @@ $(eval $(call gb_CppunitTest_set_include,sw_ww8export,\
-I$(SRCDIR)/sw/inc \
-I$(SRCDIR)/sw/source/core/inc \
-I$(SRCDIR)/sw/source/uibase/inc \
-I$(SRCDIR)/sw/qa/extras/inc \
-I$(SRCDIR)/sw/qa/inc \
$$(INCLUDE) \
))

2
sw/CppunitTest_sw_ww8export2.mk
View file

@ -41,7 +41,7 @@ $(eval $(call gb_CppunitTest_use_externals,sw_ww8export2,\
$(eval $(call gb_CppunitTest_set_include,sw_ww8export2,\
-I$(SRCDIR)/sw/inc \
-I$(SRCDIR)/sw/source/core/inc \
-I$(SRCDIR)/sw/qa/extras/inc \
-I$(SRCDIR)/sw/qa/inc \
$$(INCLUDE) \
))

2
sw/CppunitTest_sw_ww8export3.mk
View file

@ -40,7 +40,7 @@ $(eval $(call gb_CppunitTest_use_externals,sw_ww8export3,\
$(eval $(call gb_CppunitTest_set_include,sw_ww8export3,\
-I$(SRCDIR)/sw/inc \
-I$(SRCDIR)/sw/source/core/inc \
-I$(SRCDIR)/sw/qa/extras/inc \
-I$(SRCDIR)/sw/qa/inc \
$$(INCLUDE) \
))

2
sw/CppunitTest_sw_ww8import.mk
View file

@ -41,7 +41,7 @@ $(eval $(call gb_CppunitTest_set_include,sw_ww8import,\
-I$(SRCDIR)/sw/inc \
-I$(SRCDIR)/sw/source/core/inc \
-I$(SRCDIR)/sw/source/uibase/inc \
-I$(SRCDIR)/sw/qa/extras/inc \
-I$(SRCDIR)/sw/qa/inc \
$$(INCLUDE) \
))

2
sw/CppunitTest_sw_xhtmlexport.mk
View file

@ -41,7 +41,7 @@ $(eval $(call gb_CppunitTest_set_include,sw_xhtmlexport,\
-I$(SRCDIR)/sw/inc \
-I$(SRCDIR)/sw/source/core/inc \
-I$(SRCDIR)/sw/source/uibase/inc \
-I$(SRCDIR)/sw/qa/extras/inc \
-I$(SRCDIR)/sw/qa/inc \
$$(INCLUDE) \
))

2
sw/ooxmlexport_setup.mk
View file

@ -49,7 +49,7 @@ $(eval $(call gb_CppunitTest_use_externals,sw_ooxmlexport$(1),\
$(eval $(call gb_CppunitTest_set_include,sw_ooxmlexport$(1),\
-I$(SRCDIR)/sw/inc \
-I$(SRCDIR)/sw/source/core/inc \
-I$(SRCDIR)/sw/qa/extras/inc \
-I$(SRCDIR)/sw/qa/inc \
$$(INCLUDE) \
))

4
sw/qa/extras/inc/bordertest.hxx → sw/qa/inc/bordertest.hxx
View file

@ -6,8 +6,8 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
#ifndef INCLUDED_SW_QA_EXTRAS_INC_BORDERTEST_HXX
#define INCLUDED_SW_QA_EXTRAS_INC_BORDERTEST_HXX
#ifndef INCLUDED_SW_QA_INC_BORDERTEST_HXX
#define INCLUDED_SW_QA_INC_BORDERTEST_HXX
#include <cppunit/TestAssert.h>
#include <com/sun/star/table/BorderLine.hpp>

6
sw/qa/extras/inc/swmodeltestbase.hxx → sw/qa/inc/swmodeltestbase.hxx
View file

@ -7,8 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
#ifndef INCLUDED_SW_QA_EXTRAS_INC_SWMODELTESTBASE_HXX
#define INCLUDED_SW_QA_EXTRAS_INC_SWMODELTESTBASE_HXX
#ifndef INCLUDED_SW_QA_INC_SWMODELTESTBASE_HXX
#define INCLUDED_SW_QA_INC_SWMODELTESTBASE_HXX
#include <memory>
#include <com/sun/star/container/XContentEnumerationAccess.hpp>
@ -1038,6 +1038,6 @@ inline std::ostream& operator<<(std::ostream& rStrm, const Color& rColor)
return rStrm;
}
#endif // INCLUDED_SW_QA_EXTRAS_INC_SWMODELTESTBASE_HXX
#endif // INCLUDED_SW_QA_INC_SWMODELTESTBASE_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */