INTEGRATION: CWS sb83 (1.25.98); FILE MERGED

2008/02/25 15:50:13 is 1.25.98.3: #i85112# spadmin link into brand package
2008/01/29 16:00:24 sb 1.25.98.2: #i85112# merged in cws_src680_native121
2007/12/10 14:53:15 sb 1.25.98.1: #i84309# Completely removed deprecated pkgchk tool.

1 files changed, 2 insertions, 290 deletions

diff --git a/scp2/source/ooo/shortcut_ooo.scp b/scp2/source/ooo/shortcut_ooo.scp
index d62838c29e7f..73943f121a97 100644
--- a/scp2/source/ooo/shortcut_ooo.scp
+++ b/scp2/source/ooo/shortcut_ooo.scp
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: shortcut_ooo.scp,v $
  *
- *  $Revision: 1.25 $
+ *  $Revision: 1.26 $
  *
- *  last change: $Author: ihi $ $Date: 2007-08-20 13:23:17 $
+ *  last change: $Author: vg $ $Date: 2008-03-18 13:34:37 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -35,34 +35,6 @@
 
 #include "macros.inc"
 
-#ifndef SYSTEM_LIBXML
-#ifdef UNX
-
-Shortcut gid_Shortcut_Lib_Xml2
-    FileID = gid_File_Lib_Xml2;
-    Dir = gid_Dir_Program;
-#ifdef MACOSX
-    Name = STRING(CONCAT2(libxml2.2,UNXSUFFIX));
-#else
-    Name = STRING(CONCAT3(libxml2,UNXSUFFIX,.2));
-#endif
-    Styles = (NETWORK,RELATIVE);
-End
-
-#endif
-
-#ifdef UNX
-
-Shortcut gid_Shortcut_Lib_Xml2_2
-    ShortcutID = gid_Shortcut_Lib_Xml2;
-    Dir = gid_Dir_Program;
-    Name = STRING(CONCAT2(libxml2,UNXSUFFIX));
-    Styles = (NETWORK,RELATIVE);
-End
-
-#endif
-#endif
-
 #ifndef SYSTEM_LIBXSLT
 #ifdef UNX
 
@@ -91,83 +63,6 @@ End
 #endif
 #endif
 
-#ifdef UNX
-
-Shortcut gid_Shortcut_Lib_Cppu_Linker
-    FileID = gid_File_Lib_Cppu;
-    Dir = gid_Dir_Program;
-    Name = STRING(CONCAT2(libuno_cppu,UNXSUFFIX));
-    Styles = (NETWORK,RELATIVE);
-End
-
-#endif
-
-#ifdef UNX
-
-Shortcut gid_Shortcut_Lib_Cppu_Old
-    FileID = gid_File_Lib_Cppu;
-    Dir = gid_Dir_Program;
-    Name = STRING(CONCAT4(libcppu,UNXSUFFIX,.,UDK_MAJOR));
-    Styles = (NETWORK,RELATIVE);
-End
-
-#endif
-
-#ifdef UNX
-
-Shortcut gid_Shortcut_Lib_Cppu_Old_Linker
-    ShortcutID = gid_Shortcut_Lib_Cppu_Old;
-    Dir = gid_Dir_Program;
-    Name = STRING(CONCAT2(libcppu,UNXSUFFIX));
-    Styles = (NETWORK,RELATIVE);
-End
-
-#endif
-
-#ifdef UNX
-
-Shortcut gid_Shortcut_Lib_Cppuhelper_Linker
-    FileID = gid_File_Lib_Cppuhelper;
-    Dir = gid_Dir_Program;
-    Name = STRING(CONCAT3(libuno_cppuhelper,COMID,UNXSUFFIX));
-    Styles = (NETWORK,RELATIVE);
-End
-
-#endif
-
-#ifdef UNX
-
-Shortcut gid_Shortcut_Lib_Cppuhelper_Old
-    FileID = gid_File_Lib_Cppuhelper;
-    Dir = gid_Dir_Program;
-    Name = STRING(CONCAT5(libcppuhelper,COMID,UNXSUFFIX,.,UDK_MAJOR));
-    Styles = (NETWORK,RELATIVE);
-End
-
-#endif
-
-#ifdef UNX
-
-Shortcut gid_Shortcut_Lib_Cppuhelper_Old_Linker
-    ShortcutID = gid_Shortcut_Lib_Cppuhelper_Old;
-    Dir = gid_Dir_Program;
-    Name = STRING(CONCAT3(libcppuhelper,COMID,UNXSUFFIX));
-    Styles = (NETWORK,RELATIVE);
-End
-
-#endif
-
-#ifdef UNX
-
-Shortcut gid_Shortcut_Lib_Cppuhelper_3
-    ShortcutID = gid_Shortcut_Lib_Cppuhelper_Old;
-    Dir = gid_Dir_Program;
-    Name = STRING(CONCAT4(libcppuhelper,UDK_MAJOR,COMID,UNXSUFFIX));
-    Styles = (NETWORK,RELATIVE);
-End
-
-#endif
-
 #ifndef SYSTEM_CURL
 
 #ifdef UNX
@@ -228,175 +123,6 @@ End
 #endif
 #endif
 
