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 /sw/source/uibase/utlui/uitool.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 'sw/source/uibase/utlui/uitool.cxx')
-rw-r--r-- | sw/source/uibase/utlui/uitool.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sw/source/uibase/utlui/uitool.cxx b/sw/source/uibase/utlui/uitool.cxx index 2bac72c751fc..e2a3276464f1 100644 --- a/sw/source/uibase/utlui/uitool.cxx +++ b/sw/source/uibase/utlui/uitool.cxx @@ -179,7 +179,7 @@ void ConvertAttrGenToChar(SfxItemSet& rSet, const SfxItemSet& rOrigSet) // Fill header footer -void FillHdFt(SwFrameFormat* pFormat, const SfxItemSet& rSet) +static void FillHdFt(SwFrameFormat* pFormat, const SfxItemSet& rSet) { SwAttrSet aSet(pFormat->GetAttrSet()); aSet.Put(rSet); @@ -196,7 +196,7 @@ void FillHdFt(SwFrameFormat* pFormat, const SfxItemSet& rSet) } /// Convert from UseOnPage to SvxPageUsage. -SvxPageUsage lcl_convertUseToSvx(UseOnPage nUse) +static SvxPageUsage lcl_convertUseToSvx(UseOnPage nUse) { SvxPageUsage nRet = SvxPageUsage::NONE; if (nUse & UseOnPage::Left) @@ -211,7 +211,7 @@ SvxPageUsage lcl_convertUseToSvx(UseOnPage nUse) } /// Convert from SvxPageUsage to UseOnPage. -UseOnPage lcl_convertUseFromSvx(SvxPageUsage nUse) +static UseOnPage lcl_convertUseFromSvx(SvxPageUsage nUse) { UseOnPage nRet = UseOnPage::NONE; if (nUse == SvxPageUsage::Left) |