diff options
| author | Vladimir Glazunov <vg@openoffice.org> | 2010-03-22 18:17:46 +0100 |
|---|---|---|
| committer | Vladimir Glazunov <vg@openoffice.org> | 2010-03-22 18:17:46 +0100 |
| commit | 51b401061b70d699c34f30a21cf6a9fde80dfd75 (patch) | |
| tree | 918c15296391b82ecf0b277101b49b9f20476f12 /rsc | |
| parent | bbdd8d299409a81f14aa6432c9d8842fa6bc8dc6 (diff) | |
| parent | b9bf85ffe5c1b22bb096cb63fc7059ebe590134e (diff) | |
CWS-TOOLING: integrate CWS vcl109
Diffstat (limited to 'rsc')
| -rw-r--r-- | rsc/source/parser/makefile.mk | 11 | ||||
| -rw-r--r-- | rsc/source/parser/parser.cxx | 59 | ||||
| -rw-r--r-- | rsc/source/parser/parser.hxx | 26 | ||||
| -rw-r--r-- | rsc/source/prj/start.cxx | 2 |
4 files changed, 1 insertions, 97 deletions
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/start.cxx b/rsc/source/prj/start.cxx index b36614cec8c4..8b952acb75f9 100644 --- a/rsc/source/prj/start.cxx +++ b/rsc/source/prj/start.cxx @@ -176,7 +176,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 |