-#ifdef UNX
-
-#ifdef SOLAR_JAVA
-
-Shortcut gid_Shortcut_Lib_Jvmaccess_Linker
-    FileID = gid_File_Lib_Jvmaccess;
-    Dir = gid_Dir_Program;
-    Name = STRING(CONCAT3(libjvmaccess,COMID,UNXSUFFIX));
-    Styles = (NETWORK,RELATIVE);
-End
-
-#endif
-
-#endif
-
-#ifdef UNX
-
-Shortcut gid_Shortcut_Lib_Reg_Linker
-    FileID = gid_File_Lib_Reg;
-    Dir = gid_Dir_Program;
-    Name = STRING(CONCAT2(libreg,UNXSUFFIX));
-    Styles = (NETWORK,RELATIVE);
-End
-
-#endif
-
-#ifdef UNX
-
-Shortcut gid_Shortcut_Lib_Rmcxt_Linker
-    FileID = gid_File_Lib_Rmcxt;
-    Dir = gid_Dir_Program;
-    Name = STRING(CONCAT2(librmcxt,UNXSUFFIX));
-    Styles = (NETWORK,RELATIVE);
-End
-
-#endif
-
-#ifdef UNX
-
-Shortcut gid_Shortcut_Lib_Sal_Linker
-    FileID = gid_File_Lib_Sal;
-    Dir = gid_Dir_Program;
-    Name = STRING(CONCAT2(libuno_sal,UNXSUFFIX));
-    Styles = (NETWORK, RELATIVE);
-End
-
-#endif
-
-#ifdef UNX
-
-Shortcut gid_Shortcut_Lib_Sal_Old
-    FileID = gid_File_Lib_Sal;
-    Dir = gid_Dir_Program;
-    Name = STRING(CONCAT4(libsal,UNXSUFFIX,.,UDK_MAJOR));
-    Styles = (NETWORK, RELATIVE);
-End
-
-#endif
-
-#ifdef UNX
-
-Shortcut gid_Shortcut_Lib_Sal_Old_Linker
-    ShortcutID = gid_Shortcut_Lib_Sal_Old;
-    Dir = gid_Dir_Program;
-    Name = STRING(CONCAT2(libsal,UNXSUFFIX));
-    Styles = (NETWORK, RELATIVE);
-End
-
-#endif
-
-#ifdef UNX
-
-Shortcut gid_Shortcut_Lib_Salhelper_Linker
-    FileID = gid_File_Lib_Salhelper;
-    Dir = gid_Dir_Program;
-    Name = STRING(CONCAT3(libuno_salhelper,COMID,UNXSUFFIX));
-    Styles = (NETWORK,RELATIVE);
-End
-
-#endif
-
-#ifdef UNX
-
-Shortcut gid_Shortcut_Lib_Salhelper_Old
-    FileID = gid_File_Lib_Salhelper;
-    Dir = gid_Dir_Program;
-    Name = STRING(CONCAT5(libsalhelper,COMID,UNXSUFFIX,.,UDK_MAJOR));
-    Styles = (NETWORK,RELATIVE);
-End
-
-#endif
-
-#ifdef UNX
-
-Shortcut gid_Shortcut_Lib_Salhelper_Old_Linker
-    ShortcutID = gid_Shortcut_Lib_Salhelper_Old;
-    Dir = gid_Dir_Program;
-    Name = STRING(CONCAT3(libsalhelper,COMID,UNXSUFFIX));
-    Styles = (NETWORK,RELATIVE);
-End
-
-#endif
-
-#ifdef UNX
-
-Shortcut gid_Shortcut_Lib_Salhelper_3
-    ShortcutID = gid_Shortcut_Lib_Salhelper_Old;
-    Dir = gid_Dir_Program;
-    Name = STRING(CONCAT4(libsalhelper,UDK_MAJOR,COMID,UNXSUFFIX));
-    Styles = (NETWORK,RELATIVE);
-End
-
-#endif
-
-#ifdef UNX
-
-Shortcut gid_Shortcut_Lib_Store_Linker
-    FileID = gid_File_Lib_Store;
-    Dir = gid_Dir_Program;
-    Name = STRING(CONCAT2(libstore,UNXSUFFIX));
-    Styles = (NETWORK, RELATIVE);
-End
-
-#endif
-
-#ifdef UNX
-
-Shortcut gid_Shortcut_Pkgchk
-    FileID = gid_File_Script_Unopkg;
-    Dir = gid_Dir_Program;
-    Name = "pkgchk";
-    Styles = (STANDALONE, NETWORK, RELATIVE);
-End
-
-Shortcut gid_Shortcut_Uno
-    FileID = gid_File_Script_Unopkg;
-    Dir = gid_Dir_Program;
-    Name = "uno";
-    Styles = (STANDALONE, NETWORK, RELATIVE);
-End
-
-#endif
-
-#if defined(UNX) && !defined(QUARTZ)
-
-Shortcut gid_Shortcut_Spadmin_Program
-    FileID = gid_File_Bin_Soffice;
-    Dir = gid_Dir_Program;
-    Name = "spadmin";
-    Styles = (NETWORK, RELATIVE);
-End
-
-#endif
-
-#ifdef UNX
-
-#ifdef SOLAR_JAVA
-
-Shortcut gid_Shortcut_Lib_Jvmfwk_Linker
-    FileID = gid_File_Lib_Jvmfwk;
-    Dir = gid_Dir_Program;
-    Name = STRING(CONCAT2(libjvmfwk,UNXSUFFIX));
-    Styles = (NETWORK,RELATIVE);
-End
-
-#endif
-
-#endif
-
 //i38417
 #ifndef WITHOUT_MOZILLA
 #ifdef UNX
@@ -445,20 +171,6 @@ End
 #endif
 //i38417 -end-
 
-
-//i44154
-
-#ifdef MACOSX
-
-Shortcut gid_Shortcut_Lib_Java_Uno
-    FileID = gid_File_Lib_Java_Uno;
-    Dir = gid_Dir_Program;
-    Name = "libjava_uno.jnilib";
-    Styles = (NETWORK, RELATIVE);
-End
-
-#endif
-
 #ifdef MACOSX
 
 Shortcut gid_Shortcut_Lib_Hsqldb_2