diff options
| author | Maxim Monastirsky <momonasmon@gmail.com> | 2017-10-09 19:56:04 +0300 |
|---|---|---|
| committer | Maxim Monastirsky <momonasmon@gmail.com> | 2017-10-16 23:34:59 +0200 |
| commit | 616f21db9e50a77b0c02dfb123f871a742f46216 (patch) | |
| tree | f878503fb8f5163c8348d5610c98e30df3b14eb9 /framework | |
| parent | a810feed4aa9eade632098704f7386afb7dfec76 (diff) | |
tdf#79657 Support add-on controls in the overflow toolbar
Change-Id: Idf76887a49561475587329c304329007034610a1
Reviewed-on: https://gerrit.libreoffice.org/43436
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Maxim Monastirsky <momonasmon@gmail.com>
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/source/uielement/addonstoolbarmanager.cxx | 1 | ||||
| -rw-r--r-- | framework/source/uielement/toolbarmanager.cxx | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/framework/source/uielement/addonstoolbarmanager.cxx b/framework/source/uielement/addonstoolbarmanager.cxx index 9d00ca60d939..7761fb20c4b8 100644 --- a/framework/source/uielement/addonstoolbarmanager.cxx +++ b/framework/source/uielement/addonstoolbarmanager.cxx @@ -266,6 +266,7 @@ void AddonsToolBarManager::FillToolbar( const Sequence< Sequence< PropertyValue AddonsParams* pRuntimeItemData = new AddonsParams; pRuntimeItemData->aImageId = aImageId; pRuntimeItemData->aTarget = aTarget; + pRuntimeItemData->aControlType = aControlType; pRuntimeItemData->nWidth = nWidth; m_pToolBar->SetItemData( nId, pRuntimeItemData ); m_pToolBar->SetItemCommand( nId, aURL ); diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx index a4525a204264..59cc6c1873c8 100644 --- a/framework/source/uielement/toolbarmanager.cxx +++ b/framework/source/uielement/toolbarmanager.cxx @@ -1193,6 +1193,11 @@ void ToolBarManager::FillOverflowToolbar( ToolBox const * pParent ) m_pToolBar->SetItemCommand( nId, aCommandURL ); m_pToolBar->SetQuickHelpText( nId, pParent->GetQuickHelpText( nId ) ); + // Handle possible add-on controls. + AddonsParams* pAddonParams = static_cast< AddonsParams* >( pParent->GetItemData( nId ) ); + if ( pAddonParams ) + m_pToolBar->SetItemData( nId, new AddonsParams( *pAddonParams ) ); + // Fill command map. It stores all our commands and from what // image manager we got our image. So we can decide if we have to use an // image from a notification message. |