From 5300f6f711c2167931d45248c1b72dbce3a7df38 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Thu, 9 Aug 2012 13:29:22 +0200 Subject: fdo#53006: Remove user/extensions/bundled cache after upgrade ... to clean out all sorts of inconsitencies that can have accrued there over time apparently due to how the mechanism of copying share/prereg/bundled worked, and to work around stale $BUNDLED_EXTENSIONS_PREREG references in a better way than the previous 81fd6b084b0f3c0eb5a97c77592f5ceb21d2dfb1 "fdo#53006 Force reinstall of all bundled extensions on upgrade." See the comment on refreshBundledExtensionsDir for how, at least in theory, that functionality could be removed again in the future. This effectively reverts 2d2b19dea1ab401b1b4971ff5b12b87bb11fd666 "Force ExtensionManager resync when the implementation changes" and 81fd6b084b0f3c0eb5a97c77592f5ceb21d2dfb1 "fdo#53006 Force reinstall of all bundled extensions on upgrade" (the latter at least on master; it had never been cherry-picked to libreoffice-3-6), which it obsoletes. Change-Id: I8f80c07a06ec9d53b03813338eeff7d7757c9d4d --- offapi/com/sun/star/deployment/XExtensionManager.idl | 8 -------- offapi/com/sun/star/deployment/XPackageManager.idl | 8 +------- 2 files changed, 1 insertion(+), 15 deletions(-) (limited to 'offapi/com/sun/star/deployment') diff --git a/offapi/com/sun/star/deployment/XExtensionManager.idl b/offapi/com/sun/star/deployment/XExtensionManager.idl index 3809d905fa5a..7744ea6d839e 100644 --- a/offapi/com/sun/star/deployment/XExtensionManager.idl +++ b/offapi/com/sun/star/deployment/XExtensionManager.idl @@ -285,19 +285,11 @@ interface XExtensionManager The active extensions are determined. That is, shared or bundled extensions are not necessaryly registered (XPackage::registerPackage). - @param forceBundled - whether to reinstall all bundled extensions even if their versions - have not changed (which might be necessary when an upgraded - installation outdates references to any share/prereg/bundled/ - data; this parameter can go again once no exisiting - UserInstallation's user/extensions/bundled/ data can contain any - $BUNDLED_EXTENSIONS_PREREG references any longer) @return If true - then at least one extension was removed or added. Otherwise nothing was changed. */ boolean synchronize( - [in] boolean forceBundled, [in] com::sun::star::task::XAbortChannel xAbortChannel, [in] com::sun::star::ucb::XCommandEnvironment xCmdEnv ) raises (DeploymentException, diff --git a/offapi/com/sun/star/deployment/XPackageManager.idl b/offapi/com/sun/star/deployment/XPackageManager.idl index 842efdf3b5e4..65cb24a6ac0f 100644 --- a/offapi/com/sun/star/deployment/XPackageManager.idl +++ b/offapi/com/sun/star/deployment/XPackageManager.idl @@ -259,10 +259,6 @@ interface XPackageManager Added extensions will be added to the database and removed extensions will be removed from the database. - @param force - whether to reinstall all extensions even if their versions have not - changed (see forceBundled parameter of - XExtensionManager.synchronize) @param xAddedExtension new extensions which may need to be registered. @@ -272,9 +268,7 @@ interface XPackageManager If true - then at least one extension was removed or added. Otherwise nothing was changed. */ - boolean synchronize( - [in] boolean force, - [in] com::sun::star::task::XAbortChannel xAbortChannel, + boolean synchronize([in] com::sun::star::task::XAbortChannel xAbortChannel, [in] com::sun::star::ucb::XCommandEnvironment xCmdEnv ) raises (DeploymentException, com::sun::star::ucb::CommandFailedException, -- cgit v1.2.3