Browse Source

* Partially undo revision 16529: removing VariantToShortString breaks webtbs/tw14536 which calls the mentioned function directly instead of using typecast.

git-svn-id: trunk@16557 -
sergei 14 years ago
parent
commit
3c2d918cfe
2 changed files with 6 additions and 0 deletions
  1. 5 0
      rtl/objpas/cvarutil.inc
  2. 1 0
      rtl/objpas/varutilh.inc

+ 5 - 0
rtl/objpas/cvarutil.inc

@@ -1422,6 +1422,11 @@ begin
 end;
 
 
+Function VariantToShortString(const VargSrc : TVarData) : ShortString;
+begin
+  Result:=VariantToAnsiString(VargSrc);
+end;
+
 { ---------------------------------------------------------------------
     Some debug routines
   ---------------------------------------------------------------------}

+ 1 - 0
rtl/objpas/varutilh.inc

@@ -71,6 +71,7 @@ function VariantToInt64(const VargSrc : TVarData ) : Int64;
 function VariantToQWord(const VargSrc : TVarData ) : Qword;
 function VariantToWideString(const VargSrc : TVarData) : WideString;
 function VariantToAnsiString(const VargSrc : TVarData) : AnsiString;
+function VariantToShortString(const VargSrc : TVarData) : ShortString;
 
 {Debug routines }
 procedure DumpVariant(const VSrc : Variant);