summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-05-05 13:11:02 +0200
committerNoel Grandin <noel@peralex.com>2015-05-05 14:05:20 +0200
commit0a442d38157190c77eb04d53a90520913b93226c (patch)
tree098c26d65ed949ec67ee92aebf0ce44b11914471 /sd
parent7d426e6fd681c6f0fb45a69f3ac7076817495135 (diff)
loplugin:staticmethods
Change-Id: I4d19f868a618cb135aa7a949222972dc35b47d2a
Diffstat (limited to 'sd')
-rw-r--r--sd/source/ui/inc/gluectrl.hxx4
-rw-r--r--sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx4
-rw-r--r--sd/source/ui/slidesorter/cache/SlsCacheConfiguration.hxx2
3 files changed, 5 insertions, 5 deletions
diff --git a/sd/source/ui/inc/gluectrl.hxx b/sd/source/ui/inc/gluectrl.hxx
index 6f7179311dd1..2c8d9c1b4416 100644
--- a/sd/source/ui/inc/gluectrl.hxx
+++ b/sd/source/ui/inc/gluectrl.hxx
@@ -33,7 +33,7 @@ class GlueEscDirLB : public ListBox
private:
::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > m_xFrame;
public:
- GlueEscDirLB( vcl::Window* pParent,
+ GlueEscDirLB( vcl::Window* pParent,
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame );
virtual ~GlueEscDirLB();
@@ -48,7 +48,7 @@ public:
class SdTbxCtlGlueEscDir: public SfxToolBoxControl
{
private:
- sal_uInt16 GetEscDirPos( SdrEscapeDirection nEscDir );
+ static sal_uInt16 GetEscDirPos( SdrEscapeDirection nEscDir );
public:
virtual void StateChanged( sal_uInt16 nSId, SfxItemState eState,
diff --git a/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx b/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx
index 876dfcf738f9..94eb6800ebfd 100644
--- a/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx
+++ b/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx
@@ -137,10 +137,10 @@ Any CacheConfiguration::GetValue (const OUString& rName)
return aResult;
}
-IMPL_LINK_NOARG_TYPED(CacheConfiguration, TimerCallback, Timer *, void)
+IMPL_STATIC_LINK_NOINSTANCE_NOARG_TYPED(CacheConfiguration, TimerCallback, Timer *, void)
{
CacheConfigSharedPtr &rInstancePtr = theInstance::get();
- // Release out reference to the instance.
+ // Release our reference to the instance.
rInstancePtr.reset();
}
diff --git a/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.hxx b/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.hxx
index 2ae271145510..2f55a20cae49 100644
--- a/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.hxx
+++ b/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.hxx
@@ -57,7 +57,7 @@ private:
CacheConfiguration();
- DECL_LINK_TYPED(TimerCallback, Timer *, void);
+ DECL_STATIC_LINK_TYPED(CacheConfiguration, TimerCallback, Timer *, void);
};
} } } // end of namespace ::sd::slidesorter::cache