This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch AOO42X in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/AOO42X by this push: new 254802d Fixed typo (extren -> extern), removed whitespace 254802d is described below commit 254802d4d9726271fe01a03b4cae6c89d228cc18 Author: mseidel <msei...@apache.org> AuthorDate: Sun Aug 22 02:55:32 2021 +0200 Fixed typo (extren -> extern), removed whitespace (cherry picked from commit 3fdeb968ff7c7073bba1719398e969123170831d) --- main/l10ntools/source/cfglex.l | 6 +++--- main/l10ntools/source/srclex.l | 22 +++++++++++----------- main/l10ntools/source/xrmlex.l | 6 +++--- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/main/l10ntools/source/cfglex.l b/main/l10ntools/source/cfglex.l index b9002cc..4ee3994 100644 --- a/main/l10ntools/source/cfglex.l +++ b/main/l10ntools/source/cfglex.l @@ -50,7 +50,7 @@ #pragma warning(push, 1) #endif -/* external functions (C++ code, declared as extren "C" */ +/* external functions (C++ code, declared as extern "C" */ extern int WorkOnTokenSet( int, char* ); extern int InitCfgExport( char * , char *); extern int EndCfgExport(); @@ -158,7 +158,7 @@ void YYWarning( char *s ) { /* write warning to stderr */ fprintf( stderr, - "Warning: \"%s\" in line %d: \"%s\"\n", s, yylineno, yytext ); + "Warning: \"%s\" in line %d: \"%s\"\n", s, yylineno, yytext ); } /*****************************************************************************/ @@ -171,7 +171,7 @@ void yyerror ( char *s ) { /* write error to stderr */ fprintf( stderr, - "Error: \"%s\" in line %d: \"%s\"\n", s, yylineno, yytext ); + "Error: \"%s\" in line %d: \"%s\"\n", s, yylineno, yytext ); SetError(); } diff --git a/main/l10ntools/source/srclex.l b/main/l10ntools/source/srclex.l index 8f388ce..b1d0a45 100644 --- a/main/l10ntools/source/srclex.l +++ b/main/l10ntools/source/srclex.l @@ -51,7 +51,7 @@ #pragma warning(push, 1) #endif -/* external functions (C++ code, declared as extren "C" */ +/* external functions (C++ code, declared as extern "C" */ extern int WorkOnTokenSet( int, char* ); extern int InitExport( char * , char * ); extern int Parse( int nTyp, char *pTokenText ); @@ -138,12 +138,12 @@ void YYWarning(); } [\t ]*[a-zA-Z0-9_]+[ \t]*("["[ \t]*[a-zA-Z0-9_\-]+[ \t]*"]"[ \t]*)?=[ \t]*L?\".*\".*\n? { -/* TEXTLINE // TextTyp = "A Text" */ +/* TEXTLINE // TextType = "A Text" */ WorkOnTokenSet( TEXTLINE, yytext ); } [\t ]*[a-zA-Z0-9_]+[ \t]*("["[ \t]*[a-zA-Z0-9_\-]+[ \t]*"]"[ \t]*)?(\n[ \t]*)?=([ \t]*\n)?(([a-zA-Z0-9_]+)|(\".*\")|([ \t\n]*))*\".*\"(([a-zA-Z0-9_]+)|(\".*\")|([ \t\n]*))*; { -/* LONGTEXTLINE // TextTyp = "A Text" HHH_XXX "A Text" ZZZ_TTT ... */ +/* LONGTEXTLINE // TextType = "A Text" HHH_XXX "A Text" ZZZ_TTT ... */ WorkOnTokenSet( LONGTEXTLINE, yytext ); } @@ -163,30 +163,30 @@ void YYWarning(); } [a-zA-Z0-9_]+[ \t]*"="[ \t]*"MAP_APPFONT"[ \t]*"(".+")".* { -/* APPFONTMAPPING Typ = MAP_APPFONT( ... ) */ +/* APPFONTMAPPING Type = MAP_APPFONT( ... ) */ WorkOnTokenSet( APPFONTMAPPING, yytext ); } [ \t]*[a-zA-Z0-9_]+[ \t]*=[ \t]*[0123456789]{1,5}[ \t]*";"?\\? { -/* TEXTREFID // TextTyp = 12345 */ +/* TEXTREFID // TextType = 12345 */ WorkOnTokenSet( TEXTREFID, yytext ); } [a-zA-Z0-9_]+[ \t]*"="[\t ]*([ \t]*"//".*\n)*.* | [a-zA-Z0-9_]+[ \t]*"=".* { -/* ASSIGNMENT Typ = ... */ +/* ASSIGNMENT Type = ... */ WorkOnTokenSet( ASSIGNMENT, yytext ); } [a-zA-Z0-9_]+[ \t]*("["[ \t]*[a-zA-Z0-9_\-]+[ \t]*"]"[ \t]*)?"="[ \t]*(\\[ \t]*)?\n?[ \t]*"{"[ \t]*(\\[ \t]*)?\n?[ \t]*"<" { -/* LISTASSIGNMENT Typ [ ... ] = ... */ +/* LISTASSIGNMENT Type [ ... ] = ... */ WorkOnTokenSet( LISTASSIGNMENT, yytext ); } "StringList"+[ \t]*("["[ \t]*[a-zA-Z0-9_\-]+[ \t]*"]"[ \t]*)?"="[ \t]*(\\[ \t]*)?\n?[ \t]*"{"[ \t]*(\\[ \t]*)?\n?[ \t]* { -/* LISTASSIGNMENT Typ [ ... ] = ... */ +/* LISTASSIGNMENT Type [ ... ] = ... */ WorkOnTokenSet( LISTASSIGNMENT, yytext ); } @@ -201,7 +201,7 @@ void YYWarning(); } [ \t]*"#define"[ \t]+[a-zA-Z0-9_]+.*"\\" { -/* RSCDEFINE #define ... */ +/* RSCDEFINE #define ... */ WorkOnTokenSet( RSCDEFINE, yytext ); } @@ -253,7 +253,7 @@ void YYWarning( char *s ) /*****************************************************************************/ { /* write warning to stderr */ - fprintf( stderr, "Warning: \"%s\" in line %d: \"%s\"\n", s, yylineno, yytext ); + fprintf( stderr, "Warning: \"%s\" in line %d: \"%s\"\n", s, yylineno, yytext ); } /*****************************************************************************/ @@ -261,7 +261,7 @@ void yyerror( char *s ) /*****************************************************************************/ { /* write error to stderr */ - fprintf( stderr, "Error: \"%s\" in line %d: \"%s\"\n", s, yylineno, yytext ); + fprintf( stderr, "Error: \"%s\" in line %d: \"%s\"\n", s, yylineno, yytext ); SetError(); } diff --git a/main/l10ntools/source/xrmlex.l b/main/l10ntools/source/xrmlex.l index 80f330f..b855201 100644 --- a/main/l10ntools/source/xrmlex.l +++ b/main/l10ntools/source/xrmlex.l @@ -50,7 +50,7 @@ #pragma warning(push, 1) #endif -/* external functions (C++ code, declared as extren "C" */ +/* external functions (C++ code, declared as extern "C" */ extern int WorkOnTokenSet( int, char* ); extern int Argument( char * ); extern int InitXrmExport( char * , char * ); @@ -169,7 +169,7 @@ void YYWarning( char *s ) { /* write warning to stderr */ fprintf( stderr, - "Warning: \"%s\" in line %d: \"%s\"\n", s, yylineno, yytext ); + "Warning: \"%s\" in line %d: \"%s\"\n", s, yylineno, yytext ); } /*****************************************************************************/ @@ -182,7 +182,7 @@ void yyerror ( char *s ) { /* write error to stderr */ fprintf( stderr, - "Error: \"%s\" in line %d: \"%s\"\n", s, yylineno, yytext ); + "Error: \"%s\" in line %d: \"%s\"\n", s, yylineno, yytext ); SetError(); }