4 files changed, 4 insertions, 61 deletions
diff --git a/rsc/source/rscpp/cpp.h b/rsc/source/rscpp/cpp.h
index 8ec451ab9d3d..ddcecc8114c2 100644
--- a/rsc/source/rscpp/cpp.h
+++ b/rsc/source/rscpp/cpp.h
@@ -290,9 +290,9 @@ extern SIZES    size_table[];           /* For #if sizeof sizes         */
 
 #ifdef NOMAIN                /* BP */
 #ifndef _NO_PROTO
-int start_cpp( int argc, char *argv[] );
+int rscpp_main( int argc, char **argv );
 #endif
-#define MAIN   start_cpp     /* fuer die cpp.lib muss main() geandert werden */
+#define MAIN   rscpp_main     /* fuer die cpp.lib muss main() geandert werden */
 #else
 #ifdef WNT
 #define MAIN   __cdecl main
diff --git a/rsc/source/rscpp/cpp1.c b/rsc/source/rscpp/cpp1.c
index 378adaa17c5e..014a14b1e65d 100644
--- a/rsc/source/rscpp/cpp1.c
+++ b/rsc/source/rscpp/cpp1.c
@@ -26,6 +26,8 @@
  *
  ************************************************************************/
 
+#define NOMAIN
+
 #include        <stdio.h>
 #include        <ctype.h>
 #include        "cppdef.h"
diff --git a/rsc/source/rscpp/cppmain.c b/rsc/source/rscpp/cppmain.c
deleted file mode 100644
index 144576e2846b..000000000000
--- a/rsc/source/rscpp/cppmain.c
+++ /dev/null
@@ -1,43 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * 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.
- *
- ************************************************************************/
-
-#define NOMAIN
-
-#include <stdio.h>
-#include <ctype.h>
-#include "cppdef.h"
-#include "cpp.h"
-
-int main( argc, argv )
-    int   argc;
-    char *argv[];
-{
-    return( start_cpp( argc, argv ) );
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/rsc/source/rscpp/makefile.mk b/rsc/source/rscpp/makefile.mk
index 2cec0885ffad..980ef451f542 100644
--- a/rsc/source/rscpp/makefile.mk
+++ b/rsc/source/rscpp/makefile.mk
@@ -57,13 +57,6 @@ OBJFILES=   \
             $(OBJ)$/cpp5.obj \
             $(OBJ)$/cpp6.obj	\
 
-.IF "$(cpp)" == ""
-LIBSALCPPRT=$(0)
-APP1TARGET= $(TARGET)
-APP1LIBS=$(LB)$/$(TARGET).lib
-APP1STACK=32768
-.ENDIF
-
 .IF "$(GUI)"=="UNX"
 CDEFS+=-Dunix
 .ENDIF
@@ -79,12 +72,3 @@ NOOPTFILES=$(OBJ)$/cpp6.obj
 # --- Targets ------------------------------------------------------
 
 .INCLUDE : target.mk
-
-cpp1.c: cppdef.h cpp.h
-cpp2.c: cppdef.h cpp.h
-cpp3.c: cppdef.h cpp.h
-cpp4.c: cppdef.h cpp.h
-cpp5.c: cppdef.h cpp.h
-cpp6.c: cppdef.h cpp.h 
-
-