incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a.@apache.org
Subject svn commit: r1371068 - /incubator/ooo/branches/AOO34/main/solenv/bin/modules/installer/scriptitems.pm
Date Thu, 09 Aug 2012 07:50:11 GMT
Author: af
Date: Thu Aug  9 07:50:10 2012
New Revision: 1371068

URL: http://svn.apache.org/viewvc?rev=1371068&view=rev
Log:
#i120476# Install locally built extensions (minimizer,presenter) 
          pre-registered, not bundled.

          Patch by: Andre Fischer
          Review by: Herbert Duerr

Modified:
    incubator/ooo/branches/AOO34/main/solenv/bin/modules/installer/scriptitems.pm

Modified: incubator/ooo/branches/AOO34/main/solenv/bin/modules/installer/scriptitems.pm
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/AOO34/main/solenv/bin/modules/installer/scriptitems.pm?rev=1371068&r1=1371067&r2=1371068&view=diff
==============================================================================
--- incubator/ooo/branches/AOO34/main/solenv/bin/modules/installer/scriptitems.pm (original)
+++ incubator/ooo/branches/AOO34/main/solenv/bin/modules/installer/scriptitems.pm Thu Aug
 9 07:50:10 2012
@@ -538,11 +538,7 @@ sub add_bundled_extension_blobs
         {
             push @bundle_files, $bundlehttpsrc . $name;
         }
-        # file:// extensions are taken from the solver bin/ directory.
-        for my $name (ExtensionsLst::GetExtensionList("file", @installer::globals::languageproducts))
-        {
-            push @bundle_files, $bundlefilesrc . $name;
-        }
+        # file:// extensions are added as pre-registered in add_bundled_prereg_extension().
     }
 
     installer::logger::print_message(
@@ -606,11 +602,11 @@ sub add_bundled_prereg_extensions
     }
     else
     {
-        # Add the default rextensions for the current language set.
-
-        # file:// URLs are currently handled by add_bundled_extension_blobs(@), therefore
-        # we may not their handling here anmore.
-        # @bundle_files = ExtensionsLst::GetExtensionList("file", @installer::globals::languageproducts);
+        # Add extensions from file:// URLs.
+        for my $name (ExtensionsLst::GetExtensionList("file", @installer::globals::languageproducts))
+        {
+            push @bundle_files, $name;
+        }
     }
 
     installer::logger::print_message(



Mime
View raw message