Changeset 214 for trunk/Components/RichTextDocumentUnit.pas

Timestamp:

Jun 13, 2007, 8:33:51 PM (18 years ago)

Author:

RBRi

Message:

using StringUtilsUnit

File:

• trunk/Components/RichTextDocumentUnit.pas (modified) (12 diffs)

trunk/Components/RichTextDocumentUnit.pas

@@ -118 +118 @@
 uses
   BseDOS, // for NLS/case mapping
-  SysUtils, ACLStringUtility;
+  SysUtils,
+  CharUtilsUnit,
+  StringUtilsUnit;
 
 const
@@ -238 +240 @@
     end;
 
-    if CurrentChar = DoubleQuote then
+    if CurrentChar = CharDoubleQuote then
     begin
       if not InQuote then
@@ -247 +249 @@
       begin
         // Could be escaped quote ""
-        if ( TextPointer + 1 ) ^ = DoubleQuote then
+        if ( TextPointer + 1 ) ^ = CharDoubleQuote then
         begin
           // yes it is
@@ -306 +308 @@
     end;
 
-    if CurrentChar = DoubleQuote then
+    if CurrentChar = CharDoubleQuote then
     begin
       if not InQuote then
@@ -320 +322 @@
           InQuote := false;
         end
-        else if ( TextPointer - 1 ) ^ = DoubleQuote then
+        else if ( TextPointer - 1 ) ^ = CharDoubleQuote then
         begin
           // yes it is
@@ -502 +504 @@
     begin
       try
-        Color := HexToInt( StrRightFrom( ColorParam, 2 ) );
+        Color := HexStrToLongInt( StrSubstringFrom( ColorParam, 2 ) );
         Result := true;
       except
@@ -511 +513 @@
       for ColorIndex := 0 to High( StandardColors ) do
       begin
-        if StringsSame( ColorParam, StandardColors[ ColorIndex ].Name ) then
+        if StrEqualIgnoringCase( ColorParam, StandardColors[ ColorIndex ].Name ) then
         begin
           Color := StandardColors[ ColorIndex ].Color;
@@ -525 +527 @@
                               const Default: TTextAlignment ): TTextAlignment;
 begin
-  if StringsSame( AlignParam, 'left' ) then
+  if StrEqualIgnoringCase( AlignParam, 'left' ) then
     Result := taLeft
-  else if StringsSame( AlignParam, 'center' ) then
+  else if StrEqualIgnoringCase( AlignParam, 'center' ) then
     Result := taCenter
-  else if StringsSame( AlignParam, 'right' ) then
+  else if StrEqualIgnoringCase( AlignParam, 'right' ) then
     Result := taRight
   else
@@ -537 +539 @@
 function GetTagTextWrap( const WrapParam: string ): boolean;
 begin
-  Result := StringsSame( WrapParam, 'yes' );
+  Result := StrEqualIgnoringCase( WrapParam, 'yes' );
 end;
 
@@ -619 +621 @@
             Result := true;
             pMatch := pMatchStart;
-            MatchLength := PCharDiff( P, pMatchStart )
+            MatchLength := PCharPointerDiff( P, pMatchStart )
                            + 1; // include this char
             exit;
@@ -746 +748 @@
   end;
   pWordStart := P;
-  WordLength := PCharDiff( pWordEnd, pWordStart );
+  WordLength := PCharPointerDiff( pWordEnd, pWordStart );
   Result := true;
 end;
@@ -798 +800 @@
     P := NextP;
   end;
-  result := PCharDiff( Q, Buffer );
+  result := PCharPointerDiff( Q, Buffer );
 end;