paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-09-02 01:41:53 +02:00
Code Issues Packages Projects Releases Wiki Activity

IDE, XmlConfig: Fixed storing properties (rtti), when "stored" incorrectly overwrote Default-instance. Introduced in r61887 #70005fc17a

Browse Source 
git-svn-id: trunk@62296 -
This commit is contained in:
martin 2019-11-25 15:19:23 +00:00
parent 189ff81e4a
commit be4d0c5b2e
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
components/lazutils/laz2_xmlcfg.pas
View File

@ -933,7 +933,7 @@ begin
if (DefInstance <> nil) then
DefValue := GetOrdProp(DefInstance, PropInfo);
if ((DefInstance <> nil) and (Value = DefValue)) or
(not IsStoredProp(Instance, PropInfo))
((DefInstance = nil) and (not IsStoredProp(Instance, PropInfo)))
then
DeleteValue(Path)
else begin
@ -972,7 +972,7 @@ begin
if (DefInstance <> nil) then
DefFloatValue := GetFloatProp(DefInstance, PropInfo);
if ((DefInstance <> nil) and (DefFloatValue = FloatValue)) or
(not IsStoredProp(Instance, PropInfo))
((DefInstance = nil) and (not IsStoredProp(Instance, PropInfo)))
then
DeleteValue(Path)
else
@ -984,7 +984,7 @@ begin
if (DefInstance <> nil) then
DefStrValue := GetStrProp(DefInstance, PropInfo);
if ((DefInstance <> nil) and (DefStrValue = StrValue)) or
(not IsStoredProp(Instance, PropInfo))
((DefInstance = nil) and (not IsStoredProp(Instance, PropInfo)))
then
DeleteValue(Path)
else
@ -996,7 +996,7 @@ begin
if (DefInstance <> nil) then
WDefStrValue := GetWideStrProp(DefInstance, PropInfo);
if ((DefInstance <> nil) and (WDefStrValue = WStrValue)) or
(not IsStoredProp(Instance, PropInfo))
((DefInstance = nil) and (not IsStoredProp(Instance, PropInfo)))
then
DeleteValue(Path)
else
@ -1008,7 +1008,7 @@ begin
if (DefInstance <> nil) then
DefInt64Value := GetInt64Prop(DefInstance, PropInfo)
if ((DefInstance <> nil) and (Int64Value = DefInt64Value)) or
(not IsStoredProp(Instance, PropInfo))
((DefInstance = nil) and (not IsStoredProp(Instance, PropInfo)))
then
DeleteValue(Path, Path)
else
@ -1020,7 +1020,7 @@ begin
if (DefInstance <> nil) then
DefBoolValue := GetOrdProp(DefInstance, PropInfo)<>0;
if ((DefInstance <> nil) and (BoolValue = DefBoolValue)) or
(not IsStoredProp(Instance, PropInfo))
((DefInstance = nil) and (not IsStoredProp(Instance, PropInfo)))
then
DeleteValue(Path)
else