mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use rtl::Reference to avoid a dynamic_cast

Browse Source 
Change-Id: I3b9781cf00df7b740c8b29c6834e54035b255269
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144327
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
This commit is contained in:
Stephan Bergmann
2022-12-14 20:04:11 +01:00
parent ef52648227
commit 557615d974
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
framework/source/services/frame.cxx
View File

@@ -71,6 +71,7 @@
#include <comphelper/multicontainer2.hxx> #include <comphelper/multicontainer2.hxx>
#include <cppuhelper/supportsservice.hxx> #include <cppuhelper/supportsservice.hxx>
#include <cppuhelper/weak.hxx> #include <cppuhelper/weak.hxx>
#include <rtl/ref.hxx>
#include <sal/log.hxx> #include <sal/log.hxx>
#include <vcl/window.hxx> #include <vcl/window.hxx>
#include <vcl/wrkwin.hxx> #include <vcl/wrkwin.hxx>
@@ -374,7 +375,7 @@ private:
/// points to an external set progress, which should be used instead of the internal one. /// points to an external set progress, which should be used instead of the internal one.
css::uno::WeakReference< css::task::XStatusIndicator > m_xIndicatorInterception; css::uno::WeakReference< css::task::XStatusIndicator > m_xIndicatorInterception;
/// helper for XDispatch/Provider and interception interfaces /// helper for XDispatch/Provider and interception interfaces
css::uno::Reference< css::frame::XDispatchProvider > m_xDispatchHelper; rtl::Reference< InterceptionHelper > m_xDispatchHelper;
/// helper for XFrames, XIndexAccess and XElementAccess interfaces /// helper for XFrames, XIndexAccess and XElementAccess interfaces
css::uno::Reference< css::frame::XFrames > m_xFramesHelper; css::uno::Reference< css::frame::XFrames > m_xFramesHelper;
/// container for ALL Listener /// container for ALL Listener
@@ -1474,10 +1475,9 @@ sal_Bool SAL_CALL XFrameImpl::setComponent(const css::uno::Reference< css::awt::
SolarMutexGuard aWriteLock; SolarMutexGuard aWriteLock;
m_xController = nullptr; m_xController = nullptr;
auto pInterceptionHelper = dynamic_cast<InterceptionHelper*>(m_xDispatchHelper.get()); if (m_xDispatchHelper)
if (pInterceptionHelper)
{ {
rtl::Reference<DispatchProvider> pDispatchProvider = pInterceptionHelper->GetSlave(); rtl::Reference<DispatchProvider> pDispatchProvider = m_xDispatchHelper->GetSlave();
if (pDispatchProvider) if (pDispatchProvider)
{ {
pDispatchProvider->ClearProtocolHandlers(); pDispatchProvider->ClearProtocolHandlers();
@@ -2117,7 +2117,7 @@ void SAL_CALL XFrameImpl::disposing()
css::uno::Reference< css::lang::XEventListener > xDispatchHelper; css::uno::Reference< css::lang::XEventListener > xDispatchHelper;
{ {
SolarMutexGuard g; SolarMutexGuard g;
xDispatchHelper.set(m_xDispatchHelper, css::uno::UNO_QUERY_THROW); xDispatchHelper = m_xDispatchHelper;
} }
xDispatchHelper->disposing(aEvent); xDispatchHelper->disposing(aEvent);
xDispatchHelper.clear(); xDispatchHelper.clear();
@@ -2383,7 +2383,7 @@ void SAL_CALL XFrameImpl::registerDispatchProviderInterceptor(
css::uno::Reference< css::frame::XDispatchProviderInterception > xInterceptionHelper; css::uno::Reference< css::frame::XDispatchProviderInterception > xInterceptionHelper;
{ {
SolarMutexGuard g; SolarMutexGuard g;
xInterceptionHelper.set( m_xDispatchHelper, css::uno::UNO_QUERY ); xInterceptionHelper = m_xDispatchHelper;
} }
if (xInterceptionHelper.is()) { if (xInterceptionHelper.is()) {
xInterceptionHelper->registerDispatchProviderInterceptor( xInterceptor ); xInterceptionHelper->registerDispatchProviderInterceptor( xInterceptor );
@@ -2402,7 +2402,7 @@ void SAL_CALL XFrameImpl::releaseDispatchProviderInterceptor(
css::uno::Reference< css::frame::XDispatchProviderInterception > xInterceptionHelper; css::uno::Reference< css::frame::XDispatchProviderInterception > xInterceptionHelper;
{ {
SolarMutexGuard g; SolarMutexGuard g;
xInterceptionHelper.set( m_xDispatchHelper, css::uno::UNO_QUERY ); xInterceptionHelper = m_xDispatchHelper;
} }
if (xInterceptionHelper.is()) { if (xInterceptionHelper.is()) {
xInterceptionHelper->releaseDispatchProviderInterceptor( xInterceptor ); xInterceptionHelper->releaseDispatchProviderInterceptor( xInterceptor );