diff options
| -rw-r--r-- | framework/source/uielement/generictoolbarcontroller.cxx | 8 | ||||
| -rw-r--r-- | svtools/source/uno/generictoolboxcontroller.cxx | 9 | ||||
| -rw-r--r-- | svtools/source/uno/toolboxcontroller.cxx | 2 |
3 files changed, 6 insertions, 13 deletions
diff --git a/framework/source/uielement/generictoolbarcontroller.cxx b/framework/source/uielement/generictoolbarcontroller.cxx index 2cb2541c6c89..12f6d4f3558a 100644 --- a/framework/source/uielement/generictoolbarcontroller.cxx +++ b/framework/source/uielement/generictoolbarcontroller.cxx @@ -123,7 +123,6 @@ void SAL_CALL GenericToolbarController::dispose() void SAL_CALL GenericToolbarController::execute( sal_Int16 KeyModifier ) { Reference< XDispatch > xDispatch; - Reference< XURLTransformer > xURLTransformer; OUString aCommandURL; { @@ -136,8 +135,6 @@ void SAL_CALL GenericToolbarController::execute( sal_Int16 KeyModifier ) m_xFrame.is() && !m_aCommandURL.isEmpty() ) { - xURLTransformer = URLTransformer::create(m_xContext); - aCommandURL = m_aCommandURL; URLToDispatchMap::iterator pIter = m_aListenerMap.find( m_aCommandURL ); if ( pIter != m_aListenerMap.end() ) @@ -145,7 +142,7 @@ void SAL_CALL GenericToolbarController::execute( sal_Int16 KeyModifier ) } } - if ( xDispatch.is() && xURLTransformer.is() ) + if ( xDispatch.is() ) { css::util::URL aTargetURL; Sequence<PropertyValue> aArgs( 1 ); @@ -155,7 +152,8 @@ void SAL_CALL GenericToolbarController::execute( sal_Int16 KeyModifier ) aArgs[0].Value <<= KeyModifier; aTargetURL.Complete = aCommandURL; - xURLTransformer->parseStrict( aTargetURL ); + if ( m_xUrlTransformer.is() ) + m_xUrlTransformer->parseStrict( aTargetURL ); // Execute dispatch asynchronously ExecuteInfo* pExecuteInfo = new ExecuteInfo; diff --git a/svtools/source/uno/generictoolboxcontroller.cxx b/svtools/source/uno/generictoolboxcontroller.cxx index dd03972489b1..0ab20dc6a20e 100644 --- a/svtools/source/uno/generictoolboxcontroller.cxx +++ b/svtools/source/uno/generictoolboxcontroller.cxx @@ -81,7 +81,6 @@ void SAL_CALL GenericToolboxController::dispose() void SAL_CALL GenericToolboxController::execute( sal_Int16 /*KeyModifier*/ ) { Reference< XDispatch > xDispatch; - Reference< XURLTransformer > xURLTransformer; OUString aCommandURL; { @@ -92,11 +91,8 @@ void SAL_CALL GenericToolboxController::execute( sal_Int16 /*KeyModifier*/ ) if ( m_bInitialized && m_xFrame.is() && - m_xContext.is() && !m_aCommandURL.isEmpty() ) { - xURLTransformer = URLTransformer::create( m_xContext ); - aCommandURL = m_aCommandURL; URLToDispatchMap::iterator pIter = m_aListenerMap.find( m_aCommandURL ); if ( pIter != m_aListenerMap.end() ) @@ -104,13 +100,14 @@ void SAL_CALL GenericToolboxController::execute( sal_Int16 /*KeyModifier*/ ) } } - if ( xDispatch.is() && xURLTransformer.is() ) + if ( xDispatch.is() ) { css::util::URL aTargetURL; Sequence<PropertyValue> aArgs; aTargetURL.Complete = aCommandURL; - xURLTransformer->parseStrict( aTargetURL ); + if ( m_xUrlTransformer.is() ) + m_xUrlTransformer->parseStrict( aTargetURL ); // Execute dispatch asynchronously ExecuteInfo* pExecuteInfo = new ExecuteInfo; diff --git a/svtools/source/uno/toolboxcontroller.cxx b/svtools/source/uno/toolboxcontroller.cxx index 32ce1a781764..4d802f1d7763 100644 --- a/svtools/source/uno/toolboxcontroller.cxx +++ b/svtools/source/uno/toolboxcontroller.cxx @@ -324,10 +324,8 @@ void SAL_CALL ToolboxController::execute( sal_Int16 KeyModifier ) if ( m_bInitialized && m_xFrame.is() && - m_xContext.is() && !m_aCommandURL.isEmpty() ) { - aCommandURL = m_aCommandURL; URLToDispatchMap::iterator pIter = m_aListenerMap.find( m_aCommandURL ); if ( pIter != m_aListenerMap.end() ) |