INTEGRATION: CWS native141 (1.10.16); FILE MERGED

2008/04/02 16:08:31 is 1.10.16.1: #i87732# version number in package names

scp2/source/ooo/installation_ooo.scp

@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: installation_ooo.scp,v $
- * $Revision: 1.11 $
+ * $Revision: 1.12 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -34,6 +34,7 @@ Installation gid_Installation_Ooo
     ProductName = "${PRODUCTNAME}";
     ProductVersion = "${PRODUCTVERSION}";
     ProductExtension = "${PRODUCTEXTENSION}";
+    OOoBaseVersion = "${OOOBASEVERSION}";
     UserDirProductVersion = "${USERDIRPRODUCTVERSION}";
     JavaVersion = "${JAVAVERSION}";
     SxwFormatVersion = "1.1";

scp2/source/ooo/profile_ooo.scp

@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: profile_ooo.scp,v $
- * $Revision: 1.12 $
+ * $Revision: 1.13 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -41,17 +41,6 @@ Profile gid_Profile_Configmgr_Ini
     Styles = (NETWORK);
 End
 
-Profile gid_Profile_Setup_Ini
-    ModuleID = gid_Module_Root;
-  #ifdef UNX
-    Name = "setuprc";
-  #else
-    Name = "setup.ini";
-  #endif
-    Dir = gid_Dir_Program;
-    Styles = (NETWORK);
-End
-
 Profile gid_Profile_Uno_Ini
     ModuleID = gid_Module_Root;
   #ifdef UNX