summaryrefslogtreecommitdiff
path: root/desktop
diff options
context:
space:
mode:
Diffstat (limited to 'desktop')
-rw-r--r--desktop/source/deployment/gui/dp_gui_dialog2.cxx12
-rw-r--r--desktop/source/deployment/gui/dp_gui_extlistbox.cxx2
2 files changed, 2 insertions, 12 deletions
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
index bd8d222a9d05..9dfca89c66a0 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
@@ -746,16 +746,12 @@ void ExtMgrDialog::setGetExtensionsURL( const OUString &rURL )
m_pGetExtensions->SetURL( rURL );
}
-
void ExtMgrDialog::addPackageToList( const uno::Reference< deployment::XPackage > &xPackage,
bool bLicenseMissing )
{
-
const SolarMutexGuard aGuard;
m_pUpdateBtn->Enable();
- m_pExtensionBox->removeEntry(xPackage);
-
if (m_pBundledCbx->IsChecked() && (xPackage->getRepositoryName() == BUNDLED_PACKAGE_MANAGER) )
{
m_pExtensionBox->addEntry( xPackage, bLicenseMissing );
@@ -768,13 +764,8 @@ void ExtMgrDialog::addPackageToList( const uno::Reference< deployment::XPackage
{
m_pExtensionBox->addEntry( xPackage, bLicenseMissing );
}
- else
- {
- //OSL_FAIL("Package will not be displayed");
- }
}
-
void ExtMgrDialog::prepareChecking()
{
m_pExtensionBox->prepareChecking();
@@ -1055,11 +1046,12 @@ IMPL_LINK_NOARG_TYPED(ExtMgrDialog, HandleAddBtn, Button*, void)
setBusy( false );
}
-
IMPL_LINK_NOARG_TYPED(ExtMgrDialog, HandleExtTypeCbx, Button*, void)
{
// re-creates the list of packages with addEntry selecting the packages
+ prepareChecking();
m_pManager->createPackageList();
+ checkEntries();
}
IMPL_LINK_NOARG_TYPED(ExtMgrDialog, HandleUpdateBtn, Button*, void)
diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
index 47a89d2d3ea9..3c74a32af415 100644
--- a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
+++ b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
@@ -970,7 +970,6 @@ void ExtensionBox_Impl::addEntry( const uno::Reference< deployment::XPackage > &
m_bNeedsRecalc = true;
}
-
void ExtensionBox_Impl::updateEntry( const uno::Reference< deployment::XPackage > &xPackage )
{
typedef std::vector< TEntry_Impl >::iterator ITER;
@@ -1000,7 +999,6 @@ void ExtensionBox_Impl::updateEntry( const uno::Reference< deployment::XPackage
}
}
-
//This function is also called as a result of removing an extension.
//see PackageManagerImpl::removePackage
//The gui is a registered as listener on the package. Removing it will cause the