framework/source/uielement/menubarmanager.cxx | 2 +-
include/vcl/menu.hxx | 3 +--
vcl/inc/salmenu.hxx | 2 +-
vcl/inc/win/salmenu.h | 2 +-
vcl/source/app/salvtables.cxx | 2 +-
vcl/source/window/menu.cxx | 6 +++---
vcl/win/window/salmenu.cxx | 5 ++---
7 files changed, 10 insertions(+), 12 deletions(-)
New commits:
commit 5b47e57f177df6ae0f5f3afd7f0bee47a208fd6d
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Mon Dec 2 10:41:36 2024 +0100
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Mon Dec 2 15:19:25 2024 +0100
vcl: Pass GetSystemMenuData param by ref
Change-Id: I04cae4a880dcf5c34e35ade9983b56d8ff8ed496
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/177661
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
Tested-by: Jenkins
diff --git a/framework/source/uielement/menubarmanager.cxx
b/framework/source/uielement/menubarmanager.cxx
index c262a990a8c6..caa0aaa36ce3 100644
--- a/framework/source/uielement/menubarmanager.cxx
+++ b/framework/source/uielement/menubarmanager.cxx
@@ -115,7 +115,7 @@ Any SAL_CALL MenuBarManager::getMenuHandle( const Sequence<
sal_Int8 >& /*Proces
{
SystemMenuData aSystemMenuData;
- m_pVCLMenu->GetSystemMenuData( &aSystemMenuData );
+ m_pVCLMenu->GetSystemMenuData(aSystemMenuData);
#ifdef _WIN32
if( SystemType == SystemDependent::SYSTEM_WIN32 )
{
diff --git a/include/vcl/menu.hxx b/include/vcl/menu.hxx
index 6c6aa9945583..bac335d305d9 100644
--- a/include/vcl/menu.hxx
+++ b/include/vcl/menu.hxx
@@ -354,8 +354,7 @@ public:
}
// returns the system's menu handle if native menus are supported
- // pData must point to a SystemMenuData structure
- void GetSystemMenuData( SystemMenuData* pData ) const;
+ void GetSystemMenuData(SystemMenuData& rData) const;
// accessibility helpers
diff --git a/vcl/inc/salmenu.hxx b/vcl/inc/salmenu.hxx
index 5cc316acc46e..469c4e3b4945 100644
--- a/vcl/inc/salmenu.hxx
+++ b/vcl/inc/salmenu.hxx
@@ -73,7 +73,7 @@ public:
virtual void SetItemText( unsigned nPos, SalMenuItem* pSalMenuItem, const
OUString& rText )= 0;
virtual void SetItemImage( unsigned nPos, SalMenuItem* pSalMenuItem, const
Image& rImage ) = 0;
virtual void SetAccelerator( unsigned nPos, SalMenuItem* pSalMenuItem,
const vcl::KeyCode& rKeyCode, const OUString& rKeyName ) = 0;
- virtual void GetSystemMenuData(SystemMenuData* pData);
+ virtual void GetSystemMenuData(SystemMenuData& rData);
virtual bool ShowNativePopupMenu(FloatingWindow * pWin, const
tools::Rectangle& rRect, FloatWinPopupFlags nFlags);
virtual void ShowCloseButton(bool bShow);
virtual bool AddMenuBarButton( const SalMenuButtonItem& ); // return false
if not implemented or failure
diff --git a/vcl/inc/win/salmenu.h b/vcl/inc/win/salmenu.h
index 7058d9c82b8a..93f2610867d7 100644
--- a/vcl/inc/win/salmenu.h
+++ b/vcl/inc/win/salmenu.h
@@ -40,7 +40,7 @@ public:
virtual void SetItemText( unsigned nPos, SalMenuItem* pSalMenuItem, const
OUString& rText ) override;
virtual void SetItemImage( unsigned nPos, SalMenuItem* pSalMenuItem, const
Image& rImage ) override;
virtual void SetAccelerator( unsigned nPos, SalMenuItem* pSalMenuItem,
const vcl::KeyCode& rKeyCode, const OUString& rKeyName ) override;
- virtual void GetSystemMenuData( SystemMenuData* pData ) override;
+ virtual void GetSystemMenuData(SystemMenuData& rData) override;
HMENU mhMenu; // the menu handle
bool mbMenuBar; // true for menu bars
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index 0f353a9eed19..a20c1831626d 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -214,7 +214,7 @@ SalObject::~SalObject() {}
SalMenu::~SalMenu() {}
-void SalMenu::GetSystemMenuData(SystemMenuData*) {}
+void SalMenu::GetSystemMenuData(SystemMenuData&) {}
bool SalMenu::ShowNativePopupMenu(FloatingWindow*, const tools::Rectangle&,
FloatWinPopupFlags)
{
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index 9750fc75ba6a..80f14042b0b7 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -2351,11 +2351,11 @@ OUString Menu::GetAccessibleDescription( sal_uInt16
nItemId ) const
return GetHelpText(nItemId);
}
-void Menu::GetSystemMenuData( SystemMenuData* pData ) const
+void Menu::GetSystemMenuData(SystemMenuData& rData) const
{
- if (pData && ImplGetSalMenu())
+ if (ImplGetSalMenu())
{
- ImplGetSalMenu()->GetSystemMenuData(pData);
+ ImplGetSalMenu()->GetSystemMenuData(rData);
}
}
diff --git a/vcl/win/window/salmenu.cxx b/vcl/win/window/salmenu.cxx
index 91a15284aeb5..afb69de605a5 100644
--- a/vcl/win/window/salmenu.cxx
+++ b/vcl/win/window/salmenu.cxx
@@ -302,10 +302,9 @@ void WinSalMenu::SetAccelerator( unsigned nPos,
SalMenuItem* pSalMenuItem, const
}
}
-void WinSalMenu::GetSystemMenuData( SystemMenuData* pData )
+void WinSalMenu::GetSystemMenuData(SystemMenuData& rData)
{
- if( pData )
- pData->hMenu = mhMenu;
+ rData.hMenu = mhMenu;
}
/*
