From be30e0e139ecc068665c8e46020b60356b05cfd6 Mon Sep 17 00:00:00 2001
From: Zolnai Tamás <zolnaitamas2000@gmail.com>
Date: Sat, 13 Apr 2013 06:02:11 +0200
Subject: Delete obsolote platform from l10ntools merge

Change-Id: I5e5b87355d3d6e369c8fccd7078581758abb3b10
---
 l10ntools/source/xrmmerge.cxx | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'l10ntools/source/xrmmerge.cxx')

diff --git a/l10ntools/source/xrmmerge.cxx b/l10ntools/source/xrmmerge.cxx
index 458beacc5f28..012d916d92d7 100644
--- a/l10ntools/source/xrmmerge.cxx
+++ b/l10ntools/source/xrmmerge.cxx
@@ -381,7 +381,7 @@ void XRMResExport::WorkOnText(
 
     if ( !pResData )
     {
-        pResData = new ResData( OString(), GetGID() );
+        pResData = new ResData( GetGID() );
     }
     pResData->sText[sLang] = rText;
 }
@@ -462,7 +462,7 @@ void XRMResMerge::WorkOnDesc(
 {
     WorkOnText( rOpenTag, rText);
     if ( pMergeDataFile && pResData ) {
-        PFormEntrys *pEntrys = pMergeDataFile->GetPFormEntrys( pResData );
+        MergeEntrys *pEntrys = pMergeDataFile->GetMergeEntrys( pResData );
         if ( pEntrys ) {
             OString sCur;
             OString sDescFilename = GetAttribute ( rOpenTag, "xlink:href" );
@@ -538,12 +538,11 @@ void XRMResMerge::WorkOnText(
 
     if ( pMergeDataFile ) {
         if ( !pResData ) {
-            OString sPlatform( "" );
-            pResData = new ResData( sPlatform, GetGID() , sFilename );
+            pResData = new ResData( GetGID(), sFilename );
             pResData->sResTyp = sResourceType;
         }
 
-        PFormEntrys *pEntrys = pMergeDataFile->GetPFormEntrys( pResData );
+        MergeEntrys *pEntrys = pMergeDataFile->GetMergeEntrys( pResData );
             if ( pEntrys ) {
                 OString sContent;
                 if ( !sLang.equalsIgnoreAsciiCase("en-US") &&
@@ -576,7 +575,7 @@ void XRMResMerge::EndOfText(
 
     Output( rCloseTag );
     if ( pMergeDataFile && pResData ) {
-        PFormEntrys *pEntrys = pMergeDataFile->GetPFormEntrys( pResData );
+        MergeEntrys *pEntrys = pMergeDataFile->GetMergeEntrys( pResData );
         if ( pEntrys ) {
             OString sCur;
             for( unsigned int n = 0; n < aLanguages.size(); n++ ){
-- 
cgit