Changeset 22506 for gs2-extensions/open-office/trunk

Timestamp:

2010-07-26T13:23:05+12:00 (14 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

File:

• gs2-extensions/open-office/trunk/perllib/plugins/OpenOfficeConverter.pm (modified) (2 diffs)

gs2-extensions/open-office/trunk/perllib/plugins/OpenOfficeConverter.pm

@@ -42 +42 @@
 
 my $opt_arguments = [
-    { 'name' => "openoffice_scripting",
-      'desc' => "{OpenOfficeConverter.openoffice_scripting}",
-      'type' => "flag",
-      'reqd' => "no" },
     { 'name' => "openoffice_port",
       'desc' => "{OpenOfficeConverter.openoffice_port}",
@@ -121 +117 @@
 
     if ($openoffice_conversion_available) {
-    if ($self->{'openoffice_scripting'}) {
-        my $oo_port = $self->{'openoffice_port'};
-        my $launch_cmd = "soffice";
-        $launch_cmd .= " \"-accept=socket,host=localhost,port=$oo_port;urp;StarOffice.ServiceManager\"";
-        $launch_cmd .= " -headless";
-        
-        $self->{'openoffice_launch_cmd'} = $launch_cmd;
-    }
+    my $oo_port = $self->{'openoffice_port'};
+    my $launch_cmd = "soffice";
+    $launch_cmd .= " \"-accept=socket,host=localhost,port=$oo_port;urp;StarOffice.ServiceManager\"";
+    $launch_cmd .= " -headless";
+    
+    $self->{'openoffice_launch_cmd'} = $launch_cmd;
     }
     else {