diff options
| author | Zolnai Tamás <zolnaitamas2000@gmail.com> | 2012-12-09 22:36:35 +0100 |
|---|---|---|
| committer | Zolnai Tamás <zolnaitamas2000@gmail.com> | 2012-12-09 22:40:48 +0100 |
| commit | c03c144d4a8453d0b4e94def8d0f5780d07643b7 (patch) | |
| tree | 01ae75881e569a8ec45d339e63d8ae0d2da6f0e7 /l10ntools | |
| parent | dc6277ef41dcf529760ad894e0aa124f18722c33 (diff) | |
Revert "Make src lists modifiable"
It is more difficult than I think first
and it needs to solve in an other way.
This reverts commit e1a91a9ceda6020bb256739e83dc371a50af3b1d.
Diffstat (limited to 'l10ntools')
| -rw-r--r-- | l10ntools/inc/export.hxx | 2 | ||||
| -rw-r--r-- | l10ntools/source/export.cxx | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/l10ntools/inc/export.hxx b/l10ntools/inc/export.hxx index ecc9e2e515c7..af94c17b5c2b 100644 --- a/l10ntools/inc/export.hxx +++ b/l10ntools/inc/export.hxx @@ -39,7 +39,6 @@ #include <vector> /* std::vector*/ #include <queue> #include <string> -#include <map> #include <unistd.h> #ifdef WNT @@ -330,7 +329,6 @@ public: private: static std::vector<rtl::OString> aLanguages; static std::vector<rtl::OString> aForcedLanguages; - std::map<OString,OString> aOrigListItems; sal_Bool WriteData( ResData *pResData, sal_Bool bCreateNew = sal_False );// called befor dest. cur ResData sal_Bool WriteExportList( ResData *pResData, ExportList *pExportList, diff --git a/l10ntools/source/export.cxx b/l10ntools/source/export.cxx index 8fb78e365fba..061d8e634f5d 100644 --- a/l10ntools/source/export.cxx +++ b/l10ntools/source/export.cxx @@ -988,7 +988,7 @@ sal_Bool Export::WriteData( ResData *pResData, sal_Bool bCreateNew ) rtl::OString sList( "pairedlist" ); WriteExportList( pResData, pResData->pPairedList, sList, bCreateNew ); if ( bCreateNew ) - pResData->pPairedList = 0; + pResData->pItemList = 0; } if ( pResData->pUIEntries ) { rtl::OString sList( "uientries" ); @@ -1694,12 +1694,14 @@ void Export::MergeRest( ResData *pResData, sal_uInt16 nMode ) if ( pList ) nMaxIndex = pList->GetSourceLanguageListEntryCount(); pEntrys = pMergeDataFile->GetPFormEntrys( pResData ); - while( nLIndex < nMaxIndex ) { + while( pEntrys && ( nLIndex < nMaxIndex )) { rtl::OString sText; - if( !pEntrys || !pEntrys->GetTransex3Text( sText, STRING_TYP_TEXT, sCur, sal_True ) ) - sText = aOrigListItems.find(pResData->sId + pResData->sGId + pResData->sResTyp)->second; + sal_Bool bText; + bText = pEntrys->GetTransex3Text( sText, STRING_TYP_TEXT, sCur, sal_True ); + if( !bText ) + bText = pEntrys->GetTransex3Text( sText , STRING_TYP_TEXT, SOURCE_LANGUAGE , sal_False ); - if (!sText.isEmpty()) + if ( bText && !sText.isEmpty()) { if ( nIdx == 1 ) { |