pascal/lazarus-ccr
1
0
Fork 0
Code Issues Releases Activity

TRxDBGridExportSpreadSheet - fix compile with fpc 2.6.4

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@3389 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
alexs75
2014-07-28 06:50:07 +00:00
parent 2544034f55
commit 9416bef4c7
5 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/rx/trunk/languages/rxdconst.es.po
View File

@ -75,8 +75,8 @@ msgstr "Campo '%s' no usado en expresión de filtro"
#: rxdconst.sexprbadnulltest #: rxdconst.sexprbadnulltest
#, fuzzy #, fuzzy
#| msgid "NULL-values enabled in '=' и '<>'" #| msgid "NULL-values enabled in '=' и '<>'"
msgid "NULL-values enabled in '=' и '<>'" msgid "NULL-values enabled in '=' и '<>'"
msgstr "Valor nulo habilitado en '=' y '<>'" msgstr "Valor nulo habilitado en '=' y '<>'"
#: rxdconst.sexprexpected #: rxdconst.sexprexpected

2
components/rx/trunk/languages/rxdconst.po
View File

@ -74,7 +74,7 @@ msgid "Field '%s' not used in filter expression"
msgstr "" msgstr ""
#: rxdconst.sexprbadnulltest #: rxdconst.sexprbadnulltest
msgid "NULL-values enabled in '=' и '<>'" msgid "NULL-values enabled in '=' и '<>'"
msgstr "" msgstr ""
#: rxdconst.sexprexpected #: rxdconst.sexprexpected

4
components/rx/trunk/languages/rxdconst.ru.po
View File

@ -75,8 +75,8 @@ msgstr "Поле '%s' не может быть использовано в вы
#: rxdconst.sexprbadnulltest #: rxdconst.sexprbadnulltest
#, fuzzy #, fuzzy
#| msgid "NULL-values enabled in '=' и '<>'" #| msgid "NULL-values enabled in '=' и '<>'"
msgid "NULL-values enabled in '=' и '<>'" msgid "NULL-values enabled in '=' и '<>'"
msgstr "NULL-значения разрешены только в выражениях '=' и '<>'" msgstr "NULL-значения разрешены только в выражениях '=' и '<>'"
#: rxdconst.sexprexpected #: rxdconst.sexprexpected

4
components/rx/trunk/languages/rxdconst.uk.po
View File

@ -84,8 +84,8 @@ msgstr "Поле '%s' не може бути використане в вира
#: rxdconst.sexprbadnulltest #: rxdconst.sexprbadnulltest
#, fuzzy #, fuzzy
#| msgid "NULL-values enabled in '=' и '<>'" #| msgid "NULL-values enabled in '=' и '<>'"
msgid "NULL-values enabled in '=' и '<>'" msgid "NULL-values enabled in '=' и '<>'"
msgstr "NULL-значення дозволені тільки у виразах '=' і '<>'" msgstr "NULL-значення дозволені тільки у виразах '=' і '<>'"
#: rxdconst.sexprexpected #: rxdconst.sexprexpected

11
components/rx/trunk/rxdbgridexportspreadsheet.pas
View File

@ -31,7 +31,7 @@
unit RxDBGridExportSpreadSheet; unit RxDBGridExportSpreadSheet;
{$mode objfpc}{$H+} {$I rx.inc}
interface interface
@ -264,7 +264,11 @@ begin
exit; exit;
FDataSet:=FRxDBGrid.DataSource.DataSet; FDataSet:=FRxDBGrid.DataSource.DataSet;
FDataSet.DisableControls; FDataSet.DisableControls;
{$IFDEF NoAutomatedBookmark}
P:=FDataSet.GetBookmark;
{$ELSE}
P:=FDataSet.Bookmark; P:=FDataSet.Bookmark;
{$ENDIF}
FWorkbook := TsWorkbook.Create; FWorkbook := TsWorkbook.Create;
FWorksheet := FWorkbook.AddWorksheet(FPageName); FWorksheet := FWorkbook.AddWorksheet(FPageName);
@ -285,7 +289,12 @@ begin
Result:=true; Result:=true;
finally finally
FWorkbook.Free; FWorkbook.Free;
{$IFDEF NoAutomatedBookmark}
FDataSet.GotoBookmark(P);
FDataSet.FreeBookmark(P);
{$ELSE}
FDataSet.Bookmark:=P; FDataSet.Bookmark:=P;
{$ENDIF}
FDataSet.EnableControls; FDataSet.EnableControls;
end; end;