Related fdo#51252: No more prereg, no more unopkg sync

Now that 5c47e5f63a79a9e72ec4a100786b1bbf65137ed4 "fdo#51252 Disable copying
share/prereg/bundled to avoid startup crashes" removed the use of share/prereg,
there is no longer need to generate it in the first place (by calling "unopkg
sync" at build or installation time), and so no need for the "unopkg sync" sub-
command, either.  This also allows to simplify some of the jvmfwk code that was
only there so that "unopkg sync" (which can require a JVM) can work in "hostile"
environments (during build and installation).

Change-Id: I52657384f4561bf27948ba4f0f88f4498e90987f

1 files changed, 1 insertions, 20 deletions

diff --git a/desktop/source/deployment/manager/dp_manager.cxx b/desktop/source/deployment/manager/dp_manager.cxx
index a088f516c8a7..7d919ed52385 100644
--- a/desktop/source/deployment/manager/dp_manager.cxx
+++ b/desktop/source/deployment/manager/dp_manager.cxx
@@ -391,24 +391,6 @@ Reference<deployment::XPackageManager> PackageManagerImpl::create(
         //No stamp file. We assume that bundled is always readonly. It must not be
         //modified from ExtensionManager but only by the installer
     }
-    else if ( context == "bundled_prereg" ) {
-        //This is a bundled repository but the registration data
-        //is in the brand layer: share/prereg
-        //It is special because the registration data are copied at the first startup
-        //into the user installation. The processed help and xcu files are not
-        //copied. Instead the backenddb.xml for the help backend references the help
-        //by using $BUNDLED_EXTENSION_PREREG instead $BUNDLED_EXTENSIONS_USER. The
-        //configmgr.ini also used $BUNDLED_EXTENSIONS_PREREG to refer to the xcu file
-        //which contain the replacement for %origin%.
-        that->m_activePackages = OUSTR(
-            "vnd.sun.star.expand:$BUNDLED_EXTENSIONS");
-        that->m_registrationData = OUSTR(
-            "vnd.sun.star.expand:$BUNDLED_EXTENSIONS_PREREG");
-        that->m_registryCache = OUSTR(
-            "vnd.sun.star.expand:$BUNDLED_EXTENSIONS_PREREG/registry");
-        logFile = OUSTR(
-            "vnd.sun.star.expand:$BUNDLED_EXTENSIONS_PREREG/log.txt");
-    }
     else if ( context == "tmp" ) {
         that->m_activePackages = OUSTR(
             "vnd.sun.star.expand:$TMP_EXTENSIONS/extensions");
@@ -989,8 +971,7 @@ OUString PackageManagerImpl::getDeployPath( ActivePackages::Data const & data )
     //The bundled extensions are not contained in an additional folder
     //with a unique name. data.temporaryName contains already the
     //UTF8 encoded folder name. See PackageManagerImpl::synchronize
-    if (!m_context.equals(OUSTR("bundled"))
-        && !m_context.equals(OUSTR("bundled_prereg")))
+    if (!m_context.equals(OUSTR("bundled")))
     {
         buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("_/") );
         buf.append( ::rtl::Uri::encode( data.fileName, rtl_UriCharClassPchar,