merge with DEV300_m64

3 files changed, 18 insertions, 6 deletions

diff --git a/idl/source/prj/command.cxx b/idl/source/prj/command.cxx
index 66790b457334..29c49199dc30 100644
--- a/idl/source/prj/command.cxx
+++ b/idl/source/prj/command.cxx
@@ -258,7 +258,7 @@ static BOOL ResponseFile( StringList * pList, int argc, char ** argv )
 |*    Beschreibung
 *************************************************************************/
 SvCommand::SvCommand( int argc, char ** argv )
-    : nFlags( 0 )
+    : nVerbosity(1), nFlags( 0 )
 {
     StringList aList;
 
@@ -353,6 +353,14 @@ SvCommand::SvCommand( int argc, char ** argv )
             { // Hilfe
                 printf( "%s", CommandLineSyntax );
             }
+            else if( aParam.EqualsIgnoreCaseAscii( "quiet" ) )
+            {
+                nVerbosity = 0;
+            }
+            else if( aParam.EqualsIgnoreCaseAscii( "verbose" ) )
+            {
+                nVerbosity = 2;
+            }
             else if( aParam.EqualsIgnoreCaseAscii( "syntax" ) )
             { // Hilfe
                 int j = 0;
diff --git a/idl/source/prj/database.cxx b/idl/source/prj/database.cxx
index 8933156bfc69..3c6d07f19921 100644
--- a/idl/source/prj/database.cxx
+++ b/idl/source/prj/database.cxx
@@ -58,9 +58,10 @@ void PrimeNumber(){
 }
 */
 
-SvIdlDataBase::SvIdlDataBase()
+SvIdlDataBase::SvIdlDataBase( const SvCommand& rCmd )
     : bExport( FALSE )
     , nUniqueId( 0 )
+    , nVerbosity( rCmd.nVerbosity )
     , bIsModified( FALSE )
     , aPersStream( *IDLAPP->pClassMgr, NULL )
     , pIdTable( NULL )
@@ -700,6 +701,7 @@ SvMetaClass * SvIdlDataBase::ReadKnownClass( SvTokenStream & rInStm )
 void SvIdlDataBase::Write( const ByteString & rText )
 {
 #ifndef W31
+    if( nVerbosity != 0 )
         fprintf( stdout, "%s", rText.GetBuffer() );
 #endif
 }
@@ -803,7 +805,7 @@ void SvIdlDataBase::WriteError( SvTokenStream & rInStm )
 |*
 |*    Beschreibung
 *************************************************************************/
-SvIdlWorkingBase::SvIdlWorkingBase()
+SvIdlWorkingBase::SvIdlWorkingBase(const SvCommand& rCmd) : SvIdlDataBase(rCmd)
 {
 }
 
diff --git a/idl/source/prj/svidl.cxx b/idl/source/prj/svidl.cxx
index 16706e936f30..8ae94ae896f5 100644
--- a/idl/source/prj/svidl.cxx
+++ b/idl/source/prj/svidl.cxx
@@ -112,8 +112,6 @@ int cdecl main ( int argc, char ** argv)
 {
 #endif
 
-    printf( "StarView Interface Definition Language (IDL) Compiler 3.0\n" );
-
 /*
     pStr = ::ResponseFile( &aCmdLine, argv, argc );
     if( pStr )
@@ -136,8 +134,12 @@ int cdecl main ( int argc, char ** argv)
     String aTmpDocuFile;
 
     SvCommand aCommand( argc, argv );
+
+    if( aCommand.nVerbosity != 0 )
+        printf( "StarView Interface Definition Language (IDL) Compiler 3.0\n" );
+
     Init();
-    SvIdlWorkingBase * pDataBase = new SvIdlWorkingBase();
+    SvIdlWorkingBase * pDataBase = new SvIdlWorkingBase(aCommand);
 
     int nExit = 0;
     if( aCommand.aExportFile.Len() )