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 /vbahelper/source | |
| 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 'vbahelper/source')
| -rw-r--r-- | vbahelper/source/vbahelper/vbahelper.cxx | 6 | ||||
| -rw-r--r-- | vbahelper/source/vbahelper/vbawindowbase.cxx | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/vbahelper/source/vbahelper/vbahelper.cxx b/vbahelper/source/vbahelper/vbahelper.cxx index 8de423bf2810..4ebc80e743c4 100644 --- a/vbahelper/source/vbahelper/vbahelper.cxx +++ b/vbahelper/source/vbahelper/vbahelper.cxx @@ -83,7 +83,7 @@ namespace vba namespace { const double factor = 2540.0 / 72.0; } // helper method to determine if the view ( calc ) is in print-preview mode -bool isInPrintPreview( SfxViewFrame* pView ) +static bool isInPrintPreview( SfxViewFrame* pView ) { sal_uInt16 nViewNo = SID_VIEWSHELL1 - SID_VIEWSHELL0; if ( pView->GetObjectShell()->GetFactory().GetViewFactoryCount() > @@ -232,7 +232,7 @@ getCurrentDoc( const OUString& sKey ) } /// @throws uno::RuntimeException - uno::Reference< frame::XModel > +static uno::Reference< frame::XModel > getCurrentDocCtx( const OUString& ctxName, const uno::Reference< uno::XComponentContext >& xContext ) { uno::Reference< frame::XModel > xModel; @@ -556,7 +556,7 @@ ContainerUtilities::FieldInList( const uno::Sequence< OUString >& SearchList, co } -bool NeedEsc(sal_Unicode cCode) +static bool NeedEsc(sal_Unicode cCode) { return OUString(".^$+\\|{}()").indexOf(cCode) != -1; } diff --git a/vbahelper/source/vbahelper/vbawindowbase.cxx b/vbahelper/source/vbahelper/vbawindowbase.cxx index e37a53b46cdb..ebc67ef0c5d3 100644 --- a/vbahelper/source/vbahelper/vbawindowbase.cxx +++ b/vbahelper/source/vbahelper/vbawindowbase.cxx @@ -59,7 +59,7 @@ VbaWindowBase::setVisible( sal_Bool _visible ) getWindow2()->setVisible( _visible ); } -void setPosSize( const uno::Reference< awt::XWindow >& xWindow, sal_Int32 nValue, sal_Int16 nFlag ) +static void setPosSize( const uno::Reference< awt::XWindow >& xWindow, sal_Int32 nValue, sal_Int16 nFlag ) { css::awt::Rectangle aRect = xWindow->getPosSize(); switch( nFlag ) |