diff options
Diffstat (limited to 'framework/source')
| -rw-r--r-- | framework/source/uiconfiguration/imagemanagerimpl.hxx | 1 | ||||
| -rw-r--r-- | framework/source/uielement/macrosmenucontroller.cxx | 16 |
2 files changed, 0 insertions, 17 deletions
diff --git a/framework/source/uiconfiguration/imagemanagerimpl.hxx b/framework/source/uiconfiguration/imagemanagerimpl.hxx index a72e8274bb43..fac7f3533904 100644 --- a/framework/source/uiconfiguration/imagemanagerimpl.hxx +++ b/framework/source/uiconfiguration/imagemanagerimpl.hxx @@ -66,7 +66,6 @@ namespace framework protected: void impl_fillCommandToImageNameMap(); ImageList* impl_getImageList( sal_Int16 nImageType ); - std::vector< OUString >& impl_getImageNameVector() { return m_aImageNameVector;} std::vector< OUString >& impl_getImageCommandNameVector() { return m_aImageCommandNameVector;} private: diff --git a/framework/source/uielement/macrosmenucontroller.cxx b/framework/source/uielement/macrosmenucontroller.cxx index adc215eda5fa..132771b07f54 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 } } -IMPL_STATIC_LINK( MacrosMenuController, ExecuteHdl_Impl, ExecuteInfo*, pExecuteInfo ) -{ - try - { - // Asynchronous execution as this can lead to our own destruction! - // Framework can recycle our current frame and the layout manager disposes all user interface - // elements if a component gets detached from its frame! - pExecuteInfo->xDispatch->dispatch( pExecuteInfo->aTargetURL, pExecuteInfo->aArgs ); - } - catch ( const Exception& ) - { - } - delete pExecuteInfo; - return 0; -} - OUString MacrosMenuController::RetrieveLabelFromCommand(const OUString& rCmdURL) { bool bModuleIdentified = !m_aModuleIdentifier.isEmpty(); |