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

GenericPopupToolbarController: deal with main command being disabled

Browse Source 
Try to set another command from the dropdown, if there is any
enabled. Otherwise give up and disable the button altogether.

Change-Id: I7fa46a946826056d04851faee9c7ad85f00c3678
This commit is contained in:
Maxim Monastirsky
2016-10-25 01:23:42 +03:00
parent e59013d6e9
commit 074449ee34
1 changed files with 46 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
framework/source/uielement/popuptoolbarcontroller.cxx
View File

@@ -264,6 +264,12 @@ public:
GenericPopupToolbarController( const css::uno::Reference< css::uno::XComponentContext >& rxContext, GenericPopupToolbarController( const css::uno::Reference< css::uno::XComponentContext >& rxContext,
const css::uno::Sequence< css::uno::Any >& rxArgs ); const css::uno::Sequence< css::uno::Any >& rxArgs );
// XInitialization
virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& rxArgs ) throw ( css::uno::Exception, css::uno::RuntimeException, std::exception ) override;
// XStatusListener
virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& rEvent ) throw ( css::uno::RuntimeException, std::exception ) override;
// XServiceInfo // XServiceInfo
virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException) override; virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException) override;
@@ -316,6 +322,46 @@ css::uno::Sequence<OUString> GenericPopupToolbarController::getSupportedServiceN
return {"com.sun.star.frame.ToolbarController"}; return {"com.sun.star.frame.ToolbarController"};
} }
void GenericPopupToolbarController::initialize( const css::uno::Sequence< css::uno::Any >& rxArgs )
throw ( css::uno::Exception, css::uno::RuntimeException, std::exception )
{
PopupMenuToolbarController::initialize( rxArgs );
if ( m_bReplaceWithLast )
// Create early, so we can use the menu is statusChanged method.
createPopupMenuController();
}
void GenericPopupToolbarController::statusChanged( const css::frame::FeatureStateEvent& rEvent )
throw ( css::uno::RuntimeException, std::exception )
{
SolarMutexGuard aGuard;
if ( m_bReplaceWithLast && !rEvent.IsEnabled && m_xPopupMenu.is() )
{
Menu* pVclMenu = VCLXMenu::GetImplementation( m_xPopupMenu )->GetMenu();
ToolBox* pToolBox = nullptr;
sal_uInt16 nId = 0;
if ( getToolboxId( nId, &pToolBox ) && pToolBox->IsItemEnabled( nId ) )
{
pVclMenu->Activate();
pVclMenu->Deactivate();
}
for ( sal_uInt16 i = 0; i < pVclMenu->GetItemCount(); ++i )
{
sal_uInt16 nItemId = pVclMenu->GetItemId( i );
if ( nItemId && pVclMenu->IsItemEnabled( nItemId ) && !pVclMenu->GetPopupMenu( nItemId ) )
{
functionExecuted( pVclMenu->GetItemCommand( nItemId ) );
return;
}
}
}
PopupMenuToolbarController::statusChanged( rEvent );
}
void GenericPopupToolbarController::functionExecuted( const OUString& rCommand ) void GenericPopupToolbarController::functionExecuted( const OUString& rCommand )
{ {
if ( m_bReplaceWithLast ) if ( m_bReplaceWithLast )