Changeset 22514 for main/trunk

Timestamp:

2010-07-27T16:06:39+12:00 (14 years ago)

Author:

kjdon

Message:

small tidyings

File:

• main/trunk/greenstone2/perllib/plugins/WordPlugin.pm (modified) (3 diffs)

main/trunk/greenstone2/perllib/plugins/WordPlugin.pm

@@ -81 +81 @@
 my $opt_openoffice_args = 
     [ { 'name' => "openoffice_scripting",
-    'desc' => "{WordPlugin.openoffice_scripting}",
+    'desc' => "{OpenOfficeConverter.openoffice_scripting}",
     'type' => "flag",
     'reqd' => "no" } ];
@@ -160 +160 @@
 
     my $self = {};
-    my $outhandle;
 
     if ($openoffice_ext_working) {
     
     $self = new OpenOfficeConverter($pluginlist, $inputargs, $hashArgOptLists);
-    $outhandle = $self->{'outhandle'};
-
     }
     else {
     $self = new ConvertBinaryFile($pluginlist, $inputargs, $hashArgOptLists);
-    $outhandle = $self->{'outhandle'};
     }
 
@@ -178 +174 @@
     }
 
+    my $outhandle = $self->{'outhandle'};
     $self->{'filename_extension'} = "doc";
     $self->{'file_type'} = "Word";