Browse Source

Fixed textractquote regression after r35598

git-svn-id: trunk@35604 -
marcus 8 years ago
parent
commit
824cabd203
1 changed files with 19 additions and 19 deletions
  1. 19 19
      rtl/objpas/sysutils/sysstr.inc

+ 19 - 19
rtl/objpas/sysutils/sysstr.inc

@@ -160,7 +160,7 @@ begin
     result:=1
     result:=1
   else
   else
     result:=0;
     result:=0;
-end;    
+end;
 {$DEFINE CAPSIZEINT:=DoCapSizeInt}
 {$DEFINE CAPSIZEINT:=DoCapSizeInt}
 {$ELSE}
 {$ELSE}
 {$DEFINE CAPSIZEINT:=}
 {$DEFINE CAPSIZEINT:=}
@@ -198,9 +198,9 @@ end;
 
 
 function CompareMemRange(P1, P2: Pointer; Length: PtrUInt): integer;{$ifdef SYSUTILSINLINE}inline;{$endif}
 function CompareMemRange(P1, P2: Pointer; Length: PtrUInt): integer;{$ifdef SYSUTILSINLINE}inline;{$endif}
 begin
 begin
-  If P1=P2 then 
+  If P1=P2 then
     Result:=0
     Result:=0
-  else  
+  else
     Result:=CompareByte(P1^,P2^,Length);
     Result:=CompareByte(P1^,P2^,Length);
 end;
 end;
 
 
