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

tdf#102004 Do not open options for extensions without options

Browse Source 
Also fix similar issue for "Disable/Enable" and "Remove" buttons

Change-Id: I383e64a9c6133ff2ebc991747c5c47c033a91174
Reviewed-on: https://gerrit.libreoffice.org/29600
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
This commit is contained in:
Muhammet Kara
2016-10-08 01:09:10 +03:00
committed by Samuel Mehrbrodt
parent 351164ea2c
commit b193f28345
1 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
desktop/source/deployment/gui/dp_gui_dialog2.cxx
View File

@@ -225,8 +225,11 @@ void ExtBoxWithBtns_Impl::RecalcAll()
} }
else else
{ {
m_pOptionsBtn->Disable();
m_pOptionsBtn->Hide(); m_pOptionsBtn->Hide();
m_pEnableBtn->Disable();
m_pEnableBtn->Hide(); m_pEnableBtn->Hide();
m_pRemoveBtn->Disable();
m_pRemoveBtn->Hide(); m_pRemoveBtn->Hide();
} }
@@ -280,7 +283,10 @@ void ExtBoxWithBtns_Impl::SetButtonStatus(const TEntry_Impl& rEntry)
if ( ( !rEntry->m_bUser || ( rEntry->m_eState == NOT_AVAILABLE ) || rEntry->m_bMissingDeps ) if ( ( !rEntry->m_bUser || ( rEntry->m_eState == NOT_AVAILABLE ) || rEntry->m_bMissingDeps )
&& !rEntry->m_bMissingLic ) && !rEntry->m_bMissingLic )
{
m_pEnableBtn->Disable();
m_pEnableBtn->Hide(); m_pEnableBtn->Hide();
}
else else
{ {
m_pEnableBtn->Enable( !rEntry->m_bLocked ); m_pEnableBtn->Enable( !rEntry->m_bLocked );
@@ -290,12 +296,15 @@ void ExtBoxWithBtns_Impl::SetButtonStatus(const TEntry_Impl& rEntry)
if ( rEntry->m_bHasOptions && bShowOptionBtn ) if ( rEntry->m_bHasOptions && bShowOptionBtn )
{ {
m_pOptionsBtn->Enable( rEntry->m_bHasOptions ); m_pOptionsBtn->Enable();
m_pOptionsBtn->Show(); m_pOptionsBtn->Show();
rEntry->m_bHasButtons = true; rEntry->m_bHasButtons = true;
} }
else else
{
m_pOptionsBtn->Disable();
m_pOptionsBtn->Hide(); m_pOptionsBtn->Hide();
}
if ( rEntry->m_bUser || rEntry->m_bShared ) if ( rEntry->m_bUser || rEntry->m_bShared )
{ {
@@ -304,7 +313,10 @@ void ExtBoxWithBtns_Impl::SetButtonStatus(const TEntry_Impl& rEntry)
rEntry->m_bHasButtons = true; rEntry->m_bHasButtons = true;
} }
else else
{
m_pRemoveBtn->Disable();
m_pRemoveBtn->Hide(); m_pRemoveBtn->Hide();
}
} }