[Libreoffice-commits] core.git: l10ntools/inc l10ntools/source
Zolnai Tamás
zolnaitamas2000 at gmail.com
Fri Apr 12 22:44:22 PDT 2013
l10ntools/inc/export.hxx | 51 ++++++++--------------
l10ntools/source/cfgmerge.cxx | 6 +-
l10ntools/source/export.cxx | 57 +++++--------------------
l10ntools/source/helpmerge.cxx | 6 +-
l10ntools/source/lngmerge.cxx | 4 -
l10ntools/source/merge.cxx | 87 ++++++++++++++-------------------------
l10ntools/source/propmerge.cxx | 4 -
l10ntools/source/stringmerge.cxx | 6 +-
l10ntools/source/treemerge.cxx | 6 +-
l10ntools/source/uimerge.cxx | 4 -
l10ntools/source/xrmmerge.cxx | 11 ++--
11 files changed, 87 insertions(+), 155 deletions(-)
New commits:
commit be30e0e139ecc068665c8e46020b60356b05cfd6
Author: Zolnai Tamás <zolnaitamas2000 at gmail.com>
Date: Sat Apr 13 06:02:11 2013 +0200
Delete obsolote platform from l10ntools merge
Change-Id: I5e5b87355d3d6e369c8fccd7078581758abb3b10
diff --git a/l10ntools/inc/export.hxx b/l10ntools/inc/export.hxx
index 0a2c10e..10223cd 100644
--- a/l10ntools/inc/export.hxx
+++ b/l10ntools/inc/export.hxx
@@ -43,7 +43,7 @@
#define NO_TRANSLATE_ISO "x-no-translate"
-class PFormEntrys;
+class MergeEntrys;
class MergeData;
typedef boost::unordered_map<OString, OString, OStringHash>
@@ -52,9 +52,6 @@ typedef boost::unordered_map<OString, OString, OStringHash>
typedef boost::unordered_map<OString, bool, OStringHash>
OStringBoolHashMap;
-typedef boost::unordered_map<OString, PFormEntrys*, OStringHash>
- PFormEntrysHashMap;
-
typedef boost::unordered_map<OString, MergeData*, OStringHash>
MergeDataHashMap;
@@ -109,8 +106,8 @@ public:
class ResData
{
public:
- ResData(const OString &rPF, const OString &rGId);
- ResData(const OString &rPF, const OString &rGId , const OString &rFilename);
+ ResData( const OString &rGId );
+ ResData( const OString &rGId , const OString &rFilename );
~ResData();
sal_Bool SetId(const OString &rId, sal_uInt16 nLevel);
@@ -153,8 +150,6 @@ public:
ExportList *pItemList;
ExportList *pFilterList;
ExportList *pPairedList;
-
- OString sPForm;
};
@@ -196,8 +191,6 @@ private:
ResStack aResStack; // stack for parsing recursive
- OString sActPForm; // hold cur. system
-
sal_Bool bDefine; // cur. res. in a define?
sal_Bool bNextMustBeDefineEOL; // define but no \ at lineend
std::size_t nLevel; // res. recursiv? how deep?
@@ -237,7 +230,7 @@ private:
sal_Bool PrepareTextToMerge(OString &rText, sal_uInt16 nTyp,
OString &rLangIndex, ResData *pResData);
- void ResData2Output( PFormEntrys *pEntry, sal_uInt16 nType, const OString& rTextType );
+ void ResData2Output( MergeEntrys *pEntry, sal_uInt16 nType, const OString& rTextType );
void MergeRest( ResData *pResData, sal_uInt16 nMode = MERGE_MODE_NORMAL );
void ConvertMergeContent( OString &rText );
void ConvertExportContent( OString &rText );
@@ -263,19 +256,17 @@ public:
//
-// class PFormEntrys
+// class MergeEntrys
//
-/******************************************************************************
-* Purpose: holds information of data to merge (one pform)
-******************************************************************************/
+/**
+ * Purpose: holds information of data to merge
+ */
-class PFormEntrys
+class MergeEntrys
{
friend class MergeDataFile;
private:
- OString data_; //TODO
- OString sHelpText; // empty string
OStringHashMap sText;
OStringBoolHashMap bTextFirst;
OStringHashMap sQuickHelpText;
@@ -284,7 +275,7 @@ private:
OStringBoolHashMap bTitleFirst;
public:
- PFormEntrys( const OString &rPForm ) : data_( rPForm ) {};
+ MergeEntrys(){};
void InsertEntry(const OString &rId, const OString &rText,
const OString &rQuickHelpText, const OString &rTitle)
{
@@ -317,15 +308,11 @@ public:
OString sGID;
OString sLID;
OString sFilename;
- PFormEntrysHashMap aMap;
+ MergeEntrys* pMergeEntrys;
public:
- MergeData( const OString &rTyp, const OString &rGID, const OString &rLID , const OString &rFilename )
- : sTyp( rTyp ), sGID( rGID ), sLID( rLID ) , sFilename( rFilename ) {};
+ MergeData( const OString &rTyp, const OString &rGID, const OString &rLID , const OString &rFilename );
~MergeData();
- PFormEntrys* GetPFormEntries();
-
- void Insert( PFormEntrys* pfEntrys );
- PFormEntrys* GetPFObject( const OString &rPFO );
+ MergeEntrys* GetMergeEntries();
sal_Bool operator==( ResData *pData );
};
@@ -347,10 +334,10 @@ class MergeDataFile
MergeData *GetMergeData( ResData *pResData , bool bCaseSensitve = false );
void InsertEntry(const OString &rTYP, const OString &rGID,
- const OString &rLID, const OString &rPFO,
- const OString &nLang, const OString &rTEXT,
- const OString &rQHTEXT, const OString &rTITLE,
- const OString &sFilename, bool bCaseSensitive);
+ const OString &rLID, const OString &nLang,
+ const OString &rTEXT, const OString &rQHTEXT,
+ const OString &rTITLE, const OString &sFilename,
+ bool bCaseSensitive);
public:
explicit MergeDataFile(
const OString &rFileName, const OString& rFile,
@@ -361,8 +348,8 @@ class MergeDataFile
std::vector<OString> GetLanguages() const;
const MergeDataHashMap& getMap() const { return aMap; }
- PFormEntrys *GetPFormEntrys( ResData *pResData );
- PFormEntrys *GetPFormEntrysCaseSensitive( ResData *pResData );
+ MergeEntrys *GetMergeEntrys( ResData *pResData );
+ MergeEntrys *GetMergeEntrysCaseSensitive( ResData *pResData );
static OString CreateKey(const OString& rTYP, const OString& rGID,
const OString& rLID, const OString& rFilename , bool bCaseSensitive = false);
diff --git a/l10ntools/source/cfgmerge.cxx b/l10ntools/source/cfgmerge.cxx
index 311af52..44f9896 100644
--- a/l10ntools/source/cfgmerge.cxx
+++ b/l10ntools/source/cfgmerge.cxx
@@ -487,7 +487,7 @@ void CfgMerge::WorkOnText(OString &rText, const OString& rLangIndex)
OString sPlatform;
- pResData = new ResData( sPlatform, sGroupId , sFilename );
+ pResData = new ResData( sGroupId, sFilename );
pResData->sId = sLocalId;
pResData->sResTyp = pStackData->sResTyp;
}
@@ -495,7 +495,7 @@ void CfgMerge::WorkOnText(OString &rText, const OString& rLangIndex)
if (rLangIndex.equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("en-US")))
bEnglish = sal_True;
- PFormEntrys *pEntrys = pMergeDataFile->GetPFormEntrysCaseSensitive( pResData );
+ MergeEntrys *pEntrys = pMergeDataFile->GetMergeEntrysCaseSensitive( pResData );
if ( pEntrys ) {
OString sContent;
pEntrys->GetText( sContent, STRING_TYP_TEXT, rLangIndex );
@@ -520,7 +520,7 @@ void CfgMerge::WorkOnResourceEnd()
{
if ( pMergeDataFile && pResData && bLocalize && bEnglish ) {
- PFormEntrys *pEntrys = pMergeDataFile->GetPFormEntrysCaseSensitive( pResData );
+ MergeEntrys *pEntrys = pMergeDataFile->GetMergeEntrysCaseSensitive( pResData );
if ( pEntrys ) {
OString sCur;
diff --git a/l10ntools/source/export.cxx b/l10ntools/source/export.cxx
index a61cf13..1cbb426 100644
--- a/l10ntools/source/export.cxx
+++ b/l10ntools/source/export.cxx
@@ -239,7 +239,6 @@ void Export::Init()
/*****************************************************************************/
{
// resets the internal status, used before parseing another file
- sActPForm = "";
bDefine = sal_False;
bNextMustBeDefineEOL = sal_False;
nLevel = 0;
@@ -416,7 +415,7 @@ int Export::Execute( int nToken, const char * pToken )
// create new instance for this res. and fill mandatory fields
- pResData = new ResData( sActPForm, FullId() , sFilename );
+ pResData = new ResData( FullId() , sFilename );
aResStack.push_back( pResData );
sToken = sToken.replaceAll("\n", OString()).
replaceAll("\r", OString()).
@@ -455,7 +454,7 @@ int Export::Execute( int nToken, const char * pToken )
// create new instance for this res. and fill mandatory fields
- pResData = new ResData( sActPForm, FullId() , sFilename );
+ pResData = new ResData( FullId() , sFilename );
aResStack.push_back( pResData );
sToken = sToken.replaceAll("\n", OString()).
replaceAll("\r", OString()).
@@ -482,7 +481,7 @@ int Export::Execute( int nToken, const char * pToken )
aResStack[ nLevel - 2 ]->bChild = sal_True;
}
- ResData *pNewData = new ResData( sActPForm, FullId() , sFilename );
+ ResData *pNewData = new ResData( FullId() , sFilename );
pNewData->sResTyp = sLowerTyp;
aResStack.push_back( pNewData );
}
@@ -817,40 +816,8 @@ int Export::Execute( int nToken, const char * pToken )
break;
case CONDITION: {
bDontWriteOutput = sal_False;
- sToken = sToken.replace('\r', ' ').replace('\t', ' ');
- for (;;) {
- sal_Int32 n = 0;
- sToken = sToken.replaceFirst(" ", " ", &n);
- if (n == -1) {
- break;
- }
- }
- sal_Int32 n = 0;
- OString sCondition(sToken.getToken(0, ' ', n));
- if ( sCondition == "#ifndef" ) {
- sActPForm = "!defined ";
- sActPForm += sToken.getToken(0, ' ', n);
- }
- else if ( sCondition == "#ifdef" ) {
- sActPForm = "defined ";
- sActPForm += sToken.getToken(0, ' ', n);
- }
- else if ( sCondition == "#if" ) {
- sActPForm = sToken.copy( 4 ).replaceAll("||", "\\or");
- }
- else if ( sCondition == "#elif" ) {
- sActPForm = sToken.copy( 6 ).replaceAll("||", "\\or");
- }
- else if ( sCondition == "#else" ) {
- sActPForm = sCondition;
- }
- else if ( sCondition == "#endif" ) {
- sActPForm = "";
- }
- else break;
if ( nLevel ) {
WriteData( pResData, sal_True );
- pResData->sPForm = sActPForm;
}
}
break;
@@ -1495,7 +1462,7 @@ sal_Bool Export::PrepareTextToMerge(OString &rText, sal_uInt16 nTyp,
}
- PFormEntrys *pEntrys = pMergeDataFile->GetPFormEntrys( pResData );
+ MergeEntrys *pEntrys = pMergeDataFile->GetMergeEntrys( pResData );
pResData->sId = sOldId;
pResData->sGId = sOldGId;
pResData->sResTyp = sOldTyp;
@@ -1530,7 +1497,7 @@ sal_Bool Export::PrepareTextToMerge(OString &rText, sal_uInt16 nTyp,
return sal_True;
}
-void Export::ResData2Output( PFormEntrys *pEntry, sal_uInt16 nType, const OString& rTextType )
+void Export::ResData2Output( MergeEntrys *pEntry, sal_uInt16 nType, const OString& rTextType )
{
sal_Bool bAddSemicolon = sal_False;
sal_Bool bFirst = sal_True;
@@ -1600,7 +1567,7 @@ void Export::MergeRest( ResData *pResData, sal_uInt16 nMode )
}
switch ( nMode ) {
case MERGE_MODE_NORMAL : {
- PFormEntrys *pEntry = pMergeDataFile->GetPFormEntrys( pResData );
+ MergeEntrys *pEntry = pMergeDataFile->GetMergeEntrys( pResData );
if ( pEntry ) {
if ( pResData->bText )
@@ -1649,7 +1616,7 @@ void Export::MergeRest( ResData *pResData, sal_uInt16 nMode )
else
pResData->sId = "1";
- PFormEntrys *pEntrys;
+ MergeEntrys *pEntrys;
std::size_t nLIndex = 0;
std::size_t nMaxIndex = 0;
if ( pList )
@@ -1664,17 +1631,17 @@ void Export::MergeRest( ResData *pResData, sal_uInt16 nMode )
sal_Bool bTranslateList = true;
if( !bPairedList ){
pResData->sId = OString::number(nMaxIndex);
- pEntrys = pMergeDataFile->GetPFormEntrys( pResData );
+ pEntrys = pMergeDataFile->GetMergeEntrys( pResData );
if ( !pEntrys )
bTranslateList = false;
pResData->sId = OString::valueOf(static_cast<sal_Int32>(nMaxIndex+1));
- pEntrys = pMergeDataFile->GetPFormEntrys( pResData );
+ pEntrys = pMergeDataFile->GetMergeEntrys( pResData );
if ( pEntrys )
bTranslateList = false;
pResData->sId = "1";
}
- pEntrys = pMergeDataFile->GetPFormEntrys( pResData );
+ pEntrys = pMergeDataFile->GetMergeEntrys( pResData );
while(( nLIndex < nMaxIndex )) {
if ( nIdx == 1 )
{
@@ -1787,8 +1754,8 @@ void Export::MergeRest( ResData *pResData, sal_uInt16 nMode )
}
else
pResData->sId = OString::number(nIdx);
- PFormEntrys *oldEntry = pEntrys;
- pEntrys = pMergeDataFile->GetPFormEntrys( pResData );
+ MergeEntrys *oldEntry = pEntrys;
+ pEntrys = pMergeDataFile->GetMergeEntrys( pResData );
if( !pEntrys )
pEntrys = oldEntry;
}
diff --git a/l10ntools/source/helpmerge.cxx b/l10ntools/source/helpmerge.cxx
index 904aae7..b7c3891 100644
--- a/l10ntools/source/helpmerge.cxx
+++ b/l10ntools/source/helpmerge.cxx
@@ -178,7 +178,7 @@ bool HelpParser::MergeSingleFile( XMLFile* file , MergeDataFile& aMergeDataFile
XMLHashMap* aXMLStrHM = file->GetStrings();
LangHashMap* aLangHM;
- static ResData pResData( "","","");
+ static ResData pResData("","");
pResData.sResTyp = "help";
for(XMLHashMap::iterator pos=aXMLStrHM->begin();pos!=aXMLStrHM->end();++pos) // Merge every l10n related string
@@ -205,7 +205,7 @@ bool HelpParser::MergeSingleFile( XMLFile* file , MergeDataFile& aMergeDataFile
void HelpParser::ProcessHelp( LangHashMap* aLangHM , const OString& sCur , ResData *pResData , MergeDataFile& aMergeDataFile ){
XMLElement* pXMLElement = NULL;
- PFormEntrys *pEntrys = NULL;
+ MergeEntrys *pEntrys = NULL;
OString sLId;
@@ -222,7 +222,7 @@ void HelpParser::ProcessHelp( LangHashMap* aLangHM , const OString& sCur , ResDa
sLId = pXMLElement->GetOldref();
pResData->sId = sLId;
- pEntrys = aMergeDataFile.GetPFormEntrys( pResData );
+ pEntrys = aMergeDataFile.GetMergeEntrys( pResData );
if( pEntrys != NULL)
{
OString sNewText;
diff --git a/l10ntools/source/lngmerge.cxx b/l10ntools/source/lngmerge.cxx
index 4d8cb0d..f343b26 100644
--- a/l10ntools/source/lngmerge.cxx
+++ b/l10ntools/source/lngmerge.cxx
@@ -209,9 +209,9 @@ sal_Bool LngParser::Merge(
OString sID( sGroup );
std::size_t nLastLangPos = 0;
- ResData *pResData = new ResData( "", sID , sSource );
+ ResData *pResData = new ResData( sID, sSource );
pResData->sResTyp = "LngText";
- PFormEntrys *pEntrys = aMergeDataFile.GetPFormEntrys( pResData );
+ MergeEntrys *pEntrys = aMergeDataFile.GetMergeEntrys( pResData );
// read languages
bGroup = sal_False;
diff --git a/l10ntools/source/merge.cxx b/l10ntools/source/merge.cxx
index 3487030..f1b283f 100644
--- a/l10ntools/source/merge.cxx
+++ b/l10ntools/source/merge.cxx
@@ -63,7 +63,7 @@ namespace
// class ResData
//
-ResData::ResData(const OString &rPF, const OString &rGId)
+ResData::ResData( const OString &rGId )
:
nWidth( 0 ),
nChildIndex( 0 ),
@@ -86,14 +86,12 @@ ResData::ResData(const OString &rPF, const OString &rGId)
pUIEntries( NULL ),
pItemList( NULL ),
pFilterList( NULL ),
- pPairedList( NULL ),
- sPForm( rPF )
+ pPairedList( NULL )
{
sGId = sGId.replaceAll("\r", OString());
- sPForm = sPForm.replaceAll("\r", OString());
}
-ResData::ResData(const OString &rPF, const OString &rGId , const OString &rFilename)
+ResData::ResData( const OString &rGId, const OString &rFilename)
:
nWidth( 0 ),
nChildIndex( 0 ),
@@ -117,11 +115,9 @@ ResData::ResData(const OString &rPF, const OString &rGId , const OString &rFilen
pUIEntries( NULL ),
pItemList( NULL ),
pFilterList( NULL ),
- pPairedList( NULL ),
- sPForm( rPF )
+ pPairedList( NULL )
{
sGId = sGId.replaceAll("\r", OString());
- sPForm = sPForm.replaceAll("\r", OString());
}
@@ -162,10 +158,10 @@ ResData::~ResData()
}
//
-// class PFormEntrys
+// class MergeEntrys
//
-sal_Bool PFormEntrys::GetText( OString &rReturn,
+sal_Bool MergeEntrys::GetText( OString &rReturn,
sal_uInt16 nTyp, const OString &nLangIndex, sal_Bool bDel )
{
@@ -178,9 +174,6 @@ sal_Bool PFormEntrys::GetText( OString &rReturn,
bReturn = bTextFirst[ nLangIndex ];
bTextFirst[ nLangIndex ] = sal_False;
break;
- case STRING_TYP_HELPTEXT :
- rReturn = sHelpText;
- break;
case STRING_TYP_QUICKHELPTEXT :
rReturn = sQuickHelpText[ nLangIndex ];
if ( bDel )
@@ -204,27 +197,25 @@ sal_Bool PFormEntrys::GetText( OString &rReturn,
// class MergeData
//
-MergeData::~MergeData()
-{
-}
-
-PFormEntrys* MergeData::GetPFormEntries()
+MergeData::MergeData(
+ const OString &rTyp, const OString &rGID,
+ const OString &rLID , const OString &rFilename )
+ : sTyp( rTyp ),
+ sGID( rGID ),
+ sLID( rLID ) ,
+ sFilename( rFilename ),
+ pMergeEntrys( new MergeEntrys() )
{
- if( aMap.find( OString(RTL_CONSTASCII_STRINGPARAM("HACK")) ) != aMap.end() )
- return aMap[OString(RTL_CONSTASCII_STRINGPARAM("HACK"))];
- return NULL;
}
-void MergeData::Insert(PFormEntrys* pfEntrys )
+MergeData::~MergeData()
{
- aMap.insert( PFormEntrysHashMap::value_type( OString(RTL_CONSTASCII_STRINGPARAM("HACK")) , pfEntrys ) );
+ delete pMergeEntrys;
}
-PFormEntrys* MergeData::GetPFObject( const OString& rPFO )
+MergeEntrys* MergeData::GetMergeEntries()
{
- if( aMap.find( OString(RTL_CONSTASCII_STRINGPARAM("HACK")) ) != aMap.end() )
- return aMap[ rPFO ];
- return NULL;
+ return pMergeEntrys;
}
sal_Bool MergeData::operator==( ResData *pData )
@@ -252,7 +243,6 @@ MergeDataFile::MergeDataFile(
bool bFirstLang = true;
while( !aInputStream.eof() )
{
- const OString sHack("HACK");
const OString sFileName( lcl_NormalizeFilename(rFile) );
const bool bReadAll = sFileName.isEmpty();
const OString sPoFileName(sPoFile.data(), sPoFile.length());
@@ -331,7 +321,7 @@ MergeDataFile::MergeDataFile(
InsertEntry(
aActPo.getResourceType(), aActPo.getGroupId(),
- aActPo.getLocalId(), sHack, sLang, sText,
+ aActPo.getLocalId(), sLang, sText,
sQHText, sTitle, aActPo.getSourceFile(), bCaseSensitive );
if( bFirstLang && bWithQtz &&
@@ -340,7 +330,7 @@ MergeDataFile::MergeDataFile(
aLanguageSet.insert("qtz");
InsertEntry(
aActPo.getResourceType(), aActPo.getGroupId(),
- aActPo.getLocalId(), sHack, "qtz",
+ aActPo.getLocalId(), "qtz",
sQTZText + "||" + sExText, sQTZQHText + "||" + sExQHText,
sQTZTitle + "||" + sExTitle, aActPo.getSourceFile(),
bCaseSensitive );
@@ -391,31 +381,30 @@ MergeData *MergeDataFile::GetMergeData( ResData *pResData , bool bCaseSensitive
}
-PFormEntrys *MergeDataFile::GetPFormEntrys( ResData *pResData )
+MergeEntrys *MergeDataFile::GetMergeEntrys( ResData *pResData )
{
- // search for requested PFormEntrys
+ // search for requested MergeEntrys
MergeData *pData = GetMergeData( pResData );
if ( pData )
- return pData->GetPFormEntries();
+ return pData->GetMergeEntries();
return NULL;
}
-PFormEntrys *MergeDataFile::GetPFormEntrysCaseSensitive( ResData *pResData )
+MergeEntrys *MergeDataFile::GetMergeEntrysCaseSensitive( ResData *pResData )
{
- // search for requested PFormEntrys
+ // search for requested MergeEntrys
MergeData *pData = GetMergeData( pResData , true );
if ( pData )
- return pData->GetPFormEntries();
+ return pData->GetMergeEntries();
return NULL;
}
void MergeDataFile::InsertEntry(
const OString &rTYP, const OString &rGID,
- const OString &rLID, const OString &rPFO,
- const OString &nLANG, const OString &rTEXT,
- const OString &rQHTEXT, const OString &rTITLE ,
- const OString &rInFilename , bool bCaseSensitive
- )
+ const OString &rLID, const OString &nLANG,
+ const OString &rTEXT, const OString &rQHTEXT,
+ const OString &rTITLE, const OString &rInFilename,
+ bool bCaseSensitive )
{
MergeData *pData;
@@ -433,19 +422,9 @@ void MergeDataFile::InsertEntry(
aMap.insert( MergeDataHashMap::value_type( sKey, pData ) );
}
- PFormEntrys *pFEntrys = 0;
-
- // search for PFormEntrys
- pFEntrys = pData->GetPFObject( rPFO );
- if( !pFEntrys )
- {
- // create new PFormEntrys, cause no one exists with current properties
- pFEntrys = new PFormEntrys( rPFO );
- pData->Insert( pFEntrys );
- }
-
- // finaly insert the cur string
- pFEntrys->InsertEntry( nLANG , rTEXT, rQHTEXT, rTITLE );
+ // insert the cur string
+ MergeEntrys *pMergeEntrys = pData->GetMergeEntries();
+ pMergeEntrys->InsertEntry( nLANG , rTEXT, rQHTEXT, rTITLE );
}
OString MergeDataFile::CreateKey(const OString& rTYP, const OString& rGID,
diff --git a/l10ntools/source/propmerge.cxx b/l10ntools/source/propmerge.cxx
index 72affe3..386fa43 100644
--- a/l10ntools/source/propmerge.cxx
+++ b/l10ntools/source/propmerge.cxx
@@ -189,9 +189,9 @@ void PropParser::Merge( const OString &rMergeSrc, const OString &rDestinationFil
nEqualSign != -1 )
{
const OString sID( sLine.copy( 0, sLine.indexOf("=") ).trim() );
- ResData aResData( "", sID , m_sSource );
+ ResData aResData( sID, m_sSource );
aResData.sResTyp = "property";
- PFormEntrys* pEntrys = aMergeDataFile.GetPFormEntrys( &aResData );
+ MergeEntrys* pEntrys = aMergeDataFile.GetMergeEntrys( &aResData );
if( pEntrys )
{
OString sNewText;
diff --git a/l10ntools/source/stringmerge.cxx b/l10ntools/source/stringmerge.cxx
index bc2057a..40fe6c2 100644
--- a/l10ntools/source/stringmerge.cxx
+++ b/l10ntools/source/stringmerge.cxx
@@ -122,12 +122,12 @@ void StringParser::Merge(
{
xmlChar* pID = xmlGetProp(pCurrent, (const xmlChar*)("name"));
ResData aResData(
- "", helper::xmlStrToOString( pID ),
+ helper::xmlStrToOString( pID ),
static_cast<OString>(m_pSource->name) );
xmlFree( pID );
aResData.sResTyp = "string";
- PFormEntrys* pEntrys =
- (&aMergeDataFile)->GetPFormEntrys( &aResData );
+ MergeEntrys* pEntrys =
+ (&aMergeDataFile)->GetMergeEntrys( &aResData );
if( pEntrys )
{
OString sNewText;
diff --git a/l10ntools/source/treemerge.cxx b/l10ntools/source/treemerge.cxx
index b340ebe..d80203d 100644
--- a/l10ntools/source/treemerge.cxx
+++ b/l10ntools/source/treemerge.cxx
@@ -157,12 +157,12 @@ namespace
{
xmlChar* pID = xmlGetProp(pCurrent, (const xmlChar*)("id"));
ResData aResData(
- "", helper::xmlStrToOString( pID ),
+ helper::xmlStrToOString( pID ),
static_cast<OString>(io_pSource->name) );
xmlFree( pID );
aResData.sResTyp = helper::xmlStrToOString( pNodeName );
- PFormEntrys* pEntrys =
- pMergeDataFile->GetPFormEntrys( &aResData );
+ MergeEntrys* pEntrys =
+ pMergeDataFile->GetMergeEntrys( &aResData );
if( pEntrys )
{
OString sNewText;
diff --git a/l10ntools/source/uimerge.cxx b/l10ntools/source/uimerge.cxx
index ce4d757..e724b83 100644
--- a/l10ntools/source/uimerge.cxx
+++ b/l10ntools/source/uimerge.cxx
@@ -106,9 +106,9 @@ namespace
if (aI->second->sGID.isEmpty())
continue;
- PFormEntrys* pFoo = aI->second->GetPFormEntries();
+ MergeEntrys* pEntrys = aI->second->GetMergeEntries();
OString sOut;
- pFoo->GetText( sOut, STRING_TYP_TEXT, rLanguage );
+ pEntrys->GetText( sOut, STRING_TYP_TEXT, rLanguage );
if (sOut.isEmpty())
continue;
diff --git a/l10ntools/source/xrmmerge.cxx b/l10ntools/source/xrmmerge.cxx
index 458beac..012d916 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++ ){
More information about the Libreoffice-commits
mailing list