[Libreoffice-commits] .: l10ntools/source

[Andras Timar]

 l10ntools/source/help/HelpIndexerTool.java |   23 -----------------------
 l10ntools/source/help/HelpLinker.cxx       |   17 -----------------
 l10ntools/source/xmlparse.cxx              |    2 --
 3 files changed, 42 deletions(-)

New commits:
commit 8f21e3b66c2a7b0e60aa3a61ffff0509a2170e21
Author: Andras Timar <atimar at suse.com>
Date:   Wed Jan 4 17:39:45 2012 +0100

    help compiler: less verbose output to console

diff --git a/l10ntools/source/help/HelpIndexerTool.java b/l10ntools/source/help/HelpIndexerTool.java
index c20d9f1..d1d0873 100644
--- a/l10ntools/source/help/HelpIndexerTool.java
+++ b/l10ntools/source/help/HelpIndexerTool.java
@@ -185,21 +185,11 @@ public class HelpIndexerTool
 
         try
         {
-            Date start = new Date();
             Analyzer analyzer = aLanguageStr.equals("ja") ? (Analyzer)new CJKAnalyzer() : (Analyzer)new StandardAnalyzer();
             IndexWriter writer = new IndexWriter( aIndexDir, analyzer, true );
-            if( !bExtensionMode )
-                System.out.println( "Lucene: Indexing to directory '" + aIndexDir + "'..." );
             int nRet = indexDocs( writer, aModule, bExtensionMode, aCaptionFilesDir, aContentFilesDir );
             if( nRet != -1 )
-            {
-                if( !bExtensionMode )
-                {
-                    System.out.println();
-                    System.out.println( "Optimizing ..." );
-                }
                 writer.optimize();
-            }
             writer.close();
 
             boolean bCfsFileOk = true;
@@ -229,8 +219,6 @@ public class HelpIndexerTool
                 if( nRet == -1 )
                     deleteRecursively( aIndexDir );
 
-                if( bCfsFileOk && bSegmentFileOk )
-                    System.out.println( "Zipping ..." );
                 File aDirToZipFile = new File( aDirToZipStr );
                 createZipFile( aDirToZipFile, aTargetZipFileStr );
                 deleteRecursively( aDirToZipFile );
@@ -247,10 +235,6 @@ public class HelpIndexerTool
                 System.out.println( "segment file check failed, terminating..." );
                 System.exit( -1 );
             }
-
-            Date end = new Date();
-            if( !bExtensionMode )
-                System.out.println(end.getTime() - start.getTime() + " total milliseconds");
         }
         catch (IOException e)
         {
@@ -288,8 +272,6 @@ public class HelpIndexerTool
         HashSet aContentFilesHashSet = new HashSet( aContentFilesList );
 
         // Loop over caption files and find corresponding content file
-        if( !bExtensionMode )
-            System.out.println( "Indexing, adding files" );
         int nCaptionFilesLen = aCaptionFiles.length;
         for( int i = 0 ; i < nCaptionFilesLen ; i++ )
         {
@@ -298,9 +280,6 @@ public class HelpIndexerTool
             File aContentFile = null;
             if( aContentFilesHashSet.contains( aCaptionFileStr ) )
                 aContentFile = new File( aContentFilesDir, aCaptionFileStr );
-
-            if( !bExtensionMode )
-                System.out.print( "." );
             writer.addDocument( HelpFileDocument.Document( aModule, aCaptionFile, aContentFile ) );
         }
 
@@ -314,8 +293,6 @@ public class HelpIndexerTool
                 // Not already handled in caption files loop
                 File aCaptionFile = null;
                 File aContentFile = new File( aContentFilesDir, aContentFileStr );
-                if( !bExtensionMode )
-                    System.out.print( "." );
                 writer.addDocument( HelpFileDocument.Document( aModule, aCaptionFile, aContentFile ) );
             }
         }
diff --git a/l10ntools/source/help/HelpLinker.cxx b/l10ntools/source/help/HelpLinker.cxx
index b754991..bf237c0 100644
--- a/l10ntools/source/help/HelpLinker.cxx
+++ b/l10ntools/source/help/HelpLinker.cxx
@@ -483,22 +483,10 @@ void HelpLinker::link() throw( HelpProcessingException )
     if ( (!bExtensionMode || bIndexForExtension) && !helpFiles.empty())
         initIndexerPreProcessor();
 
-    if( !bExtensionMode )
-    {
-        std::cout << "Making " << outputFile.native_file_string() <<
-            " from " << helpFiles.size() << " input files" << std::endl;
-    }
-
     // here we start our loop over the hzip files.
     HashSet::iterator end = helpFiles.end();
     for (HashSet::iterator iter = helpFiles.begin(); iter != end; ++iter)
     {
-        if( !bExtensionMode )
-        {
-            std::cout << ".";
-            std::cout.flush();
-        }
-
         // process one file
         // streamTable contains the streams in the hzip file
         StreamTable streamTable;
@@ -671,8 +659,6 @@ void HelpLinker::link() throw( HelpProcessingException )
         }
 
     } // while loop over hzip files ending
-    if( !bExtensionMode )
-        std::cout << std::endl;
 
     } // try
     catch( const HelpProcessingException& )
@@ -1040,7 +1026,6 @@ void HelpLinker::main( std::vector<std::string> &args,
 
 int main(int argc, char**argv)
 {
-    sal_uInt32 starttime = osl_getGlobalTimer();
     std::vector<std::string> args;
     for (int i = 1; i < argc; ++i)
         args.push_back(std::string(argv[i]));
@@ -1055,8 +1040,6 @@ int main(int argc, char**argv)
         std::cerr << e.m_aErrorMsg;
         exit(1);
     }
-    sal_uInt32 endtime = osl_getGlobalTimer();
-    std::cout << "time taken was " << (endtime-starttime)/1000.0 << " seconds" << std::endl;
     return 0;
 }
 
diff --git a/l10ntools/source/xmlparse.cxx b/l10ntools/source/xmlparse.cxx
index d8c9ed1..829bd76 100644
--- a/l10ntools/source/xmlparse.cxx
+++ b/l10ntools/source/xmlparse.cxx
@@ -581,13 +581,11 @@ XMLFile& XMLFile::operator=(const XMLFile& obj){
                 LangHashMap* newelem = new LangHashMap();
                 for(LangHashMap::iterator pos2=elem->begin(); pos2!=elem->end();++pos2){
                     (*newelem)[ pos2->first ] = new XMLElement( *pos2->second );
-                    printf("*");
                 }
                 (*XMLStrings)[ pos->first ] = newelem;
             }
         }
     }
-    printf("done!\n");
     return *this;
 }