jl152 import 263449 from native0jl:#i77196# no registration of components in uno.exe at startup, fixed extension activation, basic, etc.

8 files changed, 16 insertions, 5 deletions

diff --git a/offapi/com/sun/star/deployment/ExtensionManager.idl b/offapi/com/sun/star/deployment/ExtensionManager.idl
index 81b06acffddd..ee93623ce538 100644
--- a/offapi/com/sun/star/deployment/ExtensionManager.idl
+++ b/offapi/com/sun/star/deployment/ExtensionManager.idl
@@ -42,7 +42,7 @@ module com { module sun { module star { module deployment {
     </code>.
     </p>
 
-    @since OOo 2.0.0
+    @since OOo 3.3.0
 */
 singleton ExtensionManager : XExtensionManager;
 
diff --git a/offapi/com/sun/star/deployment/ExtensionRemovedException.idl b/offapi/com/sun/star/deployment/ExtensionRemovedException.idl
index 4091b63b7797..bb3116c9f554 100644
--- a/offapi/com/sun/star/deployment/ExtensionRemovedException.idl
+++ b/offapi/com/sun/star/deployment/ExtensionRemovedException.idl
@@ -42,7 +42,7 @@ interface XPackage;
    because the extension was removed. <member>XPackage::isRemoved</member> will
    return true on that object.
 
-   @since OOo 3.2.1
+   @since OOo 3.3.0
 */
 exception ExtensionRemovedException: com::sun::star::uno::Exception {
 
diff --git a/offapi/com/sun/star/deployment/InvalidRemovedParameterException.idl b/offapi/com/sun/star/deployment/InvalidRemovedParameterException.idl
index c4f998cd9a00..3a2cb5e330cc 100644
--- a/offapi/com/sun/star/deployment/InvalidRemovedParameterException.idl
+++ b/offapi/com/sun/star/deployment/InvalidRemovedParameterException.idl
@@ -42,7 +42,7 @@ interface XPackage;
    called with a different value for the <code>removed</code> parameter and that
    the <type>XPackage</type> object created by that call still exist.
 
-   @since OOo 3.2.1
+   @since OOo 3.3.0
 */
 exception InvalidRemovedParameterException: com::sun::star::uno::Exception {
     /** the value of the <code>removed</code> parameter which was used in
diff --git a/offapi/com/sun/star/deployment/XExtensionManager.idl b/offapi/com/sun/star/deployment/XExtensionManager.idl
index 2346f72395af..6deb5402cca8 100644
--- a/offapi/com/sun/star/deployment/XExtensionManager.idl
+++ b/offapi/com/sun/star/deployment/XExtensionManager.idl
@@ -41,7 +41,7 @@
 
 module com { module sun { module star { module deployment {
 
-/** The <type>XPackageManager</type> interface is used to add or remove
+/** The <type>XExtensionManager</type> interface is used to add or remove
     packages to a specific deployment context.
     Packages are deployable files, e.g. scripts or UNO components.
     <p>
@@ -62,7 +62,7 @@ module com { module sun { module star { module deployment {
     </p>
 
     @see thePackageManagerFactory
-    @since OOo 2.0.0
+    @since OOo 3.3.0
 */
 interface XExtensionManager
 {
diff --git a/offapi/com/sun/star/deployment/XPackage.idl b/offapi/com/sun/star/deployment/XPackage.idl
index 689a46ea22d9..6d3ae5d91d22 100644
--- a/offapi/com/sun/star/deployment/XPackage.idl
+++ b/offapi/com/sun/star/deployment/XPackage.idl
@@ -139,6 +139,10 @@ interface XPackage
 
     /** registers this <type>XPackage</type>, thus activating the package.
 
+        @param startup
+               indicates that registration is adapted to the particular
+               startup scenario. That is, it is set to true, when called
+               from <member>XExtensionManager::synchronize</member>
         @param xAbortChannel
                abort channel to asynchronously abort the registration process,
                or null
@@ -146,6 +150,7 @@ interface XPackage
                command environment for error and progress handling
     */
     void registerPackage(
+        [in] boolean startup,
         [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 dfffefb8b907..c7fe077ff65c 100644
--- a/offapi/com/sun/star/deployment/XPackageManager.idl
+++ b/offapi/com/sun/star/deployment/XPackageManager.idl
@@ -68,6 +68,8 @@ module com { module sun { module star { module deployment {
 
     @see thePackageManagerFactory
     @since OOo 2.0.0
+    @deprecated
+         Use <type>XExtensionManager</type>.
 */
 interface XPackageManager
 {
diff --git a/offapi/com/sun/star/deployment/XPackageManagerFactory.idl b/offapi/com/sun/star/deployment/XPackageManagerFactory.idl
index e3264bc0babf..4b5b7183ba47 100644
--- a/offapi/com/sun/star/deployment/XPackageManagerFactory.idl
+++ b/offapi/com/sun/star/deployment/XPackageManagerFactory.idl
@@ -45,6 +45,8 @@ module com { module sun { module star { module deployment {
     </p>
 
     @since OOo 2.0.0
+    @deprecated
+    Use <type>XExtensionManager</type>.
 */
 interface XPackageManagerFactory
 {
diff --git a/offapi/com/sun/star/deployment/thePackageManagerFactory.idl b/offapi/com/sun/star/deployment/thePackageManagerFactory.idl
index 612eae1e2513..85e95acea598 100644
--- a/offapi/com/sun/star/deployment/thePackageManagerFactory.idl
+++ b/offapi/com/sun/star/deployment/thePackageManagerFactory.idl
@@ -43,6 +43,8 @@ module com { module sun { module star { module deployment {
     </p>
 
     @since OOo 2.0.0
+    @deprecated
+        Use <type>XExtensionManager</type>.
 */
 singleton thePackageManagerFactory : XPackageManagerFactory;