summaryrefslogtreecommitdiff
path: root/desktop
diff options
context:
space:
mode:
authorKatarina Behrens <Katarina.Behrens@cib.de>2015-06-02 11:13:44 +0200
committerMichael Stahl <mstahl@redhat.com>2015-06-04 19:38:16 +0000
commite069404a5382ac0095f64a824ef8dc0a9eae260d (patch)
tree6197db64f53c1f2fdf476368f085c86833a93182 /desktop
parent72bd4796b29cab3e818289af520beca1ae100ede (diff)
Build time option --disable-extension-update
to disable the possibility to update installed extensions Change-Id: Ifdee0f3b13ee3e2bcb288c8ded98cb9805a6e55a Reviewed-on: https://gerrit.libreoffice.org/16059 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'desktop')
-rw-r--r--desktop/source/deployment/gui/dp_gui_dialog2.cxx11
-rw-r--r--desktop/source/deployment/gui/dp_gui_dialog2.hxx2
2 files changed, 11 insertions, 2 deletions
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
index 92b802fc4fdc..fb98cdd6bf15 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
@@ -364,7 +364,9 @@ MENU_COMMAND ExtBoxWithBtns_Impl::ShowPopupMenu( const Point & rPos, const long
PopupMenu aPopup;
+#if ENABLE_EXTENSION_UPDATE
aPopup.InsertItem( CMD_UPDATE, DialogHelper::getResourceString( RID_CTX_ITEM_CHECK_UPDATE ) );
+#endif
if ( ! GetEntryData( nPos )->m_bLocked )
{
@@ -700,7 +702,6 @@ ExtMgrDialog::ExtMgrDialog(vcl::Window *pParent, TheExtensionManager *pManager,
m_pAddBtn->SetClickHdl( LINK( this, ExtMgrDialog, HandleAddBtn ) );
m_pCloseBtn->SetClickHdl( LINK( this, ExtMgrDialog, HandleCloseBtn ) );
- m_pUpdateBtn->SetClickHdl( LINK( this, ExtMgrDialog, HandleUpdateBtn ) );
m_pGetExtensions->SetClickHdl( LINK( this, ExtMgrDialog, HandleHyperlink ) );
m_pCancelBtn->SetClickHdl( LINK( this, ExtMgrDialog, HandleCancelBtn ) );
@@ -714,7 +715,12 @@ ExtMgrDialog::ExtMgrDialog(vcl::Window *pParent, TheExtensionManager *pManager,
m_pProgressBar->Hide();
+#if ENABLE_EXTENSION_UPDATE
+ m_pUpdateBtn->SetClickHdl( LINK( this, ExtMgrDialog, HandleUpdateBtn ) );
m_pUpdateBtn->Enable(false);
+#else
+ m_pUpdateBtn->Hide();
+#endif
m_aIdle.SetPriority(SchedulerPriority::LOWEST);
m_aIdle.SetIdleHdl( LINK( this, ExtMgrDialog, TimeOutHdl ) );
@@ -1075,8 +1081,9 @@ IMPL_LINK_NOARG(ExtMgrDialog, HandleExtTypeCbx)
IMPL_LINK_NOARG(ExtMgrDialog, HandleUpdateBtn)
{
+#if ENABLE_EXTENSION_UPDATE
m_pManager->checkUpdates( false, true );
-
+#endif
return 1;
}
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.hxx b/desktop/source/deployment/gui/dp_gui_dialog2.hxx
index 6e8037f42ab2..97be277d8d2b 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.hxx
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.hxx
@@ -20,6 +20,8 @@
#ifndef INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_GUI_DP_GUI_DIALOG2_HXX
#define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_GUI_DP_GUI_DIALOG2_HXX
+#include <config_extension_update.h>
+
#include <vcl/dialog.hxx>
#include <vcl/button.hxx>
#include <vcl/fixed.hxx>