diff --git a/components/rx/trunk/languages/rxdconst.es.po b/components/rx/trunk/languages/rxdconst.es.po
index 1171ce8c5..fa4838140 100644
--- a/components/rx/trunk/languages/rxdconst.es.po
+++ b/components/rx/trunk/languages/rxdconst.es.po
@@ -75,8 +75,8 @@ msgstr "Campo '%s' no usado en expresión de filtro"
 
 #: rxdconst.sexprbadnulltest
 #, 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 '<>'"
 
 #: rxdconst.sexprexpected
diff --git a/components/rx/trunk/languages/rxdconst.po b/components/rx/trunk/languages/rxdconst.po
index 40b98c58e..6686c7d1b 100644
--- a/components/rx/trunk/languages/rxdconst.po
+++ b/components/rx/trunk/languages/rxdconst.po
@@ -74,7 +74,7 @@ msgid "Field '%s' not used in filter expression"
 msgstr ""
 
 #: rxdconst.sexprbadnulltest
-msgid "NULL-values enabled in '=' и '<>'"
+msgid "NULL-values enabled in '=' и '<>'"
 msgstr ""
 
 #: rxdconst.sexprexpected
diff --git a/components/rx/trunk/languages/rxdconst.ru.po b/components/rx/trunk/languages/rxdconst.ru.po
index 76ccdf6bf..38f3a8a9b 100644
--- a/components/rx/trunk/languages/rxdconst.ru.po
+++ b/components/rx/trunk/languages/rxdconst.ru.po
@@ -75,8 +75,8 @@ msgstr "Поле '%s' не может быть использовано в вы
 
 #: rxdconst.sexprbadnulltest
 #, fuzzy
-#| msgid "NULL-values enabled in '=' и '<>'"
-msgid "NULL-values enabled in '=' и '<>'"
+#| msgid "NULL-values enabled in '=' и '<>'"
+msgid "NULL-values enabled in '=' и '<>'"
 msgstr "NULL-значения разрешены только в выражениях '=' и '<>'"
 
 #: rxdconst.sexprexpected
diff --git a/components/rx/trunk/languages/rxdconst.uk.po b/components/rx/trunk/languages/rxdconst.uk.po
index b6fa70d48..f479eba5b 100644
--- a/components/rx/trunk/languages/rxdconst.uk.po
+++ b/components/rx/trunk/languages/rxdconst.uk.po
@@ -84,8 +84,8 @@ msgstr "Поле '%s' не може бути використане в вира
 
 #: rxdconst.sexprbadnulltest
 #, fuzzy
-#| msgid "NULL-values enabled in '=' и '<>'"
-msgid "NULL-values enabled in '=' и '<>'"
+#| msgid "NULL-values enabled in '=' и '<>'"
+msgid "NULL-values enabled in '=' и '<>'"
 msgstr "NULL-значення дозволені тільки у виразах '=' і '<>'"
 
 #: rxdconst.sexprexpected
diff --git a/components/rx/trunk/rxdbgridexportspreadsheet.pas b/components/rx/trunk/rxdbgridexportspreadsheet.pas
index 97cd6ed59..7a522c171 100644
--- a/components/rx/trunk/rxdbgridexportspreadsheet.pas
+++ b/components/rx/trunk/rxdbgridexportspreadsheet.pas
@@ -31,7 +31,7 @@
 
 unit RxDBGridExportSpreadSheet;
 
-{$mode objfpc}{$H+}
+{$I rx.inc}
 
 interface
 
@@ -264,7 +264,11 @@ begin
     exit;
   FDataSet:=FRxDBGrid.DataSource.DataSet;
   FDataSet.DisableControls;
+  {$IFDEF NoAutomatedBookmark}
+  P:=FDataSet.GetBookmark;
+  {$ELSE}
   P:=FDataSet.Bookmark;
+  {$ENDIF}
 
   FWorkbook := TsWorkbook.Create;
   FWorksheet := FWorkbook.AddWorksheet(FPageName);
@@ -285,7 +289,12 @@ begin
     Result:=true;
   finally
     FWorkbook.Free;
+    {$IFDEF NoAutomatedBookmark}
+    FDataSet.GotoBookmark(P);
+    FDataSet.FreeBookmark(P);
+    {$ELSE}
     FDataSet.Bookmark:=P;
+    {$ENDIF}
     FDataSet.EnableControls;
   end;