INTEGRATION: CWS unotlc (1.3.20); FILE MERGED

2004/07/30 13:19:22 dbo 1.3.20.1: #i31111# API revision
Issue number:
Submitted by:
Reviewed by:

3 files changed, 14 insertions, 32 deletions

diff --git a/offapi/com/sun/star/deployment/XPackageManager.idl b/offapi/com/sun/star/deployment/XPackageManager.idl
index 412257c75343..eabf8dddd6c2 100644
--- a/offapi/com/sun/star/deployment/XPackageManager.idl
+++ b/offapi/com/sun/star/deployment/XPackageManager.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: XPackageManager.idl,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: kz $ $Date: 2004-06-11 11:50:44 $
+ *  last change: $Author: obo $ $Date: 2004-08-12 12:02:22 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -68,7 +68,6 @@
 #include <com/sun/star/deployment/XPackage.idl>
 #include <com/sun/star/ucb/XCommandEnvironment.idl>
 #include <com/sun/star/deployment/DeploymentException.idl>
-#include <com/sun/star/deployment/XPackageRegistry.idl>
 #include <com/sun/star/container/NoSuchElementException.idl>
 #include <com/sun/star/lang/IllegalArgumentException.idl>
 
@@ -116,14 +115,6 @@ interface XPackageManager
     */
     string getContext();
 
-    /** gets access to the underlying package registry being used when packages
-        are added or removed.
-
-        @return
-                registry
-    */
-    XPackageRegistry getPackageRegistry();
-
     /** creates a command channel to be used to asynchronously abort a command.
 
         @return
diff --git a/offapi/com/sun/star/deployment/XPackageManagerFactory.idl b/offapi/com/sun/star/deployment/XPackageManagerFactory.idl
index 37098bda09b7..bfebf6b17f51 100644
--- a/offapi/com/sun/star/deployment/XPackageManagerFactory.idl
+++ b/offapi/com/sun/star/deployment/XPackageManagerFactory.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: XPackageManagerFactory.idl,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: kz $ $Date: 2004-06-11 11:51:01 $
+ *  last change: $Author: obo $ $Date: 2004-08-12 12:02:35 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -88,19 +88,16 @@ interface XPackageManagerFactory
         <p>
         Packages for context strings <code>"user"</code> and
         <code>"shared"</code> will be registered and
-        revoked persistently whilst <code>vnd.sun.star.tdoc</code> urls
-        (open documents) will be registered and revoked transiently.
+        revoked persistently.
         </p>
-        <p>
-        Document contexts (<code>"vnd.sun.star.pkg:..."</code>,
-        <code>"vnd.sun.star.tdoc:..."</code>) will get a
+        <!-- p>
+        Document contexts (<code>"vnd.sun.star.tdoc:..."</code>) will get a
         <type>XPackageManager</type> object that stores packages
         in the given document and modify the manifest.
-        </p>
+        </p -->
         <p>
-        Context strings other than <code>"user"</code>, <code>"shared"</code>,
-        <code>"vnd.sun.star.tdoc:..."</code> and
-        <code>"vnd.sun.star.pkg:..."</code> will last in an
+        Context strings other than <code>"user"</code>, <code>"shared"</code>
+        <!-- or <code>vnd.sun.star.tdoc</code --> will last in an
         <type scope="com::sun::star::lang">IllegalArgumentException</type>.
         </p>
 
@@ -115,16 +112,11 @@ interface XPackageManagerFactory
                    => persistent storage and registration into installation's
                       shared layer
                </li>
-               <li><code>"vnd.sun.star.tdoc:///4711/uno_packages"</code>
+               <!-- li><code>"vnd.sun.star.tdoc:///4711/uno_packages"</code>
                         (open document)
                    => transient storage in folder uno_packages
                       and transient registration
-               </li>
-               <li><code>"vnd.sun.star.pkg:///x.sxw/uno_packages"</code>
-               (closed document)
-                   => persistent storage in folder uno_packages,
-                      but no registration
-               </li>
+               </li -->
                </ul>
         @return
                <type>XPackageManager</type> object
diff --git a/offapi/com/sun/star/deployment/makefile.mk b/offapi/com/sun/star/deployment/makefile.mk
index 5ff182d4b637..37e405de5687 100644
--- a/offapi/com/sun/star/deployment/makefile.mk
+++ b/offapi/com/sun/star/deployment/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.3 $
+#   $Revision: 1.4 $
 #
-#   last change: $Author: kz $ $Date: 2004-06-11 11:51:33 $
+#   last change: $Author: obo $ $Date: 2004-08-12 12:02:50 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -74,7 +74,6 @@ IDLFILES = \
         XPackage.idl                                            \
         XPackageRegistry.idl                                    \
         PackageRegistryBackend.idl                              \
-        PackageRegistry.idl                                     \
         XPackageManager.idl                                     \
         XPackageManagerFactory.idl                              \
         thePackageManagerFactory.idl