diff options
author | Thorsten Behrens <tbehrens@novell.com> | 2011-03-18 09:48:35 +0100 |
---|---|---|
committer | Jan Holesovsky <kendy@suse.cz> | 2011-03-18 17:35:01 +0100 |
commit | f5d9c8570d9d98fc7bf0497efe353531dd76359d (patch) | |
tree | 31825c5da264c7d9df6d947031aca564c8a14d3d /scp2 | |
parent | b846e8e650a8169b13f5e0942cf11efbc504ab5a (diff) |
Remove undefined DataCarrier entries from scp2
Michael's fixes turned those into build breaker
Diffstat (limited to 'scp2')
-rw-r--r-- | scp2/source/ooo/datacarrier_ooo.scp | 34 | ||||
-rw-r--r-- | scp2/source/ooo/makefile.mk | 1 | ||||
-rw-r--r-- | scp2/source/sdkoo/sdkoo.scp | 5 |
3 files changed, 0 insertions, 40 deletions
diff --git a/scp2/source/ooo/datacarrier_ooo.scp b/scp2/source/ooo/datacarrier_ooo.scp deleted file mode 100644 index 89bfef1e5626..000000000000 --- a/scp2/source/ooo/datacarrier_ooo.scp +++ /dev/null @@ -1,34 +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. - * -************************************************************************/ - -#include "macros.inc" - -DataCarrier gid_Datacarrier - Name = "%PRODUCTNAME %PRODUCTVERSION"; - DiskNo = 1; -End - diff --git a/scp2/source/ooo/makefile.mk b/scp2/source/ooo/makefile.mk index 329cf375d570..eb4d92ab66f5 100644 --- a/scp2/source/ooo/makefile.mk +++ b/scp2/source/ooo/makefile.mk @@ -268,7 +268,6 @@ PARFILES= \ scpaction_ooo.par \ directory_ooo.par \ directory_ooo_macosx.par \ - datacarrier_ooo.par \ file_ooo.par \ file_extra_ooo.par \ file_font_ooo.par \ diff --git a/scp2/source/sdkoo/sdkoo.scp b/scp2/source/sdkoo/sdkoo.scp index f991f062fbc7..a94377135d3f 100644 --- a/scp2/source/sdkoo/sdkoo.scp +++ b/scp2/source/sdkoo/sdkoo.scp @@ -39,11 +39,6 @@ Installation gid_Installation_Sdk #endif End -DataCarrier gid_Datacarrier - Name = "%PRODUCTNAME %PRODUCTVERSION"; - DiskNo = 1; -End - #ifndef MACOSX #ifdef WNT |