summaryrefslogtreecommitdiffstats
path: root/perl-install/printer/office.pm
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2002-11-14 16:39:56 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2002-11-14 16:39:56 +0000
commitd6ed9e5423700f460ef04b456b5beb5249faff92 (patch)
treef172a5106e7777929e804984385e5aedf8862796 /perl-install/printer/office.pm
parent63feea58c6f6ebaa497c518073ff2d06f42173fa (diff)
downloaddrakx-backup-do-not-use-d6ed9e5423700f460ef04b456b5beb5249faff92.tar
drakx-backup-do-not-use-d6ed9e5423700f460ef04b456b5beb5249faff92.tar.gz
drakx-backup-do-not-use-d6ed9e5423700f460ef04b456b5beb5249faff92.tar.bz2
drakx-backup-do-not-use-d6ed9e5423700f460ef04b456b5beb5249faff92.tar.xz
drakx-backup-do-not-use-d6ed9e5423700f460ef04b456b5beb5249faff92.zip
- printer::data : export all data structures
- cleanups - all code is now runnable in strict mode
Diffstat (limited to 'perl-install/printer/office.pm')
-rw-r--r--perl-install/printer/office.pm7
1 files changed, 4 insertions, 3 deletions
diff --git a/perl-install/printer/office.pm b/perl-install/printer/office.pm
index 4ab60bcca..f870c4dac 100644
--- a/perl-install/printer/office.pm
+++ b/perl-install/printer/office.pm
@@ -3,6 +3,7 @@ package printer::office;
use strict;
use common;
use run_program;
+use printer::data;
use printer::common;
use printer::cups;
@@ -97,7 +98,7 @@ sub configureoffice {
# the "Generic Printer"
my @parameters = $suites{$suite}{param};
$configfilecontent = removeentry(@parameters, $configfilecontent);
- $configfilecontent = addentry($parameters[0], $parameters[1] . $suites{$suite}{perl} . $printer::data::lprcommand{$printer->{SPOOLER}{print_command}}, $configfilecontent);
+ $configfilecontent = addentry($parameters[0], $parameters[1] . $suites{$suite}{perl} . $spoolers{$printer->{SPOOLER}{print_command}}, $configfilecontent);
# Write back Star Office configuration file
return writesofficeconfigfile($configfilename, $configfilecontent);
}
@@ -207,7 +208,7 @@ sub makestarofficeprinterentry {
# symbol correctly.
$configfile = removeentry("ports", "$queue=", $configfile);
$configfile = addentry("ports",
- "$queue=/usr/bin/perl -p -e \"s=16#80 /euro=16#80 /Euro=\" | /usr/bin/$printer::data::lprcommand{$printer->{SPOOLER}{print_command}} -P $queue",
+ "$queue=/usr/bin/perl -p -e \"s=16#80 /euro=16#80 /Euro=\" | /usr/bin/$spoolers{$printer->{SPOOLER}{print_command}} -P $queue",
$configfile);
# Make printer's section
$configfile = addsection("$queue,PostScript,$queue", $configfile);
@@ -261,7 +262,7 @@ sub makeopenofficeprinterentry {
# symbol correctly.
$configfile = removeentry($queue, "Command=", $configfile);
$configfile = addentry($queue,
- "Command=/usr/bin/perl -p -e \"s=/euro /unused=/Euro /unused=\" | /usr/bin/$printer::data::lprcommand{$printer->{SPOOLER}{print_command}} -P $queue",
+ "Command=/usr/bin/perl -p -e \"s=/euro /unused=/Euro /unused=\" | /usr/bin/$spoolers{$printer->{SPOOLER}{print_command}} -P $queue",
$configfile);
# "Comment" line
$configfile = removeentry($queue, "Comment=", $configfile);