diff options
Diffstat (limited to 'desktop/source/deployment/gui/dp_gui_dialog2.cxx')
| -rw-r--r-- | desktop/source/deployment/gui/dp_gui_dialog2.cxx | 69 |
1 files changed, 30 insertions, 39 deletions
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx index e5d284d1d5d0..656ea5e026cb 100644 --- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx +++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "dp_gui.hrc" #include "svtools/controldims.hrc" @@ -1089,8 +1080,8 @@ IMPL_LINK_NOARG(ExtMgrDialog, HandleAddBtn) // ----------------------------------------------------------------------- IMPL_LINK_NOARG(ExtMgrDialog, HandleExtTypeCbx) { - // re-creates the list of packages with addEntry selecting the packages - m_pManager->createPackageList(); + // re-creates the list of packages with addEntry selecting the packages + m_pManager->createPackageList(); return 1; } // ----------------------------------------------------------------------- @@ -1588,6 +1579,13 @@ void UpdateRequiredDialog::Resize() // VCL::Dialog short UpdateRequiredDialog::Execute() { + //ToDo + //I believe m_bHasLockedEntries was used to prevent showing extensions which cannot + //be disabled because they are in a read only repository. However, disabling extensions + //is now always possible because the registration data of all repositories + //are in the user installation. + //Therfore all extensions could be displayed and all the handling around m_bHasLockedEntries + //could be removed. if ( m_bHasLockedEntries ) { // Set other text, disable update btn, remove not shared entries from list; @@ -1650,22 +1648,15 @@ bool UpdateRequiredDialog::isEnabled( const uno::Reference< deployment::XPackage return bRegistered; } -//------------------------------------------------------------------------------ +// Checks the dependencies no matter if the extension is enabled or disabled! bool UpdateRequiredDialog::checkDependencies( const uno::Reference< deployment::XPackage > &xPackage ) const { - if ( isEnabled( xPackage ) ) - { - bool bDependenciesValid = false; - try { - bDependenciesValid = xPackage->checkDependencies( uno::Reference< ucb::XCommandEnvironment >() ); - } - catch ( const deployment::DeploymentException & ) {} - if ( ! bDependenciesValid ) - { - return false; - } + bool bDependenciesValid = false; + try { + bDependenciesValid = xPackage->checkDependencies( uno::Reference< ucb::XCommandEnvironment >() ); } - return true; + catch ( const deployment::DeploymentException & ) {} + return bDependenciesValid; } //------------------------------------------------------------------------------ @@ -1679,7 +1670,7 @@ bool UpdateRequiredDialog::hasActiveEntries() { TEntry_Impl pEntry = m_pExtensionBox->GetEntryData( nIndex ); - if ( !checkDependencies( pEntry->m_xPackage ) ) + if ( isEnabled(pEntry->m_xPackage) && !checkDependencies( pEntry->m_xPackage ) ) { bRet = true; break; |