summaryrefslogtreecommitdiff
path: root/svx/source/toolbars/extrusionbar.cxx
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2018-09-15 19:13:19 +0200
committerStephan Bergmann <sbergman@redhat.com>2018-09-17 09:05:38 +0200
commit206b5b2661be37efdff3c6aedb6f248c4636be79 (patch)
treeaf385e5b4725dcfea23988d9113cced8e9ccaf3c /svx/source/toolbars/extrusionbar.cxx
parenta85d3ba1c0de313b60324b9ecfa488bb99d69d06 (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 'svx/source/toolbars/extrusionbar.cxx')
-rw-r--r--svx/source/toolbars/extrusionbar.cxx16
1 files changed, 8 insertions, 8 deletions
diff --git a/svx/source/toolbars/extrusionbar.cxx b/svx/source/toolbars/extrusionbar.cxx
index c7fc165671bb..cf14a4a55448 100644
--- a/svx/source/toolbars/extrusionbar.cxx
+++ b/svx/source/toolbars/extrusionbar.cxx
@@ -78,7 +78,7 @@ ExtrusionBar::~ExtrusionBar()
SetRepeatTarget(nullptr);
}
-void getLightingDirectionDefaults( const Direction3D **pLighting1Defaults, const Direction3D **pLighting2Defaults )
+static void getLightingDirectionDefaults( const Direction3D **pLighting1Defaults, const Direction3D **pLighting2Defaults )
{
static const Direction3D aLighting1Defaults[9] =
@@ -608,7 +608,7 @@ void ExtrusionBar::execute( SdrView* pSdrView, SfxRequest const & rReq, SfxBindi
}
}
-void getExtrusionDirectionState( SdrView const * pSdrView, SfxItemSet& rSet )
+static void getExtrusionDirectionState( SdrView const * pSdrView, SfxItemSet& rSet )
{
const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList();
const size_t nCount = rMarkList.GetMarkCount();
@@ -755,7 +755,7 @@ void getExtrusionDirectionState( SdrView const * pSdrView, SfxItemSet& rSet )
rSet.DisableItem( SID_EXTRUSION_DIRECTION );
}
-void getExtrusionProjectionState( SdrView const * pSdrView, SfxItemSet& rSet )
+static void getExtrusionProjectionState( SdrView const * pSdrView, SfxItemSet& rSet )
{
const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList();
const size_t nCount = rMarkList.GetMarkCount();
@@ -810,7 +810,7 @@ void getExtrusionProjectionState( SdrView const * pSdrView, SfxItemSet& rSet )
rSet.DisableItem( SID_EXTRUSION_PROJECTION );
}
-void getExtrusionSurfaceState( SdrView const * pSdrView, SfxItemSet& rSet )
+static void getExtrusionSurfaceState( SdrView const * pSdrView, SfxItemSet& rSet )
{
const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList();
const size_t nCount = rMarkList.GetMarkCount();
@@ -895,7 +895,7 @@ void getExtrusionSurfaceState( SdrView const * pSdrView, SfxItemSet& rSet )
rSet.DisableItem( SID_EXTRUSION_SURFACE );
}
-void getExtrusionDepthState( SdrView const * pSdrView, SfxItemSet& rSet )
+static void getExtrusionDepthState( SdrView const * pSdrView, SfxItemSet& rSet )
{
const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList();
const size_t nCount = rMarkList.GetMarkCount();
@@ -974,7 +974,7 @@ static bool compare_direction( const Direction3D& d1, const Direction3D& d2 )
return false;
}
-void getExtrusionLightingDirectionState( SdrView const * pSdrView, SfxItemSet& rSet )
+static void getExtrusionLightingDirectionState( SdrView const * pSdrView, SfxItemSet& rSet )
{
const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList();
const size_t nCount = rMarkList.GetMarkCount();
@@ -1053,7 +1053,7 @@ void getExtrusionLightingDirectionState( SdrView const * pSdrView, SfxItemSet& r
rSet.DisableItem( SID_EXTRUSION_LIGHTING_DIRECTION );
}
-void getExtrusionLightingIntensityState( SdrView const * pSdrView, SfxItemSet& rSet )
+static void getExtrusionLightingIntensityState( SdrView const * pSdrView, SfxItemSet& rSet )
{
const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList();
const size_t nCount = rMarkList.GetMarkCount();
@@ -1120,7 +1120,7 @@ void getExtrusionLightingIntensityState( SdrView const * pSdrView, SfxItemSet& r
rSet.DisableItem( SID_EXTRUSION_LIGHTING_INTENSITY );
}
-void getExtrusionColorState( SdrView const * pSdrView, SfxItemSet& rSet )
+static void getExtrusionColorState( SdrView const * pSdrView, SfxItemSet& rSet )
{
const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList();
const size_t nCount = rMarkList.GetMarkCount();