paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-07-23 18:45:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

LazReport, fix selecting the right export filter when there are multiple options for the same file format (ej PowerPDF and CairoExport), probably broken in r49728 #400b4c4719

Browse Source 
git-svn-id: trunk@52466 -
This commit is contained in:
jesus 2016-06-09 20:51:44 +00:00
parent d4b66e8921
commit 1c61bf995e
1 changed files with 35 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
components/lazreport/source/lr_view.pas
View File

@ -1347,68 +1347,53 @@ end;
procedure TfrPreviewForm.SaveBtnClick(Sender: TObject);
var
i, Index, IndexOffset: Integer;
FilterStr, FilterExtension, FileExtension: String;
i, Index: Integer;
FilterStr: string;
FilterInfo: TExportFilterItem;
FExtList:TStringList;
begin
if EMFPages = nil then Exit;
FExtList:=TStringList.Create;
Index := 1;
if not (roHideDefaultFilter in TfrReport(Doc).Options) then
begin
FExtList.Add('*.frp');
FilterStr := sRepFile + ' (*.frp)|*.frp';
IndexOffset := 2;
end
else
begin
FilterStr := '';
IndexOffset := 1;
end;
FileExtension := ExtractFileExt(SaveDialog.FileName);
for i := 0 to ExportFilters.Count - 1 do
begin
FilterInfo := ExportFilters[i];
if FilterInfo.Enabled then
try
Index := 1;
if not (roHideDefaultFilter in TfrReport(Doc).Options) then
begin
FExtList.Add(FilterInfo.FilterExt);
if FilterStr <> '' then
FilterStr := FilterStr + '|';
FilterStr := FilterStr + FilterInfo.FilterDesc + '|' + FilterInfo.FilterExt;
FilterExtension := ExtractFileExt(FilterInfo.FilterExt);
if (Index = 1) and (Comparetext(FilterExtension, FileExtension)=0) then
Index := i + IndexOffset;
end;
end;
FExtList.Add('*.frp');
FilterStr := sRepFile + ' (*.frp)|*.frp';
end else
FilterStr := '';
SaveDialog.Filter := FilterStr;
SaveDialog.FilterIndex := Index;
if SaveDialog.Execute then
begin
FileExtension:=ExtractFileExt(SaveDialog.FileName);
if FileExtension = '' then
FileExtension:=UTF8Copy(FExtList[SaveDialog.FilterIndex - 1], 2, UTF8Length(FExtList[SaveDialog.FilterIndex - 1]) - 1);
if FileExtension = '.frp' then
SaveToFile(SaveDialog.FileName)
else
for i := 0 to ExportFilters.Count - 1 do
begin
for i := 0 to ExportFilters.Count - 1 do
FilterInfo := ExportFilters[i];
if FilterInfo.Enabled then
begin
FilterInfo := ExportFilters[i];
if FilterInfo.Enabled and (FileExtension = UTF8Copy(FilterInfo.FilterExt, 2, UTF8Length(FilterInfo.FilterExt) - 1)) then
begin
ExportToWithFilterIndex(i, ChangeFileExt(SaveDialog.FileName, FileExtension));
break;
end;
FExtList.AddObject(FilterInfo.FilterExt, TObject(PtrInt(i)));
if FilterStr <> '' then
FilterStr := FilterStr + '|';
FilterStr := FilterStr + FilterInfo.FilterDesc + '|' + FilterInfo.FilterExt;
end;
end;
end;
FExtList.Free;
ScrollBox1.Invalidate;
SaveDialog.Filter := FilterStr;
SaveDialog.FilterIndex := Index;
if SaveDialog.Execute then
begin
Index := SaveDialog.FilterIndex - 1;
if fExtList.Objects[Index]=nil then
SaveToFile(SaveDialog.Filename) // using .frp
else
begin
Index := PtrInt(fExtList.Objects[Index]);
WriteLn('Exporting ',SaveDialog.FileName,' with ', ExportFilters[Index].FilterDesc);
ExportToWithFilterIndex(Index, SaveDialog.FileName);
end;
end;
finally
FExtList.Free;
ScrollBox1.Invalidate;
end;
end;
procedure TfrPreviewForm.PrintBtnClick(Sender: TObject);