diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2018-09-15 19:13:19 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2018-09-17 09:05:38 +0200 |
commit | 206b5b2661be37efdff3c6aedb6f248c4636be79 (patch) | |
tree | af385e5b4725dcfea23988d9113cced8e9ccaf3c /sfx2/source/dialog/templdlg.cxx | |
parent | a85d3ba1c0de313b60324b9ecfa488bb99d69d06 (diff) |
New loplugin:external
...warning about (for now only) functions and variables with external linkage
that likely don't need it.
The problems with moving entities into unnamed namespacs and breaking ADL
(as alluded to in comments in compilerplugins/clang/external.cxx) are
illustrated by the fact that while
struct S1 { int f() { return 0; } };
int f(S1 s) { return s.f(); }
namespace N {
struct S2: S1 { int f() { return 1; } };
int f(S2 s) { return s.f(); }
}
int main() { return f(N::S2()); }
returns 1, both moving just the struct S2 into an nunnamed namespace,
struct S1 { int f() { return 0; } };
int f(S1 s) { return s.f(); }
namespace N {
namespace { struct S2: S1 { int f() { return 1; } }; }
int f(S2 s) { return s.f(); }
}
int main() { return f(N::S2()); }
as well as moving just the function f overload into an unnamed namespace,
struct S1 { int f() { return 0; } };
int f(S1 s) { return s.f(); }
namespace N {
struct S2: S1 { int f() { return 1; } };
namespace { int f(S2 s) { return s.f(); } }
}
int main() { return f(N::S2()); }
would each change the program to return 0 instead.
Change-Id: I4d09f7ac5e8f9bcd6e6bde4712608444b642265c
Reviewed-on: https://gerrit.libreoffice.org/60539
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'sfx2/source/dialog/templdlg.cxx')
-rw-r--r-- | sfx2/source/dialog/templdlg.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx index 50d6f4764d96..88042ea54ea4 100644 --- a/sfx2/source/dialog/templdlg.cxx +++ b/sfx2/source/dialog/templdlg.cxx @@ -521,7 +521,7 @@ public: }; -void MakeTree_Impl(StyleTreeArr_Impl& rArr) +static void MakeTree_Impl(StyleTreeArr_Impl& rArr) { const comphelper::string::NaturalStringSorter aSorter( ::comphelper::getProcessComponentContext(), @@ -564,7 +564,7 @@ void MakeTree_Impl(StyleTreeArr_Impl& rArr) }); } -inline bool IsExpanded_Impl( const std::vector<OUString>& rEntries, +static inline bool IsExpanded_Impl( const std::vector<OUString>& rEntries, const OUString &rStr) { for (const auto & rEntry : rEntries) @@ -575,7 +575,7 @@ inline bool IsExpanded_Impl( const std::vector<OUString>& rEntries, return false; } -SvTreeListEntry* FillBox_Impl(SvTreeListBox* pBox, +static SvTreeListEntry* FillBox_Impl(SvTreeListBox* pBox, StyleTree_Impl* pEntry, const std::vector<OUString>& rEntries, SfxStyleFamily eStyleFamily, @@ -601,7 +601,7 @@ SvTreeListEntry* FillBox_Impl(SvTreeListBox* pBox, namespace SfxTemplate { // converts from SFX_STYLE_FAMILY Ids to 1-6 - sal_uInt16 SfxFamilyIdToNId(SfxStyleFamily nFamily) + static sal_uInt16 SfxFamilyIdToNId(SfxStyleFamily nFamily) { switch ( nFamily ) { @@ -616,7 +616,7 @@ namespace SfxTemplate } // converts from 1-6 to SFX_STYLE_FAMILY Ids - SfxStyleFamily NIdToSfxFamilyId(sal_uInt16 nId) + static SfxStyleFamily NIdToSfxFamilyId(sal_uInt16 nId) { switch (nId) { |