[Libreoffice-commits] .: Branch 'integration/dev300_m101' - scp2/source

[Thorsten Behrens]

 scp2/source/ooo/datacarrier_ooo.scp |   34 ----------------------------------
 scp2/source/ooo/makefile.mk         |    1 -
 scp2/source/sdkoo/sdkoo.scp         |    5 -----
 3 files changed, 40 deletions(-)

New commits:
commit 3c3fb16362bfb8f13a25e7d1eb76632b1053e53a
Author: Thorsten Behrens <tbehrens at novell.com>
Date:   Fri Mar 18 09:48:35 2011 +0100

    Remove undefined DataCarrier entries from scp2
    
    Michael's fixes turned those into build breaker

diff --git a/scp2/source/ooo/datacarrier_ooo.scp b/scp2/source/ooo/datacarrier_ooo.scp
deleted file mode 100644
index 89bfef1..0000000
--- 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 d4ec0c0..a532953 100644
--- a/scp2/source/ooo/makefile.mk
+++ b/scp2/source/ooo/makefile.mk
@@ -264,7 +264,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 f991f06..a943771 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