summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sw/CppunitTest_sw_tox.mk84
-rw-r--r--sw/CppunitTest_sw_uwriter.mk3
-rw-r--r--sw/Module_sw.mk4
-rw-r--r--sw/inc/ToxLinkProcessor.hxx2
-rw-r--r--sw/inc/ToxTabStopTokenHandler.hxx4
-rw-r--r--sw/inc/ToxTextGenerator.hxx2
-rw-r--r--sw/inc/ToxWhitespaceStripper.hxx2
-rw-r--r--sw/qa/core/test_ToxLinkProcessor.cxx (renamed from sw/qa/extras/tox/test_ToxLinkProcessor.cxx)0
-rw-r--r--sw/qa/core/test_ToxTextGenerator.cxx (renamed from sw/qa/extras/tox/test_ToxTextGenerator.cxx)0
-rw-r--r--sw/qa/core/test_ToxWhitespaceStripper.cxx (renamed from sw/qa/extras/tox/test_ToxWhitespaceStripper.cxx)3
-rw-r--r--sw/source/core/inc/txmsrt.hxx2
11 files changed, 9 insertions, 97 deletions
diff --git a/sw/CppunitTest_sw_tox.mk b/sw/CppunitTest_sw_tox.mk
deleted file mode 100644
index cca386fe2a88..000000000000
--- a/sw/CppunitTest_sw_tox.mk
+++ /dev/null
@@ -1,84 +0,0 @@
-# -*- 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:
diff --git a/sw/CppunitTest_sw_uwriter.mk b/sw/CppunitTest_sw_uwriter.mk
index 495d0887b530..9f4e9f947297 100644
--- a/sw/CppunitTest_sw_uwriter.mk
+++ b/sw/CppunitTest_sw_uwriter.mk
@@ -14,6 +14,9 @@ $(eval $(call gb_CppunitTest_CppunitTest,sw_uwriter))
$(eval $(call gb_CppunitTest_add_exception_objects,sw_uwriter, \
sw/qa/core/uwriter \
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))
diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk
index d2059683dab7..b5809c2a7599 100644
--- a/sw/Module_sw.mk
+++ b/sw/Module_sw.mk
@@ -46,10 +46,6 @@ $(eval $(call gb_Module_add_targets,sw,\
endif
-$(eval $(call gb_Module_add_check_targets,sw,\
- CppunitTest_sw_tox \
-))
-
$(eval $(call gb_Module_add_slowcheck_targets,sw,\
CppunitTest_sw_uwriter \
CppunitTest_sw_htmlexport \
diff --git a/sw/inc/ToxLinkProcessor.hxx b/sw/inc/ToxLinkProcessor.hxx
index dcf10022575f..2e439c05f2d8 100644
--- a/sw/inc/ToxLinkProcessor.hxx
+++ b/sw/inc/ToxLinkProcessor.hxx
@@ -24,7 +24,7 @@ namespace sw {
/** A helper class for ToxTextGenerator.
* It collects information about encountered link tokens and allows access in a processed form.
*/
-class SW_DLLPUBLIC ToxLinkProcessor {
+class ToxLinkProcessor {
public:
ToxLinkProcessor() {}
virtual ~ToxLinkProcessor() {}
diff --git a/sw/inc/ToxTabStopTokenHandler.hxx b/sw/inc/ToxTabStopTokenHandler.hxx
index 8830de9b942a..a0d9e421c190 100644
--- a/sw/inc/ToxTabStopTokenHandler.hxx
+++ b/sw/inc/ToxTabStopTokenHandler.hxx
@@ -28,7 +28,7 @@ namespace sw {
* @internal
* This is an interface class. It allows to mock the class in unit tests
*/
-class SW_DLLPUBLIC ToxTabStopTokenHandler
+class ToxTabStopTokenHandler
{
public:
virtual ~ToxTabStopTokenHandler() {}
@@ -50,7 +50,7 @@ public:
};
/** The default implementation of ToxTabStopTokenHandler */
-class SW_DLLPUBLIC DefaultToxTabStopTokenHandler : public ToxTabStopTokenHandler
+class DefaultToxTabStopTokenHandler : public ToxTabStopTokenHandler
{
public:
diff --git a/sw/inc/ToxTextGenerator.hxx b/sw/inc/ToxTextGenerator.hxx
index a9c9cadd279b..45af1314a6ee 100644
--- a/sw/inc/ToxTextGenerator.hxx
+++ b/sw/inc/ToxTextGenerator.hxx
@@ -54,7 +54,7 @@ class ToxTabStopTokenHandler;
*
* You can control its behavior by calling @link SetTabstopPolicy() and specifying the desired behavior.
*/
-class SW_DLLPUBLIC ToxTextGenerator
+class ToxTextGenerator
{
public:
ToxTextGenerator(const SwForm& toxForm, boost::shared_ptr<ToxTabStopTokenHandler> tabStopHandler);
diff --git a/sw/inc/ToxWhitespaceStripper.hxx b/sw/inc/ToxWhitespaceStripper.hxx
index bc8e8699c032..dc3e741bf95a 100644
--- a/sw/inc/ToxWhitespaceStripper.hxx
+++ b/sw/inc/ToxWhitespaceStripper.hxx
@@ -30,7 +30,7 @@ namespace sw {
*
* @note One leading whitespace is preserved.
*/
-class SW_DLLPUBLIC ToxWhitespaceStripper
+class ToxWhitespaceStripper
{
public:
ToxWhitespaceStripper(const OUString&);
diff --git a/sw/qa/extras/tox/test_ToxLinkProcessor.cxx b/sw/qa/core/test_ToxLinkProcessor.cxx
index e0ae1a1bd41e..e0ae1a1bd41e 100644
--- a/sw/qa/extras/tox/test_ToxLinkProcessor.cxx
+++ b/sw/qa/core/test_ToxLinkProcessor.cxx
diff --git a/sw/qa/extras/tox/test_ToxTextGenerator.cxx b/sw/qa/core/test_ToxTextGenerator.cxx
index 7f622d084203..7f622d084203 100644
--- a/sw/qa/extras/tox/test_ToxTextGenerator.cxx
+++ b/sw/qa/core/test_ToxTextGenerator.cxx
diff --git a/sw/qa/extras/tox/test_ToxWhitespaceStripper.cxx b/sw/qa/core/test_ToxWhitespaceStripper.cxx
index adaffd9627b5..30da0bdb1a6b 100644
--- a/sw/qa/extras/tox/test_ToxWhitespaceStripper.cxx
+++ b/sw/qa/core/test_ToxWhitespaceStripper.cxx
@@ -18,7 +18,6 @@
#include <cppunit/TestAssert.h>
#include <cppunit/TestFixture.h>
#include <cppunit/extensions/HelperMacros.h>
-#include <cppunit/plugin/TestPlugIn.h>
using namespace sw;
@@ -145,6 +144,4 @@ ToxWhitespaceStripperTest::PositionAfterStringCanBeRequested()
// Put the test suite in the registry
CPPUNIT_TEST_SUITE_REGISTRATION(ToxWhitespaceStripperTest);
-CPPUNIT_PLUGIN_IMPLEMENT();
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/txmsrt.hxx b/sw/source/core/inc/txmsrt.hxx
index d2d550ac383e..f1e62ad165df 100644
--- a/sw/source/core/inc/txmsrt.hxx
+++ b/sw/source/core/inc/txmsrt.hxx
@@ -118,7 +118,7 @@ public:
/**
* Class for sorting directories
*/
-struct SW_DLLPUBLIC SwTOXSortTabBase
+struct SwTOXSortTabBase
{
SwTOXSources aTOXSources;
::com::sun::star::lang::Locale aLocale;
generated by cgit (git 2.34.1) at 2025-02-06 17:06:42 +0000