summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakeshi Abe <tabe@fixedpoint.jp>2011-03-05 23:31:46 +0900
committerTakeshi Abe <tabe@fixedpoint.jp>2011-03-05 23:38:22 +0900
commite6dc9117b7ab11b954c3b2a1f440fa682331bba7 (patch)
tree7c1473d2e767c14b4778ccdaf97773c01f4fcb34
parente0bff79ab235d6a9eaf7f34f1e423c1b0cbcf39e (diff)
Remove dead code
-rw-r--r--l10ntools/source/cfgmerge.cxx7
-rw-r--r--l10ntools/source/export.cxx54
-rw-r--r--l10ntools/source/export2.cxx1
-rw-r--r--l10ntools/source/help/HelpLinker.cxx11
4 files changed, 5 insertions, 68 deletions
diff --git a/l10ntools/source/cfgmerge.cxx b/l10ntools/source/cfgmerge.cxx
index edf369889342..5e55e5823a79 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 865065b31191..1c91379d3587 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 cd34fae43d88..8dea46fe8a24 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 3ac553af49ee..a8eec6909914 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
-*/
}