summaryrefslogtreecommitdiff
path: root/scp2
diff options
context:
space:
mode:
authorRĂ¼diger Timm <rt@openoffice.org>2008-06-09 11:51:39 +0000
committerRĂ¼diger Timm <rt@openoffice.org>2008-06-09 11:51:39 +0000
commita948fda791b7249f7068cee402823e7bd47b811a (patch)
treee74c3571daa7c497f69f6772a9d1fa46b8fb1ffa /scp2
parentafd465c7ce286205e4bf1899b722f21e88c6af7e (diff)
INTEGRATION: CWS sb87 (1.235.12); FILE MERGED
2008/04/24 13:20:37 sb 1.235.12.4: RESYNC: (1.235-1.240); FILE MERGED 2008/04/14 08:31:39 sb 1.235.12.3: #i86315# moved Jobs-stclient.xcu from basis to brand layer 2008/04/10 15:47:01 sb 1.235.12.2: #i87512# removed configimport 2008/04/04 12:23:14 sb 1.235.12.1: #i87548# moved npsoplugin dynamic library to brand layer, kept nsplugin executable (called from plugin, in turn calling soffice) in basis layer
Diffstat (limited to 'scp2')
-rw-r--r--scp2/source/ooo/file_ooo.scp40
1 files changed, 1 insertions, 39 deletions
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index 9270def05580..ba16e0cae33a 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: file_ooo.scp,v $
- * $Revision: 1.246 $
+ * $Revision: 1.247 $
*
* This file is part of OpenOffice.org.
*
@@ -124,15 +124,6 @@ End
#ifndef WITHOUT_MOZILLA
#if !defined(UNX) || defined(ENABLE_GTK)
-File gid_File_Lib_Npsoplugin
- BIN_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Program;
- Name = SPECIAL_NAME(npsoplugin);
-End
-#endif
-
-#if !defined(UNX) || defined(ENABLE_GTK)
File gid_File_Exe_Nsplugin
BIN_FILE_BODY;
Styles = (PACKED);
@@ -168,28 +159,6 @@ End
#endif
-File gid_File_Bin_Configimport
- BIN_FILE_BODY;
- Dir = gid_Dir_Program;
- Styles = (PACKED);
- #ifdef UNX
- Name = "configimport.bin";
- #else
- Name = "configimport.exe";
- #endif
-End
-
-#ifdef UNX
-
-File gid_File_Script_Configimport
- BIN_FILE_BODY;
- Dir = gid_Dir_Program;
- Styles = (PACKED);
- Name = "configimport";
-End
-
-#endif
-
File gid_File_Bin_Gengal
BIN_FILE_BODY;
Dir = gid_Dir_Program;
@@ -2867,13 +2836,6 @@ File gid_File_Stclient_Wrapper
#endif
Styles = ();
End
-
-File gid_File_Registry_Spool_Oo_Office_Jobs_Stclient_Xcu
- TXT_FILE_BODY;
- Styles = (PACKED, SCPZIP_REPLACE);
- Dir = gid_Dir_Share_Registry_Modules_Oo_Office_Jobs;
- Name = "/registry/spool/org/openoffice/Office/Jobs/Jobs-stclient.xcu";
-End
#endif
#endif