[Libreoffice-commits] .: 3 commits - l10ntools/inc l10ntools/source
Takeshi Abe
tabe at kemper.freedesktop.org
Sat Mar 5 06:39:19 PST 2011
l10ntools/inc/cfgmerge.hxx | 1
l10ntools/source/cfgmerge.cxx | 13 --------
l10ntools/source/export.cxx | 54 +++--------------------------------
l10ntools/source/export2.cxx | 1
l10ntools/source/help/HelpLinker.cxx | 11 -------
l10ntools/source/helpex.cxx | 1
l10ntools/source/helpmerge.cxx | 9 -----
l10ntools/source/lngex.cxx | 9 -----
l10ntools/source/localize.cxx | 1
l10ntools/source/merge.cxx | 10 ------
l10ntools/source/xmlparse.cxx | 6 ---
l10ntools/source/xrmmerge.cxx | 18 -----------
12 files changed, 5 insertions(+), 129 deletions(-)
New commits:
commit f6345cad1d4f3e7b3e8cc193a4bce1becbd55eb1
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date: Sat Mar 5 23:31:46 2011 +0900
Remove dead code
diff --git a/l10ntools/source/cfgmerge.cxx b/l10ntools/source/cfgmerge.cxx
index edf3698..5e55e58 100644
--- a/l10ntools/source/cfgmerge.cxx
+++ b/l10ntools/source/cfgmerge.cxx
@@ -583,9 +583,6 @@ int CfgParser::Execute( int nToken, char * pToken )
void CfgParser::Error( const ByteString &rError )
/*****************************************************************************/
{
-// ByteString sError( rError );
-// sError.Append("Error: In file ");
-// sError.Append( sActFileName );
yyerror(( char * ) rError.GetBuffer());
}
@@ -662,10 +659,6 @@ void CfgExport::WorkOnRessourceEnd()
pStackData->sText[ ByteString("en-US") ].Len() )))
{
ByteString sFallback = pStackData->sText[ ByteString("en-US") ];
-
- //if ( pStackData->sText[ ByteString("en-US") ].Len())
- // sFallback = pStackData->sText[ ByteString("en-US") ];
-
ByteString sLocalId = pStackData->sIdentifier;
ByteString sGroupId;
if ( aStack.size() == 1 ) {
diff --git a/l10ntools/source/export.cxx b/l10ntools/source/export.cxx
index 118ddb3..210aba3 100644
--- a/l10ntools/source/export.cxx
+++ b/l10ntools/source/export.cxx
@@ -1193,25 +1193,15 @@ BOOL Export::WriteData( ResData *pResData, BOOL bCreateNew )
if ( bUnmerge )
return TRUE;
-/* ByteStringHashMap::iterator pos3 = pResData->sText.begin();
- ByteStringHashMap::iterator end3 = pResData->sText.end();
- for(;pos3!=end3;++pos3){
-
- printf("[%s]=%s\n", pos3->first.GetBuffer(), pos3->second.GetBuffer() );
- }*/
// mandatory to export: en-US
- if (( //pResData->sText[ ByteString("de") ].Len() &&
- ( pResData->sText[ SOURCE_LANGUAGE ].Len()))
+ if (( pResData->sText[ SOURCE_LANGUAGE ].Len())
||
- ( //pResData->sHelpText[ ByteString("de") ].Len() &&
- ( pResData->sHelpText[ SOURCE_LANGUAGE ].Len()))
+ ( pResData->sHelpText[ SOURCE_LANGUAGE ].Len())
||
- ( //pResData->sQuickHelpText[ ByteString("de") ].Len() &&
- ( pResData->sQuickHelpText[ SOURCE_LANGUAGE ].Len()))
+ ( pResData->sQuickHelpText[ SOURCE_LANGUAGE ].Len())
||
- ( //pResData->sTitle[ ByteString("de") ].Len() &&
- ( pResData->sTitle[ SOURCE_LANGUAGE ].Len())))
+ ( pResData->sTitle[ SOURCE_LANGUAGE ].Len()))
{
FillInFallbacks( pResData );
@@ -1238,52 +1228,32 @@ BOOL Export::WriteData( ResData *pResData, BOOL bCreateNew )
sXText = pResData->sText[ sCur ];
else {
sXText = pResData->sText[ SOURCE_LANGUAGE ];
- /*if ( !sXText.Len())
- sXText = pResData->sText[ ByteString("en") ];
- if ( !sXText.Len())
- sXText = pResData->sText[ ByteString("de") ];*/
}
if ( pResData->sHelpText[ sCur ].Len())
sXHText = pResData->sHelpText[ sCur ];
else {
sXHText = pResData->sHelpText[ SOURCE_LANGUAGE ];
- /*if ( !sXHText.Len())
- sXHText = pResData->sHelpText[ ByteString("en") ];
- if ( !sXText.Len())
- sXHText = pResData->sHelpText[ ByteString("de") ];*/
}
if ( pResData->sQuickHelpText[ sCur ].Len())
sXQHText = pResData->sQuickHelpText[ sCur ];
else {
sXQHText = pResData->sQuickHelpText[ SOURCE_LANGUAGE ];
- /*if ( !sXQHText.Len())
- sXQHText = pResData->sQuickHelpText[ ByteString("en") ];
- if ( !sXQHText.Len())
- sXQHText = pResData->sQuickHelpText[ ByteString("de") ];*/
}
if ( pResData->sTitle[ sCur ].Len())
sXTitle = pResData->sTitle[ sCur ];
else {
sXTitle = pResData->sTitle[ SOURCE_LANGUAGE ];
- /*if ( !sXTitle.Len())
- sXTitle = pResData->sTitle[ ByteString("en") ];
- if ( !sXTitle.Len())
- sXTitle = pResData->sTitle[ ByteString("de") ];*/
}
if ( !sXText.Len())
sXText = "-";
if ( !sXHText.Len()) {
- /*if ( pResData->sHelpText[ ByteString("de") ].Len())
- sXHText = pResData->sHelpText[ ByteString("de") ];*/
if ( pResData->sHelpText[ SOURCE_LANGUAGE ].Len())
sXHText = pResData->sHelpText[ SOURCE_LANGUAGE ];
- /*else if ( pResData->sHelpText[ ByteString("en") ].Len())
- sXHText = pResData->sHelpText[ ByteString("en") ];*/
}
}
else
@@ -1309,7 +1279,6 @@ BOOL Export::WriteData( ResData *pResData, BOOL bCreateNew )
sOutput += sXTitle; sOutput += "\t";
sOutput += sTimeStamp;
- // if( !sCur.EqualsIgnoreCaseAscii("de") ||( sCur.EqualsIgnoreCaseAscii("de") && !Export::isMergingGermanAllowed( sProject ) ) )
aOutput.WriteLine( sOutput );
}
@@ -1404,11 +1373,7 @@ BOOL Export::WriteExportList( ResData *pResData, ExportList *pExportList,
ByteString sLID( ByteString::CreateFromInt64( i + 1 ));
for( unsigned int n = 0; n < aLanguages.size(); n++ ){
sCur = aLanguages[ n ];
- if ( //1 )
- //(*pEntry)[ ByteString("de") ].Len() &&
- (*pEntry)[ SOURCE_LANGUAGE ].Len() )
- //||
- // (*pEntry)[ ByteString("en") ].Len()))
+ if ( (*pEntry)[ SOURCE_LANGUAGE ].Len() )
{
if ( bEnableExport )
{
@@ -1422,15 +1387,9 @@ BOOL Export::WriteExportList( ResData *pResData, ExportList *pExportList,
sText = GetPairedListString( sText );
}
else{
- //if ((*pEntry)[ sCur ].Len()){
- // if( sCur.EqualsIgnoreCaseAscii("de") ){
- // sText = StripList( (*pEntry)[ sCur ] );
- // }
- // else
sText = StripList( (*pEntry)[ sCur ] );
if( sText == "\\\"" )
sText = "\"";
- //}
}
ByteString sOutput( sProject ); sOutput += "\t";
@@ -1446,7 +1405,6 @@ BOOL Export::WriteExportList( ResData *pResData, ExportList *pExportList,
sOutput += sText; sOutput += "\t\t\t\t";
sOutput += sTimeStamp;
- //if( !sCur.EqualsIgnoreCaseAscii("de") ||( sCur.EqualsIgnoreCaseAscii("de") && !Export::isMergingGermanAllowed( sProject ) ) )
aOutput.WriteLine( sOutput );
}
@@ -1550,7 +1508,6 @@ void Export::InsertListEntry( const ByteString &rText, const ByteString &rLine )
(*pCurEntry)[ nListLang ] = rText;
// Remember en-US fallback string, so each list has the same amount of elements
- //if ( nListLang.EqualsIgnoreCaseAscii("en-US") ) {
if ( Export::isSourceLanguage( nListLang ) ) {
if( nList == LIST_PAIRED ){
const ByteString sPlist("pairedlist");
@@ -1571,7 +1528,6 @@ void Export::InsertListEntry( const ByteString &rText, const ByteString &rLine )
// new fallback
}
- //if ( nListLang.EqualsIgnoreCaseAscii("en-US") ) {
if ( Export::isSourceLanguage( nListLang ) ) {
if( nList == LIST_PAIRED ){
(*pCurEntry)[ SOURCE_LANGUAGE ] = rLine;
diff --git a/l10ntools/source/export2.cxx b/l10ntools/source/export2.cxx
index 36280e2..3cad8ae 100644
--- a/l10ntools/source/export2.cxx
+++ b/l10ntools/source/export2.cxx
@@ -147,7 +147,6 @@ void Export::QuotHTMLXRM( ByteString &rString )
/*****************************************************************************/
{
ByteString sReturn;
- //BOOL bBreak = FALSE;
for ( USHORT i = 0; i < rString.Len(); i++ ) {
ByteString sTemp = rString.Copy( i );
if ( sTemp.Search( "<Arg n=" ) == 0 ) {
diff --git a/l10ntools/source/help/HelpLinker.cxx b/l10ntools/source/help/HelpLinker.cxx
index 9d7508d..70b306d 100644
--- a/l10ntools/source/help/HelpLinker.cxx
+++ b/l10ntools/source/help/HelpLinker.cxx
@@ -396,7 +396,6 @@ void HelpLinker::link() throw( HelpProcessingException )
if( bExtensionMode )
{
- //indexDirParentName = sourceRoot;
indexDirParentName = extensionDestination;
}
else
@@ -732,16 +731,6 @@ void HelpLinker::link() throw( HelpProcessingException )
fs::copy( fsAdditionalFileName, fsTargetName );
}
}
-
-/*
- /////////////////////////////////////////////////////////////////////////
- /// remove temprary directory for index creation
- /////////////////////////////////////////////////////////////////////////
-#ifndef CMC_DEBUG
- if( !bExtensionMode )
- fs::remove_all( indexDirParentName );
-#endif
-*/
}
commit 60239fde98d88ef7449fe507cd11ccd91ce3d56e
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date: Sat Mar 5 23:18:40 2011 +0900
Removed unused field bGerman
diff --git a/l10ntools/inc/cfgmerge.hxx b/l10ntools/inc/cfgmerge.hxx
index d68984e..4b13a12 100644
--- a/l10ntools/inc/cfgmerge.hxx
+++ b/l10ntools/inc/cfgmerge.hxx
@@ -193,7 +193,6 @@ private:
std::vector<ByteString> aLanguages;
ResData *pResData;
- BOOL bGerman;
ByteString sFilename;
BOOL bEnglish;
diff --git a/l10ntools/source/cfgmerge.cxx b/l10ntools/source/cfgmerge.cxx
index 2f7cff9..edf3698 100644
--- a/l10ntools/source/cfgmerge.cxx
+++ b/l10ntools/source/cfgmerge.cxx
@@ -700,7 +700,6 @@ void CfgExport::WorkOnRessourceEnd()
sOutput += sText; sOutput += "\t\t\t\t";
sOutput += sTimeStamp;
- //if( !sCur.EqualsIgnoreCaseAscii("de") ||( sCur.EqualsIgnoreCaseAscii("de") && !Export::isMergingGermanAllowed( sPrj ) ) )
pOutputStream->WriteLine( sOutput );
}
}
@@ -730,7 +729,6 @@ CfgMerge::CfgMerge(
: CfgOutputParser( rOutputFile ),
pMergeDataFile( NULL ),
pResData( NULL ),
- bGerman( FALSE ),
sFilename( rFilename ),
bEnglish( FALSE )
{
@@ -781,8 +779,6 @@ void CfgMerge::WorkOnText(
pResData->sResTyp = pStackData->sResTyp;
}
- //if ( nLangIndex.EqualsIgnoreCaseAscii("de") )
- // bGerman = TRUE;
if (( nLangIndex.EqualsIgnoreCaseAscii("en-US") ))
bEnglish = TRUE;
@@ -834,7 +830,6 @@ void CfgMerge::WorkOnRessourceEnd()
ByteString sContent;
pEntrys->GetText( sContent, STRING_TYP_TEXT, sCur , TRUE );
if (
- // (!sCur.EqualsIgnoreCaseAscii("de") ) &&
( !sCur.EqualsIgnoreCaseAscii("en-US") ) &&
( sContent != "-" ) && ( sContent.Len()))
@@ -874,7 +869,6 @@ void CfgMerge::WorkOnRessourceEnd()
}
delete pResData;
pResData = NULL;
- bGerman = FALSE;
bEnglish = FALSE;
}
commit 50ecc72670a81a1e901e95591aca42bf3834a1ef
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date: Sat Mar 5 23:15:22 2011 +0900
Remove dead code
diff --git a/l10ntools/source/helpex.cxx b/l10ntools/source/helpex.cxx
index 753fbff..7573fb5 100644
--- a/l10ntools/source/helpex.cxx
+++ b/l10ntools/source/helpex.cxx
@@ -146,7 +146,6 @@ BOOL ParseCommandLine( int argc, char* argv[])
break;
case STATE_PRJ: {
sPrj = argv[ i ];
-// sPrj.ToLowerAscii(); // the project
}
break;
case STATE_ROOT: {
diff --git a/l10ntools/source/helpmerge.cxx b/l10ntools/source/helpmerge.cxx
index 99890f8..80381c3 100644
--- a/l10ntools/source/helpmerge.cxx
+++ b/l10ntools/source/helpmerge.cxx
@@ -164,7 +164,6 @@ bool HelpParser::CreateSDF(
if(file.get() == NULL){
printf("%s\n",ByteString(aParser.GetError().sMessage,RTL_TEXTENCODING_ASCII_US).GetBuffer());
exit(-1);
- //return false;
}
file->Extract();
if( !file->CheckExportStatus() ){
@@ -184,8 +183,6 @@ bool HelpParser::CreateSDF(
LangHashMap* pElem;
XMLElement* pXMLElement = NULL;
- //Dump(aXMLStrHM);
-
ByteString sTimeStamp( Export::GetTimeStamp() );
OUString sOUTimeStamp( sTimeStamp.GetBuffer() , sTimeStamp.Len() , RTL_TEXTENCODING_ASCII_US );
@@ -243,16 +240,12 @@ bool HelpParser::CreateSDF(
sBuffer.append( GSI_SEQUENCE4 ); //"\t\t\t\t";
sBuffer.append( sOUTimeStamp );
ByteString sOut( sBuffer.makeStringAndClear().getStr() , RTL_TEXTENCODING_UTF8 );
- //if( !sCur.EqualsIgnoreCaseAscii("de") ||( sCur.EqualsIgnoreCaseAscii("de") && !Export::isMergingGermanAllowed( rPrj_in ) ) )
- //{
if( data.getLength() > 0 ) aSDFStream.WriteLine( sOut );
- //}
pXMLElement=NULL;
}else fprintf(stdout,"\nDBG: NullPointer in HelpParser::CreateSDF , Language %s\n",sCur.GetBuffer() );
}
}
- //Dump(aXMLStrHM);
aSDFStream.Close();
if( !sUsedTempFile.EqualsIgnoreCaseAscii( "" ) ){
@@ -397,7 +390,6 @@ bool HelpParser::Merge(
{
printf("%s\n",ByteString(aParser.GetError().sMessage,RTL_TEXTENCODING_UTF8).GetBuffer());
exit(-1);
- //return false;
}
@@ -489,7 +481,6 @@ bool HelpParser::MergeSingleFile( XMLFile* file , MergeDataFile& aMergeDataFile
return false;
}
}
- //remove( sTargetFile.GetBuffer() );
FileStat aFSTest( aTar );
if( aFSTest.GetSize() < 1 )
diff --git a/l10ntools/source/lngex.cxx b/l10ntools/source/lngex.cxx
index f4ec4b6..13c6207 100644
--- a/l10ntools/source/lngex.cxx
+++ b/l10ntools/source/lngex.cxx
@@ -102,14 +102,6 @@ BOOL ParseCommandLine( int argc, char* argv[])
nState = STATE_UTF8;
bUTF8 = TRUE;
}
-/* else if ( sSwitch == "-NOUTF8" ) {
- nState = STATE_UTF8;
- bUTF8 = FALSE;
- }*/
-/* else if ( sSwitch == "-ULF" ) {
- nState = STATE_ULF;
- bULF = TRUE;
- }*/
else if ( sSwitch == "-L" ) {
nState = STATE_LANGUAGES;
}
@@ -130,7 +122,6 @@ BOOL ParseCommandLine( int argc, char* argv[])
break;
case STATE_PRJ: {
sPrj = argv[ i ];
-// sPrj.ToLowerAscii(); // the project
}
break;
case STATE_ROOT: {
diff --git a/l10ntools/source/localize.cxx b/l10ntools/source/localize.cxx
index 6a1b05f..40ec3a6 100644
--- a/l10ntools/source/localize.cxx
+++ b/l10ntools/source/localize.cxx
@@ -761,7 +761,6 @@ BOOL SourceTreeLocalizer::Merge( const ByteString &rSourceFile , const ByteStrin
BOOL bReturn = aSDF.IsOpen();
if ( bReturn ) {
bReturn = ExecuteMerge();
-// aSDF.Close();
}
aSDF.Close();
nMode = LOCALIZE_NONE;
diff --git a/l10ntools/source/merge.cxx b/l10ntools/source/merge.cxx
index 6d4d157..c8c1d8b 100644
--- a/l10ntools/source/merge.cxx
+++ b/l10ntools/source/merge.cxx
@@ -205,7 +205,6 @@ BOOL MergeData::operator==( ResData *pData )
/*****************************************************************************/
MergeDataFile::MergeDataFile( const ByteString &rFileName, const ByteString& sFile ,BOOL bErrLog,
-// CharSet aCharSet, BOOL bUTF8 , bool bCaseSensitive )
CharSet aCharSet, bool bCaseSensitive )
/*****************************************************************************/
@@ -230,7 +229,6 @@ MergeDataFile::MergeDataFile( const ByteString &rFileName, const ByteString& sFi
if( !aInputStream.IsOpen() ) {
printf("Warning : Can't open %s\n", rFileName.GetBuffer());
- //exit( -1 );
return;
}
while ( !aInputStream.IsEof()) {
@@ -292,13 +290,6 @@ MergeDataFile::~MergeDataFile()
{
}
-/*****************************************************************************/
-//void MergeDataFile::WriteErrorLog( const ByteString &rFileName )
-/*****************************************************************************/
-//{
-// DEAD
-//}
-
ByteString MergeDataFile::Dump(){
ByteString sRet( "MergeDataFile\n" );
@@ -362,7 +353,6 @@ MergeData *MergeDataFile::GetMergeData( ResData *pResData , bool bCaseSensitive
//printf("DBG: Found[%s]\n",sKey.GetBuffer());
return aMap[ sKey ];
}
- //Dump();
pResData->sGId = sOldG;
pResData->sId = sOldL;
//printf("DBG: Found[%s]\n",sKey.GetBuffer());
diff --git a/l10ntools/source/xmlparse.cxx b/l10ntools/source/xmlparse.cxx
index f2aeb95..d28fb44 100644
--- a/l10ntools/source/xmlparse.cxx
+++ b/l10ntools/source/xmlparse.cxx
@@ -1341,8 +1341,6 @@ void XMLUtil::QuotHTML( String &rString )
case '>': sReturn.append( GT );i++;break;
case '\\': sReturn.append( QUOT );i++;break;
case '\"': sReturn.append( APOS );i++;break;
- //case '\'': sReturn += "\'";i++;break;
- //case '&' : sRetrun += "&";i++;break;
default: sReturn.append( SLASH );break;
}
@@ -1361,10 +1359,6 @@ void XMLUtil::QuotHTML( String &rString )
sReturn.append( QQUOT );
break;
-/* case '\'':
- sReturn += "'";
- break;
-*/
case '&':
if (
( ( i + 4 ) < rString.Len()) &&
diff --git a/l10ntools/source/xrmmerge.cxx b/l10ntools/source/xrmmerge.cxx
index 931ba76..79342de 100644
--- a/l10ntools/source/xrmmerge.cxx
+++ b/l10ntools/source/xrmmerge.cxx
@@ -322,9 +322,6 @@ int XRMResParser::Execute( int nToken, char * pToken )
sLID = "";
sGID += ".";
sGID += GetAttribute( rToken, "id" );
- //sLocalized = "1";
-
- //sLocalized = "X:";
sLocalized = true;
break;
@@ -336,11 +333,6 @@ int XRMResParser::Execute( int nToken, char * pToken )
sLID = "";
sGID += ".";
sGID += GetAttribute( rToken, "id" );
-// if ( GetAttribute( rToken, "localized" ) == "false" )
-// sLocalized += "0";
-// sLocalized = false;
-// else
-// sLocalized += "1";
sLocalized = true;
break;
@@ -446,9 +438,7 @@ void XRMResParser::ConvertStringToDBFormat( ByteString &rString )
do {
sResult = rString;
rString.EraseLeadingChars( _LF );
- // rString.EraseLeadingChars( ' ' );
rString.EraseLeadingChars( '\t' );
- // rString.EraseTrailingChars( ' ' );
rString.EraseTrailingChars( '\t' );
} while ( sResult != rString );
@@ -563,9 +553,6 @@ void XRMResExport::EndOfText(
char cSearch = 0x00;
ByteString sSearch( cSearch );
- // if ( !pResData->sText[ ByteString("en-US") ].Len() )
- // pResData->sText[ ByteString("en-US") ] = pResData->sText[ ByteString("de") ];
-
Export::FillInFallbacks( pResData );
ByteString sTimeStamp( Export::GetTimeStamp());
@@ -574,7 +561,6 @@ void XRMResExport::EndOfText(
sCur = aLanguages[ n ];
ByteString sAct = pResData->sText[ sCur ];
- //Export::UnquotHTML( sAct );
sAct.EraseAllChars( 0x0A );
ByteString sOutput( sPrj ); sOutput += "\t";
@@ -594,7 +580,6 @@ void XRMResExport::EndOfText(
sOutput += sTimeStamp;
sOutput.SearchAndReplaceAll( sSearch, "_" );
- //if( !sCur.EqualsIgnoreCaseAscii("de") ||( sCur.EqualsIgnoreCaseAscii("de") && !Export::isMergingGermanAllowed( sPrj ) ) )
if( sAct.Len() > 1 )
pOutputStream->WriteLine( sOutput );
}
@@ -647,7 +632,6 @@ void XRMResMerge::WorkOnText(
if ( pMergeDataFile ) {
if ( !pResData ) {
ByteString sPlatform( "" );
-// pResData = new ResData( sPlatform, GetGID() , sFilename );
pResData = new ResData( sPlatform, GetLID() , sFilename );
pResData->sId = GetLID();
@@ -702,8 +686,6 @@ void XRMResMerge::EndOfText(
( sContent != "-" ) && ( sContent.Len()))
{
ByteString sText( sContent );
- //Export::QuotHTMLXRM( sText );
-
ByteString sAdditionalLine( "\t" );
sAdditionalLine += rOpenTag;
ByteString sSearch = "xml:lang=\"";
More information about the Libreoffice-commits
mailing list