summaryrefslogtreecommitdiff
path: root/solenv/bin
diff options
context:
space:
mode:
authorRüdiger Timm <rt@openoffice.org>2008-08-27 10:30:38 +0000
committerRüdiger Timm <rt@openoffice.org>2008-08-27 10:30:38 +0000
commit3dd3fc82691fa887d51d07f0a4c30caecd210b89 (patch)
treef9d31f382b3f7642c2c082b76814e0d823e7a177 /solenv/bin
parentdee262f3aba2ff37788b9e5c6807e2c2a820562f (diff)
INTEGRATION: CWS native185_DEV300 (1.51.18.1.6); FILE MERGED
2008/08/12 16:07:57 is 1.51.18.1.6.1: #i92713# userland installation with prepared database
Diffstat (limited to 'solenv/bin')
-rw-r--r--solenv/bin/modules/installer/scriptitems.pm8
1 files changed, 4 insertions, 4 deletions
diff --git a/solenv/bin/modules/installer/scriptitems.pm b/solenv/bin/modules/installer/scriptitems.pm
index fef458d8f0f4..6c1669ef58af 100644
--- a/solenv/bin/modules/installer/scriptitems.pm
+++ b/solenv/bin/modules/installer/scriptitems.pm
@@ -8,7 +8,7 @@
#
# $RCSfile: scriptitems.pm,v $
#
-# $Revision: 1.52 $
+# $Revision: 1.53 $
#
# This file is part of OpenOffice.org.
#
@@ -1694,11 +1694,11 @@ sub change_keys_of_scpactions
# the style XPD_ONLY), except an xpd installation set is created
############################################################################
-sub remove_Xpdonly_Scpactions
+sub remove_Xpdonly_Items
{
my ($itemsarrayref) = @_;
- if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::scriptitems::remove_Xpdonly_Scpactions : $#{$itemsarrayref}"); }
+ if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::scriptitems::remove_Xpdonly_Items : $#{$itemsarrayref}"); }
my $infoline;
@@ -1712,7 +1712,7 @@ sub remove_Xpdonly_Scpactions
if ( $styles =~ /\bXPD_ONLY\b/ )
{
- $infoline = "Removing \"xpd only\" scp action $oneitem->{'gid'} from the installation set.\n";
+ $infoline = "Removing \"xpd only\" item $oneitem->{'gid'} from the installation set.\n";
push( @installer::globals::globallogfileinfo, $infoline);
next;