Refactor name of wdEncoding variable, fixes tobya#178

Darthmineboy · Feb 22, 2022 · c56a138 · c56a138
1 parent 0a43b06
commit c56a138
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/src/WordUtils.pas b/src/WordUtils.pas
@@ -148,7 +148,7 @@ function TWordDocConverter.DestroyOfficeApp: boolean;
 function TWordDocConverter.ExecuteConversion(fileToConvert: String; OutputFilename: String; OutputFileFormat : Integer): TConversionInfo;
 
 var
-  wdEncoding : OleVariant;
+  EncodingValue : OleVariant;
   NonsensePassword : OleVariant;
 
   ExitAction : TExitAction;
@@ -216,9 +216,11 @@ function TWordDocConverter.ExecuteConversion(fileToConvert: String; OutputFilena
         end;
 
 
+        // Encoding can be set.  If a HTML type, then additional values
+        // need to be set for Weboptions.encoding
         if Encoding = -1 then
         begin
-           wdEncoding := EmptyParam;
+           EncodingValue := EmptyParam;
         end
         else
         begin
@@ -232,7 +234,7 @@ function TWordDocConverter.ExecuteConversion(fileToConvert: String; OutputFilena
 
            end;
 
-           wdEncoding := Encoding;
+           EncodingValue := Encoding;
         end;
 
       case ExitAction of
@@ -307,7 +309,7 @@ function TWordDocConverter.ExecuteConversion(fileToConvert: String; OutputFilena
                                                   EmptyParam, //SaveNativePictureFormat,
                                                   EmptyParam, //SaveFormsData,
                                                   EmptyParam, //SaveAsAOCELetter,
-                                                  wdEncoding, //Encoding,
+                                                  EncodingValue, //Encoding,
                                                   EmptyParam, //InsertLineBreaks,
                                                   EmptyParam, //AllowSubstitutions,
                                                   EmptyParam, //LineEnding,
@@ -328,7 +330,7 @@ function TWordDocConverter.ExecuteConversion(fileToConvert: String; OutputFilena
                                               EmptyParam,  //SaveNativePictureFo
                                               EmptyParam,  //SaveFormsData
                                               EmptyParam,  //SaveAsAOCELetter
-                                              wdEncoding,  //Encoding
+                                              EncodingValue,  //Encoding
                                               EmptyParam,  //InsertLineBreaks
                                               EmptyParam,  //AllowSubstitutions
                                               EmptyParam,  //LineEnding