summaryrefslogtreecommitdiff
path: root/sw/qa
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2019-11-19 16:32:49 +0100
committerStephan Bergmann <sbergman@redhat.com>2019-11-22 12:57:32 +0100
commitf853ec317f6af1b8c65cc5bd758371689c75118d (patch)
treeb86d729bf9a9465ee619ead3b5635efa62a1804e /sw/qa
parentf31d36966bceb90e261cbecd42634bde4448d527 (diff)
Extend loplugin:external to warn about classes
...following up on 314f15bff08b76bf96acf99141776ef64d2f1355 "Extend loplugin:external to warn about enums". Cases where free functions were moved into an unnamed namespace along with a class, to not break ADL, are in: filter/source/svg/svgexport.cxx sc/source/filter/excel/xelink.cxx sc/source/filter/excel/xilink.cxx svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx All other free functions mentioning moved classes appear to be harmless and not give rise to (silent, even) ADL breakage. (One remaining TODO in compilerplugins/clang/external.cxx is that derived classes are not covered by computeAffectedTypes, even though they could also be affected by ADL-breakage--- but don't seem to be in any acutal case across the code base.) For friend declarations using elaborate type specifiers, like class C1 {}; class C2 { friend class C1; }; * If C2 (but not C1) is moved into an unnamed namespace, the friend declaration must be changed to not use an elaborate type specifier (i.e., "friend C1;"; see C++17 [namespace.memdef]/3: "If the name in a friend declaration is neither qualified nor a template-id and the declaration is a function or an elaborated-type-specifier, the lookup to determine whether the entity has been previously declared shall not consider any scopes outside the innermost enclosing namespace.") * If C1 (but not C2) is moved into an unnamed namespace, the friend declaration must be changed too, see <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=71882> "elaborated-type-specifier friend not looked up in unnamed namespace". Apart from that, to keep changes simple and mostly mechanical (which should help avoid regressions), out-of-line definitions of class members have been left in the enclosing (named) namespace. But explicit specializations of class templates had to be moved into the unnamed namespace to appease <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=92598> "explicit specialization of template from unnamed namespace using unqualified-id in enclosing namespace". Also, accompanying declarations (of e.g. typedefs or static variables) that could arguably be moved into the unnamed namespace too have been left alone. And in some cases, mention of affected types in blacklists in other loplugins needed to be adapted. And sc/qa/unit/mark_test.cxx uses a hack of including other .cxx, one of which is sc/source/core/data/segmenttree.cxx where e.g. ScFlatUInt16SegmentsImpl is not moved into an unnamed namespace (because it is declared in sc/inc/segmenttree.hxx), but its base ScFlatSegmentsImpl is. GCC warns about such combinations with enabled-by-default -Wsubobject-linkage, but "The compiler doesn’t give this warning for types defined in the main .C file, as those are unlikely to have multiple definitions." (<https://gcc.gnu.org/onlinedocs/gcc-9.2.0/gcc/Warning-Options.html>) The warned-about classes also don't have multiple definitions in the given test, so disable the warning when including the .cxx. Change-Id: Ib694094c0d8168be68f8fe90dfd0acbb66a3f1e4 Reviewed-on: https://gerrit.libreoffice.org/83239 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'sw/qa')
-rw-r--r--sw/qa/core/test_ToxLinkProcessor.cxx4
-rw-r--r--sw/qa/core/test_ToxTextGenerator.cxx8
-rw-r--r--sw/qa/extras/accessibility/accessible_relation_set.cxx3
-rw-r--r--sw/qa/extras/ooxmlexport/ooxmlexport2.cxx4
-rw-r--r--sw/qa/extras/tiledrendering/tiledrendering.cxx4
-rw-r--r--sw/qa/extras/uiwriter/uiwriter.cxx8
6 files changed, 31 insertions, 0 deletions
diff --git a/sw/qa/core/test_ToxLinkProcessor.cxx b/sw/qa/core/test_ToxLinkProcessor.cxx
index 01e349a5fea5..2e65c2ff6c28 100644
--- a/sw/qa/core/test_ToxLinkProcessor.cxx
+++ b/sw/qa/core/test_ToxLinkProcessor.cxx
@@ -87,6 +87,8 @@ ToxLinkProcessorTest::AddingAndClosingTwoOverlappingLinksResultsInOneClosedLink(
CPPUNIT_ASSERT_EQUAL(URL_1, sut.m_ClosedLinks[0]->mINetFormat.GetValue());
}
+namespace {
+
class ToxLinkProcessorWithOverriddenObtainPoolId : public ToxLinkProcessor {
public:
virtual sal_uInt16
@@ -101,6 +103,8 @@ public:
}
};
+}
+
void
ToxLinkProcessorTest::LinkIsCreatedCorrectly()
{
diff --git a/sw/qa/core/test_ToxTextGenerator.cxx b/sw/qa/core/test_ToxTextGenerator.cxx
index e46e40ab4776..a2d347536a65 100644
--- a/sw/qa/core/test_ToxTextGenerator.cxx
+++ b/sw/qa/core/test_ToxTextGenerator.cxx
@@ -51,6 +51,8 @@ public:
};
+namespace {
+
struct MockedSortTab : public SwTOXSortTabBase {
MockedSortTab()
: SwTOXSortTabBase(TOX_SORT_INDEX,nullptr,nullptr,nullptr) {}
@@ -63,6 +65,8 @@ struct MockedSortTab : public SwTOXSortTabBase {
}
};
+}
+
void
ToxTextGeneratorTest::EmptyStringIsReturnedForPageNumberPlaceholderOfZeroItems()
{
@@ -109,6 +113,8 @@ ToxTextGeneratorTest::EmptyStringIsReturnedAsNumStringIfToxSourcesIsEmpty()
CPPUNIT_ASSERT_EQUAL(expected, actual);
}
+namespace {
+
class MockedToxTabStopTokenHandler : public ToxTabStopTokenHandler {
public:
virtual HandledTabStopToken
@@ -140,6 +146,8 @@ private:
SwChapterField mChapterField;
};
+}
+
void
ToxTextGeneratorTest::ChapterNumberWithoutTextIsGeneratedForNoprepstTitle()
{
diff --git a/sw/qa/extras/accessibility/accessible_relation_set.cxx b/sw/qa/extras/accessibility/accessible_relation_set.cxx
index 9efcc8ec060c..faf05c8c7daa 100644
--- a/sw/qa/extras/accessibility/accessible_relation_set.cxx
+++ b/sw/qa/extras/accessibility/accessible_relation_set.cxx
@@ -38,6 +38,8 @@ using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::accessibility;
using namespace css::lang;
+namespace
+{
class AccessibilityTools
{
public:
@@ -45,6 +47,7 @@ public:
getAccessibleObjectForRole(const css::uno::Reference<css::accessibility::XAccessible>& xacc,
sal_Int16 role);
};
+}
css::uno::Reference<css::accessibility::XAccessibleContext>
AccessibilityTools::getAccessibleObjectForRole(
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport2.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport2.cxx
index c3f700aa3a92..7ccadb2ba4c7 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport2.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport2.cxx
@@ -332,6 +332,8 @@ DECLARE_OOXMLEXPORT_TEST(testTable, "table.odt")
assertXPath(pXmlDocCT, "//w:style[@w:styleId='Normal']/w:qFormat", 1);
}
+namespace {
+
struct SingleLineBorders {
sal_Int16 top, bottom, left, right;
SingleLineBorders(int t=0, int b=0, int l=0, int r=0)
@@ -348,6 +350,8 @@ struct SingleLineBorders {
}
};
+}
+
DECLARE_OOXMLEXPORT_TEST(testTableBorders, "table-borders.docx")
{
uno::Reference<text::XTextTablesSupplier> xTablesSupplier(mxComponent, uno::UNO_QUERY);
diff --git a/sw/qa/extras/tiledrendering/tiledrendering.cxx b/sw/qa/extras/tiledrendering/tiledrendering.cxx
index e6b624a5cb1e..0e01db65ba67 100644
--- a/sw/qa/extras/tiledrendering/tiledrendering.cxx
+++ b/sw/qa/extras/tiledrendering/tiledrendering.cxx
@@ -714,6 +714,8 @@ void SwTiledRenderingTest::testPartHash()
}
}
+namespace {
+
/// A view callback tracks callbacks invoked on one specific view.
class ViewCallback
{
@@ -923,6 +925,8 @@ public:
}
};
+}
+
void SwTiledRenderingTest::testMissingInvalidation()
{
comphelper::LibreOfficeKit::setActive();
diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx b/sw/qa/extras/uiwriter/uiwriter.cxx
index 49ff03a594c1..27cd93fb857e 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -4057,6 +4057,8 @@ void SwUiWriterTest::testDde()
#endif
}
+namespace {
+
//IdleTask class to add a low priority Idle task
class IdleTask
{
@@ -4069,6 +4071,8 @@ class IdleTask
Idle maIdle;
};
+}
+
//constructor of IdleTask Class
IdleTask::IdleTask() : flag( false )
{
@@ -4254,6 +4258,8 @@ void SwUiWriterTest::testTdf87922()
}
#if HAVE_MORE_FONTS
+namespace {
+
struct PortionItem
{
PortionItem(OUString const & sItemType, sal_Int32 nLength,
@@ -4310,6 +4316,8 @@ class PortionHandler : public SwPortionHandler
mPortionItems.emplace_back("finish", 0, PortionType::NONE);
}
};
+
+}
#endif
void SwUiWriterTest::testTdf77014()