summaryrefslogtreecommitdiff
path: root/extensions
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-03-24 10:49:28 +0200
committerNoel Grandin <noel@peralex.com>2015-03-24 10:51:22 +0200
commit858e455634ebfff8ef7b65a9c97d3bc8240cd094 (patch)
tree688dd5dbe73ee53ef4b84124632e045045b404d1 /extensions
parenta6df3c0babf409d8fc0bf52efd9c2fa74a95998e (diff)
loplugin:constantfunction: various
Change-Id: I6eddda9f4b31c7ce413c328b6a857a81bd222eed
Diffstat (limited to 'extensions')
-rw-r--r--extensions/source/bibliography/framectr.cxx21
-rw-r--r--extensions/source/bibliography/framectr.hxx3
-rw-r--r--extensions/source/bibliography/loadlisteneradapter.cxx12
-rw-r--r--extensions/source/bibliography/loadlisteneradapter.hxx3
4 files changed, 2 insertions, 37 deletions
diff --git a/extensions/source/bibliography/framectr.cxx b/extensions/source/bibliography/framectr.cxx
index 77ea3255c251..662bf4c641fa 100644
--- a/extensions/source/bibliography/framectr.cxx
+++ b/extensions/source/bibliography/framectr.cxx
@@ -153,19 +153,8 @@ BibFrameCtrl_Impl::~BibFrameCtrl_Impl()
{
}
-void BibFrameCtrl_Impl::frameAction(const FrameActionEvent& aEvent) throw( uno::RuntimeException, std::exception )
+void BibFrameCtrl_Impl::frameAction(const FrameActionEvent& ) throw( uno::RuntimeException, std::exception )
{
- if ( pController && aEvent.Frame == pController->getFrame())
- {
- if(aEvent.Action == FrameAction_FRAME_ACTIVATED)
- {
- pController->activate();
- }
- else if(aEvent.Action == FrameAction_FRAME_DEACTIVATING)
- {
- pController->deactivate();
- }
- }
}
void BibFrameCtrl_Impl::disposing( const lang::EventObject& /*Source*/ )
@@ -910,12 +899,4 @@ void BibFrameController_Impl::ChangeDataSource(const uno::Sequence< beans::Prope
}
}
-void BibFrameController_Impl::activate()
-{
-}
-void BibFrameController_Impl::deactivate()
-{
-}
-
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/bibliography/framectr.hxx b/extensions/source/bibliography/framectr.hxx
index 0319560a960c..81c4c56597e9 100644
--- a/extensions/source/bibliography/framectr.hxx
+++ b/extensions/source/bibliography/framectr.hxx
@@ -78,9 +78,6 @@ public:
virtual ~BibFrameController_Impl();
- void activate();
- void deactivate();
-
void ChangeDataSource(const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs);
void RemoveFilter();
diff --git a/extensions/source/bibliography/loadlisteneradapter.cxx b/extensions/source/bibliography/loadlisteneradapter.cxx
index be720a080d1e..58925c5b0966 100644
--- a/extensions/source/bibliography/loadlisteneradapter.cxx
+++ b/extensions/source/bibliography/loadlisteneradapter.cxx
@@ -44,12 +44,6 @@ namespace bib
}
- void OComponentListener::_disposing( const EventObject& /*_rSource*/ ) throw( RuntimeException)
- {
- // nothing to do here, override if you're interested in
- }
-
-
void OComponentListener::setAdapter( OComponentAdapterBase* pAdapter )
{
{
@@ -124,14 +118,10 @@ namespace bib
// XEventListener
- void SAL_CALL OComponentAdapterBase::disposing( const EventObject& _rSource ) throw( RuntimeException, std::exception )
+ void SAL_CALL OComponentAdapterBase::disposing( const EventObject& ) throw( RuntimeException, std::exception )
{
if ( m_pListener )
{
- // tell the listener
- if ( !locked() )
- m_pListener->_disposing( _rSource );
-
// disconnect the listener
if ( m_pListener ) // may have been reset whilest calling into _disposing
m_pListener->setAdapter( NULL );
diff --git a/extensions/source/bibliography/loadlisteneradapter.hxx b/extensions/source/bibliography/loadlisteneradapter.hxx
index 701f2129b9d3..29b921f34841 100644
--- a/extensions/source/bibliography/loadlisteneradapter.hxx
+++ b/extensions/source/bibliography/loadlisteneradapter.hxx
@@ -51,9 +51,6 @@ namespace bib
virtual ~OComponentListener();
- // XEventListener equivalents
- void _disposing( const ::com::sun::star::lang::EventObject& _rSource ) throw( ::com::sun::star::uno::RuntimeException );
-
protected:
void setAdapter( OComponentAdapterBase* _pAdapter );
};