[Libreoffice-commits] .: rsc/source

Caolán McNamara caolan at kemper.freedesktop.org
Tue Feb 22 04:17:00 PST 2011


 rsc/source/parser/erscerr.cxx |    2 --
 rsc/source/prj/start.cxx      |    9 ---------
 2 files changed, 11 deletions(-)

New commits:
commit c0d02fa33017f3559601326a16736c054ff614a3
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Feb 22 10:27:04 2011 +0000

    -r and -s doesn't do anything

diff --git a/rsc/source/parser/erscerr.cxx b/rsc/source/parser/erscerr.cxx
index 0898565..738c94b 100644
--- a/rsc/source/parser/erscerr.cxx
+++ b/rsc/source/parser/erscerr.cxx
@@ -187,10 +187,8 @@ void RscError::WriteError( const ERRTYPE& rError, const char * pMessage )
             StdLstOut( "Command line: rsc @<Command File>\n" );
             StdLstOut( "-h  shows this help.\n" );
             StdLstOut( "-p  No Preprocessor.\n" );
-            StdLstOut( "-s  Syntax analysis, creates .srs file\n");
             StdLstOut( "-l  Linker, links files created with rsc -s,\n" );
             StdLstOut( "    creates .rc file and .res file.\n" );
-            StdLstOut( "-r  Prevents .res file.\n" );
             StdLstOut( "-d  Symbol definitions for the Preprocessor.\n" );
             StdLstOut( "-i  Include directives for the Preprocessor.\n" );
             StdLstOut( "-presponse     Use response file for Preprocessor.\n" );
diff --git a/rsc/source/prj/start.cxx b/rsc/source/prj/start.cxx
index 79830d6..e24a8d2 100644
--- a/rsc/source/prj/start.cxx
+++ b/rsc/source/prj/start.cxx
@@ -306,7 +306,6 @@ static BOOL CallRsc2( ByteString aRsc2Name,
 SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
 {
     BOOL			bPrePro  = TRUE;
-    BOOL			bResFile = TRUE;
     BOOL			bHelp	 = FALSE;
     BOOL			bError	 = FALSE;
     BOOL			bResponse = FALSE;
@@ -352,11 +351,6 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
             { // kein Preprozessor
                 bPrePro = FALSE;
             }
-            else if( !rsc_stricmp( (*ppStr) + 1, "r" )
-              || !rsc_stricmp( (*ppStr) + 1, "s" ) )
-            { // erzeugt kein .res-file
-                bResFile = FALSE;
-            }
             else if( !rsc_stricmp( (*ppStr) + 1, "h" ) )
             { // Hilfe anzeigen
                 bHelp = TRUE;
@@ -405,10 +399,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
     };
 
     if( bHelp )
-    {
         bPrePro = FALSE;
-        bResFile = FALSE;
-    };
     if( bPrePro && !aInputList.empty() )
     {
         ByteString aTmpName;


More information about the Libreoffice-commits mailing list