@@ -208,7 +208,7 @@ function CompareMem(P1, P2: Pointer; Length: PtrUInt): Boolean;{$ifdef SYSUTILSI
 begin
 begin
   if P1=P2 then
   if P1=P2 then
     Result:=True
     Result:=True
-  else 
+  else
     Result:=CompareByte(P1^,P2^,Length)=0;
     Result:=CompareByte(P1^,P2^,Length)=0;
 end;
 end;
 
 
@@ -224,7 +224,7 @@ end;
 function CompareText(const S1, S2: string): Integer; overload;
 function CompareText(const S1, S2: string): Integer; overload;
 
 
 var
 var
-  i, count, count1, count2: sizeint; 
+  i, count, count1, count2: sizeint;
   Chr1, Chr2: byte;
   Chr1, Chr2: byte;
   P1, P2: PChar;
   P1, P2: PChar;
 begin
 begin
@@ -685,12 +685,12 @@ var
   P,Q,R: PChar;
   P,Q,R: PChar;
 begin
 begin
  result:='';
  result:='';
- if P=Nil then exit;
+ if Src=Nil then exit;
  P := Src;
  P := Src;
  Q := StrEnd(P);
  Q := StrEnd(P);
- if P=Q then 
+ if P=Q then
    exit;
    exit;
- if P^<>quote then 
+ if P^<>quote then
    exit(strpas(P));
    exit(strpas(P));
  inc(p);
  inc(p);
  setlength(result,(Q-P)+1);
  setlength(result,(Q-P)+1);
@@ -859,7 +859,7 @@ const
 function IntToHex(Value: Longint; Digits: integer): string;
 function IntToHex(Value: Longint; Digits: integer): string;
 var i: integer;
 var i: integer;
 begin
 begin
- If Digits=0 then 
+ If Digits=0 then
    Digits:=1;
    Digits:=1;
  SetLength(result, digits);
  SetLength(result, digits);
  for i := 0 to digits - 1 do
  for i := 0 to digits - 1 do
@@ -876,7 +876,7 @@ end ;
 function IntToHex(Value: int64; Digits: integer): string;
 function IntToHex(Value: int64; Digits: integer): string;
 var i: integer;
 var i: integer;
 begin
 begin
- If Digits=0 then 
+ If Digits=0 then
    Digits:=1;
    Digits:=1;
  SetLength(result, digits);
  SetLength(result, digits);
  for i := 0 to digits - 1 do
  for i := 0 to digits - 1 do
@@ -1863,7 +1863,7 @@ end;
 Function CurrToStr(Value: Currency; Const FormatSettings: TFormatSettings): string;
 Function CurrToStr(Value: Currency; Const FormatSettings: TFormatSettings): string;
 begin
 begin
   Result:=FloatToStrF(Value,ffGeneral,-1,0,FormatSettings);
   Result:=FloatToStrF(Value,ffGeneral,-1,0,FormatSettings);
-end;  
+end;
 
 
 
 
 function StrToCurr(const S: string): Currency;
 function StrToCurr(const S: string): Currency;
@@ -1873,7 +1873,7 @@ begin
 end;
 end;
 
 
 
 
-function StrToCurr(const S: string; Const FormatSettings: TFormatSettings): Currency; 
+function StrToCurr(const S: string; Const FormatSettings: TFormatSettings): Currency;
 begin
 begin
   if not TextToFloat(PChar(pointer(S)), Result, fvCurrency,FormatSettings) then
   if not TextToFloat(PChar(pointer(S)), Result, fvCurrency,FormatSettings) then
     Raise EConvertError.createfmt(SInValidFLoat,[S]);
     Raise EConvertError.createfmt(SInValidFLoat,[S]);
@@ -1886,10 +1886,10 @@ Begin
 End;
 End;
 
 
 
 
-function TryStrToCurr(const S: string;Out Value : Currency; Const FormatSettings: TFormatSettings): Boolean;       
+function TryStrToCurr(const S: string;Out Value : Currency; Const FormatSettings: TFormatSettings): Boolean;
 Begin
 Begin
   Result := TextToFloat(PChar(pointer(S)), Value, fvCurrency,FormatSettings);
   Result := TextToFloat(PChar(pointer(S)), Value, fvCurrency,FormatSettings);
-End;  
+End;
 
 
 
 
 function StrToCurrDef(const S: string; Default : Currency): Currency;
 function StrToCurrDef(const S: string; Default : Currency): Currency;
@@ -1898,11 +1898,11 @@ begin
     Result:=Default;
     Result:=Default;
 end;
 end;
 
 
-function StrToCurrDef(const S: string; Default : Currency; Const FormatSettings: TFormatSettings): Currency;  
+function StrToCurrDef(const S: string; Default : Currency; Const FormatSettings: TFormatSettings): Currency;
 begin
 begin
   if not TextToFloat(PChar(pointer(S)), Result, fvCurrency,FormatSettings) then
   if not TextToFloat(PChar(pointer(S)), Result, fvCurrency,FormatSettings) then
     Result:=Default;
     Result:=Default;
-end; 
+end;
 {$endif FPUNONE}
 {$endif FPUNONE}
 
 
 function AnsiDequotedStr(const S: string; AQuote: Char): string;
 function AnsiDequotedStr(const S: string; AQuote: Char): string;
@@ -2299,7 +2299,7 @@ Var
           Digits:=Copy(Digits, 2, Length(Digits));
           Digits:=Copy(Digits, 2, Length(Digits));
           Dec(DecimalPoint);
           Dec(DecimalPoint);
           End;
           End;
-        End;  
+        End;
       Exp := 0;
       Exp := 0;
       End
       End
     Else
     Else
@@ -2471,7 +2471,7 @@ Var
                   Inc(Buf);
                   Inc(Buf);
                   End;
                   End;
                 End;
                 End;
-              if Digits[Dig]<>'-' then  
+              if Digits[Dig]<>'-' then
                 Dec(DigitExponent);
                 Dec(DigitExponent);
               Inc(Dig);
               Inc(Dig);
               Inc(Fmt);
               Inc(Fmt);
@@ -2772,7 +2772,7 @@ Function LastDelimiter(const Delimiters, S: string): SizeInt;
 var
 var
   chs: TSysCharSet;
   chs: TSysCharSet;
   I: SizeInt;
   I: SizeInt;
-  
+
 begin
 begin
   chs := [];
   chs := [];
   for I := 1 to Length(Delimiters) do
   for I := 1 to Length(Delimiters) do