diff options
Diffstat (limited to 'framework/source/dispatch/interceptionhelper.cxx')
-rw-r--r-- | framework/source/dispatch/interceptionhelper.cxx | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/framework/source/dispatch/interceptionhelper.cxx b/framework/source/dispatch/interceptionhelper.cxx index 3363805299f8..40cfe404edc3 100644 --- a/framework/source/dispatch/interceptionhelper.cxx +++ b/framework/source/dispatch/interceptionhelper.cxx @@ -17,22 +17,24 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <dispatch/dispatchprovider.hxx> #include <dispatch/interceptionhelper.hxx> #include <com/sun/star/frame/XInterceptorInfo.hpp> #include <com/sun/star/lang/DisposedException.hpp> #include <osl/diagnose.h> +#include <utility> #include <vcl/svapp.hxx> -#include <tools/diagnose_ex.h> +#include <comphelper/diagnose_ex.hxx> using namespace com::sun::star; namespace framework{ InterceptionHelper::InterceptionHelper(const css::uno::Reference< css::frame::XFrame >& xOwner, - const css::uno::Reference< css::frame::XDispatchProvider >& xSlave) + rtl::Reference< DispatchProvider > xSlave) : m_xOwnerWeak (xOwner ) - , m_xSlave (xSlave ) + , m_xSlave (std::move(xSlave )) { } @@ -116,10 +118,7 @@ void SAL_CALL InterceptionHelper::registerDispatchProviderInterceptor(const css: if (xInfo.is()) aInfo.lURLPattern = xInfo->getInterceptedURLs(); else - { - aInfo.lURLPattern.realloc(1); - aInfo.lURLPattern[0] = "*"; - } + aInfo.lURLPattern = { "*" }; // SAFE { SolarMutexClearableGuard aWriteLock; @@ -237,7 +236,7 @@ void SAL_CALL InterceptionHelper::disposing(const css::lang::EventObject& aEvent // We need a full copy of all currently registered interceptor objects. // Otherwise we can't iterate over this vector without the risk, that our iterator will be invalid. - // Because this vetor will be influenced by every deregistered interceptor. + // Because this vector will be influenced by every deregistered interceptor. InterceptionHelper::InterceptorList aCopy = m_lInterceptionRegs; aReadLock.clear(); |