Changeset 22506

Show
Ignore:
Timestamp:
26.07.2010 13:23:05 (9 years ago)
Author:
kjdon
Message:

openoffice_scripting arg has been moved to top level plugin. It should control whether we use this converter plugin or not. Once we ARE using the plugin, then this cinversion should always be on

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • gs2-extensions/open-office/trunk/perllib/plugins/OpenOfficeConverter.pm

    r22502 r22506  
    4242 
    4343my $opt_arguments = [ 
    44     { 'name' => "openoffice_scripting", 
    45       'desc' => "{OpenOfficeConverter.openoffice_scripting}", 
    46       'type' => "flag", 
    47       'reqd' => "no" }, 
    4844    { 'name' => "openoffice_port", 
    4945      'desc' => "{OpenOfficeConverter.openoffice_port}", 
     
    121117 
    122118    if ($openoffice_conversion_available) { 
    123     if ($self->{'openoffice_scripting'}) { 
    124         my $oo_port = $self->{'openoffice_port'}; 
    125         my $launch_cmd = "soffice"; 
    126         $launch_cmd .= " \"-accept=socket,host=localhost,port=$oo_port;urp;StarOffice.ServiceManager\""; 
    127         $launch_cmd .= " -headless"; 
    128          
    129         $self->{'openoffice_launch_cmd'} = $launch_cmd; 
    130     } 
     119    my $oo_port = $self->{'openoffice_port'}; 
     120    my $launch_cmd = "soffice"; 
     121    $launch_cmd .= " \"-accept=socket,host=localhost,port=$oo_port;urp;StarOffice.ServiceManager\""; 
     122    $launch_cmd .= " -headless"; 
     123     
     124    $self->{'openoffice_launch_cmd'} = $launch_cmd; 
    131125    } 
    132126    else {