Kaydet (Commit) 6c52a8b9 authored tarafından Caolán McNamara's avatar Caolán McNamara

drop SW_DLLPUBLICs for unit-test only exposure

seeing as have a uwriter target for the non-exposed symbols case.

As a motivating side-effect stops crashing on exit on an optimized build with
my x86_64 fedora 20 gcc 4.8.3 build

Change-Id: If0240ee02d4899e488b12d2d8d5f9b6bf7cca37d
üst fa430e6b
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#
# This file is part of the LibreOffice project.
#
# This Source Code Form is subject to the terms of the Mozilla Public
# 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/.
#
# This file contains the unit test definition for class in the sources/core/tox subfolder
# The macro which defines the main method is contained in test_ToxWhitespaceStripper.cxx
$(eval $(call gb_CppunitTest_CppunitTest,sw_tox))
$(eval $(call gb_CppunitTest_add_exception_objects,sw_tox, \
sw/qa/extras/tox/test_ToxWhitespaceStripper \
sw/qa/extras/tox/test_ToxLinkProcessor \
sw/qa/extras/tox/test_ToxTextGenerator \
))
$(eval $(call gb_CppunitTest_use_libraries,sw_tox, \
$(call gb_Helper_optional,AVMEDIA,avmedia) \
basegfx \
comphelper \
cppu \
cppuhelper \
drawinglayer \
editeng \
i18nlangtag \
i18nutil \
lng \
sal \
salhelper \
sax \
sb \
sfx \
sot \
svl \
svt \
svx \
svxcore \
sw \
test \
unotest \
vcl \
tk \
tl \
ucbhelper \
utl \
xmlreader \
xo \
$(gb_UWINAPI) \
))
$(eval $(call gb_CppunitTest_use_externals,sw_tox, \
boost_headers \
icuuc \
libxml2 \
))
$(eval $(call gb_CppunitTest_use_api,sw_tox,\
offapi \
udkapi \
))
$(eval $(call gb_CppunitTest_use_components,sw_tox, \
configmgr/source/configmgr \
framework/util/fwk \
i18npool/util/i18npool \
ucb/source/core/ucb1 \
ucb/source/ucp/file/ucpfile1 \
))
$(eval $(call gb_CppunitTest_use_configuration,sw_tox))
$(eval $(call gb_CppunitTest_use_ure,sw_tox))
$(eval $(call gb_CppunitTest_use_vcl,sw_tox))
$(eval $(call gb_CppunitTest_set_include,sw_tox,\
-I$(SRCDIR)/sw/inc \
-I$(SRCDIR)/sw/source/core/inc \
$$(INCLUDE) \
))
# vim: set noet sw=4 ts=4:
...@@ -14,6 +14,9 @@ $(eval $(call gb_CppunitTest_CppunitTest,sw_uwriter)) ...@@ -14,6 +14,9 @@ $(eval $(call gb_CppunitTest_CppunitTest,sw_uwriter))
$(eval $(call gb_CppunitTest_add_exception_objects,sw_uwriter, \ $(eval $(call gb_CppunitTest_add_exception_objects,sw_uwriter, \
sw/qa/core/uwriter \ sw/qa/core/uwriter \
sw/qa/core/Test-BigPtrArray \ sw/qa/core/Test-BigPtrArray \
sw/qa/core/test_ToxWhitespaceStripper \
sw/qa/core/test_ToxLinkProcessor \
sw/qa/core/test_ToxTextGenerator \
)) ))
$(eval $(call gb_CppunitTest_use_library_objects,sw_uwriter,sw)) $(eval $(call gb_CppunitTest_use_library_objects,sw_uwriter,sw))
......
...@@ -46,10 +46,6 @@ $(eval $(call gb_Module_add_targets,sw,\ ...@@ -46,10 +46,6 @@ $(eval $(call gb_Module_add_targets,sw,\
endif endif
$(eval $(call gb_Module_add_check_targets,sw,\
CppunitTest_sw_tox \
))
$(eval $(call gb_Module_add_slowcheck_targets,sw,\ $(eval $(call gb_Module_add_slowcheck_targets,sw,\
CppunitTest_sw_uwriter \ CppunitTest_sw_uwriter \
CppunitTest_sw_htmlexport \ CppunitTest_sw_htmlexport \
......
...@@ -24,7 +24,7 @@ namespace sw { ...@@ -24,7 +24,7 @@ namespace sw {
/** A helper class for ToxTextGenerator. /** A helper class for ToxTextGenerator.
* It collects information about encountered link tokens and allows access in a processed form. * It collects information about encountered link tokens and allows access in a processed form.
*/ */
class SW_DLLPUBLIC ToxLinkProcessor { class ToxLinkProcessor {
public: public:
ToxLinkProcessor() {} ToxLinkProcessor() {}
virtual ~ToxLinkProcessor() {} virtual ~ToxLinkProcessor() {}
......
...@@ -28,7 +28,7 @@ namespace sw { ...@@ -28,7 +28,7 @@ namespace sw {
* @internal * @internal
* This is an interface class. It allows to mock the class in unit tests * This is an interface class. It allows to mock the class in unit tests
*/ */
class SW_DLLPUBLIC ToxTabStopTokenHandler class ToxTabStopTokenHandler
{ {
public: public:
virtual ~ToxTabStopTokenHandler() {} virtual ~ToxTabStopTokenHandler() {}
...@@ -50,7 +50,7 @@ public: ...@@ -50,7 +50,7 @@ public:
}; };
/** The default implementation of ToxTabStopTokenHandler */ /** The default implementation of ToxTabStopTokenHandler */
class SW_DLLPUBLIC DefaultToxTabStopTokenHandler : public ToxTabStopTokenHandler class DefaultToxTabStopTokenHandler : public ToxTabStopTokenHandler
{ {
public: public:
......
...@@ -54,7 +54,7 @@ class ToxTabStopTokenHandler; ...@@ -54,7 +54,7 @@ class ToxTabStopTokenHandler;
* *
* You can control its behavior by calling @link SetTabstopPolicy() and specifying the desired behavior. * You can control its behavior by calling @link SetTabstopPolicy() and specifying the desired behavior.
*/ */
class SW_DLLPUBLIC ToxTextGenerator class ToxTextGenerator
{ {
public: public:
ToxTextGenerator(const SwForm& toxForm, boost::shared_ptr<ToxTabStopTokenHandler> tabStopHandler); ToxTextGenerator(const SwForm& toxForm, boost::shared_ptr<ToxTabStopTokenHandler> tabStopHandler);
......
...@@ -30,7 +30,7 @@ namespace sw { ...@@ -30,7 +30,7 @@ namespace sw {
* *
* @note One leading whitespace is preserved. * @note One leading whitespace is preserved.
*/ */
class SW_DLLPUBLIC ToxWhitespaceStripper class ToxWhitespaceStripper
{ {
public: public:
ToxWhitespaceStripper(const OUString&); ToxWhitespaceStripper(const OUString&);
......
...@@ -18,7 +18,6 @@ ...@@ -18,7 +18,6 @@
#include <cppunit/TestAssert.h> #include <cppunit/TestAssert.h>
#include <cppunit/TestFixture.h> #include <cppunit/TestFixture.h>
#include <cppunit/extensions/HelperMacros.h> #include <cppunit/extensions/HelperMacros.h>
#include <cppunit/plugin/TestPlugIn.h>
using namespace sw; using namespace sw;
...@@ -145,6 +144,4 @@ ToxWhitespaceStripperTest::PositionAfterStringCanBeRequested() ...@@ -145,6 +144,4 @@ ToxWhitespaceStripperTest::PositionAfterStringCanBeRequested()
// Put the test suite in the registry // Put the test suite in the registry
CPPUNIT_TEST_SUITE_REGISTRATION(ToxWhitespaceStripperTest); CPPUNIT_TEST_SUITE_REGISTRATION(ToxWhitespaceStripperTest);
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
...@@ -118,7 +118,7 @@ public: ...@@ -118,7 +118,7 @@ public:
/** /**
* Class for sorting directories * Class for sorting directories
*/ */
struct SW_DLLPUBLIC SwTOXSortTabBase struct SwTOXSortTabBase
{ {
SwTOXSources aTOXSources; SwTOXSources aTOXSources;
::com::sun::star::lang::Locale aLocale; ::com::sun::star::lang::Locale aLocale;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment