diff --git a/components/lazreport/source/languages/lr_const.cs.po b/components/lazreport/source/languages/lr_const.cs.po index fc7ec3be3e..d88aa18050 100644 --- a/components/lazreport/source/languages/lr_const.cs.po +++ b/components/lazreport/source/languages/lr_const.cs.po @@ -460,6 +460,10 @@ msgstr "COPY(, , )/Vrací znaků z msgid "COUNT()/Returns count of data rows given in the . " msgstr "COUNT()/Vrací počet datových řádků zadaných v . " +#: lr_const.sdescriptioncrlf +msgid "CRLF/Returns lineending character sequence." +msgstr "" + #: lr_const.sdescriptiondayof msgid "DAYOF()/Returns day number (1..31) of given ." msgstr "DAYOF()/Vrací číslo dne (1..31) zadaného ." diff --git a/components/lazreport/source/languages/lr_const.de.po b/components/lazreport/source/languages/lr_const.de.po index c1ac35dfda..3ea5883b8c 100644 --- a/components/lazreport/source/languages/lr_const.de.po +++ b/components/lazreport/source/languages/lr_const.de.po @@ -461,6 +461,10 @@ msgstr "COPY(, , )/gibt Zeichen von msgid "COUNT()/Returns count of data rows given in the . " msgstr "COUNT()/Liefert die Zahl der Datenreihen des angegebenen . " +#: lr_const.sdescriptioncrlf +msgid "CRLF/Returns lineending character sequence." +msgstr "" + #: lr_const.sdescriptiondayof msgid "DAYOF()/Returns day number (1..31) of given ." msgstr "DAYOF()/Gibt den Tag (1..31) des angegebenen zurück." diff --git a/components/lazreport/source/languages/lr_const.es.po b/components/lazreport/source/languages/lr_const.es.po index 65c5c52e13..6f2848093d 100644 --- a/components/lazreport/source/languages/lr_const.es.po +++ b/components/lazreport/source/languages/lr_const.es.po @@ -454,6 +454,10 @@ msgstr "COPY(, , )/Devuelve caracteres desde msgid "COUNT()/Returns count of data rows given in the . " msgstr "COUNT()/Regresa la cuenta de registros en . " +#: lr_const.sdescriptioncrlf +msgid "CRLF/Returns lineending character sequence." +msgstr "" + #: lr_const.sdescriptiondayof msgid "DAYOF()/Returns day number (1..31) of given ." msgstr "DAYOF()/Regresa el día (1..31) de una dada." diff --git a/components/lazreport/source/languages/lr_const.fr.po b/components/lazreport/source/languages/lr_const.fr.po index f93b7f555a..76f4d6f802 100644 --- a/components/lazreport/source/languages/lr_const.fr.po +++ b/components/lazreport/source/languages/lr_const.fr.po @@ -452,6 +452,10 @@ msgstr "COPY(, , )/Retourne caractères msgid "COUNT()/Returns count of data rows given in the . " msgstr "COUNT()/Retourne le nombre de lignes de . " +#: lr_const.sdescriptioncrlf +msgid "CRLF/Returns lineending character sequence." +msgstr "" + #: lr_const.sdescriptiondayof msgid "DAYOF()/Returns day number (1..31) of given ." msgstr "DAYOF()/Renvoie le nombre de jours (1..31) de ." diff --git a/components/lazreport/source/languages/lr_const.hu.po b/components/lazreport/source/languages/lr_const.hu.po index a025592a46..58adb51c26 100644 --- a/components/lazreport/source/languages/lr_const.hu.po +++ b/components/lazreport/source/languages/lr_const.hu.po @@ -451,6 +451,10 @@ msgstr "COPY(, , )/A hossz msgid "COUNT()/Returns count of data rows given in the . " msgstr "COUNT()/A oszlopban található adatsorok számát adja vissza." +#: lr_const.sdescriptioncrlf +msgid "CRLF/Returns lineending character sequence." +msgstr "" + #: lr_const.sdescriptiondayof msgid "DAYOF()/Returns day number (1..31) of given ." msgstr "DAYOF()/A nap számát (1..31) adja vissza a -ból." diff --git a/components/lazreport/source/languages/lr_const.id.po b/components/lazreport/source/languages/lr_const.id.po index 394794afde..16499843ef 100644 --- a/components/lazreport/source/languages/lr_const.id.po +++ b/components/lazreport/source/languages/lr_const.id.po @@ -463,6 +463,10 @@ msgstr "" msgid "COUNT()/Returns count of data rows given in the . " msgstr "COUNT()/Mengembalikan jumlah baris-data yang diberikan dalam . " +#: lr_const.sdescriptioncrlf +msgid "CRLF/Returns lineending character sequence." +msgstr "" + #: lr_const.sdescriptiondayof msgid "DAYOF()/Returns day number (1..31) of given ." msgstr "DAYOF()/Mengembalikan angka hari (1..31) dari tanggal ." diff --git a/components/lazreport/source/languages/lr_const.it.po b/components/lazreport/source/languages/lr_const.it.po index a56006d2cf..1b7c0f839e 100644 --- a/components/lazreport/source/languages/lr_const.it.po +++ b/components/lazreport/source/languages/lr_const.it.po @@ -455,6 +455,10 @@ msgstr "COPY(, , )/Ritorna dalla )/Returns count of data rows given in the . " msgstr "COUNT()/Ritorna ilnumero di righe dati in . " +#: lr_const.sdescriptioncrlf +msgid "CRLF/Returns lineending character sequence." +msgstr "" + #: lr_const.sdescriptiondayof msgid "DAYOF()/Returns day number (1..31) of given ." msgstr "DAYOF()/Ritorna il numero del giorno (1..31) della ." diff --git a/components/lazreport/source/languages/lr_const.lt.po b/components/lazreport/source/languages/lr_const.lt.po index c7e9639c08..db9a0d38de 100644 --- a/components/lazreport/source/languages/lr_const.lt.po +++ b/components/lazreport/source/languages/lr_const.lt.po @@ -454,6 +454,10 @@ msgstr "COPY(, , )/Grąžina simbolių iš )/Returns count of data rows given in the . " msgstr "COUNT()/Grąžina duotame esančių eilučių kiekį." +#: lr_const.sdescriptioncrlf +msgid "CRLF/Returns lineending character sequence." +msgstr "" + #: lr_const.sdescriptiondayof msgid "DAYOF()/Returns day number (1..31) of given ." msgstr "DAYOF()/Grąžina duotos dienos numerį (1..31)." diff --git a/components/lazreport/source/languages/lr_const.pl.po b/components/lazreport/source/languages/lr_const.pl.po index c42f0b0299..c253a08f01 100644 --- a/components/lazreport/source/languages/lr_const.pl.po +++ b/components/lazreport/source/languages/lr_const.pl.po @@ -459,6 +459,10 @@ msgstr "COPY(, , )/Zwraca znaków z z msgid "COUNT()/Returns count of data rows given in the . " msgstr "COUNT()/Zwraca ilość wierszy z bazy danych dla danej . " +#: lr_const.sdescriptioncrlf +msgid "CRLF/Returns lineending character sequence." +msgstr "" + #: lr_const.sdescriptiondayof msgid "DAYOF()/Returns day number (1..31) of given ." msgstr "DAYOF()/Zwraca numer dnia (1..31) z podanej daty w ." diff --git a/components/lazreport/source/languages/lr_const.pot b/components/lazreport/source/languages/lr_const.pot index ec08832c12..28d546d518 100644 --- a/components/lazreport/source/languages/lr_const.pot +++ b/components/lazreport/source/languages/lr_const.pot @@ -444,6 +444,10 @@ msgstr "" msgid "COUNT()/Returns count of data rows given in the . " msgstr "" +#: lr_const.sdescriptioncrlf +msgid "CRLF/Returns lineending character sequence." +msgstr "" + #: lr_const.sdescriptiondayof msgid "DAYOF()/Returns day number (1..31) of given ." msgstr "" diff --git a/components/lazreport/source/languages/lr_const.pt_BR.po b/components/lazreport/source/languages/lr_const.pt_BR.po index 9ee3dfcdbe..92455fc115 100644 --- a/components/lazreport/source/languages/lr_const.pt_BR.po +++ b/components/lazreport/source/languages/lr_const.pt_BR.po @@ -451,6 +451,10 @@ msgstr "COPY(, , )/Retorna caracteres de < msgid "COUNT()/Returns count of data rows given in the . " msgstr "COUNT()/Retorna a contagem de linhas de uma dada ." +#: lr_const.sdescriptioncrlf +msgid "CRLF/Returns lineending character sequence." +msgstr "" + #: lr_const.sdescriptiondayof msgid "DAYOF()/Returns day number (1..31) of given ." msgstr "DAYOF()/Retorna o numero do dia (1..31) de uma dada ." diff --git a/components/lazreport/source/languages/lr_const.ru.po b/components/lazreport/source/languages/lr_const.ru.po index 92f5a5fda1..6628cf6f8d 100644 --- a/components/lazreport/source/languages/lr_const.ru.po +++ b/components/lazreport/source/languages/lr_const.ru.po @@ -451,6 +451,10 @@ msgstr "COPY(, , )/Возвращает си msgid "COUNT()/Returns count of data rows given in the . " msgstr "COUNT()/Возвращает число строк данных в . " +#: lr_const.sdescriptioncrlf +msgid "CRLF/Returns lineending character sequence." +msgstr "" + #: lr_const.sdescriptiondayof msgid "DAYOF()/Returns day number (1..31) of given ." msgstr "DAYOF()/Возвращает номер дня (1..31) для заданной ." diff --git a/components/lazreport/source/languages/lr_const.tr.po b/components/lazreport/source/languages/lr_const.tr.po index 7aed82a727..4d96d18950 100644 --- a/components/lazreport/source/languages/lr_const.tr.po +++ b/components/lazreport/source/languages/lr_const.tr.po @@ -451,6 +451,10 @@ msgstr "COPY (, , ) / / ile başlayan )/Returns count of data rows given in the . " msgstr "COUNT () / içinde verilen veri satırı sayısını döndürür. " +#: lr_const.sdescriptioncrlf +msgid "CRLF/Returns lineending character sequence." +msgstr "" + #: lr_const.sdescriptiondayof msgid "DAYOF()/Returns day number (1..31) of given ." msgstr "DAYOF () / Verilen tarihin gün numarasını (1..31) döndürür." diff --git a/components/lazreport/source/languages/lr_const.uk.po b/components/lazreport/source/languages/lr_const.uk.po index 5c0050fc8d..908f8de1c4 100644 --- a/components/lazreport/source/languages/lr_const.uk.po +++ b/components/lazreport/source/languages/lr_const.uk.po @@ -453,6 +453,10 @@ msgstr "COPY(, , )/Повертає симв msgid "COUNT()/Returns count of data rows given in the . " msgstr "COUNT()/Повертає кількість рядків даних у ." +#: lr_const.sdescriptioncrlf +msgid "CRLF/Returns lineending character sequence." +msgstr "" + #: lr_const.sdescriptiondayof msgid "DAYOF()/Returns day number (1..31) of given ." msgstr "DAYOF()/Повертає номер дня (1..31) для заданої ." diff --git a/components/lazreport/source/languages/lr_const.zh_CN.po b/components/lazreport/source/languages/lr_const.zh_CN.po index 383bb74467..7cd62d4493 100644 --- a/components/lazreport/source/languages/lr_const.zh_CN.po +++ b/components/lazreport/source/languages/lr_const.zh_CN.po @@ -452,6 +452,10 @@ msgstr "" msgid "COUNT()/Returns count of data rows given in the . " msgstr "" +#: lr_const.sdescriptioncrlf +msgid "CRLF/Returns lineending character sequence." +msgstr "" + #: lr_const.sdescriptiondayof msgid "DAYOF()/Returns day number (1..31) of given ." msgstr "" diff --git a/components/lazreport/source/lr_class.pas b/components/lazreport/source/lr_class.pas index 8d013b8625..22525f3442 100644 --- a/components/lazreport/source/lr_class.pas +++ b/components/lazreport/source/lr_class.pas @@ -10380,6 +10380,12 @@ begin aValue:= frVariables[s]; Exit; end else + if s1 = 'CRLF' then + begin + aValue := LineEnding; + Exit; + end + else if s1 = 'REPORTTITLE' then begin aValue := Title; @@ -12622,6 +12628,7 @@ begin // internal functions/operators Add('COPY', true); Add('STR', true); + Add('CRLF', true); Add('INT', true); Add('ROUND', true); Add('FRAC', true); @@ -12661,6 +12668,7 @@ begin AddFunctionDesc('POS', SStringCategory, SDescriptionPOS); AddFunctionDesc('COPY', SStringCategory, SDescriptionCOPY); AddFunctionDesc('STR', SStringCategory, SDescriptionSTR); + AddFunctionDesc('CRLF', SStringCategory, SDescriptionCRLF); AddFunctionDesc('INPUT', SOtherCategory, SDescriptionINPUT); AddFunctionDesc('MESSAGEBOX', SOtherCategory, SDescriptionMESSAGEBOX); diff --git a/components/lazreport/source/lr_const.pas b/components/lazreport/source/lr_const.pas index 4b7e46ac69..d482155ef5 100644 --- a/components/lazreport/source/lr_const.pas +++ b/components/lazreport/source/lr_const.pas @@ -769,6 +769,9 @@ resourcestring SDescriptionSTR = 'STR()/'+ 'Converts the given (numeric) in string.'; + SDescriptionCRLF = 'CRLF/'+ + 'Returns lineending character sequence.'; + SDescriptionINT = 'INT()/'+ 'Returns the integer part of floating point .';