summaryrefslogtreecommitdiff
path: root/rsc/source
diff options
context:
space:
mode:
Diffstat (limited to 'rsc/source')
-rw-r--r--rsc/source/parser/erscerr.cxx2
-rw-r--r--rsc/source/parser/makefile.mk11
-rw-r--r--rsc/source/parser/parser.cxx59
-rw-r--r--rsc/source/parser/parser.hxx26
-rw-r--r--rsc/source/prj/gui.cxx11
-rw-r--r--rsc/source/prj/start.cxx11
6 files changed, 6 insertions, 114 deletions
diff --git a/rsc/source/parser/erscerr.cxx b/rsc/source/parser/erscerr.cxx
index 11aaf9cce85f..158aea21b6e3 100644
--- a/rsc/source/parser/erscerr.cxx
+++ b/rsc/source/parser/erscerr.cxx
@@ -200,7 +200,7 @@ void RscError::WriteError( const ERRTYPE& rError, const char * pMessage )
case ERR_NOINPUT:
StdLstErr( "Input file was not specified.\n");
case ERR_USAGE:
- StdLstOut( "Copyright (C) 1990-92 STAR DIVISION GmbH\n" );
+ StdLstOut( "Copyright (C) 2000, 2010 Oracle and/or its affiliates.\n" );
{
char buf[40];
diff --git a/rsc/source/parser/makefile.mk b/rsc/source/parser/makefile.mk
index 1254bee932f6..a46c60aae213 100644
--- a/rsc/source/parser/makefile.mk
+++ b/rsc/source/parser/makefile.mk
@@ -45,17 +45,6 @@ ENABLE_EXCEPTIONS=true
YACCTARGET= $(INCCOM)$/yyrscyacc.cxx
YACCFILES= rscyacc.y
-CXXFILES= rscpar.cxx \
- rscyacc.cxx \
- rsclex.cxx \
- erscerr.cxx \
- rsckey.cxx \
- rscinit.cxx \
- rscibas.cxx \
- rscdb.cxx \
- rscicpx.cxx \
- parser.cxx
-
OBJFILES= $(OBJ)$/rscpar.obj \
$(OBJ)$/rscyacc.obj \
$(OBJ)$/rsclex.obj \
diff --git a/rsc/source/parser/parser.cxx b/rsc/source/parser/parser.cxx
deleted file mode 100644
index 1ba974a4778d..000000000000
--- a/rsc/source/parser/parser.cxx
+++ /dev/null
@@ -1,59 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_rsc.hxx"
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <string.h>
-#include <ctype.h>
-
-#include <tools/solar.h>
-#define RSC_COMPILER
-
-#include <rscall.h>
-#include <rsctools.hxx>
-#include <rschash.hxx>
-#include <rsckey.hxx>
-#include <rsctree.hxx>
-#include <rscerror.h>
-#include <rscdef.hxx>
-
-#include <rsctop.hxx>
-#include <rscmgr.hxx>
-#include <rscconst.hxx>
-#include <rscarray.hxx>
-#include <rscclass.hxx>
-#include <rsccont.hxx>
-#include <rscrange.hxx>
-#include <rscflag.hxx>
-#include <rscstr.hxx>
-
-#include <rscdb.hxx>
-#include <rscpar.hxx>
-
diff --git a/rsc/source/parser/parser.hxx b/rsc/source/parser/parser.hxx
deleted file mode 100644
index 274b720b1e2d..000000000000
--- a/rsc/source/parser/parser.hxx
+++ /dev/null
@@ -1,26 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
diff --git a/rsc/source/prj/gui.cxx b/rsc/source/prj/gui.cxx
index 0ff0549d161f..67d86a8b35cf 100644
--- a/rsc/source/prj/gui.cxx
+++ b/rsc/source/prj/gui.cxx
@@ -30,6 +30,7 @@
#include <stdlib.h>
#include <stdio.h>
+#include <sal/main.h>
#include <rscrsc.hxx>
#include <rscdb.hxx>
@@ -68,15 +69,7 @@ RscVerbosity lcl_determineVerbosity( int argc, char ** argv )
return RscVerbosityNormal;
}
-#if defined( UNX ) || ( defined( OS2 ) && ( defined( CSET ) || defined ( GCC ))) || defined (WTC) || defined(ICC) || defined(__MINGW32__)
-int main ( int argc, char ** argv) {
-#else
-#if defined( MTW )
-int main ( int argc, char const ** argv) {
-#else
-int cdecl main ( int argc, char ** argv) {
-#endif
-#endif
+SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) {
#ifndef UNX
#ifdef CSET
atexit( ExitProgram );
diff --git a/rsc/source/prj/start.cxx b/rsc/source/prj/start.cxx
index b36614cec8c4..a2841dd9765b 100644
--- a/rsc/source/prj/start.cxx
+++ b/rsc/source/prj/start.cxx
@@ -54,6 +54,7 @@
#endif // UNX
#include <rsctools.hxx>
#include <rscerror.h>
+#include <sal/main.h>
#include <tools/fsys.hxx>
/*************** C O D E ************************************************/
@@ -176,7 +177,7 @@ static BOOL CallPrePro( const ByteString& rPrePro,
#if ((defined OS2 || defined WNT) && (defined TCPP || defined tcpp)) || defined UNX || defined OS2
nExit = spawnvp( P_WAIT, rPrePro.GetBuffer(), (char* const*)pCmdL->GetBlock() );
#elif defined CSET
- nExit = spawnvp( P_WAIT, (char*)rPrePro.GetBuffer(), char **) (const char**)pCmdL->GetBlock() );
+ nExit = spawnvp( P_WAIT, (char*)rPrePro.GetBuffer(), (const char**)pCmdL->GetBlock() );
#elif defined WTC
nExit = spawnvp( P_WAIT, (char*)rPrePro.GetBuffer(), (const char* const*)pCmdL->GetBlock() );
#elif defined MTW
@@ -322,14 +323,8 @@ static BOOL CallRsc2( ByteString aRsc2Name,
|* Letzte Aenderung MM 05.09.91
|*
*************************************************************************/
-#if defined UNX || (defined OS2 && (defined CSET || defined GCC )) || defined WTC || defined MTW || defined ICC || defined(__MINGW32__)
-int main ( int argc, char ** argv)
-{
-#else
-int cdecl main ( int argc, char ** argv)
+SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
{
-#endif
-
BOOL bPrePro = TRUE;
BOOL bResFile = TRUE;
BOOL bHelp = FALSE;
generated by cgit (git 2.34.1) at 2024-07-13 09:25:07 +0000