diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2023-11-07 13:29:51 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2023-11-08 06:50:35 +0100 |
| commit | 3b8e58b3bea6fd67cb7c5dc25115a32ca6975117 (patch) | |
| tree | 1dc73d55a4db4b23c182a4dba2172797e435ff02 /vcl/source | |
| parent | 74f884d48ed27e1ce861620a57802ad156a86d15 (diff) | |
loplugin:fieldcast in vcl
Change-Id: Ib6300ae7d8081a71f6dd5238b14f4114479862b4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159083
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'vcl/source')
| -rw-r--r-- | vcl/source/window/menu.cxx | 4 | ||||
| -rw-r--r-- | vcl/source/window/menubarwindow.cxx | 2 | ||||
| -rw-r--r-- | vcl/source/window/menufloatingwindow.cxx | 2 | ||||
| -rw-r--r-- | vcl/source/window/menuitemlist.hxx | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx index 60673fbe434e..3a66b962ebd6 100644 --- a/vcl/source/window/menu.cxx +++ b/vcl/source/window/menu.cxx @@ -747,7 +747,7 @@ void Menu::SetPopupMenu( sal_uInt16 nItemId, PopupMenu* pMenu ) return; // same menu, nothing to do - if ( static_cast<PopupMenu*>(pData->pSubMenu.get()) == pMenu ) + if ( pData->pSubMenu.get() == pMenu ) return; // remove old menu @@ -779,7 +779,7 @@ PopupMenu* Menu::GetPopupMenu( sal_uInt16 nItemId ) const MenuItemData* pData = pItemList->GetData( nItemId ); if ( pData ) - return static_cast<PopupMenu*>(pData->pSubMenu.get()); + return pData->pSubMenu.get(); else return nullptr; } diff --git a/vcl/source/window/menubarwindow.cxx b/vcl/source/window/menubarwindow.cxx index e77b600ea445..c52b0cf6787a 100644 --- a/vcl/source/window/menubarwindow.cxx +++ b/vcl/source/window/menubarwindow.cxx @@ -287,7 +287,7 @@ void MenuBarWindow::ImplCreatePopup( bool bPreSelectFirst ) ( pItemData->pSubMenu != m_pActivePopup )) ) return; - m_pActivePopup = static_cast<PopupMenu*>(pItemData->pSubMenu.get()); + m_pActivePopup = pItemData->pSubMenu.get(); tools::Long nX = 0; MenuItemData* pData = nullptr; for ( sal_uLong n = 0; n < m_nHighlightedItem; n++ ) diff --git a/vcl/source/window/menufloatingwindow.cxx b/vcl/source/window/menufloatingwindow.cxx index 3fb13ee1deee..95a0d3f4d02a 100644 --- a/vcl/source/window/menufloatingwindow.cxx +++ b/vcl/source/window/menufloatingwindow.cxx @@ -336,7 +336,7 @@ IMPL_LINK( MenuFloatingWindow, HighlightChanged, Timer*, pTimer, void ) if ( !(pItemData->bEnabled && pItemData->pSubMenu && pItemData->pSubMenu->GetItemCount() && ( pItemData->pSubMenu != pActivePopup )) ) return; - pActivePopup = static_cast<PopupMenu*>(pItemData->pSubMenu.get()); + pActivePopup = pItemData->pSubMenu.get(); tools::Long nY = nScrollerHeight+ImplGetStartY(); MenuItemData* pData = nullptr; for ( sal_uLong n = 0; n < nHighlightedItem; n++ ) diff --git a/vcl/source/window/menuitemlist.hxx b/vcl/source/window/menuitemlist.hxx index 4cd89b478577..fc25a402922d 100644 --- a/vcl/source/window/menuitemlist.hxx +++ b/vcl/source/window/menuitemlist.hxx @@ -35,7 +35,7 @@ struct MenuItemData sal_uInt16 nId; // SV Id MenuItemType eType; // MenuItem-Type MenuItemBits nBits; // MenuItem-Bits - VclPtr<Menu> pSubMenu; // Pointer to SubMenu + VclPtr<PopupMenu> pSubMenu; // Pointer to SubMenu OUString aText; // Menu-Text SalLayoutGlyphs aTextGlyphs; ///< Text layout of aText. OUString aHelpText; // Help-String |