framework/inc/uielement/statusbarwrapper.hxx | 5 ++-
framework/inc/uielement/toolbarwrapper.hxx | 5 ++-
framework/source/uielement/statusbarwrapper.cxx | 16 +++--------
framework/source/uielement/toolbarwrapper.cxx | 33 ++++++++----------------
4 files changed, 22 insertions(+), 37 deletions(-)
New commits:
commit ba1c844fe8735702af31f79843221c5b94af8fe1
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Wed Nov 8 15:11:43 2023 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Fri Nov 10 09:53:17 2023 +0100
loplugin:fieldcast in framework::StatusBarWrapper
Change-Id: I10198364323ed1886f6f356c964fc68bab8627e7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159254
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/framework/inc/uielement/statusbarwrapper.hxx
b/framework/inc/uielement/statusbarwrapper.hxx
index 203ae6956a16..c281b4f4866f 100644
--- a/framework/inc/uielement/statusbarwrapper.hxx
+++ b/framework/inc/uielement/statusbarwrapper.hxx
@@ -20,12 +20,13 @@
#pragma once
#include <helper/uiconfigelementwrapperbase.hxx>
-
+#include <rtl/ref.hxx>
#include <com/sun/star/lang/XComponent.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
namespace framework
{
+class StatusBarManager;
class StatusBarWrapper final : public UIConfigElementWrapperBase
{
@@ -47,7 +48,7 @@ class StatusBarWrapper final : public
UIConfigElementWrapperBase
virtual void SAL_CALL updateSettings() override;
private:
- css::uno::Reference< css::lang::XComponent >
m_xStatusBarManager;
+ rtl::Reference< StatusBarManager >
m_xStatusBarManager;
css::uno::Reference< css::uno::XComponentContext > m_xContext;
};
diff --git a/framework/source/uielement/statusbarwrapper.cxx
b/framework/source/uielement/statusbarwrapper.cxx
index 8ce6e48e5eb1..845a0b9269cf 100644
--- a/framework/source/uielement/statusbarwrapper.cxx
+++ b/framework/source/uielement/statusbarwrapper.cxx
@@ -137,11 +137,9 @@ void SAL_CALL StatusBarWrapper::updateSettings()
try
{
- StatusBarManager* pStatusBarManager = static_cast< StatusBarManager
*>( m_xStatusBarManager.get() );
-
m_xConfigData = m_xConfigSource->getSettings( m_aResourceURL, false );
if ( m_xConfigData.is() )
- pStatusBarManager->FillStatusBar( m_xConfigData );
+ m_xStatusBarManager->FillStatusBar( m_xConfigData );
}
catch ( const NoSuchElementException& )
{
@@ -152,15 +150,11 @@ Reference< XInterface > SAL_CALL
StatusBarWrapper::getRealInterface()
{
SolarMutexGuard g;
- if ( m_xStatusBarManager.is() )
+ if ( m_xStatusBarManager )
{
- StatusBarManager* pStatusBarManager = static_cast< StatusBarManager
*>( m_xStatusBarManager.get() );
- if ( pStatusBarManager )
- {
- vcl::Window* pWindow = pStatusBarManager->GetStatusBar();
- if ( pWindow )
- return Reference< XInterface >( VCLUnoHelper::GetInterface(
pWindow ), UNO_QUERY );
- }
+ vcl::Window* pWindow = m_xStatusBarManager->GetStatusBar();
+ if ( pWindow )
+ return Reference< XInterface >( VCLUnoHelper::GetInterface(
pWindow ), UNO_QUERY );
}
return Reference< XInterface >();
commit 11a97db6c8552b3b4a6e312268ddc5f8ade0ee4e
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Wed Nov 8 15:10:10 2023 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Fri Nov 10 09:53:09 2023 +0100
loplugin:fieldcast in framework::ToolBarWrapper
Change-Id: I4158b4c0b5ce57cca5a2a0978ac951274202c159
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159253
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/framework/inc/uielement/toolbarwrapper.hxx
b/framework/inc/uielement/toolbarwrapper.hxx
index a1bfbd0b09c9..6325c0b54183 100644
--- a/framework/inc/uielement/toolbarwrapper.hxx
+++ b/framework/inc/uielement/toolbarwrapper.hxx
@@ -25,7 +25,7 @@
#include <com/sun/star/ui/XUIFunctionListener.hpp>
#include <com/sun/star/ui/XContextChangeEventListener.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
-
+#include <rtl/ref.hxx>
#include <memory>
namespace weld
@@ -37,6 +37,7 @@ namespace weld
namespace framework
{
+class ToolBarManager;
class ToolBarWrapper final : public
cppu::ImplInheritanceHelper<UIConfigElementWrapperBase,
css::ui::XUIFunctionListener,
@@ -75,7 +76,7 @@ class ToolBarWrapper final : public
cppu::ImplInheritanceHelper<UIConfigElementW
virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32
nHandle, const css::uno::Any& aValue ) override;
virtual void impl_fillNewData() override;
- css::uno::Reference< css::lang::XComponent >
m_xToolBarManager;
+ rtl::Reference< ToolBarManager >
m_xToolBarManager;
css::uno::Reference< css::uno::XComponentContext > m_xContext;
css::uno::Reference< css::ui::XUIElement > m_xSubElement;
diff --git a/framework/source/uielement/toolbarwrapper.cxx
b/framework/source/uielement/toolbarwrapper.cxx
index 8f3937ef094f..ae988744c142 100644
--- a/framework/source/uielement/toolbarwrapper.cxx
+++ b/framework/source/uielement/toolbarwrapper.cxx
@@ -214,9 +214,8 @@ void SAL_CALL ToolBarWrapper::update()
if ( m_bDisposed )
throw DisposedException();
- ToolBarManager* pToolBarManager = static_cast< ToolBarManager *>(
m_xToolBarManager.get() );
- if ( pToolBarManager )
- pToolBarManager->CheckAndUpdateImages();
+ if ( m_xToolBarManager )
+ m_xToolBarManager->CheckAndUpdateImages();
}
// XUIElementSettings
@@ -251,13 +250,12 @@ void SAL_CALL ToolBarWrapper::updateSettings()
void ToolBarWrapper::impl_fillNewData()
{
- ToolBarManager* pToolBarManager = static_cast< ToolBarManager *>(
m_xToolBarManager.get() );
- if ( pToolBarManager )
+ if ( m_xToolBarManager )
{
Reference< XUIElementSettings > xUIElementSettings( m_xSubElement,
UNO_QUERY );
Reference< XIndexAccess > xContextData = xUIElementSettings.is() ?
xUIElementSettings->getSettings( false ) : nullptr;
OUString aContextToolbar = xContextData.is() ?
m_xSubElement->getResourceURL() : OUString();
- pToolBarManager->FillToolbar( m_xConfigData, xContextData,
aContextToolbar );
+ m_xToolBarManager->FillToolbar( m_xConfigData, xContextData,
aContextToolbar );
}
}
@@ -307,14 +305,10 @@ Reference< XInterface > SAL_CALL
ToolBarWrapper::getRealInterface( )
{
SolarMutexGuard g;
- if ( m_xToolBarManager.is() )
+ if ( m_xToolBarManager )
{
- ToolBarManager* pToolBarManager = static_cast< ToolBarManager *>(
m_xToolBarManager.get() );
- if ( pToolBarManager )
- {
- vcl::Window* pWindow = pToolBarManager->GetToolBar();
- return Reference< XInterface >( VCLUnoHelper::GetInterface(
pWindow ), UNO_QUERY );
- }
+ vcl::Window* pWindow = m_xToolBarManager->GetToolBar();
+ return Reference< XInterface >( VCLUnoHelper::GetInterface( pWindow ),
UNO_QUERY );
}
return Reference< XInterface >();
@@ -327,12 +321,8 @@ void SAL_CALL ToolBarWrapper::functionExecute(
{
SolarMutexGuard g;
- if ( m_xToolBarManager.is() )
- {
- ToolBarManager* pToolBarManager = static_cast< ToolBarManager *>(
m_xToolBarManager.get() );
- if ( pToolBarManager )
- pToolBarManager->notifyRegisteredControllers( aUIElementName,
aCommand );
- }
+ if ( m_xToolBarManager )
+ m_xToolBarManager->notifyRegisteredControllers( aUIElementName,
aCommand );
}
void SAL_CALL ToolBarWrapper::setFastPropertyValue_NoBroadcast( sal_Int32
nHandle, const css::uno::Any& aValue )
@@ -349,11 +339,10 @@ void SAL_CALL
ToolBarWrapper::setFastPropertyValue_NoBroadcast( sal_Int32 nHandl
if ( !(m_xToolBarManager.is() && !m_bDisposed && ( bNewNoClose != bNoClose
)))
return;
- ToolBarManager* pToolBarManager = static_cast< ToolBarManager *>(
m_xToolBarManager.get() );
- if ( !pToolBarManager )
+ if ( !m_xToolBarManager )
return;
- ToolBox* pToolBox = pToolBarManager->GetToolBar();
+ ToolBox* pToolBox = m_xToolBarManager->GetToolBar();
if ( !pToolBox )
return;
