diff options
| author | Tim Retout <tim@retout.co.uk> | 2012-08-20 19:47:29 +0100 |
|---|---|---|
| committer | Tim Retout <tim@retout.co.uk> | 2012-08-21 22:23:40 +0100 |
| commit | c2e7add01b814fb460abbec190cd452f39845ab5 (patch) | |
| tree | 735254e0ac03698f74fa6db22594e0224265fab6 /solenv | |
| parent | installer: Remove code handling unused ONLY_INSTALLED_PRODUCT flag. (diff) | |
| download | core-c2e7add01b814fb460abbec190cd452f39845ab5.tar.gz core-c2e7add01b814fb460abbec190cd452f39845ab5.zip | |
installer: Remove unused remove_scpactions_without_name
Change-Id: I22e959adc5ee7a9901f812cadc7492fd229fbb15
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/bin/make_installer.pl | 2 | ||||
| -rw-r--r-- | solenv/bin/modules/installer/scriptitems.pm | 33 |
2 files changed, 0 insertions, 35 deletions
diff --git a/solenv/bin/make_installer.pl b/solenv/bin/make_installer.pl index 7045b1dabfd3..a45b5031f6ff 100644 --- a/solenv/bin/make_installer.pl +++ b/solenv/bin/make_installer.pl @@ -411,8 +411,6 @@ if ( $installer::globals::helppack ) { installer::scriptitems::use_langpack_copy if ( $allvariableshashref->{'PRODUCTNAME'} eq "LibO-dev" ) { installer::scriptitems::use_devversion_copy_scpaction($scpactionsinproductarrayref); } if ( $installer::globals::patch ) { installer::scriptitems::use_patch_copy_scpaction($scpactionsinproductarrayref); } -# $scpactionsinproductarrayref = installer::scriptitems::remove_scpactions_without_name($scpactionsinproductarrayref); - installer::scriptitems::change_keys_of_scpactions($scpactionsinproductarrayref); installer::logger::print_message( "... analyzing shortcuts ... \n" ); diff --git a/solenv/bin/modules/installer/scriptitems.pm b/solenv/bin/modules/installer/scriptitems.pm index 9893beaf78de..8467d682dd43 100644 --- a/solenv/bin/modules/installer/scriptitems.pm +++ b/solenv/bin/modules/installer/scriptitems.pm @@ -1501,39 +1501,6 @@ sub make_filename_language_specific } ############################################################################ -# Removing all scpactions, that have no name. -# See: FlatLoaderZip -############################################################################ - -sub remove_scpactions_without_name -{ - my ($itemsarrayref) = @_; - - my $infoline; - - my @newitemsarray = (); - - for ( my $i = 0; $i <= $#{$itemsarrayref}; $i++ ) - { - my $oneitem = ${$itemsarrayref}[$i]; - my $name = ""; - - if ( $oneitem->{'Name'} ) { $name = $oneitem->{'Name'}; } - - if ( $name eq "" ) - { - $infoline = "ATTENTION: Removing scpaction $oneitem->{'gid'} from the installation set.\n"; - push( @installer::globals::logfileinfo, $infoline); - next; - } - - push(@newitemsarray, $oneitem); - } - - return \@newitemsarray; -} - -############################################################################ # Because of the item "File" the source name must be "Name". Therefore # "Copy" is changed to "Name" and "Name" is changed to "DestinationName". ############################################################################ |