summaryrefslogtreecommitdiff
path: root/desktop/source
diff options
context:
space:
mode:
authorKatarina Behrens <Katarina.Behrens@cib.de>2019-12-20 15:00:58 +0100
committerSamuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>2020-02-27 10:09:10 +0100
commit675295d7e18c1505835893e51a853a5b4ce37ed6 (patch)
tree2733e21a25002a2c5aa420e8f7d46f20152b4e6e /desktop/source
parentb83b4f967f8cbee208e44600821aa1a5518e34ac (diff)
Drop checking for user extensions w/ the same ID on every synchronization
the question in 2012 was, is this still necessary? It slows down every warm start so let's assume it is not, remove it and see what happens Change-Id: Ia185fd18433d4145c0f33df8d7f60ba734f8504a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/85609 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Diffstat (limited to 'desktop/source')
-rw-r--r--desktop/source/deployment/manager/dp_extensionmanager.cxx27
1 files changed, 0 insertions, 27 deletions
diff --git a/desktop/source/deployment/manager/dp_extensionmanager.cxx b/desktop/source/deployment/manager/dp_extensionmanager.cxx
index 708c40215fa5..558ebe02fdfd 100644
--- a/desktop/source/deployment/manager/dp_extensionmanager.cxx
+++ b/desktop/source/deployment/manager/dp_extensionmanager.cxx
@@ -1224,33 +1224,6 @@ sal_Bool ExtensionManager::synchronize(
bModified |= static_cast<bool>(getBundledRepository()->synchronize(xAbortChannel, xCmdEnv));
progressBundled.update("\n\n");
- //Always determine the active extension.
- //TODO: Is this still necessary? (It used to be necessary for the
- // first-start optimization: The setup created the registration data
- // for the bundled extensions (share/prereg/bundled) which was copied to
- // the user installation when a user started OOo for the first time
- // after running setup. All bundled extensions were registered at that
- // moment. However, extensions with the same identifier could be in the
- // shared or user repository, in which case the respective bundled
- // extensions had to be revoked.)
- try
- {
- const uno::Sequence<uno::Sequence<Reference<css::deployment::XPackage> > >
- seqSeqExt = getAllExtensions(xAbortChannel, xCmdEnv);
- for (sal_Int32 i = 0; i < seqSeqExt.getLength(); i++)
- {
- uno::Sequence<Reference<css::deployment::XPackage> > const & seqExt =
- seqSeqExt[i];
- activateExtension(seqExt, isUserDisabled(seqExt), true,
- xAbortChannel, xCmdEnv);
- }
- }
- catch (...)
- {
- //We catch the exception, so we can write the lastmodified file
- //so we will no repeat this every time OOo starts.
- OSL_FAIL("Extensions Manager: synchronize");
- }
OUString lastSyncBundled("$BUNDLED_EXTENSIONS_USER/lastsynchronized");
writeLastModified(lastSyncBundled, xCmdEnv, m_xContext);
OUString lastSyncShared("$SHARED_EXTENSIONS_USER/lastsynchronized");