diff options
| author | Kurt Zenker <kz@openoffice.org> | 2006-07-06 13:34:29 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2006-07-06 13:34:29 +0000 |
| commit | f029a44941970d1d54534075aa94b1fb0af90b2b (patch) | |
| tree | be79f9c60311d45b1f075447bbacc3a4ce8a57a9 /transex3/source/export.cxx | |
| parent | c9b899316887fa78e237e549adc73c641da2e5ab (diff) | |
INTEGRATION: CWS warningfixes01 (1.50.2); FILE MERGED
2006/06/27 18:08:45 ihi 1.50.2.1: #i66753# Crash caused by missing translation in StringLists
Diffstat (limited to 'transex3/source/export.cxx')
| -rw-r--r-- | transex3/source/export.cxx | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/transex3/source/export.cxx b/transex3/source/export.cxx index ad04a561eab8..6234bd0ea2b1 100644 --- a/transex3/source/export.cxx +++ b/transex3/source/export.cxx @@ -4,9 +4,9 @@ * * $RCSfile: export.cxx,v $ * - * $Revision: 1.50 $ + * $Revision: 1.51 $ * - * last change: $Author: hr $ $Date: 2006-06-19 17:21:29 $ + * last change: $Author: kz $ $Date: 2006-07-06 14:34:29 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -561,7 +561,7 @@ int Export::Execute( int nToken, const char * pToken ) /* printf("+---------------\n"); printf("sToken = %s\n",sToken.GetBuffer()); printf("nToken = %d\n",nToken); - printf("+---------------\n");*/ + printf("+---------------\n"); */ BOOL bWriteToMerged = bMergeMode; if ( nToken == CONDITION ) { @@ -2350,7 +2350,9 @@ void Export::MergeRest( ResData *pResData, USHORT nMode ) nMaxIndex = pList->GetGermanEntryCount(); //if( pMergeDataFile ) pMergeDataFile->Dump(); pEntrys = pMergeDataFile->GetPFormEntrys( pResData ); - while( pEntrys && ( nLIndex < nMaxIndex )) { + while( pEntrys && ( nLIndex < nMaxIndex )) { + + //while( pEntrys && ( nLIndex < nMaxIndex )) { //if( pEntrys ) pEntrys->Dump(); ByteString sText; BOOL bText; @@ -2451,6 +2453,7 @@ void Export::MergeRest( ResData *pResData, USHORT nMode ) sText1 += " ;\n"; sText1 += sSpace; sText1 += "\t"; + //printf("Writing '%s'\n",sText1.GetBuffer()); WriteToMerged( sText1 ,true ); // Set matching pairedlist identifier @@ -2468,6 +2471,7 @@ void Export::MergeRest( ResData *pResData, USHORT nMode ) else break; nLIndex ++; + pEntrys = pMergeDataFile->GetPFormEntrys( pResData ); } if ( nIdx > 1 ) { ByteString sFooter( sSpace.Copy( 1 )); @@ -2520,6 +2524,7 @@ void Export::MergeRest( ResData *pResData, USHORT nMode ) sLine.SearchAndReplace( "\"", "< \"" ); } } + while( PrepareTextToMerge( sLine, nList, nListLang, pResData ) && ( nListIndex <= nMaxIndex )) { ByteString sText( "\t" ); sText += sLine; |