From 889de665ec9d2ac25a9dccd4830cb97ed0c7c56e Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Mon, 30 Jul 2012 08:41:34 +0200 Subject: Typo ressource -> resource Change-Id: Id13e7acfbe34eca5e124c9032d36d6f158bfb831 --- l10ntools/inc/cfgmerge.hxx | 6 +++--- l10ntools/inc/export.hxx | 2 +- l10ntools/inc/tokens.h | 6 +++--- l10ntools/source/cfgmerge.cxx | 10 +++++----- l10ntools/source/export.cxx | 12 ++++++------ l10ntools/source/srclex.l | 10 +++++----- 6 files changed, 23 insertions(+), 23 deletions(-) (limited to 'l10ntools') diff --git a/l10ntools/inc/cfgmerge.hxx b/l10ntools/inc/cfgmerge.hxx index 6c82cc3a1ccb..c554aaf9246f 100644 --- a/l10ntools/inc/cfgmerge.hxx +++ b/l10ntools/inc/cfgmerge.hxx @@ -122,7 +122,7 @@ protected: rtl::OString &rText, const rtl::OString &rLangIndex )=0; - virtual void WorkOnRessourceEnd()=0; + virtual void WorkOnResourceEnd()=0; virtual void Output(const rtl::OString & rOutput)=0; @@ -174,7 +174,7 @@ protected: const rtl::OString &rIsoLang ); - void WorkOnRessourceEnd(); + void WorkOnResourceEnd(); void Output(const rtl::OString& rOutput); public: CfgExport( @@ -202,7 +202,7 @@ private: protected: virtual void WorkOnText(rtl::OString &rText, const rtl::OString &rLangIndex); - void WorkOnRessourceEnd(); + void WorkOnResourceEnd(); void Output(const rtl::OString& rOutput); public: diff --git a/l10ntools/inc/export.hxx b/l10ntools/inc/export.hxx index bf1809bfb54e..7e6a912d77a5 100644 --- a/l10ntools/inc/export.hxx +++ b/l10ntools/inc/export.hxx @@ -398,7 +398,7 @@ public: // /****************************************************************************** -* Purpose: holds information of data to merge (one ressource) +* Purpose: holds information of data to merge (one resource) ******************************************************************************/ class MergeDataFile; diff --git a/l10ntools/inc/tokens.h b/l10ntools/inc/tokens.h index c42ee50848e2..1d035a7ddef7 100644 --- a/l10ntools/inc/tokens.h +++ b/l10ntools/inc/tokens.h @@ -39,9 +39,9 @@ /*------------------------------------------------------ */ #define CONDITION 501 /* #if... | #endif ... | ... */ #define EMPTYLINE 502 /* */ -#define RESSOURCE 503 /* Menu MID_TEST */ -#define RESSOURCEEXPR 504 /* Menu ( MID_TEST + .. ) */ -#define SMALRESSOURCE 505 /* PageItem { */ +#define RESOURCE 503 /* Menu MID_TEST */ +#define RESOURCEEXPR 504 /* Menu ( MID_TEST + .. ) */ +#define SMALRESOURCE 505 /* PageItem { */ #define TEXTLINE 506 /* TEXT = "hhh" */ #define LONGTEXTLINE 507 /* TEXT = "hhh" TEST "HHH" ... */ #define TEXT 508 /* "Something like this" */ diff --git a/l10ntools/source/cfgmerge.cxx b/l10ntools/source/cfgmerge.cxx index faaa6d52071c..92427af36e21 100644 --- a/l10ntools/source/cfgmerge.cxx +++ b/l10ntools/source/cfgmerge.cxx @@ -294,7 +294,7 @@ int CfgParser::ExecuteAnalyzedToken( int nToken, char *pToken ) break; case CFG_TEXT_START: { if ( sCurrentResTyp != sTokenName ) { - WorkOnRessourceEnd(); + WorkOnResourceEnd(); rtl::OString sCur; for( unsigned int i = 0; i < aLanguages.size(); ++i ){ sCur = aLanguages[ i ]; @@ -330,7 +330,7 @@ int CfgParser::ExecuteAnalyzedToken( int nToken, char *pToken ) } else if ( sTokenName == "label" ) { if ( sCurrentResTyp != sTokenName ) { - WorkOnRessourceEnd(); + WorkOnResourceEnd(); rtl::OString sCur; for( unsigned int i = 0; i < aLanguages.size(); ++i ){ sCur = aLanguages[ i ]; @@ -348,7 +348,7 @@ int CfgParser::ExecuteAnalyzedToken( int nToken, char *pToken ) if ( aStack.GetStackData() && ( aStack.GetStackData()->GetTagType() == sTokenName )) { if (sCurrentText.isEmpty()) - WorkOnRessourceEnd(); + WorkOnResourceEnd(); aStack.Pop(); pStackData = aStack.GetStackData(); } @@ -476,7 +476,7 @@ CfgExport::~CfgExport() } /*****************************************************************************/ -void CfgExport::WorkOnRessourceEnd() +void CfgExport::WorkOnResourceEnd() /*****************************************************************************/ { if ( bLocalize ) { @@ -612,7 +612,7 @@ void CfgMerge::Output(const rtl::OString& rOutput) } /*****************************************************************************/ -void CfgMerge::WorkOnRessourceEnd() +void CfgMerge::WorkOnResourceEnd() /*****************************************************************************/ { diff --git a/l10ntools/source/export.cxx b/l10ntools/source/export.cxx index 065d7b743159..fc6f5bcaf5c4 100644 --- a/l10ntools/source/export.cxx +++ b/l10ntools/source/export.cxx @@ -359,9 +359,9 @@ int Export::Execute( int nToken, const char * pToken ) // res. exists at cur. level pResData = ( (nLevel-1) < aResStack.size() ) ? aResStack[ nLevel-1 ] : NULL; } - else if (( nToken != RESSOURCE ) && - ( nToken != RESSOURCEEXPR ) && - ( nToken != SMALRESSOURCE ) && + else if (( nToken != RESOURCE ) && + ( nToken != RESOURCEEXPR ) && + ( nToken != SMALRESOURCE ) && ( nToken != LEVELUP ) && ( nToken != NORMDEFINE ) && ( nToken != RSCDEFINE ) && @@ -454,8 +454,8 @@ int Export::Execute( int nToken, const char * pToken ) case RSCDEFINE: bDefine = sal_True; // res. defined in macro - case RESSOURCE: - case RESSOURCEEXPR: { + case RESOURCE: + case RESOURCEEXPR: { bDontWriteOutput = sal_False; if ( nToken != RSCDEFINE ) bNextMustBeDefineEOL = sal_False; @@ -495,7 +495,7 @@ int Export::Execute( int nToken, const char * pToken ) } } break; - case SMALRESSOURCE: { + case SMALRESOURCE: { bDontWriteOutput = sal_False; // this is the beginning of a new res. bNextMustBeDefineEOL = sal_False; diff --git a/l10ntools/source/srclex.l b/l10ntools/source/srclex.l index 2fbd3f0e6278..e99eea42ac44 100644 --- a/l10ntools/source/srclex.l +++ b/l10ntools/source/srclex.l @@ -1,7 +1,7 @@ %{ /* - * lexer for parsing ressource source files (*.src) + * lexer for parsing resource source files (*.src) * */ @@ -112,13 +112,13 @@ void YYWarning(); [a-zA-Z]+[ \t]+[^={;\n]+\n[ \t]*"#".*\n[ \t]*"{" | [a-zA-Z]+[ \t]+[^={;\n]+\n?([ \t]*"//".*\n)*[ \t]*"{" { -/* RESSOURCE // String TTT_XX ... */ - WorkOnTokenSet( RESSOURCE, yytext ); +/* RESOURCE // String TTT_XX ... */ + WorkOnTokenSet( RESOURCE, yytext ); } ^[\t ]*[a-zA-Z_]+[\t ]*"\\"?[\t ]*\n?[ \t]*"{"[\t ]*"\\"? { -/* SMALRESSOURCE // String ... */ - WorkOnTokenSet( SMALRESSOURCE, yytext ); +/* SMALRESOURCE // String ... */ + WorkOnTokenSet( SMALRESOURCE, yytext ); } [\t ]*[a-zA-Z0-9_]+[ \t]*("["[ \t]*[a-zA-Z0-9_\-]+[ \t]*"]"[ \t]*)?=[ \t]*L?\".*\".*\n? { -- cgit v1.2.3