|
@@ -1287,6 +1287,14 @@ begin
|
|
end; {$ENDIF}
|
|
end; {$ENDIF}
|
|
end;
|
|
end;
|
|
|
|
|
|
|
|
+function VarDateToString(DT: TDateTime): AnsiString;
|
|
|
|
+begin
|
|
|
|
+ if Trunc(DT) = 0 then
|
|
|
|
+ Result := TimeToStr(DT)
|
|
|
|
+ else
|
|
|
|
+ Result := DateTimeToStr(DT);
|
|
|
|
+end;
|
|
|
|
+
|
|
{--- WideString ---}
|
|
{--- WideString ---}
|
|
|
|
|
|
Function VariantToWideString(const VargSrc : TVarData) : WideString;
|
|
Function VariantToWideString(const VargSrc : TVarData) : WideString;
|
|
@@ -1306,7 +1314,7 @@ begin
|
|
varSingle : Result := FloatToStr(vSingle);
|
|
varSingle : Result := FloatToStr(vSingle);
|
|
varDouble : Result := FloatToStr(vDouble);
|
|
varDouble : Result := FloatToStr(vDouble);
|
|
varCurrency : Result := FloatToStr(vCurrency);
|
|
varCurrency : Result := FloatToStr(vCurrency);
|
|
- varDate : Result := FloatToStr(vDate);
|
|
|
|
|
|
+ varDate : Result := VarDateToString(vDate);
|
|
{$endif}
|
|
{$endif}
|
|
varBoolean : Result := BoolToStr(vBoolean, True);
|
|
varBoolean : Result := BoolToStr(vBoolean, True);
|
|
varVariant : Result := VariantToWideString(PVarData(vPointer)^);
|
|
varVariant : Result := VariantToWideString(PVarData(vPointer)^);
|
|
@@ -1329,7 +1337,7 @@ begin
|
|
varSingle : Result := FloatToStr(PSingle(vPointer)^);
|
|
varSingle : Result := FloatToStr(PSingle(vPointer)^);
|
|
varDouble : Result := FloatToStr(PDouble(vPointer)^);
|
|
varDouble : Result := FloatToStr(PDouble(vPointer)^);
|
|
varCurrency : Result := FloatToStr(PCurrency(vPointer)^);
|
|
varCurrency : Result := FloatToStr(PCurrency(vPointer)^);
|
|
- varDate : Result := FloatToStr(PDate(vPointer)^);
|
|
|
|
|
|
+ varDate : Result := VarDateToString(PDate(vPointer)^);
|
|
{$endif}
|
|
{$endif}
|
|
varBoolean : Result := BoolToStr(PWordBool(vPointer)^, True);
|
|
varBoolean : Result := BoolToStr(PWordBool(vPointer)^, True);
|
|
varVariant : Result := VariantToWideString(PVarData(vPointer)^);
|
|
varVariant : Result := VariantToWideString(PVarData(vPointer)^);
|
|
@@ -1373,7 +1381,7 @@ begin
|
|
varSingle : Result := FloatToStr(vSingle);
|
|
varSingle : Result := FloatToStr(vSingle);
|
|
varDouble : Result := FloatToStr(vDouble);
|
|
varDouble : Result := FloatToStr(vDouble);
|
|
varCurrency : Result := FloatToStr(vCurrency);
|
|
varCurrency : Result := FloatToStr(vCurrency);
|
|
- varDate : Result := DateToStr(vDate);
|
|
|
|
|
|
+ varDate : Result := VarDateToString(vDate);
|
|
{$endif}
|
|
{$endif}
|
|
varBoolean : Result := BoolToStr(vBoolean, True);
|
|
varBoolean : Result := BoolToStr(vBoolean, True);
|
|
varVariant : Result := VariantToAnsiString(PVarData(vPointer)^);
|
|
varVariant : Result := VariantToAnsiString(PVarData(vPointer)^);
|
|
@@ -1396,7 +1404,7 @@ begin
|
|
varSingle : Result := FloatToStr(PSingle(vPointer)^);
|
|
varSingle : Result := FloatToStr(PSingle(vPointer)^);
|
|
varDouble : Result := FloatToStr(PDouble(vPointer)^);
|
|
varDouble : Result := FloatToStr(PDouble(vPointer)^);
|
|
varCurrency : Result := FloatToStr(PCurrency(vPointer)^);
|
|
varCurrency : Result := FloatToStr(PCurrency(vPointer)^);
|
|
- varDate : Result := DateToStr(PDate(vPointer)^);
|
|
|
|
|
|
+ varDate : Result := VarDateToString(PDate(vPointer)^);
|
|
{$endif}
|
|
{$endif}
|
|
varBoolean : Result := BoolToStr(PWordBool(vPointer)^, True);
|
|
varBoolean : Result := BoolToStr(PWordBool(vPointer)^, True);
|
|
varVariant : Result := VariantToAnsiString(PVarData(vPointer)^);
|
|
varVariant : Result := VariantToAnsiString(PVarData(vPointer)^);
|