- Timestamp:
- 2013-10-01T16:07:24+13:00 (11 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
gs2-extensions/open-office/trunk/src/perllib/plugins/OpenOfficeConverter.pm
r25334 r28335 54 54 else { 55 55 my $gextoo_home = $ENV{'GEXT_OPENOFFICE'}; 56 #my $jodjar = & util::filename_cat($gextoo_home,"lib","java","jodconverter.jar");57 my $jodjar = & util::filename_cat($gextoo_home,"jodconverter-2.2.2","lib","jodconverter-cli-2.2.2.jar");56 #my $jodjar = &FileUtils::filenameConcatenate($gextoo_home,"lib","java","jodconverter.jar"); 57 my $jodjar = &FileUtils::filenameConcatenate($gextoo_home,"jodconverter-2.2.2","lib","jodconverter-cli-2.2.2.jar"); 58 58 59 59 if (!-e $jodjar) { … … 84 84 # and open office is on a remote windows machine 85 85 if(!defined $ENV{'SOFFICE_HOME'}) { 86 $ENV{'SOFFICE_HOME'} = & util::filename_cat($ENV{'ProgramFiles'},"OpenOffice.org 3");86 $ENV{'SOFFICE_HOME'} = &FileUtils::filenameConcatenate($ENV{'ProgramFiles'},"OpenOffice.org 3"); 87 87 } 88 88 my $ooffice_dir_guess = 89 & util::filename_cat($ENV{'SOFFICE_HOME'},"program");89 &FileUtils::filenameConcatenate($ENV{'SOFFICE_HOME'},"program"); 90 90 if (-d $ooffice_dir_guess) { 91 91 &util::envvar_append("PATH",$ooffice_dir_guess); … … 218 218 $file_root .= "_$convert_id" if ($convert_id ne ""); 219 219 my $target_file = "$file_root.$target_file_type"; 220 $target_file_path = & util::filename_cat($cache_dir,$target_file);220 $target_file_path = &FileUtils::filenameConcatenate($cache_dir,$target_file); 221 221 } 222 222 else { … … 228 228 229 229 my $gextoo_home = $ENV{'GEXT_OPENOFFICE'}; 230 #my $jodjar = & util::filename_cat($gextoo_home,"lib","java","jodconverter.jar");231 my $jodjar = & util::filename_cat($gextoo_home,"jodconverter-2.2.2","lib","jodconverter-cli-2.2.2.jar");230 #my $jodjar = &FileUtils::filenameConcatenate($gextoo_home,"lib","java","jodconverter.jar"); 231 my $jodjar = &FileUtils::filenameConcatenate($gextoo_home,"jodconverter-2.2.2","lib","jodconverter-cli-2.2.2.jar"); 232 232 233 233 # debugging: print out all the env vars, when import's verbosity is high … … 326 326 foreach my $ootmp_file_path (@{$self->{'ootmp_file_paths'}}) { 327 327 if (-e $ootmp_file_path) { 328 & util::rm($ootmp_file_path);328 &FileUtils::removeFiles($ootmp_file_path); 329 329 } 330 330 }
Note:
See TracChangeset
for help on using the changeset viewer.