summaryrefslogtreecommitdiff
path: root/framework/source/dispatch/interceptionhelper.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'framework/source/dispatch/interceptionhelper.cxx')
-rw-r--r--framework/source/dispatch/interceptionhelper.cxx19
1 files changed, 1 insertions, 18 deletions
diff --git a/framework/source/dispatch/interceptionhelper.cxx b/framework/source/dispatch/interceptionhelper.cxx
index 49ff66cd01f1..ca438acb1079 100644
--- a/framework/source/dispatch/interceptionhelper.cxx
+++ b/framework/source/dispatch/interceptionhelper.cxx
@@ -25,8 +25,6 @@
namespace framework{
-bool InterceptionHelper::m_bPreferrFirstInterceptor = true;
-
InterceptionHelper::InterceptionHelper(const css::uno::Reference< css::frame::XFrame >& xOwner,
const css::uno::Reference< css::frame::XDispatchProvider >& xSlave)
: m_xOwnerWeak (xOwner )
@@ -134,9 +132,8 @@ void SAL_CALL InterceptionHelper::registerDispatchProviderInterceptor(const css:
// because we created it. But we have to look for the static bool which
// regulate direction of using of interceptor objects!
- // b1) If "m_bPreferrFirstInterceptor" is set to true, we have to
// insert it behind any other existing interceptor - means at the end of our list.
- else if (m_bPreferrFirstInterceptor)
+ else
{
css::uno::Reference< css::frame::XDispatchProvider > xMasterD = m_lInterceptionRegs.rbegin()->xInterceptor;
css::uno::Reference< css::frame::XDispatchProviderInterceptor > xMasterI (xMasterD, css::uno::UNO_QUERY);
@@ -148,20 +145,6 @@ void SAL_CALL InterceptionHelper::registerDispatchProviderInterceptor(const css:
m_lInterceptionRegs.push_back(aInfo);
}
- // b2) If "m_bPreferrFirstInterceptor" is set to false, we have to
- // insert it before any other existing interceptor - means at the beginning of our list.
- else
- {
- css::uno::Reference< css::frame::XDispatchProvider > xSlaveD = m_lInterceptionRegs.begin()->xInterceptor;
- css::uno::Reference< css::frame::XDispatchProviderInterceptor > xSlaveI (xSlaveD , css::uno::UNO_QUERY);
-
- xInterceptor->setMasterDispatchProvider(xThis );
- xInterceptor->setSlaveDispatchProvider (xSlaveD );
- xSlaveI->setMasterDispatchProvider (aInfo.xInterceptor);
-
- m_lInterceptionRegs.push_front(aInfo);
- }
-
css::uno::Reference< css::frame::XFrame > xOwner(m_xOwnerWeak.get(), css::uno::UNO_QUERY);
aWriteLock.clear();