* Patch by Graeme Geldenhuys to fix various issues (bug ID 23432)

git-svn-id: http://svn.freepascal.org/svn/fpc/trunk@23222 3ad0048d-3df7-0310-abae-a5850022a9f2

3 files changed, 4 insertions, 7 deletions

diff --git a/utils/fpdoc/dw_ipflin.pas b/utils/fpdoc/dw_ipflin.pas
index 27ae54f637..cc5c5fcd4e 100644
--- a/utils/fpdoc/dw_ipflin.pas
+++ b/utils/fpdoc/dw_ipflin.pas
@@ -196,7 +196,6 @@ const
   cMax = 100;
 var
   sl: TStringlist;
-  ns: string;
   i: integer;
   lText: string;
 begin
@@ -632,8 +631,6 @@ begin
 end;
 
 function TIPFNewWriter.GetLabel(AElement: TPasElement): String;
-var
-  i: Integer;
 begin
   if AElement.ClassType = TPasUnresolvedTypeRef then
     Result := Engine.ResolveLink(Module, AElement.Name)
@@ -704,7 +701,7 @@ end;
 
 Function TIPFNewWriter.StripText(S : String) : String;
 var
-  I,L: Integer;
+  I: Integer;
 begin
   //Result := S;
   SetLength(Result, 0);
diff --git a/utils/fpdoc/dw_latex.pp b/utils/fpdoc/dw_latex.pp
index 282986e66f..d2fc0b6778 100644
--- a/utils/fpdoc/dw_latex.pp
+++ b/utils/fpdoc/dw_latex.pp
@@ -128,9 +128,9 @@ Type
     procedure DescrBeginTableCell; override;
     procedure DescrEndTableCell; override;
     // TFPDocWriter class methods
-    Function InterPretOption(Const Cmd,Arg : String) : boolean; override;
     Property ImageDir : String Read FImageDir Write FImageDir;
   public
+    Function InterPretOption(Const Cmd,Arg : String) : boolean; override;
     Class Function FileNameExtension : String; override;
   end;
 
diff --git a/utils/fpdoc/dwlinear.pp b/utils/fpdoc/dwlinear.pp
index 470a2f6d24..6c877ff349 100644
--- a/utils/fpdoc/dwlinear.pp
+++ b/utils/fpdoc/dwlinear.pp
@@ -86,6 +86,8 @@ Type
     procedure WriteUnitEntry(UnitRef : TPasType);virtual; Abstract;
     procedure EndUnitOverview; virtual; Abstract;
     Property LastURL : DomString Read FLastURL Write FLastURL;
+    // Overriden from fpdocwriter;
+    procedure DescrWriteText(const AText: DOMString); override;
   Public
     Constructor Create(APackage: TPasPackage; AEngine: TFPDocEngine); override;
     function InterpretOption(const Cmd, Arg: String): Boolean; override;
@@ -113,8 +115,6 @@ Type
     procedure WriteExample(ADocNode: TDocNode);
     procedure WriteSeeAlso(ADocNode: TDocNode);
     Procedure WriteTopicNode(Node : TDocNode; Level : Integer);
-    // Overriden from fpdocwriter;
-    procedure DescrWriteText(const AText: DOMString); override;
   end;
 
 implementation