diff options
author | Noel Grandin <noel@peralex.com> | 2015-07-14 11:27:52 +0200 |
---|---|---|
committer | Noel Grandin <noelgrandin@gmail.com> | 2015-07-14 10:21:55 +0000 |
commit | 06ea347b939895d3091ce747c26de58f4d4a766a (patch) | |
tree | e93a25d2aadc36c263a8ccd8b593449b37fb8b6b /framework | |
parent | 9be8c4f21200aeec5b334d9536b3b7a0b72c24fa (diff) |
loplugin:unusedmethods svtools
Change-Id: I04ad31055c04a247faddf4311943ca769051473c
Reviewed-on: https://gerrit.libreoffice.org/17032
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'framework')
12 files changed, 0 insertions, 101 deletions
diff --git a/framework/inc/uielement/fontmenucontroller.hxx b/framework/inc/uielement/fontmenucontroller.hxx index c54c7f3bbb90..fc3dc43145b7 100644 --- a/framework/inc/uielement/fontmenucontroller.hxx +++ b/framework/inc/uielement/fontmenucontroller.hxx @@ -64,7 +64,6 @@ namespace framework private: virtual void impl_setPopupMenu() SAL_OVERRIDE; - virtual void impl_select(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch >& _xDispatch,const ::com::sun::star::util::URL& aURL) SAL_OVERRIDE; void fillPopupMenu( const com::sun::star::uno::Sequence< OUString >& rFontNameSeq, com::sun::star::uno::Reference< com::sun::star::awt::XPopupMenu >& rPopupMenu ); OUString m_aFontFamilyName; diff --git a/framework/inc/uielement/fontsizemenucontroller.hxx b/framework/inc/uielement/fontsizemenucontroller.hxx index 30366e04bcad..e59e47b4271c 100644 --- a/framework/inc/uielement/fontsizemenucontroller.hxx +++ b/framework/inc/uielement/fontsizemenucontroller.hxx @@ -62,7 +62,6 @@ namespace framework private: virtual void impl_setPopupMenu() SAL_OVERRIDE; - virtual void impl_select(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch >& _xDispatch,const ::com::sun::star::util::URL& aURL) SAL_OVERRIDE; void setCurHeight( long nHeight, com::sun::star::uno::Reference< com::sun::star::awt::XPopupMenu >& rPopupMenu ); void fillPopupMenu( com::sun::star::uno::Reference< com::sun::star::awt::XPopupMenu >& rPopupMenu ); OUString retrievePrinterName( com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame ); diff --git a/framework/inc/uielement/headermenucontroller.hxx b/framework/inc/uielement/headermenucontroller.hxx index 6849e7577229..1fe19906f731 100644 --- a/framework/inc/uielement/headermenucontroller.hxx +++ b/framework/inc/uielement/headermenucontroller.hxx @@ -62,7 +62,6 @@ namespace framework virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& Source ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; private: - virtual void impl_select(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch >& _xDispatch,const ::com::sun::star::util::URL& aURL) SAL_OVERRIDE; void fillPopupMenu( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& rModel, com::sun::star::uno::Reference< com::sun::star::awt::XPopupMenu >& rPopupMenu ); ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > m_xModel; diff --git a/framework/inc/uielement/langselectionmenucontroller.hxx b/framework/inc/uielement/langselectionmenucontroller.hxx index 8a0f46b06a22..e22f4de43d4c 100644 --- a/framework/inc/uielement/langselectionmenucontroller.hxx +++ b/framework/inc/uielement/langselectionmenucontroller.hxx @@ -67,7 +67,6 @@ namespace framework private: virtual void impl_setPopupMenu() SAL_OVERRIDE; - virtual void impl_select(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch >& _xDispatch,const ::com::sun::star::util::URL& aURL) SAL_OVERRIDE; enum Mode { MODE_SetLanguageSelectionMenu, diff --git a/framework/inc/uielement/macrosmenucontroller.hxx b/framework/inc/uielement/macrosmenucontroller.hxx index 74f78659dd4f..d8803971beeb 100644 --- a/framework/inc/uielement/macrosmenucontroller.hxx +++ b/framework/inc/uielement/macrosmenucontroller.hxx @@ -70,7 +70,6 @@ namespace framework virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& Source ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; private: - virtual void impl_select(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch >& _xDispatch,const ::com::sun::star::util::URL& aURL) SAL_OVERRIDE; void fillPopupMenu( com::sun::star::uno::Reference< com::sun::star::awt::XPopupMenu >& rPopupMenu ); OUString RetrieveLabelFromCommand(const OUString& rCmdURL); void addScriptItems( PopupMenu* pPopupMenu, sal_uInt16 startItemId ); diff --git a/framework/source/uielement/controlmenucontroller.cxx b/framework/source/uielement/controlmenucontroller.cxx index 5f222ddec194..f37038e6817d 100644 --- a/framework/source/uielement/controlmenucontroller.cxx +++ b/framework/source/uielement/controlmenucontroller.cxx @@ -219,7 +219,6 @@ public: private: virtual void impl_setPopupMenu() SAL_OVERRIDE; - virtual void impl_select(const uno::Reference< frame::XDispatch >& _xDispatch,const util::URL& aURL) SAL_OVERRIDE; class UrlToDispatchMap : public std::unordered_map< OUString, uno::Reference< frame::XDispatch >, @@ -361,18 +360,6 @@ void SAL_CALL ControlMenuController::statusChanged( const FeatureStateEvent& Eve } // XMenuListener -void ControlMenuController::impl_select(const Reference< XDispatch >& /*_xDispatch*/,const ::com::sun::star::util::URL& aURL) -{ - UrlToDispatchMap::iterator pIter = m_aURLToDispatchMap.find( aURL.Complete ); - if ( pIter != m_aURLToDispatchMap.end() ) - { - Sequence<PropertyValue> aArgs; - Reference< XDispatch > xDispatch = pIter->second; - if ( xDispatch.is() ) - xDispatch->dispatch( aURL, aArgs ); - } -} - void SAL_CALL ControlMenuController::itemActivated( const css::awt::MenuEvent& ) throw (RuntimeException, std::exception) { osl::ResettableMutexGuard aLock( m_aMutex ); diff --git a/framework/source/uielement/fontmenucontroller.cxx b/framework/source/uielement/fontmenucontroller.cxx index 41bf4ca15275..71176480a40a 100644 --- a/framework/source/uielement/fontmenucontroller.cxx +++ b/framework/source/uielement/fontmenucontroller.cxx @@ -147,14 +147,6 @@ void SAL_CALL FontMenuController::statusChanged( const FeatureStateEvent& Event } // XMenuListener -void FontMenuController::impl_select(const Reference< XDispatch >& _xDispatch,const ::com::sun::star::util::URL& aTargetURL) -{ - Sequence<PropertyValue> aArgs; - OSL_ENSURE(_xDispatch.is(),"FontMenuController::impl_select: No dispatch"); - if ( _xDispatch.is() ) - _xDispatch->dispatch( aTargetURL, aArgs ); -} - void SAL_CALL FontMenuController::itemActivated( const css::awt::MenuEvent& ) throw (RuntimeException, std::exception) { osl::MutexGuard aLock( m_aMutex ); diff --git a/framework/source/uielement/fontsizemenucontroller.cxx b/framework/source/uielement/fontsizemenucontroller.cxx index 97b2d1baab7e..fa4b07b32676 100644 --- a/framework/source/uielement/fontsizemenucontroller.cxx +++ b/framework/source/uielement/fontsizemenucontroller.cxx @@ -278,15 +278,6 @@ void SAL_CALL FontSizeMenuController::statusChanged( const FeatureStateEvent& Ev } } -// XMenuListener -void FontSizeMenuController::impl_select(const Reference< XDispatch >& _xDispatch,const ::com::sun::star::util::URL& aTargetURL) -{ - Sequence<PropertyValue> aArgs; - OSL_ENSURE(_xDispatch.is(),"FontSizeMenuController::impl_select: No dispatch"); - if ( _xDispatch.is() ) - _xDispatch->dispatch( aTargetURL, aArgs ); -} - // XPopupMenuController void FontSizeMenuController::impl_setPopupMenu() { diff --git a/framework/source/uielement/headermenucontroller.cxx b/framework/source/uielement/headermenucontroller.cxx index 7931af4e2dce..abbcac413c21 100644 --- a/framework/source/uielement/headermenucontroller.cxx +++ b/framework/source/uielement/headermenucontroller.cxx @@ -210,14 +210,6 @@ void SAL_CALL HeaderMenuController::statusChanged( const FeatureStateEvent& Even } // XMenuListener -void HeaderMenuController::impl_select(const Reference< XDispatch >& _xDispatch,const ::com::sun::star::util::URL& aTargetURL) -{ - Sequence<PropertyValue> aArgs; - OSL_ENSURE(_xDispatch.is(),"HeaderMenuController::impl_select: No dispatch"); - if ( _xDispatch.is() ) - _xDispatch->dispatch( aTargetURL, aArgs ); -} - void SAL_CALL HeaderMenuController::updatePopupMenu() throw (::com::sun::star::uno::RuntimeException, std::exception) { osl::ResettableMutexGuard aLock( m_aMutex ); diff --git a/framework/source/uielement/langselectionmenucontroller.cxx b/framework/source/uielement/langselectionmenucontroller.cxx index 0cafd9aac45f..17b689d1aad1 100644 --- a/framework/source/uielement/langselectionmenucontroller.cxx +++ b/framework/source/uielement/langselectionmenucontroller.cxx @@ -128,38 +128,6 @@ void SAL_CALL LanguageSelectionMenuController::statusChanged( const FeatureState } } -// XMenuListener -void LanguageSelectionMenuController::impl_select(const Reference< XDispatch >& _xDispatch,const ::com::sun::star::util::URL& aTargetURL) -{ - Reference< XDispatch > xDispatch = _xDispatch; - - if ( aTargetURL.Complete == m_aMenuCommandURL_Font ) - { //open format/character dialog for current selection - xDispatch = m_xMenuDispatch_Font; - } - else if ( aTargetURL.Complete == m_aMenuCommandURL_Lang ) - { //open language tab-page in tools/options dialog - xDispatch = m_xMenuDispatch_Lang; - } - else if ( aTargetURL.Complete == m_aMenuCommandURL_CharDlgForParagraph ) - { //open format/character dialog for current selection - xDispatch = m_xMenuDispatch_CharDlgForParagraph; - } - - if ( !xDispatch.is() ) - { - Reference< XDispatchProvider > xDispatchProvider( m_xFrame, UNO_QUERY ); - if ( xDispatchProvider.is() ) - xDispatch = xDispatchProvider->queryDispatch( aTargetURL, OUString(), 0 ); - } - - if ( xDispatch.is() ) - { - Sequence<PropertyValue> aArgs; - xDispatch->dispatch( aTargetURL, aArgs ); - } -} - // XPopupMenuController void LanguageSelectionMenuController::impl_setPopupMenu() { diff --git a/framework/source/uielement/macrosmenucontroller.cxx b/framework/source/uielement/macrosmenucontroller.cxx index cd0703fd40d5..adc215eda5fa 100644 --- a/framework/source/uielement/macrosmenucontroller.cxx +++ b/framework/source/uielement/macrosmenucontroller.cxx @@ -122,22 +122,6 @@ void SAL_CALL MacrosMenuController::statusChanged( const FeatureStateEvent& ) th } } -// XMenuListener -void MacrosMenuController::impl_select(const Reference< XDispatch >& /*_xDispatch*/,const ::com::sun::star::util::URL& aTargetURL) -{ - // need to requery, since we handle more than one type of Command - // if we don't do this only .uno:ScriptOrganizer commands are executed - Reference< XDispatchProvider > xDispatchProvider( m_xFrame, UNO_QUERY ); - Reference< XDispatch > xDispatch = xDispatchProvider->queryDispatch( aTargetURL, OUString(), 0 ); - if( xDispatch.is() ) - { - ExecuteInfo* pExecuteInfo = new ExecuteInfo; - pExecuteInfo->xDispatch = xDispatch; - pExecuteInfo->aTargetURL = aTargetURL; - Application::PostUserEvent( LINK(0, MacrosMenuController , ExecuteHdl_Impl), pExecuteInfo ); - } -} - IMPL_STATIC_LINK( MacrosMenuController, ExecuteHdl_Impl, ExecuteInfo*, pExecuteInfo ) { try diff --git a/framework/source/uielement/objectmenucontroller.cxx b/framework/source/uielement/objectmenucontroller.cxx index a3842eecb664..ef7968e7462e 100644 --- a/framework/source/uielement/objectmenucontroller.cxx +++ b/framework/source/uielement/objectmenucontroller.cxx @@ -88,7 +88,6 @@ public: private: void fillPopupMenu( const css::uno::Sequence< css::embed::VerbDescriptor >& rVerbCommandSeq, css::uno::Reference< css::awt::XPopupMenu >& rPopupMenu ); - virtual void impl_select(const css::uno::Reference< css::frame::XDispatch >& _xDispatch,const css::util::URL& aURL) SAL_OVERRIDE; css::uno::Reference< css::frame::XDispatch > m_xObjectUpdateDispatch; }; @@ -161,15 +160,6 @@ void SAL_CALL ObjectMenuController::statusChanged( const FeatureStateEvent& Even } } -// XMenuListener -void ObjectMenuController::impl_select(const Reference< XDispatch >& _xDispatch,const ::com::sun::star::util::URL& aTargetURL) -{ - Sequence<PropertyValue> aArgs; - OSL_ENSURE(_xDispatch.is(),"ObjectMenuController::impl_select: No dispatch"); - if ( _xDispatch.is() ) - _xDispatch->dispatch( aTargetURL, aArgs ); -} - } extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL |