diff options
| author | Nils Fuhrmann <nf@openoffice.org> | 2002-06-03 12:02:59 +0000 |
|---|---|---|
| committer | Nils Fuhrmann <nf@openoffice.org> | 2002-06-03 12:02:59 +0000 |
| commit | 8e1c8a850295f10fcd85e68c5216b1430a75547e (patch) | |
| tree | 291b5b1f4e45d0b33c6d9a510d1491816fd6b232 /transex3 | |
| parent | 64083b16e6c39d314e616a3d89b840a0767392f5 (diff) | |
#98120#: Support for new configuration format *.xcu
Diffstat (limited to 'transex3')
| -rw-r--r-- | transex3/inc/tokens.h | 5 | ||||
| -rw-r--r-- | transex3/source/cfgmerge.cxx | 13 |
2 files changed, 13 insertions, 5 deletions
diff --git a/transex3/inc/tokens.h b/transex3/inc/tokens.h index 2bb115fde405..e48083ed3e93 100644 --- a/transex3/inc/tokens.h +++ b/transex3/inc/tokens.h @@ -2,9 +2,9 @@ * * $RCSfile: tokens.h,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: nf $ $Date: 2002-05-07 09:31:20 $ + * last change: $Author: nf $ $Date: 2002-06-03 13:02:59 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -119,6 +119,7 @@ #define CFG_TOKEN_COMPONENT 601 #define CFG_TOKEN_CONFIGNAME 602 #define CFG_TOKEN_TEMPLATE 603 +#define CFG_TOKEN_OORNAME 604 /*------------------------------------------------------ */ /*------------------------------------------------------ */ diff --git a/transex3/source/cfgmerge.cxx b/transex3/source/cfgmerge.cxx index 5238b6fdc840..bebcdbb6cf72 100644 --- a/transex3/source/cfgmerge.cxx +++ b/transex3/source/cfgmerge.cxx @@ -2,9 +2,9 @@ * * $RCSfile: cfgmerge.cxx,v $ * - * $Revision: 1.21 $ + * $Revision: 1.22 $ * - * last change: $Author: nf $ $Date: 2001-07-04 13:06:41 $ + * last change: $Author: nf $ $Date: 2002-06-03 13:02:59 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -451,6 +451,7 @@ int CfgParser::ExecuteAnalyzedToken( int nToken, char *pToken ) case CFG_TOKEN_COMPONENT: case CFG_TOKEN_TEMPLATE: case CFG_TOKEN_CONFIGNAME: + case CFG_TOKEN_OORNAME: case CFG_TAG: case ANYTOKEN: case CFG_TEXT_START: @@ -472,6 +473,10 @@ int CfgParser::ExecuteAnalyzedToken( int nToken, char *pToken ) case CFG_TOKEN_CONFIGNAME: sSearch = "cfg:name="; break; + case CFG_TOKEN_OORNAME: + sSearch = "oor:name="; + bLocalize = TRUE; + break; case CFG_TEXT_START: { sCurrentResTyp = sTokenName; @@ -556,7 +561,9 @@ int CfgParser::Execute( int nToken, char * pToken ) else if ( sToken.Search( "template-id=" ) != STRING_NOTFOUND ) return ExecuteAnalyzedToken( CFG_TOKEN_TEMPLATE, pToken ); else if ( sToken.Search( "cfg:name=" ) != STRING_NOTFOUND ) - return ExecuteAnalyzedToken( CFG_TOKEN_CONFIGNAME, pToken ); + return ExecuteAnalyzedToken( CFG_TOKEN_OORNAME, pToken ); + else if ( sToken.Search( "oor:name=" ) != STRING_NOTFOUND ) + return ExecuteAnalyzedToken( CFG_TOKEN_OORNAME, pToken ); break; } return ExecuteAnalyzedToken( nToken, pToken ); |