Changeset 32317
- Timestamp:
- 2018-07-30T20:34:58+12:00 (6 years ago)
- Location:
- gs2-extensions/open-office/trunk
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
gs2-extensions/open-office/trunk/src/perllib/plugins/OpenOfficeConverter.pm
r28335 r32317 72 72 } 73 73 74 #my $cmd = "soffice - headless 2>&1"; # for linux and mac75 my $cmd = "soffice \"- accept=socket,host=$ENV{'SOFFICE_HOST'},port=$ENV{'SOFFICE_PORT'};urp;StarOffice.ServiceManager\"-headless 2>&1"; # for linux and mac74 #my $cmd = "soffice --headless 2>&1"; # for linux and mac 75 my $cmd = "soffice \"--accept=socket,host=$ENV{'SOFFICE_HOST'},port=$ENV{'SOFFICE_PORT'};urp;StarOffice.ServiceManager\" --headless 2>&1"; # for linux and mac 76 76 my $status = 0; 77 77 78 78 # No more JODCONVERTER_PORT env var: the port that jodconverter uses is now the 79 79 # same as SOFFICE_PORT, because the 2 are meant to communicate on the same port. 80 # The default port that jodconverter expects OO to listen on is 8100, so we try that.80 # The default port that jodconverter expects OO (OpenOffice/libreoffice/soffice/staroffice) to listen on is 8100, so we try that. 81 81 if ($ENV{'GSDLOS'} =~ m/^windows$/) { 82 82 … … 100 100 $status = system("which soffice >nul 2>&1"); # which.exe should be in bin/windows 101 101 if ($status == 0) { 102 $cmd = "start \"soffice process\" soffice \"- accept=socket,host=$ENV{'SOFFICE_HOST'},port=$ENV{'SOFFICE_PORT'};urp;StarOffice.ServiceManager\"-headless 2>&1";102 $cmd = "start \"soffice process\" soffice \"--accept=socket,host=$ENV{'SOFFICE_HOST'},port=$ENV{'SOFFICE_PORT'};urp;StarOffice.ServiceManager\" --headless 2>&1"; 103 103 $cmd .= " >nul"; 104 104 #print STDERR "***** Tried to start-up OpenOffice with:\n$cmd\n"; … … 179 179 180 180 my $launch_cmd = "soffice"; 181 $launch_cmd .= " \"- accept=socket,host=localhost,port=$oo_port;urp;StarOffice.ServiceManager\"";182 $launch_cmd .= " - headless";181 $launch_cmd .= " \"--accept=socket,host=localhost,port=$oo_port;urp;StarOffice.ServiceManager\""; 182 $launch_cmd .= " --headless"; 183 183 $self->{'openoffice_launch_cmd'} = $launch_cmd; 184 184 } -
gs2-extensions/open-office/trunk/src/perllib/plugins/OpenOfficePlugin.pm
r28335 r32317 46 46 my $arguments = 47 47 [ { 'name' => "process_exp", 48 'desc' => "{Base Plugin.process_exp}",48 'desc' => "{BaseImporter.process_exp}", 49 49 'type' => "regexp", 50 50 'deft' => &get_default_process_exp(), … … 69 69 push(@{$hashArgOptLists->{"OptList"}},$options); 70 70 71 72 71 my $ooc_self = new OpenOfficeConverter($pluginlist, $inputargs, $hashArgOptLists, 1); 73 72 my $cbf_self = new ConvertBinaryFile($pluginlist, $inputargs, $hashArgOptLists); 74 73 75 my $self = Base Plugin::merge_inheritance($ooc_self, $cbf_self);74 my $self = BaseImporter::merge_inheritance($ooc_self, $cbf_self); 76 75 77 76 if ($self->{'info_only'}) { … … 135 134 136 135 if (!$self->{'openoffice_ext_working'}) { 137 # use Base Pluginversion to set up the doc obj, then we will do a little bit more in process138 return $self->Base Plugin::read_into_doc_obj(@_);136 # use BaseImporter version to set up the doc obj, then we will do a little bit more in process 137 return $self->BaseImporter::read_into_doc_obj(@_); 139 138 } 140 139 # use convertbinaryfile version, will call tmp_area_convert_file and use
Note:
See TracChangeset
for help on using the changeset viewer.