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

chmhelp, lhelp: cleanup

Browse Source 
git-svn-id: trunk@31949 -
This commit is contained in:
juha 2011-08-11 20:25:23 +00:00
parent c7d7e4e44d
commit 3e2ccd6a39
3 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
components/chmhelp/lhelp/chmcontentprovider.pas
View File

@ -448,12 +448,12 @@ end;
procedure TChmContentProvider.FillTOC(Data: PtrInt);
var
fChm: TChmReader;
ParentNode: TTreeNode;
i: Integer;
SM: TChmSiteMap;
HasSearchIndex: Boolean = False;
Stream: TMemoryStream;
fChm: TChmReader;
ParentNode: TTreeNode;
i: Integer;
SM: TChmSiteMap;
HasSearchIndex: Boolean = False;
Stream: TMemoryStream;
begin
if fFillingToc or fFillingIndex then begin
Application.QueueAsyncCall(@FillToc, Data);
@ -575,10 +575,10 @@ end;
procedure TChmContentProvider.ContentsTreeSelectionChanged(Sender: TObject);
var
ATreeNode: TContentTreeNode;
ARootNode: TTreeNode;
fChm: TChmReader = nil;
Uri: String;
ATreeNode: TContentTreeNode;
ARootNode: TTreeNode;
fChm: TChmReader = nil;
Uri: String;
begin
if (fContentsTree.Selected = nil) then Exit;
if fContentsTree.Selected.Parent = nil then
@ -676,7 +676,7 @@ var
SearchText: String;
Node: TTreeNode;
begin
if not fIndexEdit.Focused then Exit;
if not fIndexEdit.Focused then Exit;
SearchText := LowerCase(fIndexEdit.Text);
Node := fIndexView.Items.GetFirstNode;
while Node<>nil do begin
@ -872,6 +872,7 @@ var
k: Integer;
Item: TContentTreeNode;
begin
// if fKeywordCombo.Text = '' then Exit;
SearchWords := TStringList.Create;
SearchWords.Delimiter := ' ';
Searchwords.DelimitedText := fKeywordCombo.Text;

2
components/chmhelp/lhelp/chmdataprovider.pas
View File

@ -108,7 +108,7 @@ end;
function TIpChmDataProvider.DoCheckURL(const URL: string;
var ContentType: string): Boolean;
var
Reader: TChmReader = nil;
Reader: TChmReader = nil;
begin
//DebugLn('RequestedUrl: ',URL);
Result := fChm.ObjectExists(StripInPageLink(Url), Reader) > 0;

4
components/chmhelp/lhelp/lhelpcore.pas
View File

@ -608,7 +608,6 @@ begin
FileMenuCloseItem.Enabled := en;
ViewMenuContents.Enabled := en;
if en and not (csDestroying in ActivePage.ComponentState) then
Caption := 'LHelp - ' + ActivePage.fContentProvider.Title
else
@ -647,10 +646,7 @@ end;
finalization
if IPCServer <> nil then
try
FreeAndNil(IPCServer);
except
end;
end.