diff options
author | marco <marco@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2017-06-23 11:28:27 +0000 |
---|---|---|
committer | marco <marco@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2017-06-23 11:28:27 +0000 |
commit | 14cdc67da2b489acc3e02012d644597da2c5e2c4 (patch) | |
tree | 9e2ac44cf8891345eb87ea649a87c404e817cc77 | |
parent | 6890c71f322a3a2261b624567be3f5d894250ebe (diff) | |
download | fpc-14cdc67da2b489acc3e02012d644597da2c5e2c4.tar.gz |
--- Merging r36585 into '.':
U packages/fcl-base/src/inifiles.pp
--- Recording mergeinfo for merge of r36585 into '.':
U .
# revisions: 36585
git-svn-id: https://svn.freepascal.org/svn/fpc/branches/fixes_3_0@36586 3ad0048d-3df7-0310-abae-a5850022a9f2
-rw-r--r-- | packages/fcl-base/src/inifiles.pp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/packages/fcl-base/src/inifiles.pp b/packages/fcl-base/src/inifiles.pp index 6ecd2be960..89d9f95953 100644 --- a/packages/fcl-base/src/inifiles.pp +++ b/packages/fcl-base/src/inifiles.pp @@ -220,7 +220,7 @@ type procedure ReadSection(const Section: string; Strings: TStrings); override; procedure ReadSectionRaw(const Section: string; Strings: TStrings); procedure ReadSections(Strings: TStrings); override; - procedure ReadSectionValues(const Section: string; Strings: TStrings; AOptions : TSectionValuesOptions = []); overload; override; + procedure ReadSectionValues(const Section: string; Strings: TStrings; AOptions : TSectionValuesOptions = [svoIncludeInvalid]); overload; override; procedure EraseSection(const Section: string); override; procedure DeleteKey(const Section, Ident: String); override; procedure UpdateFile; override; @@ -832,7 +832,7 @@ end; procedure TCustomIniFile.ReadSectionValues(const Section: string; Strings: TStrings); begin - ReadSectionValues(Section,Strings,[]); + ReadSectionValues(Section,Strings,[svoIncludeInvalid]); end; { TIniFile } @@ -1113,7 +1113,7 @@ begin end; end; -procedure TIniFile.ReadSectionValues(const Section: string; Strings: TStrings; AOptions : TSectionValuesOptions = []); +procedure TIniFile.ReadSectionValues(const Section: string; Strings: TStrings; AOptions : TSectionValuesOptions = [svoIncludeInvalid]); var oSection: TIniFileSection; s: string; |