Transex3: Simplify members for lists

No need for hashmaps (ExportListEntry) because only one
list is stored (en-US). One list member is enough instead of
one for all types.

Change-Id: I952d6616e436c5aa7656854f83d442434ffcbd54

l10ntools/inc/export.hxx

@@ -54,36 +54,6 @@ typedef boost::unordered_map<OString, bool, OStringHash>
 
 #define SOURCE_LANGUAGE "en-US"
 #define X_COMMENT "x-comment"
-#define LIST_REFID  "LIST_REFID"
-
-//
-// class ExportList
-//
-
-typedef OStringHashMap ExportListEntry;
-
-
-/// Container for parse different types of string lists
-class ExportList
-{
-private:
-    std::vector< ExportListEntry* > maList;
-    std::size_t nSourceLanguageListEntryCount;
-
-public:
-    ExportList() { nSourceLanguageListEntryCount = 0; }
-    std::size_t GetSourceLanguageListEntryCount() { return nSourceLanguageListEntryCount; }
-    void NewSourceLanguageListEntry() { nSourceLanguageListEntryCount++; }
-    size_t size() const { return maList.size(); }
-    void push_back( ExportListEntry* item ) { maList.push_back( item ); }
-
-    ExportListEntry* operator [] ( size_t i )
-        {
-            return ( i < maList.size() ) ? maList[ i ] : NULL;
-        }
-};
-
-#define REFID_NONE 0xFFFF
 
 //
 // class ResData
@@ -93,6 +63,7 @@ public:
 #define ID_LEVEL_TEXT       0x0002
 #define ID_LEVEL_IDENTIFIER 0x0005
 
+typedef std::vector< OString > ExportList;
 
 /// Purpose: holds mandatory data to export a single res (used with ResStack)
 class ResData
@@ -100,7 +71,6 @@ class ResData
 public:
     ResData( const OString &rGId );
     ResData( const OString &rGId , const OString &rFilename );
-    ~ResData();
     sal_Bool SetId(const OString &rId, sal_uInt16 nLevel);
 
     sal_uInt16 nIdLevel;
@@ -110,7 +80,6 @@ public:
     sal_Bool bText;
     sal_Bool bQuickHelpText;
     sal_Bool bTitle;
-    sal_Bool bList;
 
     OString sResTyp;
     OString sId;
@@ -125,10 +94,7 @@ public:
 
     OString sTextTyp;
 
-    ExportList  *pStringList;
-    ExportList  *pItemList;
-    ExportList  *pFilterList;
-    ExportList  *pPairedList;
+    ExportList  m_aList;
 };
 
 
@@ -168,7 +134,6 @@ private:
     sal_Bool bNextMustBeDefineEOL;          ///< define but no \ at lineend
     std::size_t nLevel; // res. recursiv? how deep?
     sal_uInt16 nList;                       ///< cur. res. is List
-    OString m_sListLang;
     std::size_t nListIndex;
     std::size_t nListLevel;
     sal_Bool bMergeMode;
@@ -181,8 +146,7 @@ private:
     std::vector<OString> aLanguages;
 
     sal_Bool WriteData( ResData *pResData, sal_Bool bCreateNew = sal_False ); ///< called befor dest. cur ResData
-    sal_Bool WriteExportList( ResData *pResData, ExportList *pExportList,
-                        const OString &rTyp, sal_Bool bCreateNew = sal_False );
+    sal_Bool WriteExportList( ResData *pResData, ExportList& rExportList, const sal_uInt16 nTyp );
 
     OString MergePairedList( OString const & sLine , OString const & sText );
 
@@ -192,7 +156,7 @@ private:
     OString GetPairedListString(const OString& rText);
     OString StripList(const OString& rText);
 
-    void InsertListEntry(const OString &rText, const OString &rLine);
+    void InsertListEntry(const OString &rLine);
     void CleanValue( OString &rValue );
     OString GetText(const OString &rSource, int nToken);
 
@@ -200,10 +164,10 @@ private:
       Get all MergeEntrys for the ExportList identified by pResData
       Check whether list can merge and load all needed MergeEntry from DataBase.
     */
-    bool GetAllMergeEntrysOfList(ResData *pResData, std::vector<MergeEntrys*>& o_vMergeEntrys, ExportList*& o_pList);
+    bool GetAllMergeEntrysOfList(ResData *pResData, std::vector<MergeEntrys*>& o_vMergeEntrys);
 
     void ResData2Output( MergeEntrys *pEntry, sal_uInt16 nType, const OString& rTextType );
-    void MergeRest( ResData *pResData, sal_uInt16 nMode = MERGE_MODE_NORMAL );
+    void MergeRest( ResData *pResData );
     void ConvertMergeContent( OString &rText );
     void ConvertExportContent( OString &rText );
 

l10ntools/source/merge.cxx

@@ -71,13 +71,8 @@ ResData::ResData( const OString &rGId )
     bText( sal_False ),
     bQuickHelpText( sal_False ),
     bTitle( sal_False ),
-    bList( sal_False ),
     sGId( rGId ),
-    sTextTyp( "Text" ),
-    pStringList( NULL ),
-    pItemList( NULL ),
-    pFilterList( NULL ),
-    pPairedList( NULL )
+    sTextTyp( "Text" )
 {
     sGId = sGId.replaceAll("\r", OString());
 }
@@ -90,47 +85,13 @@ ResData::ResData( const OString &rGId, const OString &rFilename)
     bText( sal_False ),
     bQuickHelpText( sal_False ),
     bTitle( sal_False ),
-    bList( sal_False ),
     sGId( rGId ),
     sFilename( rFilename ),
-    sTextTyp( "Text" ),
-    pStringList( NULL ),
-    pItemList( NULL ),
-    pFilterList( NULL ),
-    pPairedList( NULL )
+    sTextTyp( "Text" )
 {
     sGId = sGId.replaceAll("\r", OString());
 }
 
-
-ResData::~ResData()
-{
-    if ( pStringList ) {
-        // delete existing res. of type StringList
-        for ( size_t i = 0; i < pStringList->size(); i++ ) {
-            ExportListEntry* test = (*pStringList)[ i ];
-            if( test != NULL ) delete test;
-        }
-        delete pStringList;
-    }
-    if ( pFilterList ) {
-        // delete existing res. of type FilterList
-        for ( size_t i = 0; i < pFilterList->size(); i++ ) {
-            ExportListEntry* test = (*pFilterList)[ i ];
-            delete test;
-        }
-        delete pFilterList;
-    }
-    if ( pItemList ) {
-        // delete existing res. of type ItemList
-        for ( size_t i = 0; i < pItemList->size(); i++ ) {
-            ExportListEntry* test = (*pItemList)[ i ];
-            delete test;
-        }
-        delete pItemList;
-    }
-}
-
 //
 // class MergeEntrys
 //