strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert commit 2fe53b2e43

Browse source 
Commit 709b1f3ddb fixes the
root cause of the crash during a dynamic_cast so revert
commit 709b1f3ddb as it was
merely a workaround and is no longer needed.

Change-Id: Ia052913eba7fd4d979054ea6a644f4ff9791277c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/176217
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
This commit is contained in:
Patrick Luby 2024-11-07 08:52:37 -05:00 committed by Noel Grandin
parent cc9b55e8a8
commit 1e99b33b9a
4 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
framework/source/uielement/toolbarmodemenucontroller.cxx
View file

@ -274,7 +274,7 @@ void SAL_CALL ToolbarModeMenuController::setPopupMenu( const Reference< css::awt
// Create popup menu on demand // Create popup menu on demand
SolarMutexGuard aSolarMutexGuard; SolarMutexGuard aSolarMutexGuard;
m_xPopupMenu = dynamic_cast<VCLXMenu*>(xPopupMenu.get()); m_xPopupMenu = dynamic_cast<VCLXPopupMenu*>(xPopupMenu.get());
assert(bool(xPopupMenu) == bool(m_xPopupMenu) && "we only support VCLXPopupMenu"); assert(bool(xPopupMenu) == bool(m_xPopupMenu) && "we only support VCLXPopupMenu");
m_xPopupMenu->addMenuListener( Reference< css::awt::XMenuListener >(this) ); m_xPopupMenu->addMenuListener( Reference< css::awt::XMenuListener >(this) );
fillPopupMenu( m_xPopupMenu ); fillPopupMenu( m_xPopupMenu );

2
framework/source/uielement/toolbarsmenucontroller.cxx
View file

@ -706,7 +706,7 @@ void SAL_CALL ToolbarsMenuController::setPopupMenu( const Reference< css::awt::X
// Create popup menu on demand // Create popup menu on demand
SolarMutexGuard aSolarMutexGuard; SolarMutexGuard aSolarMutexGuard;
m_xPopupMenu = dynamic_cast<VCLXMenu*>(xPopupMenu.get()); m_xPopupMenu = dynamic_cast<VCLXPopupMenu*>(xPopupMenu.get());
assert(bool(xPopupMenu) == bool(m_xPopupMenu) && "we only support VCLXPopupMenu"); assert(bool(xPopupMenu) == bool(m_xPopupMenu) && "we only support VCLXPopupMenu");
m_xPopupMenu->addMenuListener( Reference< css::awt::XMenuListener >(this) ); m_xPopupMenu->addMenuListener( Reference< css::awt::XMenuListener >(this) );
fillPopupMenu( m_xPopupMenu ); fillPopupMenu( m_xPopupMenu );

4
include/svtools/popupmenucontrollerbase.hxx
View file

@ -37,7 +37,7 @@
namespace com :: sun :: star :: frame { class XFrame; } namespace com :: sun :: star :: frame { class XFrame; }
namespace com :: sun :: star :: uno { class XComponentContext; } namespace com :: sun :: star :: uno { class XComponentContext; }
namespace com :: sun :: star :: util { class XURLTransformer; } namespace com :: sun :: star :: util { class XURLTransformer; }
class VCLXMenu; class VCLXPopupMenu;
namespace svt namespace svt
{ {
@ -118,7 +118,7 @@ namespace svt
css::uno::Reference< css::frame::XDispatch > m_xDispatch; css::uno::Reference< css::frame::XDispatch > m_xDispatch;
css::uno::Reference< css::frame::XFrame > m_xFrame; css::uno::Reference< css::frame::XFrame > m_xFrame;
css::uno::Reference< css::util::XURLTransformer > m_xURLTransformer; css::uno::Reference< css::util::XURLTransformer > m_xURLTransformer;
rtl::Reference< VCLXMenu > m_xPopupMenu; rtl::Reference< VCLXPopupMenu > m_xPopupMenu;
comphelper::OInterfaceContainerHelper4<XStatusListener> maStatusListeners; comphelper::OInterfaceContainerHelper4<XStatusListener> maStatusListeners;
}; };
} }

2
svtools/source/uno/popupmenucontrollerbase.cxx
View file

@ -343,7 +343,7 @@ void SAL_CALL PopupMenuControllerBase::setPopupMenu( const Reference< awt::XPopu
// Create popup menu on demand // Create popup menu on demand
SolarMutexGuard aSolarMutexGuard; SolarMutexGuard aSolarMutexGuard;
m_xPopupMenu = dynamic_cast<VCLXMenu*>(xPopupMenu.get()); m_xPopupMenu = dynamic_cast<VCLXPopupMenu*>(xPopupMenu.get());
assert(bool(xPopupMenu) == bool(m_xPopupMenu) && "we only support VCLXPopupMenu"); assert(bool(xPopupMenu) == bool(m_xPopupMenu) && "we only support VCLXPopupMenu");
m_xPopupMenu->addMenuListener( Reference< awt::XMenuListener >(this) ); m_xPopupMenu->addMenuListener( Reference< awt::XMenuListener >(this) );