summaryrefslogtreecommitdiff
path: root/svl/source
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 /svl/source
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 'svl/source')
-rw-r--r--svl/source/items/style.cxx4
-rw-r--r--svl/source/misc/gridprinter.cxx4
-rw-r--r--svl/source/undo/undo.cxx4
-rw-r--r--svl/source/uno/pathservice.cxx3
4 files changed, 15 insertions, 0 deletions
diff --git a/svl/source/items/style.cxx b/svl/source/items/style.cxx
index 950201bef962..f1463d501c3e 100644
--- a/svl/source/items/style.cxx
+++ b/svl/source/items/style.cxx
@@ -38,6 +38,8 @@
#include <string.h>
#ifdef DBG_UTIL
+namespace {
+
class DbgStyleSheetReferences
{
public:
@@ -54,6 +56,8 @@ public:
sal_uInt32 mnPools;
};
+}
+
static DbgStyleSheetReferences aDbgStyleSheetReferences;
#endif
diff --git a/svl/source/misc/gridprinter.cxx b/svl/source/misc/gridprinter.cxx
index 4f013d4b6b8c..b40dd049c8ef 100644
--- a/svl/source/misc/gridprinter.cxx
+++ b/svl/source/misc/gridprinter.cxx
@@ -26,6 +26,8 @@ const mdds::mtv::element_t element_type_string = mdds::mtv::element_type_user_st
// String block
typedef mdds::mtv::default_element_block<element_type_string, OUString> string_block;
+namespace {
+
struct matrix_trait
{
typedef string_block string_element_block;
@@ -36,6 +38,8 @@ struct matrix_trait
}
+}
+
namespace rtl {
// Callbacks for the string block. This needs to be in the same namespace as
diff --git a/svl/source/undo/undo.cxx b/svl/source/undo/undo.cxx
index 5d84ae1e0378..98b15675c00e 100644
--- a/svl/source/undo/undo.cxx
+++ b/svl/source/undo/undo.cxx
@@ -212,6 +212,8 @@ namespace svl { namespace undo { namespace impl
typedef void ( SfxUndoListener::*UndoListenerVoidMethod )();
typedef void ( SfxUndoListener::*UndoListenerStringMethod )( const OUString& );
+ namespace {
+
struct NotifyUndoListener
{
explicit NotifyUndoListener( UndoListenerVoidMethod i_notificationMethod )
@@ -252,6 +254,8 @@ namespace svl { namespace undo { namespace impl
OUString m_sActionComment;
};
+ }
+
class UndoManagerGuard
{
public:
diff --git a/svl/source/uno/pathservice.cxx b/svl/source/uno/pathservice.cxx
index 6b428b160f64..3b4e0c178b2c 100644
--- a/svl/source/uno/pathservice.cxx
+++ b/svl/source/uno/pathservice.cxx
@@ -30,6 +30,8 @@ namespace com { namespace sun { namespace star { namespace uno {
class XComponentContext;
} } } }
+namespace {
+
class PathService : public ::cppu::WeakImplHelper< css::frame::XConfigManager, css::lang::XServiceInfo >
{
SvtPathOptions const m_aOptions;
@@ -73,6 +75,7 @@ public:
{}
};
+}
extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
com_sun_star_comp_svl_PathService_get_implementation(css::uno::XComponentContext*,