[Libreoffice-commits] core.git: 13 commits - chart2/AllLangResTarget_chartcontroller.mk chart2/source connectivity/AllLangResTarget_sdbcl.mk cui/AllLangResTarget_cui.mk cui/source dbaccess/AllLangResTarget_dbu.mk desktop/AllLangResTarget_deploymentgui.mk extensions/AllLangResTarget_pcr.mk extensions/AllLangResTarget_updchk.mk extensions/source framework/AllLangResTarget_fwe.mk l10ntools/inc l10ntools/source scaddins/AllLangResTarget_analysis.mk sc/AllLangResTarget_sc.mk sc/source sd/AllLangResTarget_sd.mk sd/source sfx2/AllLangResTarget_sfx2.mk solenv/gbuild svtools/AllLangResTarget_svt.mk svx/AllLangResTarget_svx.mk sw/AllLangResTarget_sw.mk vcl/AllLangResTarget_vcl.mk wizards/AllLangResTarget_wzi.mk
Zolnai Tamás
zolnaitamas2000 at gmail.com
Thu Dec 26 22:16:56 PST 2013
chart2/AllLangResTarget_chartcontroller.mk | 19
connectivity/AllLangResTarget_sdbcl.mk | 2
cui/AllLangResTarget_cui.mk | 5
dbaccess/AllLangResTarget_dbu.mk | 2
desktop/AllLangResTarget_deploymentgui.mk | 5
extensions/AllLangResTarget_pcr.mk | 5
extensions/AllLangResTarget_updchk.mk | 2
framework/AllLangResTarget_fwe.mk | 2
l10ntools/inc/export.hxx | 62 --
l10ntools/inc/tokens.h | 7
l10ntools/source/export.cxx | 671 ++++++++---------------------
l10ntools/source/merge.cxx | 55 --
l10ntools/source/srclex.l | 10
sc/AllLangResTarget_sc.mk | 11
sc/source/ui/formdlg/formdlgs.src | 24 -
sc/source/ui/src/pseudo.src | 22
scaddins/AllLangResTarget_analysis.mk | 5
sd/AllLangResTarget_sd.mk | 9
sfx2/AllLangResTarget_sfx2.mk | 9
solenv/gbuild/AllLangResTarget.mk | 40 +
svtools/AllLangResTarget_svt.mk | 4
svx/AllLangResTarget_svx.mk | 4
sw/AllLangResTarget_sw.mk | 5
vcl/AllLangResTarget_vcl.mk | 6
wizards/AllLangResTarget_wzi.mk | 2
25 files changed, 283 insertions(+), 705 deletions(-)
New commits:
commit 1459d6b2696f4c2e7c98e217e33ae2c421e3d6b2
Author: Zolnai Tamás <zolnaitamas2000 at gmail.com>
Date: Thu Dec 26 23:02:05 2013 +0100
Transex3: modify list localization/export part
Avoid using numbers to identify the list items because
using numbers can lead to mixed translations. Use the
corresponding string instead.
Change-Id: I963efbf0b4d6b17f77c51cbda0af57efa66cf8cf
diff --git a/l10ntools/source/export.cxx b/l10ntools/source/export.cxx
index fc9a8a0..fd91eeb 100644
--- a/l10ntools/source/export.cxx
+++ b/l10ntools/source/export.cxx
@@ -807,13 +807,15 @@ sal_Bool Export::WriteExportList(ResData *pResData, ExportList& rExportList,
}
else
{
- sLID = OString::number(i + 1);
sText = StripList( sText );
if( sText == "\\\"" )
sText = "\"";
}
ConvertExportContent(sText);
+ if (nTyp != LIST_PAIRED)
+ sLID = sText;
+
OString sType = lcl_GetListTyp( nList, false );
common::writePoEntry(
commit a5867ea09798a570838928bd8e24715fc2d8e4d1
Author: Zolnai Tamás <zolnaitamas2000 at gmail.com>
Date: Thu Dec 26 21:21:59 2013 +0100
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
diff --git a/l10ntools/inc/export.hxx b/l10ntools/inc/export.hxx
index 038ad3f..453ec51 100644
--- a/l10ntools/inc/export.hxx
+++ b/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 );
diff --git a/l10ntools/source/export.cxx b/l10ntools/source/export.cxx
index 1dabc8d..fc9a8a0 100644
--- a/l10ntools/source/export.cxx
+++ b/l10ntools/source/export.cxx
@@ -46,6 +46,28 @@ boost::scoped_ptr< Export > exporter;
}
+static OString lcl_GetListTyp( const sal_uInt16 nTyp, const bool bUpperCamelCase )
+{
+ OString sType;
+ switch (nTyp)
+ {
+ case LIST_STRING:
+ sType = bUpperCamelCase ? "StringList" : "stringlist";
+ break;
+ case LIST_FILTER:
+ sType = bUpperCamelCase ? "FilterList" : "filterlist";
+ break;
+ case LIST_ITEM:
+ sType = bUpperCamelCase ? "ItemList" : "itemlist";
+ break;
+ case LIST_PAIRED:
+ sType = bUpperCamelCase ? "PairedList" : "pairedlist";
+ break;
+ default: break;
+ }
+ return sType;
+}
+
}
extern "C" {
@@ -225,7 +247,6 @@ void Export::Init()
bNextMustBeDefineEOL = sal_False;
nLevel = 0;
nList = LIST_NON;
- m_sListLang = OString();
nListIndex = 0;
for ( size_t i = 0, n = aResStack.size(); i < n; ++i )
delete aResStack[ i ];
@@ -263,7 +284,6 @@ int Export::Execute( int nToken, const char * pToken )
OString sToken( pToken );
OString sOrig( sToken );
- sal_Bool bWriteToMerged = bMergeMode;
if ( nToken == CONDITION )
{
@@ -348,6 +368,8 @@ int Export::Execute( int nToken, const char * pToken )
if ( nOpen < nClose )
bExecuteDown = sal_True;
}
+
+ sal_Bool bWriteToMerged = bMergeMode;
switch ( nToken ) {
case NORMDEFINE:
@@ -421,9 +443,10 @@ int Export::Execute( int nToken, const char * pToken )
case LEVELUP: {
// push
if ( nList )
+ {
nListLevel++;
- if ( nList )
break;
+ }
OString sLowerTyp;
if ( pResData )
@@ -440,7 +463,7 @@ int Export::Execute( int nToken, const char * pToken )
break;
case LEVELDOWN: {
// pop
- if ( !nList ) {
+ if ( !nList || !nListLevel ) {
if ( nLevel ) {
if ( bDefine && (nLevel == 1 )) {
bDefine = sal_False;
@@ -453,15 +476,17 @@ int Export::Execute( int nToken, const char * pToken )
aResStack.erase( it );
nLevel--;
}
+ if( nList )
+ {
+ nList = LIST_NON;
+ nListLevel = 1;
+ }
}
- else {
+ else
+ {
if ( bDefine )
bNextMustBeDefineEOL = sal_True;
- if ( !nListLevel ) {
- nList = LIST_NON;
- }
- else
- nListLevel--;
+ nListLevel--;
}
}
break;
@@ -484,19 +509,15 @@ int Export::Execute( int nToken, const char * pToken )
}
else if (sKey =="STRINGLIST")
{
- pResData->bList = sal_True;
nList = LIST_STRING;
- m_sListLang = SOURCE_LANGUAGE;
nListIndex = 0;
- nListLevel = 0;
+ nListLevel = 1;
}
else if (sKey == "FILTERLIST")
{
- pResData->bList = sal_True;
nList = LIST_FILTER;
- m_sListLang = SOURCE_LANGUAGE;
nListIndex = 0;
- nListLevel = 0;
+ nListLevel = 1;
}
if (sToken.indexOf( '{' ) != -1
&& (lcl_countOccurrences(sToken, '{')
@@ -520,35 +541,24 @@ int Export::Execute( int nToken, const char * pToken )
sKey = sKey.toAsciiUpperCase();
if (sKey == "STRINGLIST")
{
- pResData->bList = sal_True;
nList = LIST_STRING;
- m_sListLang = SOURCE_LANGUAGE;
- nListIndex = 0;
- nListLevel = 0;
}
else if (sKey == "FILTERLIST")
{
- pResData->bList = sal_True;
nList = LIST_FILTER;
- m_sListLang = SOURCE_LANGUAGE;
- nListIndex = 0;
- nListLevel = 0;
}
else if (sKey == "PAIREDLIST")
{
- pResData->bList = sal_True;
nList = LIST_PAIRED;
- m_sListLang = SOURCE_LANGUAGE;
- nListIndex = 0;
- nListLevel = 0;
}
else if (sKey == "ITEMLIST")
{
- pResData->bList = sal_True;
nList = LIST_ITEM;
- m_sListLang = SOURCE_LANGUAGE;
+ }
+ if( nList )
+ {
nListIndex = 0;
- nListLevel = 0;
+ nListLevel = 1;
}
}
}
@@ -556,16 +566,11 @@ int Export::Execute( int nToken, const char * pToken )
case TEXT:
case _LISTTEXT:
case LISTTEXT: {
- // this is an entry for a String- or FilterList
- if ( nList ) {
+ // this is an entry for a List
+ if ( nList )
+ {
SetChildWithText();
- sal_Int32 n = 0;
- OString sEntry(sToken.getToken(1, '"', n));
- if ( lcl_countOccurrences(sToken, '"') > 2 )
- sEntry += "\"";
- if ( sEntry == "\\\"" )
- sEntry = "\"";
- InsertListEntry( sEntry, sOrig );
+ InsertListEntry( sOrig );
}
}
break;
@@ -743,29 +748,12 @@ sal_Bool Export::WriteData( ResData *pResData, sal_Bool bCreateNew )
pResData->sTitle[ SOURCE_LANGUAGE ] = "";
}
}
- if ( pResData->pStringList ) {
- OString sList( "stringlist" );
- WriteExportList( pResData, pResData->pStringList, sList, bCreateNew );
- if ( bCreateNew )
- pResData->pStringList = 0;
- }
- if ( pResData->pFilterList ) {
- OString sList( "filterlist" );
- WriteExportList( pResData, pResData->pFilterList, sList, bCreateNew );
- if ( bCreateNew )
- pResData->pFilterList = 0;
- }
- if ( pResData->pItemList ) {
- OString sList( "itemlist" );
- WriteExportList( pResData, pResData->pItemList, sList, bCreateNew );
- if ( bCreateNew )
- pResData->pItemList = 0;
- }
- if ( pResData->pPairedList ) {
- OString sList( "pairedlist" );
- WriteExportList( pResData, pResData->pPairedList, sList, bCreateNew );
+
+ if( nList )
+ {
+ WriteExportList( pResData, pResData->m_aList, nList );
if ( bCreateNew )
- pResData->pPairedList = 0;
+ pResData->m_aList.clear();
}
return sal_True;
}
@@ -792,8 +780,8 @@ OString Export::StripList(const OString & rText)
return s1.copy( 0 , s1.lastIndexOf('\"'));
}
-sal_Bool Export::WriteExportList(ResData *pResData, ExportList *pExportList,
- const OString &rTyp, sal_Bool bCreateNew)
+sal_Bool Export::WriteExportList(ResData *pResData, ExportList& rExportList,
+ const sal_uInt16 nTyp)
{
OString sGID(pResData->sGId);
if (sGID.isEmpty())
@@ -806,15 +794,13 @@ sal_Bool Export::WriteExportList(ResData *pResData, ExportList *pExportList,
}
}
- for ( size_t i = 0; pExportList != NULL && i < pExportList->size(); i++ )
+ for ( size_t i = 0; i < rExportList.size(); i++ )
{
- ExportListEntry *pEntry = (*pExportList)[ i ];
-
OString sLID;
- OString sText((*pEntry)[ SOURCE_LANGUAGE ] );
+ OString sText(rExportList[ i ]);
// Strip PairList Line String
- if (rTyp.equalsIgnoreAsciiCase("pairedlist"))
+ if (nTyp == LIST_PAIRED)
{
sLID = GetPairedListID( sText );
sText = GetPairedListString( sText );
@@ -827,15 +813,13 @@ sal_Bool Export::WriteExportList(ResData *pResData, ExportList *pExportList,
sText = "\"";
}
ConvertExportContent(sText);
+
+ OString sType = lcl_GetListTyp( nList, false );
+
common::writePoEntry(
"Transex3", *aOutput.mPo, global::inputPathname,
- rTyp, sGID, sLID, OString(), sText);
-
- if ( bCreateNew )
- delete [] pEntry;
+ sType, sGID, sLID, OString(), sText);
}
- if ( bCreateNew )
- delete pExportList;
return sal_True;
}
@@ -863,67 +847,14 @@ OString Export::FullId()
return sFull.makeStringAndClear();
}
-void Export::InsertListEntry(const OString &rText, const OString &rLine)
+void Export::InsertListEntry(const OString &rLine)
{
ResData *pResData = ( nLevel-1 < aResStack.size() ) ? aResStack[ nLevel-1 ] : NULL;
- ExportList *pList = NULL;
- if ( nList == LIST_STRING ) {
- pList = pResData->pStringList;
- if ( !pList ) {
- pResData->pStringList = new ExportList();
- pList = pResData->pStringList;
- nListIndex = 0;
- }
- }
- else if ( nList == LIST_FILTER ) {
- pList = pResData->pFilterList;
- if ( !pList ) {
- pResData->pFilterList = new ExportList();
- pList = pResData->pFilterList;
- nListIndex = 0;
- }
- }
- else if ( nList == LIST_ITEM ) {
- pList = pResData->pItemList;
- if ( !pList ) {
- pResData->pItemList = new ExportList();
- pList = pResData->pItemList;
- nListIndex = 0;
- }
- }
- else if ( nList == LIST_PAIRED ) {
- pList = pResData->pPairedList;
- if ( !pList ) {
- pResData->pPairedList = new ExportList();
- pList = pResData->pPairedList;
- nListIndex = 0;
- }
- }
- else
- return;
-
- if ( nListIndex + 1 > pList->size())
- {
- ExportListEntry *pNew = new ExportListEntry();
- (*pNew)[LIST_REFID] = OString::number(REFID_NONE);
- pList->push_back(pNew);
- }
- ExportListEntry *pCurEntry = (*pList)[ nListIndex ];
-
- // For paired list use the line to set proper lid
- if( nList == LIST_PAIRED ){
- (*pCurEntry)[ m_sListLang ] = rLine;
- }else
- (*pCurEntry)[ m_sListLang ] = rText;
+ if( pResData->m_aList.empty() )
+ nListIndex = 0;
- if ( m_sListLang.equalsIgnoreAsciiCase("en-US") ) {
- (*pCurEntry)[ SOURCE_LANGUAGE ] = rLine;
-
- pList->NewSourceLanguageListEntry();
- }
-
- nListIndex++;
+ pResData->m_aList.push_back(rLine);
}
void Export::CleanValue( OString &rValue )
@@ -1074,62 +1005,24 @@ void Export::ConvertExportContent( OString& rText )
rText = helper::unEscapeAll(rText,"\\n""\\t""\\\\""\\\"","\n""\t""\\""\"");
}
-bool Export::GetAllMergeEntrysOfList(ResData *pResData, std::vector<MergeEntrys*>& o_vMergeEntrys, ExportList*& o_pList )
+bool Export::GetAllMergeEntrysOfList(ResData *pResData, std::vector<MergeEntrys*>& o_vMergeEntrys )
{
o_vMergeEntrys.clear();
- o_pList = 0;
if (!pResData->sGId.isEmpty())
pResData->sGId = pResData->sGId + OString('.');
pResData->sGId = pResData->sGId + pResData->sId;
- // Find out the type of List
- MergeEntrys* pEntrysOfFirstItem = 0;
- sal_uInt16 nType = LIST_STRING;
- bool bPairedList = false;
- while( !pEntrysOfFirstItem && nType <= LIST_PAIRED )
- {
- switch ( nType )
- {
- case LIST_STRING : pResData->sResTyp = "stringlist"; o_pList = pResData->pStringList; bPairedList = false; break;
- case LIST_FILTER : pResData->sResTyp = "filterlist"; o_pList = pResData->pFilterList; bPairedList = false; break;
- case LIST_ITEM : pResData->sResTyp = "itemlist"; o_pList = pResData->pItemList; bPairedList = false; break;
- case LIST_PAIRED : pResData->sResTyp = "pairedlist"; o_pList = pResData->pPairedList; bPairedList = true; break;
- }
+ pResData->sResTyp = lcl_GetListTyp( nList, false );
- // Set matching pairedlist identifier
- if( bPairedList && pResData->pPairedList )
- {
- ExportListEntry* pListE = ( ExportListEntry* ) (*pResData->pPairedList)[ 0 ];
- pResData->sId = GetPairedListID ( (*pListE)[ SOURCE_LANGUAGE ] );
- }
- else
- pResData->sId = "1";
-
- pEntrysOfFirstItem = pMergeDataFile->GetMergeEntrys( pResData );
- ++nType;
- }
-
- if( !pEntrysOfFirstItem )
- {
- o_pList = 0;
- return false;
- }
- else
- nList = nType-1;
-
- sal_uInt16 nMaxIndex = 0;
- if ( o_pList )
- {
- nMaxIndex = o_pList->GetSourceLanguageListEntryCount();
- }
+ const sal_uInt16 nMaxIndex = pResData->m_aList.size();
/**
* Check whether count of listentries match with count
* of translated items. If not than write origin items
* to the list to avoid mixed translations
* (exclude pairedlist)
*/
- if( !bPairedList )
+ if( nList != LIST_PAIRED )
{
MergeEntrys* pEntrys;
// MergeData contains longer list
@@ -1145,18 +1038,12 @@ bool Export::GetAllMergeEntrysOfList(ResData *pResData, std::vector<MergeEntrys*
pResData->sId = "1";
}
- o_vMergeEntrys.push_back(pEntrysOfFirstItem);
-
- for( sal_uInt16 nLIndex = 2; nLIndex <= nMaxIndex; ++nLIndex )
+ for( sal_uInt16 nLIndex = 1; nLIndex <= nMaxIndex; ++nLIndex )
{
// Set matching pairedlist identifier
- if ( bPairedList )
+ if ( nList == LIST_PAIRED )
{
- ExportListEntry* pListE = ( ExportListEntry* )(*pResData->pPairedList)[ ( nLIndex ) -1 ];
- if( pListE )
- {
- pResData->sId = GetPairedListID ( (*pListE)[ SOURCE_LANGUAGE ] );
- }
+ pResData->sId = GetPairedListID ( pResData->m_aList[ ( nLIndex ) -1 ] );
}
else
pResData->sId = OString::number(nLIndex);
@@ -1214,159 +1101,126 @@ void Export::ResData2Output( MergeEntrys *pEntry, sal_uInt16 nType, const OStrin
}
}
-void Export::MergeRest( ResData *pResData, sal_uInt16 nMode )
+void Export::MergeRest( ResData *pResData )
{
if ( !pMergeDataFile ){
pMergeDataFile = new MergeDataFile( sMergeSrc, global::inputPathname, false );
aLanguages = pMergeDataFile->GetLanguages();
}
- switch ( nMode ) {
- case MERGE_MODE_NORMAL : {
- MergeEntrys *pEntry = 0;
- if( pResData->bText || pResData->bQuickHelpText || pResData->bTitle )
- pEntry = pMergeDataFile->GetMergeEntrys( pResData );
- if ( pEntry ) {
- if ( pResData->bText )
- ResData2Output( pEntry, STRING_TYP_TEXT, pResData->sTextTyp );
+ MergeEntrys *pEntry = 0;
+ if( pResData->bText || pResData->bQuickHelpText || pResData->bTitle )
+ pEntry = pMergeDataFile->GetMergeEntrys( pResData );
- if ( pResData->bQuickHelpText )
- ResData2Output( pEntry, STRING_TYP_QUICKHELPTEXT, OString("QuickHelpText") );
+ if ( pEntry )
+ {
+ if ( pResData->bText )
+ ResData2Output( pEntry, STRING_TYP_TEXT, pResData->sTextTyp );
- if ( pResData->bTitle )
- ResData2Output( pEntry, STRING_TYP_TITLE, OString("Title") );
- }
+ if ( pResData->bQuickHelpText )
+ ResData2Output( pEntry, STRING_TYP_QUICKHELPTEXT, OString("QuickHelpText") );
- // Merge Lists
- if ( pResData->bList ) {
- OString sOldId = pResData->sId;
- OString sOldGId = pResData->sGId;
- OString sOldTyp = pResData->sResTyp;
- sal_uInt16 nOldListTyp = nList;
+ if ( pResData->bTitle )
+ ResData2Output( pEntry, STRING_TYP_TITLE, OString("Title") );
+ }
- OString sSpace;
- for ( sal_uInt16 i = 1; i < nLevel-1; i++ )
- sSpace += "\t";
+ // Merge Lists
+ if ( nList )
+ {
+ OString sOldId = pResData->sId;
+ OString sOldGId = pResData->sGId;
+ OString sOldTyp = pResData->sResTyp;
- std::vector<MergeEntrys*> vMergeEntryVector;
- ExportList* pList = 0;
- bool bTranslateList = GetAllMergeEntrysOfList(pResData, vMergeEntryVector, pList);
+ OString sSpace;
+ for ( sal_uInt16 i = 1; i < nLevel-1; i++ )
+ sSpace += "\t";
+
+ std::vector<MergeEntrys*> vMergeEntryVector;
+ bool bTranslateList = GetAllMergeEntrysOfList(pResData, vMergeEntryVector);
+
+ OString sCur;
+ for( unsigned int n = 0; n < aLanguages.size(); n++ )
+ {
+ sCur = aLanguages[ n ];
- if( pList )
+ sal_uInt16 nLIndex = 0;
+ sal_uInt16 nMaxIndex = pResData->m_aList.size();
+ while( nLIndex < nMaxIndex )
+ {
+ if ( nLIndex == 0 )
{
- OString sCur;
- for( unsigned int n = 0; n < aLanguages.size(); n++ )
- {
- sCur = aLanguages[ n ];
+ OStringBuffer sHead;
+ if ( bNextMustBeDefineEOL )
+ sHead.append("\\\n\t");
+ sHead.append(sSpace + lcl_GetListTyp( nList, true ) + " [ " + sCur + " ] ");
- sal_uInt16 nLIndex = 0;
- sal_uInt16 nMaxIndex = pList->GetSourceLanguageListEntryCount();
- while( nLIndex < nMaxIndex )
- {
- if ( nLIndex == 0 )
- {
- OStringBuffer sHead;
- if ( bNextMustBeDefineEOL )
- sHead.append("\\\n\t");
- sHead.append(sSpace);
- switch ( nList )
- {
- case LIST_STRING:
- sHead.append("StringList ");
- break;
- case LIST_FILTER:
- sHead.append("FilterList ");
- break;
- case LIST_ITEM:
- sHead.append("ItemList ");
- break;
- case LIST_PAIRED:
- sHead.append("PairedList ");
- break;
- }
- sHead.append("[ ");
- sHead.append(sCur);
- sHead.append(" ] ");
- if ( bDefine || bNextMustBeDefineEOL )
- {
- sHead.append("= \\\n");
- sHead.append(sSpace);
- sHead.append("\t{\\\n\t");
- }
- else
- {
- sHead.append("= \n");
- sHead.append(sSpace);
- sHead.append("\t{\n\t");
- }
- WriteToMerged(sHead.makeStringAndClear() , true);
- }
- OString sLine;
- if ( pList && (*pList)[ nLIndex ] )
- sLine = ( *(*pList)[ nLIndex ])[ SOURCE_LANGUAGE ];
-
- if ( sLine.indexOf( '>' ) != -1 ) {
- if ((( sLine.indexOf( '{' ) == -1 ) ||
- ( sLine.indexOf( '{' ) >= sLine.indexOf( '"' ))) &&
- (( sLine.indexOf( '<' ) == -1 ) ||
- ( sLine.indexOf( '<' ) >= sLine.indexOf( '"' ))))
- {
- sLine = sLine.replaceFirst("\"", "< \"" );
- }
- }
+ if ( bDefine || bNextMustBeDefineEOL )
+ {
+ sHead.append("= \\\n" + sSpace + "\t{\\\n\t");
+ }
+ else
+ {
+ sHead.append("= \n" + sSpace + "\t{\n\t");
+ }
+ WriteToMerged(sHead.makeStringAndClear() , true);
+ }
- if( bTranslateList && nLIndex < vMergeEntryVector.size() && vMergeEntryVector[nLIndex] )
- {
- OString sText;
- sal_Bool bText;
- bText = vMergeEntryVector[nLIndex]->GetText( sText, STRING_TYP_TEXT, sCur, sal_True );
- if ( bText && !sText.isEmpty() )
- {
- ConvertMergeContent( sText );
- OString sPre = sLine.copy( 0 , sLine.indexOf('"') );
- OString sPost = sLine.copy( sLine.lastIndexOf('"') + 1 );
- sLine = sPre + sText + sPost;
- }
- }
+ OString sLine = pResData->m_aList[ nLIndex ];
+ if ( sLine.indexOf( '>' ) != -1 )
+ {
+ if ((( sLine.indexOf( '{' ) == -1 ) ||
+ ( sLine.indexOf( '{' ) >= sLine.indexOf( '"' ))) &&
+ (( sLine.indexOf( '<' ) == -1 ) ||
+ ( sLine.indexOf( '<' ) >= sLine.indexOf( '"' ))))
+ {
+ sLine = sLine.replaceFirst("\"", "< \"" );
+ }
+ }
- OString sText1( "\t" );
- sText1 += sLine;
- if ( bDefine || bNextMustBeDefineEOL )
- sText1 += " ;\\\n";
- else
- sText1 += " ;\n";
- sText1 += sSpace;
- sText1 += "\t";
- WriteToMerged( sText1 ,true );
- ++nLIndex;
- }
- if ( nLIndex > 0 ) {
- OString sFooter;
- if (!sSpace.isEmpty()) {
- sFooter = sSpace.copy(1);
- }
- if ( bNextMustBeDefineEOL )
- sFooter += "};";
- else if ( !bDefine )
- sFooter += "};\n\t";
- else
- sFooter += "\n\n";
- WriteToMerged( sFooter ,true );
- }
+ if( bTranslateList && nLIndex < vMergeEntryVector.size() && vMergeEntryVector[nLIndex] )
+ {
+ OString sText;
+ bool bText = vMergeEntryVector[nLIndex]->GetText( sText, STRING_TYP_TEXT, sCur, sal_True );
+ if ( bText && !sText.isEmpty() )
+ {
+ ConvertMergeContent( sText );
+ OString sPre = sLine.copy( 0 , sLine.indexOf('"') );
+ OString sPost = sLine.copy( sLine.lastIndexOf('"') + 1 );
+ sLine = sPre + sText + sPost;
}
}
- pResData->sId = sOldId;
- pResData->sGId = sOldGId;
- pResData->sResTyp = sOldTyp;
- nList = nOldListTyp;
+ OString sText1( "\t" );
+ sText1 += sLine;
+ if ( bDefine || bNextMustBeDefineEOL )
+ sText1 += " ;\\\n";
+ else
+ sText1 += " ;\n";
+ sText1 += sSpace;
+ sText1 += "\t";
+ WriteToMerged( sText1 ,true );
+ ++nLIndex;
+ }
+
+ if ( nLIndex > 0 )
+ {
+ OString sFooter;
+ if (!sSpace.isEmpty())
+ sFooter = sSpace.copy(1);
+
+ if ( bNextMustBeDefineEOL )
+ sFooter += "};";
+ else if ( !bDefine )
+ sFooter += "};\n\t";
+ else
+ sFooter += "\n\n";
+ WriteToMerged( sFooter ,true );
}
}
- break;
- case MERGE_MODE_LIST : {
- }
- break;
+ pResData->sId = sOldId;
+ pResData->sGId = sOldGId;
+ pResData->sResTyp = sOldTyp;
}
pParseQueue->bMflag = false;
}
diff --git a/l10ntools/source/merge.cxx b/l10ntools/source/merge.cxx
index 0d427d9..2f8cae0 100644
--- a/l10ntools/source/merge.cxx
+++ b/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
//
commit d1c74734c8d9026b0f0c03f7382ca60165cec8c6
Author: Zolnai Tamás <zolnaitamas2000 at gmail.com>
Date: Thu Dec 26 21:21:22 2013 +0100
Transex3: NO_LOCALIZE_EXPORT
In the past, NO_LOCALIZE_EXPORT macro must be used to
skip uneeded parsing of src files which has no localizable content.
It is unsued by now and it is more effective to handle
this files on gmake level:
gb_SrsTarget_add_nonlocalizable_files
gb_SrsTarget_add_nonlocalizable_templates
Plus remove some empty src file.
Change-Id: I8fc9b2db0b5fd7a3379d3c5be970c4fc691f4c53
diff --git a/chart2/AllLangResTarget_chartcontroller.mk b/chart2/AllLangResTarget_chartcontroller.mk
index 3c6d55b..b32d4af 100644
--- a/chart2/AllLangResTarget_chartcontroller.mk
+++ b/chart2/AllLangResTarget_chartcontroller.mk
@@ -27,14 +27,8 @@ $(eval $(call gb_SrsTarget_set_include,chart2/res,\
))
$(eval $(call gb_SrsTarget_add_files,chart2/res,\
- chart2/source/controller/dialogs/Bitmaps.src \
- chart2/source/controller/dialogs/dlg_ChartType.src \
- chart2/source/controller/dialogs/dlg_CreationWizard.src \
chart2/source/controller/dialogs/dlg_DataEditor.src \
chart2/source/controller/dialogs/dlg_DataSource.src \
- chart2/source/controller/dialogs/dlg_InsertDataLabel.src \
- chart2/source/controller/dialogs/dlg_InsertErrorBars.src \
- chart2/source/controller/dialogs/dlg_InsertLegend.src \
chart2/source/controller/dialogs/dlg_ShapeFont.src \
chart2/source/controller/dialogs/dlg_ShapeParagraph.src \
chart2/source/controller/dialogs/res_BarGeometry.src \
@@ -44,16 +38,21 @@ $(eval $(call gb_SrsTarget_add_files,chart2/res,\
chart2/source/controller/dialogs/Strings_Scale.src \
chart2/source/controller/dialogs/Strings.src \
chart2/source/controller/dialogs/Strings_Statistic.src \
- chart2/source/controller/dialogs/tp_AxisLabel.src \
chart2/source/controller/dialogs/tp_ChartType.src \
chart2/source/controller/dialogs/tp_DataSource.src \
- chart2/source/controller/dialogs/tp_ErrorBars.src \
- chart2/source/controller/dialogs/tp_PointGeometry.src \
chart2/source/controller/dialogs/tp_PolarOptions.src \
chart2/source/controller/dialogs/tp_RangeChooser.src \
))
-$(eval $(call gb_SrsTarget_add_nonlocalized_files,chart2/res,\
+$(eval $(call gb_SrsTarget_add_nonlocalizable_files,chart2/res,\
+ chart2/source/controller/dialogs/Bitmaps.src \
+ chart2/source/controller/dialogs/dlg_ChartType.src \
+ chart2/source/controller/dialogs/dlg_CreationWizard.src \
+ chart2/source/controller/dialogs/dlg_InsertDataLabel.src \
+ chart2/source/controller/dialogs/dlg_InsertErrorBars.src \
+ chart2/source/controller/dialogs/dlg_InsertLegend.src \
+ chart2/source/controller/dialogs/tp_ErrorBars.src \
+ chart2/source/controller/dialogs/tp_PointGeometry.src \
chart2/source/controller/menus/ShapeContextMenu.src \
chart2/source/controller/menus/ShapeEditContextMenu.src \
))
diff --git a/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.src b/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.src
deleted file mode 100644
index e69de29..0000000
diff --git a/chart2/source/controller/dialogs/tp_AxisLabel.src b/chart2/source/controller/dialogs/tp_AxisLabel.src
deleted file mode 100644
index e69de29..0000000
diff --git a/connectivity/AllLangResTarget_sdbcl.mk b/connectivity/AllLangResTarget_sdbcl.mk
index 917adb2..0e6408e 100644
--- a/connectivity/AllLangResTarget_sdbcl.mk
+++ b/connectivity/AllLangResTarget_sdbcl.mk
@@ -20,7 +20,7 @@ $(eval $(call gb_SrsTarget_set_include,sdbcl/res,\
$$(INCLUDE) \
))
-$(eval $(call gb_SrsTarget_add_files,sdbcl/res,\
+$(eval $(call gb_SrsTarget_add_nonlocalizable_files,sdbcl/res,\
connectivity/source/resource/conn_log_res.src \
))
diff --git a/cui/AllLangResTarget_cui.mk b/cui/AllLangResTarget_cui.mk
index 4819ae8..4db5d6d 100644
--- a/cui/AllLangResTarget_cui.mk
+++ b/cui/AllLangResTarget_cui.mk
@@ -55,7 +55,6 @@ $(eval $(call gb_SrsTarget_add_files,cui/res,\
cui/source/options/optlingu.src \
cui/source/options/optpath.src \
cui/source/options/treeopt.src \
- cui/source/tabpages/align.src \
cui/source/tabpages/autocdlg.src \
cui/source/tabpages/border.src \
cui/source/tabpages/dstribut.src \
@@ -67,4 +66,8 @@ $(eval $(call gb_SrsTarget_add_files,cui/res,\
cui/source/tabpages/strings.src \
))
+$(eval $(call gb_SrsTarget_add_nonlocalizable_files,cui/res,\
+ cui/source/tabpages/align.src \
+))
+
# vim: set noet sw=4 ts=4:
diff --git a/cui/source/dialogs/cuiimapdlg.src b/cui/source/dialogs/cuiimapdlg.src
deleted file mode 100644
index e69de29..0000000
diff --git a/dbaccess/AllLangResTarget_dbu.mk b/dbaccess/AllLangResTarget_dbu.mk
index 72c0321..a991293 100644
--- a/dbaccess/AllLangResTarget_dbu.mk
+++ b/dbaccess/AllLangResTarget_dbu.mk
@@ -69,7 +69,7 @@ $(eval $(call gb_SrsTarget_add_files,dbaccess/dbu,\
dbaccess/source/ui/uno/dbinteraction.src \
))
-$(eval $(call gb_SrsTarget_add_nonlocalized_files,dbaccess/dbu,\
+$(eval $(call gb_SrsTarget_add_nonlocalizable_files,dbaccess/dbu,\
dbaccess/source/ui/imagelists/dbimagelists.src \
))
diff --git a/desktop/AllLangResTarget_deploymentgui.mk b/desktop/AllLangResTarget_deploymentgui.mk
index 9669acc..fda4fc5 100644
--- a/desktop/AllLangResTarget_deploymentgui.mk
+++ b/desktop/AllLangResTarget_deploymentgui.mk
@@ -25,7 +25,6 @@ $(eval $(call gb_SrsTarget_set_include,deploymentgui/res,\
))
$(eval $(call gb_SrsTarget_add_files,deploymentgui/res,\
- desktop/source/deployment/gui/dp_gui_backend.src \
desktop/source/deployment/gui/dp_gui_dependencydialog.src \
desktop/source/deployment/gui/dp_gui_dialog2.src \
desktop/source/deployment/gui/dp_gui_dialog.src \
@@ -34,4 +33,8 @@ $(eval $(call gb_SrsTarget_add_files,deploymentgui/res,\
desktop/source/deployment/gui/dp_gui_versionboxes.src \
))
+$(eval $(call gb_SrsTarget_add_nonlocaliable_files,deploymentgui/res,\
+ desktop/source/deployment/gui/dp_gui_backend.src \
+))
+
# vim: set ts=4 sw=4 et:
diff --git a/extensions/AllLangResTarget_pcr.mk b/extensions/AllLangResTarget_pcr.mk
index 30ff253..e6d5495 100644
--- a/extensions/AllLangResTarget_pcr.mk
+++ b/extensions/AllLangResTarget_pcr.mk
@@ -30,8 +30,11 @@ $(eval $(call gb_SrsTarget_add_files,pcr/res,\
extensions/source/propctrlr/pcrmiscres.src \
extensions/source/propctrlr/selectlabeldialog.src \
extensions/source/propctrlr/formlinkdialog.src \
- extensions/source/propctrlr/listselectiondlg.src \
extensions/source/propctrlr/newdatatype.src \
))
+$(eval $(call gb_SrsTarget_add_nonlocalizable_files,pcr/res,\
+ extensions/source/propctrlr/listselectiondlg.src \
+))
+
# vim:set noet sw=4 ts=4:
diff --git a/extensions/AllLangResTarget_updchk.mk b/extensions/AllLangResTarget_updchk.mk
index 7165b4a..b4a29d2 100644
--- a/extensions/AllLangResTarget_updchk.mk
+++ b/extensions/AllLangResTarget_updchk.mk
@@ -19,7 +19,7 @@ $(eval $(call gb_AllLangResTarget_add_srs,updchk,\
$(eval $(call gb_SrsTarget_SrsTarget,updchk/res))
-$(eval $(call gb_SrsTarget_add_nonlocalized_files,updchk/res,\
+$(eval $(call gb_SrsTarget_add_nonlocalizable_files,updchk/res,\
extensions/source/update/ui/updatecheckui.src \
))
diff --git a/extensions/source/propctrlr/taborder.src b/extensions/source/propctrlr/taborder.src
deleted file mode 100644
index e69de29..0000000
diff --git a/framework/AllLangResTarget_fwe.mk b/framework/AllLangResTarget_fwe.mk
index b3a601b..8875133 100644
--- a/framework/AllLangResTarget_fwe.mk
+++ b/framework/AllLangResTarget_fwe.mk
@@ -47,7 +47,7 @@ $(eval $(call gb_SrsTarget_set_include,fwe/fwk_services,\
-I$(SRCDIR)/framework/inc/services \
))
-$(eval $(call gb_SrsTarget_add_files,fwe/fwk_services,\
+$(eval $(call gb_SrsTarget_add_nonlocalizable_files,fwe/fwk_services,\
framework/source/services/fwk_services.src \
))
# vim: set noet sw=4 ts=4:
diff --git a/l10ntools/inc/export.hxx b/l10ntools/inc/export.hxx
index 851a5d7..038ad3f 100644
--- a/l10ntools/inc/export.hxx
+++ b/l10ntools/inc/export.hxx
@@ -171,7 +171,6 @@ private:
OString m_sListLang;
std::size_t nListIndex;
std::size_t nListLevel;
- bool bSkipFile;
sal_Bool bMergeMode;
OString sMergeSrc;
sal_Bool bError; // any errors while export?
diff --git a/l10ntools/source/export.cxx b/l10ntools/source/export.cxx
index 3d69d84..1dabc8d 100644
--- a/l10ntools/source/export.cxx
+++ b/l10ntools/source/export.cxx
@@ -180,7 +180,6 @@ Export::Export(const OString &rOutput)
nList( LIST_NON ),
nListIndex( 0 ),
nListLevel( 0 ),
- bSkipFile( false ),
bMergeMode( false ),
bError( sal_False ),
bReadOver( sal_False ),
@@ -205,7 +204,6 @@ Export::Export(
nList( LIST_NON ),
nListIndex( 0 ),
nListLevel( 0 ),
- bSkipFile( false ),
bMergeMode( sal_True ),
sMergeSrc( rMergeSource ),
bError( sal_False ),
@@ -304,14 +302,6 @@ int Export::Execute( int nToken, const char * pToken )
WriteToMerged( sOrig , false );
return 0;
}
- // #define NO_LOCALIZE_EXPORT
- if( bSkipFile ){
- if ( bMergeMode ) {
- WriteToMerged( sOrig , false );
- }
- return 1;
- }
-
if ( bDefine ) {
if (( nToken != EMPTYLINE ) && ( nToken != LEVELDOWN ) && ( nToken != LEVELUP )) {
@@ -361,24 +351,9 @@ int Export::Execute( int nToken, const char * pToken )
switch ( nToken ) {
case NORMDEFINE:
- sToken = sToken.replace('\r', ' ').replace('\t', ' ');
- for (;;) {
- sal_Int32 n = 0;
- sToken = sToken.replaceFirst(" ", " ", &n);
- if (n == -1) {
- break;
- }
- }
- if( sToken.equalsIgnoreAsciiCase("#define NO_LOCALIZE_EXPORT") ){
- bSkipFile = true;
- return 0;
- }
- if ( bMergeMode )
- WriteToMerged( sOrig , false );
-
- return 0;
-
-
+ if ( bMergeMode )
+ WriteToMerged( sOrig , false );
+ return 0;
case RSCDEFINE:
bDefine = sal_True; // res. defined in macro
diff --git a/sc/AllLangResTarget_sc.mk b/sc/AllLangResTarget_sc.mk
index 315ae34..d7a01ce 100644
--- a/sc/AllLangResTarget_sc.mk
+++ b/sc/AllLangResTarget_sc.mk
@@ -33,7 +33,6 @@ $(eval $(call gb_SrsTarget_set_include,sc/res,\
))
$(eval $(call gb_SrsTarget_add_files,sc/res,\
- sc/source/ui/src/iconsets.src \
sc/source/ui/src/popup.src \
sc/source/ui/src/autofmt.src \
sc/source/ui/src/globstr.src \
@@ -42,7 +41,6 @@ $(eval $(call gb_SrsTarget_add_files,sc/res,\
sc/source/ui/src/scfuncs.src \
sc/source/ui/src/textdlgs.src \
sc/source/ui/src/sc.src \
- sc/source/ui/src/pseudo.src \
sc/source/ui/src/hdrcont.src \
sc/source/ui/src/scerrors.src \
sc/source/ui/src/simpref.src \
@@ -56,7 +54,6 @@ $(eval $(call gb_SrsTarget_add_files,sc/res,\
sc/source/ui/src/xmlsourcedlg.src \
sc/source/ui/cctrl/checklistmenu.src \
sc/source/ui/navipi/navipi.src \
- sc/source/ui/pagedlg/pagedlg.src \
sc/source/ui/styleui/scstyles.src \
sc/source/ui/dbgui/pivot.src \
sc/source/ui/dbgui/dpgroupdlg.src \
@@ -64,7 +61,6 @@ $(eval $(call gb_SrsTarget_add_files,sc/res,\
sc/source/ui/dbgui/dapitype.src \
sc/source/ui/dbgui/imoptdlg.src \
sc/source/ui/dbgui/scendlg.src \
- sc/source/ui/dbgui/outline.src \
sc/source/ui/dbgui/validate.src \
sc/source/ui/drawfunc/drformsh.src \
sc/source/ui/drawfunc/objdraw.src \
@@ -72,11 +68,16 @@ $(eval $(call gb_SrsTarget_add_files,sc/res,\
sc/source/ui/miscdlgs/highred.src \
sc/source/ui/miscdlgs/conflictsdlg.src \
sc/source/ui/miscdlgs/acredlin.src \
- sc/source/ui/formdlg/formdlgs.src \
sc/source/ui/formdlg/dwfunctr.src \
sc/source/ui/sidebar/CellAppearancePropertyPanel.src \
sc/source/ui/StatisticsDialogs/StatisticsDialogs.src \
sc/source/core/src/compiler.src \
))
+$(eval $(call gb_SrsTarget_add_nonlocalizable_files,sc/res,\
+ sc/source/ui/src/iconsets.src \
+ sc/source/ui/pagedlg/pagedlg.src \
+ sc/source/ui/dbgui/outline.src \
+))
+
# vim: set noet sw=4 ts=4:
diff --git a/sc/source/ui/formdlg/formdlgs.src b/sc/source/ui/formdlg/formdlgs.src
deleted file mode 100644
index 1d1fe04..0000000
--- a/sc/source/ui/formdlg/formdlgs.src
+++ /dev/null
@@ -1,24 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include "sc.hrc"
-
- //---------------------------------------------------------------------------
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/src/pseudo.src b/sc/source/ui/src/pseudo.src
deleted file mode 100644
index 11cda77..0000000
--- a/sc/source/ui/src/pseudo.src
+++ /dev/null
@@ -1,22 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include <svx/svxids.hrc>
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/scaddins/AllLangResTarget_analysis.mk b/scaddins/AllLangResTarget_analysis.mk
index 0353a69..eb5ea75 100644
--- a/scaddins/AllLangResTarget_analysis.mk
+++ b/scaddins/AllLangResTarget_analysis.mk
@@ -32,8 +32,11 @@ $(eval $(call gb_SrsTarget_set_include,scaddins/analysis,\
$(eval $(call gb_SrsTarget_add_files,scaddins/analysis,\
scaddins/source/analysis/analysis.src \
- scaddins/source/analysis/analysis_deffuncnames.src \
scaddins/source/analysis/analysis_funcnames.src \
))
+$(eval $(call gb_SrsTarget_add_nonlocalizable_files,scaddins/analysis,\
+ scaddins/source/analysis/analysis_deffuncnames.src \
+))
+
# vim: set noet sw=4 ts=4:
diff --git a/sd/AllLangResTarget_sd.mk b/sd/AllLangResTarget_sd.mk
index 4ac1707..7c86bb2 100644
--- a/sd/AllLangResTarget_sd.mk
+++ b/sd/AllLangResTarget_sd.mk
@@ -43,16 +43,15 @@ $(eval $(call gb_SrsTarget_add_files,sd/res,\
sd/source/ui/app/toolbox.src \
sd/source/ui/dlg/animobjs.src \
sd/source/ui/dlg/dlgass.src \
- sd/source/ui/dlg/dlgfield.src \
- sd/source/ui/dlg/LayerDialog.src \
sd/source/ui/dlg/navigatr.src \
sd/source/ui/dlg/PaneDockingWindow.src \
sd/source/ui/slideshow/slideshow.src \
sd/source/ui/view/DocumentRenderer.src \
))
-$(eval $(call gb_SrsTarget_add_nonlocalized_files,sd/res,\
+$(eval $(call gb_SrsTarget_add_nonlocaliable_files,sd/res,\
sd/source/ui/slidesorter/view/SlsResource.src \
+ sd/source/ui/dlg/LayerDialog.src \
))
$(eval $(call gb_SrsTarget_add_templates,sd/res,\
@@ -60,6 +59,10 @@ $(eval $(call gb_SrsTarget_add_templates,sd/res,\
sd/source/ui/app/menuids_tmpl.src \
sd/source/ui/app/popup2_tmpl.src \
sd/source/ui/app/tbxids_tmpl.src \
+))
+
+$(eval $(call gb_SrsTarget_add_nonlocaliable_templates,sd/res,\
+ sd/source/ui/app/tbxids_tmpl.src \
sd/source/ui/app/toolbox2_tmpl.src \
))
diff --git a/sd/source/ui/dlg/dlgfield.src b/sd/source/ui/dlg/dlgfield.src
deleted file mode 100644
index e69de29..0000000
diff --git a/sfx2/AllLangResTarget_sfx2.mk b/sfx2/AllLangResTarget_sfx2.mk
index 0484871..01facae 100644
--- a/sfx2/AllLangResTarget_sfx2.mk
+++ b/sfx2/AllLangResTarget_sfx2.mk
@@ -39,7 +39,6 @@ $(eval $(call gb_SrsTarget_add_files,sfx/res,\
sfx2/source/appl/dde.src \
sfx2/source/appl/newhelp.src \
sfx2/source/appl/sfx.src \
- sfx2/source/bastyp/bastyp.src \
sfx2/source/bastyp/fltfnc.src \
sfx2/source/control/templateview.src \
sfx2/source/dialog/dialog.src \
@@ -50,11 +49,9 @@ $(eval $(call gb_SrsTarget_add_files,sfx/res,\
sfx2/source/dialog/taskpane.src \
sfx2/source/dialog/templateinfodlg.src \
sfx2/source/dialog/templdlg.src \
- sfx2/source/dialog/titledockwin.src \
sfx2/source/dialog/versdlg.src \
sfx2/source/doc/doc.src \
sfx2/source/doc/doctempl.src \
- sfx2/source/doc/graphhelp.src \
sfx2/source/doc/new.src \
sfx2/source/doc/templatelocnames.src \
sfx2/source/doc/templatedlg.src \
@@ -63,4 +60,10 @@ $(eval $(call gb_SrsTarget_add_files,sfx/res,\
sfx2/source/view/view.src \
))
+$(eval $(call gb_SrsTarget_add_nonlocaliable_files,sfx/res,\
+ sfx2/source/bastyp/bastyp.src \
+ sfx2/source/dialog/titledockwin.src \
+ sfx2/source/doc/graphhelp.src \
+))
+
# vim: set noet sw=4 ts=4:
diff --git a/solenv/gbuild/AllLangResTarget.mk b/solenv/gbuild/AllLangResTarget.mk
index 35afd1a..4289db1 100644
--- a/solenv/gbuild/AllLangResTarget.mk
+++ b/solenv/gbuild/AllLangResTarget.mk
@@ -128,7 +128,7 @@ $(call gb_SrsTemplatePartTarget_get_target,$(1)) : $(call gb_SrsPartMergeTarget_
mkdir -p $$(dir $$@) && \
cp $$< $$@)
ifneq ($(strip $(gb_WITH_LANG)),)
-$(call gb_SrsPartMergeTarget_SrsPartMergeTarget,$(1),$(true))
+$(call gb_SrsPartMergeTarget_SrsPartMergeTarget,$(1),$(2))
endif
endef
@@ -202,7 +202,7 @@ $(call gb_SrsTemplateTarget_get_clean_target,%) :
$(foreach part,$(PARTS),$(call gb_SrsPartMergeTarget_get_target,$(part))))
define gb_SrsTemplateTarget_add_file
-$(call gb_SrsTemplatePartTarget_SrsTemplatePartTarget,$(2))
+$(call gb_SrsTemplatePartTarget_SrsTemplatePartTarget,$(2),$(3))
$(call gb_SrsTemplateTarget_get_target,$(1)) : PARTS += $(2)
$(call gb_SrsTemplateTarget_get_clean_target,$(1)) : PARTS += $(2)
$(call gb_SrsTemplateTarget__get_target,$(1)) : $(call gb_SrsTemplatePartTarget_get_target,$(2))
@@ -316,28 +316,24 @@ $(foreach file,$(2),$(call gb_SrsTarget_add_file,$(1),$(file)))
endef
# Add a srs file that does not have any localizable content.
+# These files will be copied instead of parsing them with transex3.
#
-# This only exists to allow dependencies on SDF files. It must be used
-# if neither of the srs files in a directory have any localizable
-# content, because in that case there is going to be no SDF generated
-# for the directory. Therefore we must avoid depending on the SDF.
-#
-# gb_SrsTarget_add_nonlocalized_file srs file
-define gb_SrsTarget_add_nonlocalized_file
+# gb_SrsTarget_add_nonlocalizable_file srs file
+define gb_SrsTarget_add_nonlocalizable_file
$(call gb_SrsTarget__add_file,$(1),$(2),$(false))
endef
# Add srs files that do not have any localizable content.
#
-# gb_SrsTarget_add_nonlocalized_files srs file(s)
-define gb_SrsTarget_add_nonlocalized_files
-$(foreach file,$(2),$(call gb_SrsTarget_add_nonlocalized_file,$(1),$(file)))
+# gb_SrsTarget_add_nonlocalizable_files srs file(s)
+define gb_SrsTarget_add_nonlocalizable_files
+$(foreach file,$(2),$(call gb_SrsTarget_add_nonlocalizable_file,$(1),$(file)))
endef
define gb_SrsTarget_add_template
-$(call gb_SrsTemplateTarget_add_file,$(1),$(2))
+$(call gb_SrsTemplateTarget_add_file,$(1),$(2),$(true))
endef
@@ -346,6 +342,24 @@ $(foreach template,$(2),$(call gb_SrsTarget_add_template,$(1),$(template)))
endef
+# Add a srs template that does not have any localizable content.
+# These files will be copied instead of parsing them with transex3.
+#
+# gb_SrsTarget_add_nonlocalizable_template srs template
+define gb_SrsTarget_add_nonlocalizable_template
+$(call gb_SrsTemplateTarget_add_file,$(1),$(2),$(false))
+
+endef
+
+# Add srs templates that do not have any localizable content.
+#
+# gb_SrsTarget_add_nonlocalizable_templates srs template(s)
+define gb_SrsTarget_add_nonlocalizable_templates
+$(foreach template,$(2),$(call gb_SrsTarget_add_nonlocalizable_template,$(1),$(template)))
+
+endef
+
+
# Use templates built by another SrsTarget.
#
# gb_SrsTarget_use_srstarget srs other-srs
diff --git a/svtools/AllLangResTarget_svt.mk b/svtools/AllLangResTarget_svt.mk
index c9fd27c..aa52ba8 100644
--- a/svtools/AllLangResTarget_svt.mk
+++ b/svtools/AllLangResTarget_svt.mk
@@ -49,7 +49,6 @@ $(eval $(call gb_SrsTarget_add_files,svt/res,\
svtools/source/dialogs/wizardmachine.src \
$(if $(ENABLE_JAVA), \
svtools/source/java/javaerror.src) \
- svtools/source/misc/ehdl.src \
svtools/source/misc/imagemgr.src \
svtools/source/misc/langtab.src \
svtools/source/misc/svtools.src \
@@ -57,7 +56,8 @@ $(eval $(call gb_SrsTarget_add_files,svt/res,\
svtools/source/toolpanel/toolpanel.src \
))
-$(eval $(call gb_SrsTarget_add_nonlocalized_files,svt/res,\
+$(eval $(call gb_SrsTarget_add_nonlocalizable_files,svt/res,\
+ svtools/source/misc/ehdl.src \
svtools/source/brwbox/editbrowsebox.src \
))
diff --git a/svx/AllLangResTarget_svx.mk b/svx/AllLangResTarget_svx.mk
index 002b339..edcb3ae 100644
--- a/svx/AllLangResTarget_svx.mk
+++ b/svx/AllLangResTarget_svx.mk
@@ -46,7 +46,6 @@ $(eval $(call gb_SrsTarget_add_files,svx/res,\
svx/source/dialog/fontwork.src \
svx/source/dialog/frmsel.src \
svx/source/dialog/imapdlg.src \
- svx/source/dialog/langbox.src \
svx/source/dialog/language.src \
svx/source/dialog/passwd.src \
svx/source/dialog/prtqry.src \
@@ -86,7 +85,8 @@ $(eval $(call gb_SrsTarget_add_files,svx/res,\
svx/source/toolbars/fontworkbar.src \
))
-$(eval $(call gb_SrsTarget_add_nonlocalized_files,svx/res,\
+$(eval $(call gb_SrsTarget_add_nonlocalizable_files,svx/res,\
+ svx/source/dialog/langbox.src \
svx/source/unodraw/unodraw.src \
))
diff --git a/sw/AllLangResTarget_sw.mk b/sw/AllLangResTarget_sw.mk
index f79cd4e..456dc78 100644
--- a/sw/AllLangResTarget_sw.mk
+++ b/sw/AllLangResTarget_sw.mk
@@ -89,7 +89,6 @@ $(eval $(call gb_SrsTarget_add_files,sw/res,\
sw/source/ui/docvw/access.src \
sw/source/ui/docvw/docvw.src \
sw/source/ui/envelp/envelp.src \
- sw/source/ui/envelp/envprt.src \
sw/source/ui/envelp/label.src \
sw/source/ui/envelp/labfmt.src \
sw/source/ui/envelp/mailmrge.src \
@@ -123,4 +122,8 @@ $(eval $(call gb_SrsTarget_add_files,sw/res,\
sw/source/ui/wrtsh/wrtsh.src \
))
+$(eval $(call gb_SrsTarget_add_nonlocalizable_files,sw/res,\
+ sw/source/ui/envelp/envprt.src \
+))
+
# vim: set noet sw=4 ts=4:
diff --git a/vcl/AllLangResTarget_vcl.mk b/vcl/AllLangResTarget_vcl.mk
index 5304b75..7c286bf 100644
--- a/vcl/AllLangResTarget_vcl.mk
+++ b/vcl/AllLangResTarget_vcl.mk
@@ -35,15 +35,17 @@ $(eval $(call gb_SrsTarget_set_include,vcl/source/src,\
$(eval $(call gb_SrsTarget_add_files,vcl/source/src,\
vcl/source/src/btntext.src \
vcl/source/src/helptext.src \
- vcl/source/src/images.src \
vcl/source/src/menu.src \
vcl/source/src/print.src \
vcl/source/src/stdtext.src \
- vcl/source/src/throbber.src \
vcl/source/src/units.src \
vcl/source/src/fpicker.src \
vcl/source/edit/textundo.src \
))
+$(eval $(call gb_SrsTarget_add_nonlocalizable_files,vcl/source/src,\
+ vcl/source/src/images.src \
+ vcl/source/src/throbber.src \
+))
# vim: set noet sw=4 ts=4:
diff --git a/wizards/AllLangResTarget_wzi.mk b/wizards/AllLangResTarget_wzi.mk
index eb9c937..ebb3e4b 100644
--- a/wizards/AllLangResTarget_wzi.mk
+++ b/wizards/AllLangResTarget_wzi.mk
@@ -27,7 +27,7 @@ $(eval $(call gb_AllLangResTarget_add_srs,wzi,\
$(eval $(call gb_SrsTarget_SrsTarget,wzi/res))
-$(eval $(call gb_SrsTarget_add_nonlocalized_files,wzi/res,\
+$(eval $(call gb_SrsTarget_add_nonlocalizable_files,wzi/res,\
wizards/source/imagelists/imagelists.src \
))
commit bbee59851329142cdad62120ac02af922697e99f
Author: Zolnai Tamás <zolnaitamas2000 at gmail.com>
Date: Thu Dec 26 14:44:46 2013 +0100
Transex3: some string optimization
Change-Id: I66dab1cce489c670991d2c74ffc171638dfca3d7
diff --git a/l10ntools/source/export.cxx b/l10ntools/source/export.cxx
index 6427a13..3d69d84 100644
--- a/l10ntools/source/export.cxx
+++ b/l10ntools/source/export.cxx
@@ -734,15 +734,10 @@ sal_Bool Export::WriteData( ResData *pResData, sal_Bool bCreateNew )
else
sLID = pResData->sId;
- OString sXText;
- OString sXHText;
- OString sXQHText;
- OString sXTitle;
-
- sXText = pResData->sText[ SOURCE_LANGUAGE ];
- sXHText = pResData->sText[ X_COMMENT ];
- sXQHText = pResData->sQuickHelpText[ SOURCE_LANGUAGE ];
- sXTitle = pResData->sTitle[ SOURCE_LANGUAGE ];
+ OString sXText = pResData->sText[ SOURCE_LANGUAGE ];
+ OString sXHText = pResData->sText[ X_COMMENT ];
+ OString sXQHText = pResData->sQuickHelpText[ SOURCE_LANGUAGE ];
+ OString sXTitle = pResData->sTitle[ SOURCE_LANGUAGE ];
if( !sXText.isEmpty() )
{
@@ -1209,43 +1204,38 @@ void Export::ResData2Output( MergeEntrys *pEntry, sal_uInt16 nType, const OStrin
OString sText;
sal_Bool bText = pEntry->GetText( sText, nType, sCur , sal_True );
if ( bText && !sText.isEmpty() ) {
- OString sOutput;
+ OStringBuffer sOutput;
if ( bNextMustBeDefineEOL) {
if ( bFirst )
- sOutput += "\t\\\n";
+ sOutput.append("\t\\\n");
else
- sOutput += ";\t\\\n";
+ sOutput.append(";\t\\\n");
}
bFirst=sal_False;
- sOutput += "\t";
-
- sOutput += rTextType;
+ sOutput.append("\t" + rTextType);
if ( !sCur.equalsIgnoreAsciiCase("en-US") ) {
- sOutput += "[ ";
- sOutput += sCur;
- sOutput += " ] ";
+ sOutput.append("[ " + sCur + " ] ");
}
- sOutput += "= ";
+
ConvertMergeContent( sText );
- sOutput += sText;
+ sOutput.append("= " + sText);
if ( bDefine )
- sOutput += ";\\\n";
+ sOutput.append(";\\\n");
else if ( !bNextMustBeDefineEOL )
- sOutput += ";\n";
+ sOutput.append(";\n");
else
bAddSemicolon = sal_True;
for ( sal_uInt16 j = 1; j < nLevel; j++ )
- sOutput += "\t";
- WriteToMerged( sOutput , true );
+ sOutput.append("\t");
+ WriteToMerged( sOutput.makeStringAndClear() , true );
}
}
if ( bAddSemicolon ) {
- OString sOutput( ";" );
- WriteToMerged( sOutput , false );
+ WriteToMerged( ";" , false );
}
}
commit 87d683ead482adc252eedfe2b6cffc9e41757fed
Author: Zolnai Tamás <zolnaitamas2000 at gmail.com>
Date: Thu Dec 26 14:39:05 2013 +0100
Transex3: no need to check whether a lang occurs twice
It was an old concept that besides the en-US entry
other language entries were also added and in this
case may happened that one lang occured twice.
Change-Id: Ifac7089309ecf4a59b128c0fea5e8b757ca2c8a8
diff --git a/l10ntools/source/export.cxx b/l10ntools/source/export.cxx
index 32d2747..6427a13 100644
--- a/l10ntools/source/export.cxx
+++ b/l10ntools/source/export.cxx
@@ -628,13 +628,6 @@ int Export::Execute( int nToken, const char * pToken )
pResData->sTextTyp = sOrigKey;
if ( !bMergeMode )
{
- if (!pResData->sText[ sLangIndex ].isEmpty())
- {
- OStringBuffer sError("Language ");
- sError.append(sLangIndex);
- sError.append("defined twice");
- yyerror(sError.getStr());
- }
pResData->sText[ sLangIndex ] = sText;
}
}
@@ -643,13 +636,6 @@ int Export::Execute( int nToken, const char * pToken )
pResData->bQuickHelpText = sal_True;
if ( !bMergeMode )
{
- if (!pResData->sQuickHelpText[ sLangIndex ].isEmpty())
- {
- OStringBuffer sError("Language ");
- sError.append(sLangIndex);
- sError.append(" defined twice");
- YYWarning(sError.getStr());
- }
pResData->sQuickHelpText[ sLangIndex ] = sText;
}
}
@@ -658,13 +644,6 @@ int Export::Execute( int nToken, const char * pToken )
pResData->bTitle = sal_True;
if ( !bMergeMode )
{
- if ( !pResData->sTitle[ sLangIndex ].isEmpty())
- {
- OStringBuffer sError("Language ");
- sError.append(sLangIndex);
- sError.append(" defined twice");
- YYWarning(sError.getStr());
- }
pResData->sTitle[ sLangIndex ] = sText;
}
}
commit 62b688f961dd59d274c1f917fe62c2c91318921f
Author: Zolnai Tamás <zolnaitamas2000 at gmail.com>
Date: Thu Dec 26 14:37:59 2013 +0100
Transex3: remove unused sLastTextType member
Change-Id: I82196decf0419adabc849bd82141e8702f510c1c
diff --git a/l10ntools/inc/export.hxx b/l10ntools/inc/export.hxx
index 90600cc..851a5d7 100644
--- a/l10ntools/inc/export.hxx
+++ b/l10ntools/inc/export.hxx
@@ -176,7 +176,6 @@ private:
OString sMergeSrc;
sal_Bool bError; // any errors while export?
sal_Bool bReadOver;
- OString sLastTextTyp;
OString sFilename;
OString sLanguages;
commit eeee7f00c704739ebf912737072d07708920e6f2
Author: Zolnai Tamás <zolnaitamas2000 at gmail.com>
Date: Thu Dec 26 14:36:56 2013 +0100
Transex3: remove obsolete textrefid
Change-Id: Ic34efbd2090a11aa6fa88d67eda7ab31b1bddfcb
diff --git a/l10ntools/inc/tokens.h b/l10ntools/inc/tokens.h
index 9f4f2a8..1ec57a4 100644
--- a/l10ntools/inc/tokens.h
+++ b/l10ntools/inc/tokens.h
@@ -53,7 +53,6 @@
#define RSCDEFINELEND 516 /* */
#define PRAGMA 519 /* #pragma ... */
#define _LISTTEXT 521 /* { "Text" ... } */
-#define TEXTREFID 522 /* Text = 12345 */
#define NORMDEFINE 524 /* #define ... */
/*------------------------------------------------------ */
/*------------------------------------------------------ */
diff --git a/l10ntools/source/export.cxx b/l10ntools/source/export.cxx
index f0fbfd4..32d2747 100644
--- a/l10ntools/source/export.cxx
+++ b/l10ntools/source/export.cxx
@@ -695,8 +695,6 @@ int Export::Execute( int nToken, const char * pToken )
exit(-1);
}
break;
- case TEXTREFID :
- break;
}
if ( bWriteToMerged ) {
// the current token must be written to dest. without merging
diff --git a/l10ntools/source/srclex.l b/l10ntools/source/srclex.l
index 3642376..c97dcaa 100644
--- a/l10ntools/source/srclex.l
+++ b/l10ntools/source/srclex.l
@@ -168,11 +168,6 @@ void YYWarning();
WorkOnTokenSet( APPFONTMAPPING, yytext );
}
-[ \t]*[a-zA-Z0-9_]+[ \t]*=[ \t]*[0123456789]{1,5}[ \t]*";"?\\? {
-/* TEXTREFID // TextTyp = 12345 */
- WorkOnTokenSet( TEXTREFID, yytext );
-}
-
[a-zA-Z0-9_]+[ \t]*"="[\t ]*([ \t]*"//".*\n)*.* |
[a-zA-Z0-9_]+[ \t]*"=".* {
/* ASSIGNMENT Typ = ... */
commit 6ded5aecce2c31f353c8b0bb7fda09c525a2e5bf
Author: Zolnai Tamás <zolnaitamas2000 at gmail.com>
Date: Thu Dec 26 14:35:41 2013 +0100
Transex3: sHelpId is assigned but never used
Change-Id: I01bc171f5ad399644185e5e6d0398e89d9305ee7
diff --git a/l10ntools/inc/export.hxx b/l10ntools/inc/export.hxx
index 2d78d13..90600cc 100644
--- a/l10ntools/inc/export.hxx
+++ b/l10ntools/inc/export.hxx
@@ -115,7 +115,6 @@ public:
OString sResTyp;
OString sId;
OString sGId;
- OString sHelpId;
OString sFilename;
OStringHashMap sText;
diff --git a/l10ntools/source/export.cxx b/l10ntools/source/export.cxx
index f1d55ac..f0fbfd4 100644
--- a/l10ntools/source/export.cxx
+++ b/l10ntools/source/export.cxx
@@ -507,10 +507,6 @@ int Export::Execute( int nToken, const char * pToken )
replaceAll(" ", OString()));
pResData->SetId(sId, ID_LEVEL_IDENTIFIER);
}
- else if (sKey == "HELPID")
- {
- pResData->sHelpId = sValue;
- }
else if (sKey =="STRINGLIST")
{
pResData->bList = sal_True;
commit da989b523e6eb960722eb8de6babca534f54a350
Author: Zolnai Tamás <zolnaitamas2000 at gmail.com>
Date: Thu Dec 26 14:34:15 2013 +0100
Transex3: remove unused text types
Change-Id: Iad98aae685153589ff72a4be2ec704c0d311e1fd
diff --git a/l10ntools/inc/export.hxx b/l10ntools/inc/export.hxx
index e3a9190..2d78d13 100644
--- a/l10ntools/inc/export.hxx
+++ b/l10ntools/inc/export.hxx
@@ -90,12 +90,8 @@ public:
//
#define ID_LEVEL_NULL 0x0000
-#define ID_LEVEL_AUTOID 0x0001
#define ID_LEVEL_TEXT 0x0002
-#define ID_LEVEL_FIELDNAME 0x0003
-#define ID_LEVEL_ACCESSPATH 0x0004
#define ID_LEVEL_IDENTIFIER 0x0005
-#define ID_LEVEL_LISTINDEX 0x0006
/// Purpose: holds mandatory data to export a single res (used with ResStack)
diff --git a/l10ntools/source/export.cxx b/l10ntools/source/export.cxx
index 7df459a..f1d55ac 100644
--- a/l10ntools/source/export.cxx
+++ b/l10ntools/source/export.cxx
@@ -622,11 +622,7 @@ int Export::Execute( int nToken, const char * pToken )
if ( !sText.isEmpty() && !sLang.isEmpty() )
{
sKey = sKey.toAsciiUpperCase();
- if (sKey == "TEXT" ||
- sKey == "MESSAGE" ||
- sKey == "CUSTOMUNITTEXT" ||
- sKey == "SLOTNAME" ||
- sKey == "UINAME")
+ if (sKey == "TEXT" || sKey == "MESSAGE" || sKey == "CUSTOMUNITTEXT")
{
SetChildWithText();
if ( sLangIndex.equalsIgnoreAsciiCase("en-US") )
@@ -676,12 +672,6 @@ int Export::Execute( int nToken, const char * pToken )
pResData->sTitle[ sLangIndex ] = sText;
}
}
- else if ( sKey == "ACCESSPATH" ) {
- pResData->SetId( sText, ID_LEVEL_ACCESSPATH );
- }
- else if ( sKey == "FIELDNAME" ) {
- pResData->SetId( sText, ID_LEVEL_FIELDNAME );
- }
}
}
break;
commit edf7d340eb8d78cb99941cc28e23928d05697b10
Author: Zolnai Tamás <zolnaitamas2000 at gmail.com>
Date: Thu Dec 26 14:31:33 2013 +0100
Transex3: remove obsolete HelpText
Used alternative: Text[ x-comment ]
Change-Id: I762bf89c5ed316ec63183e3bedc22cbaac2e8aba
diff --git a/l10ntools/inc/export.hxx b/l10ntools/inc/export.hxx
index a160f6a..e3a9190 100644
--- a/l10ntools/inc/export.hxx
+++ b/l10ntools/inc/export.hxx
@@ -112,7 +112,6 @@ public:
sal_Bool bChildWithText;
sal_Bool bText;
- sal_Bool bHelpText;
sal_Bool bQuickHelpText;
sal_Bool bTitle;
sal_Bool bList;
@@ -125,8 +124,6 @@ public:
OStringHashMap sText;
- OStringHashMap sHelpText;
-
OStringHashMap sQuickHelpText;
OStringHashMap sTitle;
@@ -150,7 +147,6 @@ public:
#define LIST_ITEM 0x0004
#define LIST_PAIRED 0x0005
#define STRING_TYP_TEXT 0x0010
-#define STRING_TYP_HELPTEXT 0x0020
#define STRING_TYP_QUICKHELPTEXT 0x0040
#define STRING_TYP_TITLE 0x0080
diff --git a/l10ntools/source/export.cxx b/l10ntools/source/export.cxx
index 5bd5e84..7df459a 100644
--- a/l10ntools/source/export.cxx
+++ b/l10ntools/source/export.cxx
@@ -646,21 +646,6 @@ int Export::Execute( int nToken, const char * pToken )
pResData->sText[ sLangIndex ] = sText;
}
}
- else if ( sKey == "HELPTEXT" ) {
- SetChildWithText();
- pResData->bHelpText = sal_True;
- if ( !bMergeMode )
- {
- if (!pResData->sHelpText[ sLangIndex ].isEmpty())
- {
- OStringBuffer sError("Language ");
- sError.append(sLangIndex);
- sError.append(" defined twice");
- YYWarning(sError.getStr());
- }
- pResData->sHelpText[ sLangIndex ] = sText;
- }
- }
else if ( sKey == "QUICKHELPTEXT" ) {
SetChildWithText();
pResData->bQuickHelpText = sal_True;
@@ -774,8 +759,6 @@ sal_Bool Export::WriteData( ResData *pResData, sal_Bool bCreateNew )
if (( !pResData->sText[ SOURCE_LANGUAGE ].isEmpty())
||
- ( !pResData->sHelpText[ SOURCE_LANGUAGE ].isEmpty())
- ||
( !pResData->sQuickHelpText[ SOURCE_LANGUAGE ].isEmpty())
||
( !pResData->sTitle[ SOURCE_LANGUAGE ].isEmpty()))
@@ -794,10 +777,7 @@ sal_Bool Export::WriteData( ResData *pResData, sal_Bool bCreateNew )
OString sXTitle;
sXText = pResData->sText[ SOURCE_LANGUAGE ];
- if (!pResData->sText[ X_COMMENT ].isEmpty())
- sXHText = pResData->sText[ X_COMMENT ];
- else
- sXHText = pResData->sHelpText[ SOURCE_LANGUAGE ];
+ sXHText = pResData->sText[ X_COMMENT ];
sXQHText = pResData->sQuickHelpText[ SOURCE_LANGUAGE ];
sXTitle = pResData->sTitle[ SOURCE_LANGUAGE ];
@@ -826,7 +806,6 @@ sal_Bool Export::WriteData( ResData *pResData, sal_Bool bCreateNew )
if ( bCreateNew ) {
pResData->sText[ SOURCE_LANGUAGE ] = "";
- pResData->sHelpText[ SOURCE_LANGUAGE ] = "";
pResData->sQuickHelpText[ SOURCE_LANGUAGE ]= "";
pResData->sTitle[ SOURCE_LANGUAGE ] = "";
}
diff --git a/l10ntools/source/merge.cxx b/l10ntools/source/merge.cxx
index befa590..0d427d9 100644
--- a/l10ntools/source/merge.cxx
+++ b/l10ntools/source/merge.cxx
@@ -69,7 +69,6 @@ ResData::ResData( const OString &rGId )
bChild( sal_False ),
bChildWithText( sal_False ),
bText( sal_False ),
- bHelpText( sal_False ),
bQuickHelpText( sal_False ),
bTitle( sal_False ),
bList( sal_False ),
@@ -89,7 +88,6 @@ ResData::ResData( const OString &rGId, const OString &rFilename)
bChild( sal_False ),
bChildWithText( sal_False ),
bText( sal_False ),
- bHelpText( sal_False ),
bQuickHelpText( sal_False ),
bTitle( sal_False ),
bList( sal_False ),
commit 0dbd93b92a694a384b293e0dce87b5acdf12e9e8
Author: Zolnai Tamás <zolnaitamas2000 at gmail.com>
Date: Thu Dec 26 14:26:51 2013 +0100
Transex3: UIEntries list type is unused
This list type doesn't appear in the resource files
and there are lots of alternatives (ItemList, StringList ...)
for future need.
Change-Id: Ia4454a329ba93f54e5b3ca45443a1a84be3b4bf7
diff --git a/l10ntools/inc/export.hxx b/l10ntools/inc/export.hxx
index 971b184..a160f6a 100644
--- a/l10ntools/inc/export.hxx
+++ b/l10ntools/inc/export.hxx
@@ -134,7 +134,6 @@ public:
OString sTextTyp;
ExportList *pStringList;
- ExportList *pUIEntries;
ExportList *pItemList;
ExportList *pFilterList;
ExportList *pPairedList;
@@ -150,7 +149,6 @@ public:
#define LIST_FILTER 0x0002
#define LIST_ITEM 0x0004
#define LIST_PAIRED 0x0005
-#define LIST_UIENTRIES 0x0008
#define STRING_TYP_TEXT 0x0010
#define STRING_TYP_HELPTEXT 0x0020
#define STRING_TYP_QUICKHELPTEXT 0x0040
diff --git a/l10ntools/inc/tokens.h b/l10ntools/inc/tokens.h
index 4f4c49f..9f4f2a8 100644
--- a/l10ntools/inc/tokens.h
+++ b/l10ntools/inc/tokens.h
@@ -51,7 +51,6 @@
#define LISTTEXT 514 /* < "Text" ... > */
#define RSCDEFINE 515 /* #define MY_TEXT */
#define RSCDEFINELEND 516 /* */
-#define UIENTRIES 518 /* UIEntries = { */
#define PRAGMA 519 /* #pragma ... */
#define _LISTTEXT 521 /* { "Text" ... } */
#define TEXTREFID 522 /* Text = 12345 */
diff --git a/l10ntools/source/export.cxx b/l10ntools/source/export.cxx
index ef1df10..5bd5e84 100644
--- a/l10ntools/source/export.cxx
+++ b/l10ntools/source/export.cxx
@@ -527,14 +527,6 @@ int Export::Execute( int nToken, const char * pToken )
nListIndex = 0;
nListLevel = 0;
}
- else if (sKey == "UIENTRIES")
- {
- pResData->bList = sal_True;
- nList = LIST_UIENTRIES;
- m_sListLang = SOURCE_LANGUAGE;
- nListIndex = 0;
- nListLevel = 0;
- }
if (sToken.indexOf( '{' ) != -1
&& (lcl_countOccurrences(sToken, '{')
> lcl_countOccurrences(sToken, '}')))
@@ -543,7 +535,6 @@ int Export::Execute( int nToken, const char * pToken )
}
}
break;
- case UIENTRIES:
case LISTASSIGNMENT:
{
OString sTmpToken(
@@ -588,14 +579,6 @@ int Export::Execute( int nToken, const char * pToken )
nListIndex = 0;
nListLevel = 0;
}
- else if (sKey == "UIENTRIES")
- {
- pResData->bList = sal_True;
- nList = LIST_UIENTRIES;
- m_sListLang = SOURCE_LANGUAGE;
- nListIndex = 0;
- nListLevel = 0;
- }
}
}
break;
@@ -872,12 +855,6 @@ sal_Bool Export::WriteData( ResData *pResData, sal_Bool bCreateNew )
if ( bCreateNew )
pResData->pPairedList = 0;
}
- if ( pResData->pUIEntries ) {
- OString sList( "uientries" );
- WriteExportList( pResData, pResData->pUIEntries, sList, bCreateNew );
- if ( bCreateNew )
- pResData->pUIEntries = 0;
- }
return sal_True;
}
@@ -1011,14 +988,6 @@ void Export::InsertListEntry(const OString &rText, const OString &rLine)
nListIndex = 0;
}
}
- else if ( nList == LIST_UIENTRIES ) {
- pList = pResData->pUIEntries;
- if ( !pList ) {
- pResData->pUIEntries = new ExportList();
- pList = pResData->pUIEntries;
- nListIndex = 0;
- }
- }
else
return;
@@ -1206,13 +1175,12 @@ bool Export::GetAllMergeEntrysOfList(ResData *pResData, std::vector<MergeEntrys*
MergeEntrys* pEntrysOfFirstItem = 0;
sal_uInt16 nType = LIST_STRING;
bool bPairedList = false;
- while( !pEntrysOfFirstItem && nType <= LIST_UIENTRIES )
+ while( !pEntrysOfFirstItem && nType <= LIST_PAIRED )
{
switch ( nType )
{
case LIST_STRING : pResData->sResTyp = "stringlist"; o_pList = pResData->pStringList; bPairedList = false; break;
case LIST_FILTER : pResData->sResTyp = "filterlist"; o_pList = pResData->pFilterList; bPairedList = false; break;
- case LIST_UIENTRIES : pResData->sResTyp = "uientries"; o_pList = pResData->pUIEntries;bPairedList = false; break;
case LIST_ITEM : pResData->sResTyp = "itemlist"; o_pList = pResData->pItemList; bPairedList = false; break;
case LIST_PAIRED : pResData->sResTyp = "pairedlist"; o_pList = pResData->pPairedList; bPairedList = true; break;
}
@@ -1364,7 +1332,6 @@ void Export::MergeRest( ResData *pResData, sal_uInt16 nMode )
}
// Merge Lists
-
if ( pResData->bList ) {
OString sOldId = pResData->sId;
OString sOldGId = pResData->sGId;
@@ -1410,9 +1377,6 @@ void Export::MergeRest( ResData *pResData, sal_uInt16 nMode )
case LIST_PAIRED:
sHead.append("PairedList ");
break;
- case LIST_UIENTRIES:
- sHead.append("UIEntries ");
- break;
}
sHead.append("[ ");
sHead.append(sCur);
@@ -1436,8 +1400,7 @@ void Export::MergeRest( ResData *pResData, sal_uInt16 nMode )
sLine = ( *(*pList)[ nLIndex ])[ SOURCE_LANGUAGE ];
if ( sLine.indexOf( '>' ) != -1 ) {
- if (( nList != LIST_UIENTRIES ) &&
- (( sLine.indexOf( '{' ) == -1 ) ||
+ if ((( sLine.indexOf( '{' ) == -1 ) ||
( sLine.indexOf( '{' ) >= sLine.indexOf( '"' ))) &&
(( sLine.indexOf( '<' ) == -1 ) ||
( sLine.indexOf( '<' ) >= sLine.indexOf( '"' ))))
diff --git a/l10ntools/source/merge.cxx b/l10ntools/source/merge.cxx
index 6752c7f..befa590 100644
--- a/l10ntools/source/merge.cxx
+++ b/l10ntools/source/merge.cxx
@@ -76,7 +76,6 @@ ResData::ResData( const OString &rGId )
sGId( rGId ),
sTextTyp( "Text" ),
pStringList( NULL ),
- pUIEntries( NULL ),
pItemList( NULL ),
pFilterList( NULL ),
pPairedList( NULL )
@@ -98,7 +97,6 @@ ResData::ResData( const OString &rGId, const OString &rFilename)
sFilename( rFilename ),
sTextTyp( "Text" ),
pStringList( NULL ),
- pUIEntries( NULL ),
pItemList( NULL ),
pFilterList( NULL ),
pPairedList( NULL )
@@ -133,14 +131,6 @@ ResData::~ResData()
}
delete pItemList;
}
- if ( pUIEntries ) {
- // delete existing res. of type UIEntries
- for ( size_t i = 0; i < pUIEntries->size(); i++ ) {
- ExportListEntry* test = (*pUIEntries)[ i ];
- delete test;
- }
- delete pUIEntries;
- }
}
//
diff --git a/l10ntools/source/srclex.l b/l10ntools/source/srclex.l
index 048d1f1..3642376 100644
--- a/l10ntools/source/srclex.l
+++ b/l10ntools/source/srclex.l
@@ -191,11 +191,6 @@ void YYWarning();
WorkOnTokenSet( LISTASSIGNMENT, yytext );
}
-"UIEntries"[ \t]*("["[ \t]*[a-zA-Z0-9_\-]+[ \t]*"]"[ \t]*)?"="[ \t]*(\\[ \t]*)?\n?[ \t]*"{" {
-/* UIENTRIES */
- WorkOnTokenSet( UIENTRIES, yytext );
-}
-
"<"?[ \t]*L?\".*\".*">" {
/* LISTTEXT */
WorkOnTokenSet( LISTTEXT, yytext );
commit 94da69d4898fb2dd30834a388a980a54039dea04
Author: Zolnai Tamás <zolnaitamas2000 at gmail.com>
Date: Thu Dec 26 14:17:06 2013 +0100
Transex3: bDontWriteOutput is assigend but never used
Change-Id: I9ca8c83a225ea4860ac40c7584ec9c56acae0d6c
diff --git a/l10ntools/inc/export.hxx b/l10ntools/inc/export.hxx
index a0606f7..971b184 100644
--- a/l10ntools/inc/export.hxx
+++ b/l10ntools/inc/export.hxx
@@ -187,7 +187,6 @@ private:
OString sMergeSrc;
sal_Bool bError; // any errors while export?
sal_Bool bReadOver;
- sal_Bool bDontWriteOutput;
OString sLastTextTyp;
OString sFilename;
OString sLanguages;
diff --git a/l10ntools/source/export.cxx b/l10ntools/source/export.cxx
index 128e3a4..ef1df10 100644
--- a/l10ntools/source/export.cxx
+++ b/l10ntools/source/export.cxx
@@ -184,7 +184,6 @@ Export::Export(const OString &rOutput)
bMergeMode( false ),
bError( sal_False ),
bReadOver( sal_False ),
- bDontWriteOutput( sal_False ),
sFilename( global::inputPathname ),
sLanguages( OString() ),
pParseQueue( new ParserQueue( *this ) )
@@ -211,7 +210,6 @@ Export::Export(
sMergeSrc( rMergeSource ),
bError( sal_False ),
bReadOver( sal_False ),
- bDontWriteOutput( sal_False ),
sFilename( global::inputPathname ),
sLanguages( rLanguage ),
pParseQueue( new ParserQueue( *this ) )
@@ -386,7 +384,6 @@ int Export::Execute( int nToken, const char * pToken )
case RESOURCE:
case RESOURCEEXPR: {
- bDontWriteOutput = sal_False;
if ( nToken != RSCDEFINE )
bNextMustBeDefineEOL = sal_False;
// this is the beginning of a new res.
@@ -426,7 +423,6 @@ int Export::Execute( int nToken, const char * pToken )
}
break;
case SMALRESOURCE: {
- bDontWriteOutput = sal_False;
// this is the beginning of a new res.
bNextMustBeDefineEOL = sal_False;
nLevel++;
@@ -454,7 +450,6 @@ int Export::Execute( int nToken, const char * pToken )
if ( nList )
break;
- bDontWriteOutput = sal_False;
OString sLowerTyp;
if ( pResData )
sLowerTyp = "unknown";
@@ -471,7 +466,6 @@ int Export::Execute( int nToken, const char * pToken )
case LEVELDOWN: {
// pop
if ( !nList ) {
- bDontWriteOutput = sal_False;
if ( nLevel ) {
if ( bDefine && (nLevel == 1 )) {
bDefine = sal_False;
@@ -498,7 +492,6 @@ int Export::Execute( int nToken, const char * pToken )
break;
case ASSIGNMENT:
{
- bDontWriteOutput = sal_False;
// interpret different types of assignement
sal_Int32 n = 0;
OString sKey = sToken.getToken(0, '=', n).
@@ -553,7 +546,6 @@ int Export::Execute( int nToken, const char * pToken )
case UIENTRIES:
case LISTASSIGNMENT:
{
- bDontWriteOutput = sal_False;
OString sTmpToken(
sToken.replaceAll(" ", OString()).toAsciiLowerCase());
sal_Int32 nPos = sTmpToken.indexOf("[en-us]=");
@@ -625,7 +617,6 @@ int Export::Execute( int nToken, const char * pToken )
break;
case LONGTEXTLINE:
case TEXTLINE:
- bDontWriteOutput = sal_False;
if ( nLevel )
{
CutComment( sToken );
@@ -727,22 +718,16 @@ int Export::Execute( int nToken, const char * pToken )
}
break;
case APPFONTMAPPING:
- {
- bDontWriteOutput = sal_False;
- }
break;
case RSCDEFINELEND:
- bDontWriteOutput = sal_False;
break;
case CONDITION: {
- bDontWriteOutput = sal_False;
if ( nLevel ) {
WriteData( pResData, sal_True );
}
}
break;
case EMPTYLINE : {
- bDontWriteOutput = sal_False;
if ( bDefine ) {
bNextMustBeDefineEOL = sal_False;
bDefine = sal_False;
@@ -752,14 +737,12 @@ int Export::Execute( int nToken, const char * pToken )
}
break;
case PRAGMA : {
- bDontWriteOutput = sal_False;
fprintf(stderr, "ERROR: archaic PRAGMA %s\n", sToken.getStr());
exit(-1);
}
break;
- case TEXTREFID : {
- bDontWriteOutput = sal_True;
- }
+ case TEXTREFID :
+ break;
}
if ( bWriteToMerged ) {
// the current token must be written to dest. without merging
commit 72ace3fa98a0c82c0511b49fd4026b148205eb96
Author: Zolnai Tamás <zolnaitamas2000 at gmail.com>
Date: Thu Dec 26 14:12:45 2013 +0100
Transex3: remove not parsed tokens
Change-Id: I7e610c767e28e2af683f95aa573cbe34b35b6966
diff --git a/l10ntools/inc/tokens.h b/l10ntools/inc/tokens.h
index da340b6..4f4c49f 100644
--- a/l10ntools/inc/tokens.h
+++ b/l10ntools/inc/tokens.h
@@ -29,8 +29,6 @@
#define COMMENT 401 /*... */
#define DEFINEDRES 402 /* Text = { */
#define ANYTOKEN 404 /* XYZ */
-#define UNKNOWNTOKEN 405 /* XYZ[ \t]$ */
-#define UNKNOWNCONSTRUCTION 406 /* XYZ ( xxx, yyy, zzz ) */
#define UNKNOWNCHAR 407 /* . */
/*------------------------------------------------------ */
/* prev. tokens will not be executed */
@@ -53,13 +51,10 @@
#define LISTTEXT 514 /* < "Text" ... > */
#define RSCDEFINE 515 /* #define MY_TEXT */
#define RSCDEFINELEND 516 /* */
-#define NEWTEXTINRES 517 /* ### Achtung : Ne... */
#define UIENTRIES 518 /* UIEntries = { */
#define PRAGMA 519 /* #pragma ... */
#define _LISTTEXT 521 /* { "Text" ... } */
#define TEXTREFID 522 /* Text = 12345 */
-#define LISTRESID 523 /* < 12345; ... > */
-#define _LISTRESID 523 /* { 12345; ... } */
#define NORMDEFINE 524 /* #define ... */
/*------------------------------------------------------ */
/*------------------------------------------------------ */
diff --git a/l10ntools/source/export.cxx b/l10ntools/source/export.cxx
index ef18481..128e3a4 100644
--- a/l10ntools/source/export.cxx
+++ b/l10ntools/source/export.cxx
@@ -726,10 +726,6 @@ int Export::Execute( int nToken, const char * pToken )
}
}
break;
- case NEWTEXTINRES: {
- bDontWriteOutput = sal_True;
- }
- break;
case APPFONTMAPPING:
{
bDontWriteOutput = sal_False;
More information about the Libreoffice-commits
mailing list