diff --git a/.gitattributes b/.gitattributes
index 75bb572aaf..fc642b5700 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -4227,8 +4227,8 @@ examples/xmlreader/TestXMLReder.lpr svneol=native#text/plain
examples/xmlreader/TestXMLReder.lrs svneol=native#text/plain
examples/xmlreader/TestXMLReder.manifest svneol=native#text/plain
examples/xmlreader/TestXMLReder.rc svneol=native#text/plain
+examples/xmlreader/test.xml svneol=native#text/plain
examples/xmlreader/testxmlreaderunit.lfm svneol=native#text/plain
-examples/xmlreader/testxmlreaderunit.lrs svneol=native#text/plain
examples/xmlreader/testxmlreaderunit.pas svneol=native#text/plain
examples/xmlstreaming/mainunit.lfm svneol=native#text/plain
examples/xmlstreaming/mainunit.lrs svneol=native#text/pascal
diff --git a/examples/xmlreader/TestXMLReder.lpi b/examples/xmlreader/TestXMLReder.lpi
index ac1ab840f2..66d3167e1c 100644
--- a/examples/xmlreader/TestXMLReder.lpi
+++ b/examples/xmlreader/TestXMLReder.lpi
@@ -1,21 +1,23 @@
-
+
-
-
-
+
+
-
+
+
+
+
@@ -25,7 +27,7 @@
-
+
@@ -45,43 +47,47 @@
+
-
-
+
+
+
+
+
-
+
-
+
-
+
-
+
-
+
@@ -94,17 +100,26 @@
+
+
+
+
-
+
-
+
+
+
+
+
+
@@ -129,4 +144,5 @@
+
diff --git a/examples/xmlreader/test.xml b/examples/xmlreader/test.xml
new file mode 100644
index 0000000000..ac1ab840f2
--- /dev/null
+++ b/examples/xmlreader/test.xml
@@ -0,0 +1,132 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/examples/xmlreader/testxmlreaderunit.lfm b/examples/xmlreader/testxmlreaderunit.lfm
index 96570154b6..b8d920e040 100644
--- a/examples/xmlreader/testxmlreaderunit.lfm
+++ b/examples/xmlreader/testxmlreaderunit.lfm
@@ -1,24 +1,24 @@
object XMLRederForm: TXMLRederForm
Left = 312
- Height = 690
+ Height = 381
Top = 119
- Width = 939
+ Width = 732
ActiveControl = Panel1
Caption = 'XML reader test'
- ClientHeight = 690
- ClientWidth = 939
+ ClientHeight = 381
+ ClientWidth = 732
OnClose = FormClose
OnCreate = FormCreate
Position = poScreenCenter
- LCLVersion = '0.9.29'
+ LCLVersion = '1.1'
object TreeView1: TTreeView
Left = 0
- Height = 624
- Top = 66
- Width = 457
+ Height = 316
+ Top = 65
+ Width = 342
Align = alLeft
AutoExpand = True
- DefaultItemHeight = 19
+ DefaultItemHeight = 18
ReadOnly = True
TabOrder = 0
OnClick = TreeView1Click
@@ -26,23 +26,23 @@ object XMLRederForm: TXMLRederForm
end
object Panel1: TPanel
Left = 0
- Height = 66
+ Height = 65
Top = 0
- Width = 939
+ Width = 732
Align = alTop
AutoSize = True
- ClientHeight = 66
- ClientWidth = 939
+ ClientHeight = 65
+ ClientWidth = 732
TabOrder = 1
object BitBtn1: TBitBtn
AnchorSideTop.Control = Label1
AnchorSideTop.Side = asrBottom
AnchorSideRight.Control = Panel1
AnchorSideRight.Side = asrBottom
- Left = 867
+ Left = 666
Height = 30
- Top = 30
- Width = 66
+ Top = 28
+ Width = 59
Anchors = [akTop, akRight]
AutoSize = True
BorderSpacing.Around = 6
@@ -66,10 +66,10 @@ object XMLRederForm: TXMLRederForm
object Label1: TLabel
AnchorSideLeft.Control = Panel1
AnchorSideTop.Control = Panel1
- Left = 6
- Height = 18
- Top = 6
- Width = 66
+ Left = 7
+ Height = 15
+ Top = 7
+ Width = 52
BorderSpacing.Around = 6
Caption = 'File name'
ParentColor = False
@@ -78,16 +78,16 @@ object XMLRederForm: TXMLRederForm
AnchorSideLeft.Control = Label1
AnchorSideTop.Control = Label1
AnchorSideTop.Side = asrBottom
- Left = 12
- Height = 29
- Top = 30
- Width = 828
- FileName = '/home/alexs/work/a/2009-11-24/Magazin_7_RealizaciqTovarovUslug_2009-11-11.xml'
+ Left = 13
+ Height = 25
+ Top = 28
+ Width = 620
+ FileName = 'test.xml'
DialogOptions = []
FilterIndex = 0
HideDirectories = False
ButtonWidth = 23
- NumGlyphs = 0
+ NumGlyphs = 1
Anchors = [akTop, akLeft, akRight]
BorderSpacing.Left = 6
BorderSpacing.Top = 6
@@ -97,28 +97,28 @@ object XMLRederForm: TXMLRederForm
end
end
object Splitter1: TSplitter
- Left = 457
- Height = 624
- Top = 66
+ Left = 342
+ Height = 316
+ Top = 65
Width = 5
end
object Panel2: TPanel
- Left = 462
- Height = 624
- Top = 66
- Width = 477
+ Left = 347
+ Height = 316
+ Top = 65
+ Width = 385
Align = alClient
Caption = 'Panel2'
- ClientHeight = 624
- ClientWidth = 477
+ ClientHeight = 316
+ ClientWidth = 385
TabOrder = 3
object ListView1: TListView
AnchorSideTop.Control = Edit2
AnchorSideTop.Side = asrBottom
Left = 1
- Height = 499
- Top = 124
- Width = 475
+ Height = 204
+ Top = 111
+ Width = 383
Align = alBottom
Anchors = [akTop, akLeft, akRight, akBottom]
BorderSpacing.Top = 6
@@ -137,10 +137,10 @@ object XMLRederForm: TXMLRederForm
object Label2: TLabel
AnchorSideLeft.Control = Panel2
AnchorSideTop.Control = Panel2
- Left = 6
- Height = 18
- Top = 6
- Width = 81
+ Left = 7
+ Height = 15
+ Top = 7
+ Width = 63
BorderSpacing.Around = 6
Caption = 'Node name'
ParentColor = False
@@ -149,10 +149,10 @@ object XMLRederForm: TXMLRederForm
AnchorSideLeft.Control = Panel2
AnchorSideTop.Control = Edit1
AnchorSideTop.Side = asrBottom
- Left = 6
- Height = 18
- Top = 65
- Width = 78
+ Left = 7
+ Height = 15
+ Top = 59
+ Width = 62
BorderSpacing.Around = 6
Caption = 'Node value'
ParentColor = False
@@ -163,10 +163,10 @@ object XMLRederForm: TXMLRederForm
AnchorSideTop.Side = asrBottom
AnchorSideRight.Control = Panel2
AnchorSideRight.Side = asrBottom
- Left = 12
- Height = 29
- Top = 30
- Width = 459
+ Left = 13
+ Height = 25
+ Top = 28
+ Width = 365
Anchors = [akTop, akLeft, akRight]
BorderSpacing.Around = 6
TabOrder = 1
@@ -178,10 +178,10 @@ object XMLRederForm: TXMLRederForm
AnchorSideTop.Side = asrBottom
AnchorSideRight.Control = Panel2
AnchorSideRight.Side = asrBottom
- Left = 12
- Height = 29
- Top = 89
- Width = 459
+ Left = 13
+ Height = 25
+ Top = 80
+ Width = 365
Anchors = [akTop, akLeft, akRight]
BorderSpacing.Around = 6
TabOrder = 2
diff --git a/examples/xmlreader/testxmlreaderunit.lrs b/examples/xmlreader/testxmlreaderunit.lrs
deleted file mode 100644
index f79911a465..0000000000
--- a/examples/xmlreader/testxmlreaderunit.lrs
+++ /dev/null
@@ -1,71 +0,0 @@
-{ Это - файл ресурсов, автоматически созданный lazarus }
-
-LazarusResources.Add('TXMLRederForm','FORMDATA',[
- 'TPF0'#13'TXMLRederForm'#12'XMLRederForm'#4'Left'#3'8'#1#6'Height'#3#178#2#3
- +'Top'#2'w'#5'Width'#3#171#3#13'ActiveControl'#7#6'Panel1'#7'Caption'#6#15'XM'
- +'L reader test'#12'ClientHeight'#3#178#2#11'ClientWidth'#3#171#3#7'OnClose'#7
- +#9'FormClose'#8'OnCreate'#7#10'FormCreate'#8'Position'#7#14'poScreenCenter'
- +#10'LCLVersion'#6#6'0.9.29'#0#9'TTreeView'#9'TreeView1'#4'Left'#2#0#6'Height'
- +#3'p'#2#3'Top'#2'B'#5'Width'#3#201#1#5'Align'#7#6'alLeft'#10'AutoExpand'#9#17
- +'DefaultItemHeight'#2#19#8'ReadOnly'#9#8'TabOrder'#2#0#7'OnClick'#7#14'TreeV'
- +'iew1Click'#7'Options'#11#13'tvoAutoExpand'#17'tvoAutoItemHeight'#16'tvoHide'
- +'Selection'#21'tvoKeepCollapsedNodes'#11'tvoReadOnly'#14'tvoShowButtons'#12
- +'tvoShowLines'#11'tvoShowRoot'#11'tvoToolTips'#0#0#0#6'TPanel'#6'Panel1'#4'L'
- +'eft'#2#0#6'Height'#2'B'#3'Top'#2#0#5'Width'#3#171#3#5'Align'#7#5'alTop'#8'A'
- +'utoSize'#9#12'ClientHeight'#2'B'#11'ClientWidth'#3#171#3#8'TabOrder'#2#1#0#7
- +'TBitBtn'#7'BitBtn1'#21'AnchorSideTop.Control'#7#6'Label1'#18'AnchorSideTop.'
- +'Side'#7#9'asrBottom'#23'AnchorSideRight.Control'#7#6'Panel1'#20'AnchorSideR'
- +'ight.Side'#7#9'asrBottom'#4'Left'#3'c'#3#6'Height'#2#30#3'Top'#2#30#5'Width'
- +#2'B'#7'Anchors'#11#5'akTop'#7'akRight'#0#8'AutoSize'#9#20'BorderSpacing.Aro'
- +'und'#2#6#7'Caption'#6#4'Load'#10'Glyph.Data'#10'R'#1#0#0'N'#1#0#0'BMN'#1#0#0
- +#0#0#0#0'v'#0#0#0'('#0#0#0#18#0#0#0#18#0#0#0#1#0#4#0#0#0#0#0#216#0#0#0#0#0#0
- +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#128#0#0#128#0#0#0#128#128#0#128#0#0#0
- +#128#0#128#0#128#128#0#0#128#128#128#0#192#192#192#0#0#0#255#0#0#255#0#0#0
- +#255#255#0#255#0#0#0#255#0#255#0#255#255#0#0#255#255#255#0#238#238#238#238
- +#238#238#238#238#238#0#0#0#238#238#238#238#238#238#238#238#238#0#0#0#238#0#0
- +#0#0#0#14#238#238#0#0#0#238#0'33330'#238#238#0#0#0#238#11#3'3333'#14#238#0#0
- +#0#238#15#176'33330'#238#0#0#0#238#11#251#3'3333'#14#0#0#0#238#15#191#176#0#0
- +#0#0#0#0#0#0#238#11#251#251#251#251#14#238#238#0#0#0#238#15#191#191#191#191
- +#14#238#238#0#0#0#238#11#251#0#0#0#14#238#238#0#0#0#238#224#0#238#238#238#238
- +#0#14#0#0#0#238#238#238#238#238#238#238#224#14#0#0#0#238#238#238#238#238#14
- +#238#14#14#0#0#0#238#238#238#238#238#224#0#238#238#0#0#0#238#238#238#238#238
- +#238#238#238#238#0#0#0#238#238#238#238#238#238#238#238#238#0#0#0#238#238#238
- +#238#238#238#238#238#238#0#0#0#7'OnClick'#7#12'BitBtn1Click'#8'TabOrder'#2#0
- +#0#0#6'TLabel'#6'Label1'#22'AnchorSideLeft.Control'#7#6'Panel1'#21'AnchorSid'
- +'eTop.Control'#7#6'Panel1'#4'Left'#2#6#6'Height'#2#18#3'Top'#2#6#5'Width'#2
- +'B'#20'BorderSpacing.Around'#2#6#7'Caption'#6#9'File name'#11'ParentColor'#8
- +#0#0#13'TFileNameEdit'#13'FileNameEdit1'#22'AnchorSideLeft.Control'#7#6'Labe'
- +'l1'#21'AnchorSideTop.Control'#7#6'Label1'#18'AnchorSideTop.Side'#7#9'asrBot'
- +'tom'#4'Left'#2#12#6'Height'#2#29#3'Top'#2#30#5'Width'#3'<'#3#8'FileName'#6
- +'M/home/alexs/work/a/2009-11-24/Magazin_7_RealizaciqTovarovUslug_2009-11-11.'
- +'xml'#13'DialogOptions'#11#0#11'FilterIndex'#2#0#15'HideDirectories'#8#11'Bu'
- +'ttonWidth'#2#23#9'NumGlyphs'#2#0#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'
- +#0#18'BorderSpacing.Left'#2#6#17'BorderSpacing.Top'#2#6#20'BorderSpacing.Bot'
- +'tom'#2#6#9'MaxLength'#2#0#8'TabOrder'#2#1#0#0#0#9'TSplitter'#9'Splitter1'#4
- +'Left'#3#201#1#6'Height'#3'p'#2#3'Top'#2'B'#5'Width'#2#5#0#0#6'TPanel'#6'Pan'
- +'el2'#4'Left'#3#206#1#6'Height'#3'p'#2#3'Top'#2'B'#5'Width'#3#221#1#5'Align'
- +#7#8'alClient'#7'Caption'#6#6'Panel2'#12'ClientHeight'#3'p'#2#11'ClientWidth'
- +#3#221#1#8'TabOrder'#2#3#0#9'TListView'#9'ListView1'#21'AnchorSideTop.Contro'
- +'l'#7#5'Edit2'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#1#6'Height'#3
- +#243#1#3'Top'#2'|'#5'Width'#3#219#1#5'Align'#7#8'alBottom'#7'Anchors'#11#5'a'
- +'kTop'#6'akLeft'#7'akRight'#8'akBottom'#0#17'BorderSpacing.Top'#2#6#7'Column'
- +'s'#14#1#7'Caption'#6#4'Name'#5'Width'#2'd'#0#1#7'Caption'#6#5'Value'#5'Widt'
- +'h'#3'^'#1#0#0#8'TabOrder'#2#0#9'ViewStyle'#7#8'vsReport'#0#0#6'TLabel'#6'La'
- +'bel2'#22'AnchorSideLeft.Control'#7#6'Panel2'#21'AnchorSideTop.Control'#7#6
- +'Panel2'#4'Left'#2#6#6'Height'#2#18#3'Top'#2#6#5'Width'#2'Q'#20'BorderSpacin'
- +'g.Around'#2#6#7'Caption'#6#9'Node name'#11'ParentColor'#8#0#0#6'TLabel'#6'L'
- +'abel3'#22'AnchorSideLeft.Control'#7#6'Panel2'#21'AnchorSideTop.Control'#7#5
- +'Edit1'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#18#3'T'
- +'op'#2'A'#5'Width'#2'N'#20'BorderSpacing.Around'#2#6#7'Caption'#6#10'Node va'
- +'lue'#11'ParentColor'#8#0#0#5'TEdit'#5'Edit1'#22'AnchorSideLeft.Control'#7#6
- +'Label2'#21'AnchorSideTop.Control'#7#6'Label2'#18'AnchorSideTop.Side'#7#9'as'
- +'rBottom'#23'AnchorSideRight.Control'#7#6'Panel2'#20'AnchorSideRight.Side'#7
- +#9'asrBottom'#4'Left'#2#12#6'Height'#2#29#3'Top'#2#30#5'Width'#3#203#1#7'Anc'
- +'hors'#11#5'akTop'#6'akLeft'#7'akRight'#0#20'BorderSpacing.Around'#2#6#8'Tab'
- +'Order'#2#1#4'Text'#6#5'Edit1'#0#0#5'TEdit'#5'Edit2'#22'AnchorSideLeft.Contr'
- +'ol'#7#6'Label3'#21'AnchorSideTop.Control'#7#6'Label3'#18'AnchorSideTop.Side'
- +#7#9'asrBottom'#23'AnchorSideRight.Control'#7#6'Panel2'#20'AnchorSideRight.S'
- ,'ide'#7#9'asrBottom'#4'Left'#2#12#6'Height'#2#29#3'Top'#2'Y'#5'Width'#3#203#1
- +#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#20'BorderSpacing.Around'#2#6#8
- +'TabOrder'#2#2#4'Text'#6#5'Edit2'#0#0#0#0
-]);
diff --git a/examples/xmlreader/testxmlreaderunit.pas b/examples/xmlreader/testxmlreaderunit.pas
index 9fb44ca019..1fb75f47f5 100644
--- a/examples/xmlreader/testxmlreaderunit.pas
+++ b/examples/xmlreader/testxmlreaderunit.pas
@@ -128,8 +128,7 @@ begin
TreeView1Click(nil);
end;
-initialization
- {$I testxmlreaderunit.lrs}
+{$R *.lfm}
end.