From b193f283457c290e2cd75df0f3f6a185b66a516d Mon Sep 17 00:00:00 2001 From: Muhammet Kara Date: Sat, 8 Oct 2016 01:09:10 +0300 Subject: tdf#102004 Do not open options for extensions without options Also fix similar issue for "Disable/Enable" and "Remove" buttons Change-Id: I383e64a9c6133ff2ebc991747c5c47c033a91174 Reviewed-on: https://gerrit.libreoffice.org/29600 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt --- desktop/source/deployment/gui/dp_gui_dialog2.cxx | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'desktop/source/deployment/gui/dp_gui_dialog2.cxx') diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx index 553f1f5c1e88..c7530159e248 100644 --- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx +++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx @@ -225,8 +225,11 @@ void ExtBoxWithBtns_Impl::RecalcAll() } else { + m_pOptionsBtn->Disable(); m_pOptionsBtn->Hide(); + m_pEnableBtn->Disable(); m_pEnableBtn->Hide(); + m_pRemoveBtn->Disable(); 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 ) && !rEntry->m_bMissingLic ) + { + m_pEnableBtn->Disable(); m_pEnableBtn->Hide(); + } else { m_pEnableBtn->Enable( !rEntry->m_bLocked ); @@ -290,12 +296,15 @@ void ExtBoxWithBtns_Impl::SetButtonStatus(const TEntry_Impl& rEntry) if ( rEntry->m_bHasOptions && bShowOptionBtn ) { - m_pOptionsBtn->Enable( rEntry->m_bHasOptions ); + m_pOptionsBtn->Enable(); m_pOptionsBtn->Show(); rEntry->m_bHasButtons = true; } else + { + m_pOptionsBtn->Disable(); m_pOptionsBtn->Hide(); + } if ( rEntry->m_bUser || rEntry->m_bShared ) { @@ -304,7 +313,10 @@ void ExtBoxWithBtns_Impl::SetButtonStatus(const TEntry_Impl& rEntry) rEntry->m_bHasButtons = true; } else + { + m_pRemoveBtn->Disable(); m_pRemoveBtn->Hide(); + } } -- cgit v1.2.3