summaryrefslogtreecommitdiff
path: root/scp2/source
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2006-05-09 09:45:06 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2006-05-09 09:45:06 +0000
commit3d20f0418f1d133f5d1c82fbd2a343a3dd720e43 (patch)
treec68cde6dd76415ccaff757c8b97bea76f452f3a4 /scp2/source
parent06ceff5a43fb795aca86398a06d4c045ad57fcaf (diff)
INTEGRATION: CWS sb53 (1.38.6); FILE MERGED
2006/05/08 13:25:09 sb 1.38.6.1: #135562# Reverted changes introduced in 1.29.2.1, as they broke installed UNO packages across a StarOffice patch update.
Diffstat (limited to 'scp2/source')
-rw-r--r--scp2/source/ooo/profileitem_ooo.scp12
1 files changed, 6 insertions, 6 deletions
diff --git a/scp2/source/ooo/profileitem_ooo.scp b/scp2/source/ooo/profileitem_ooo.scp
index 6b8e2c379741..ad2572ad2b69 100644
--- a/scp2/source/ooo/profileitem_ooo.scp
+++ b/scp2/source/ooo/profileitem_ooo.scp
@@ -4,9 +4,9 @@
*
* $RCSfile: profileitem_ooo.scp,v $
*
- * $Revision: 1.38 $
+ * $Revision: 1.39 $
*
- * last change: $Author: rt $ $Date: 2006-05-02 10:23:58 $
+ * last change: $Author: hr $ $Date: 2006-05-09 10:45:06 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -693,7 +693,7 @@ ProfileItem gid_Profileitem_Uno_Uno_Types
Section = "Bootstrap";
Order = 7;
Key = "UNO_TYPES";
- Value = "$ORIGIN/types.rdb ${$PKG_SharedUnoFile:PKG_UNO_TYPES} ${$PKG_UserUnoFile:PKG_UNO_TYPES}";
+ Value = "$ORIGIN/types.rdb ${$PKG_SharedUnoFile:UNO_TYPES} ${$PKG_UserUnoFile:UNO_TYPES}";
End
ProfileItem gid_Profileitem_Uno_Uno_Services
@@ -702,7 +702,7 @@ ProfileItem gid_Profileitem_Uno_Uno_Services
Section = "Bootstrap";
Order = 8;
Key = "UNO_SERVICES";
- Value = "${$PKG_UserUnoFile:PKG_UNO_SERVICES} ${$PKG_SharedUnoFile:PKG_UNO_SERVICES} $ORIGIN/services.rdb";
+ Value = "${$PKG_UserUnoFile:UNO_SERVICES} ${$PKG_SharedUnoFile:UNO_SERVICES} $ORIGIN/services.rdb";
End
ProfileItem gid_Profileitem_Uno_Uno_Java_Component_Path
@@ -796,8 +796,8 @@ ProfileItem gid_Profileitem_Jvmfwk_Uno_Java_Jfw_Classpath_Urls
Section = "Bootstrap";
Order = 7;
Key = "UNO_JAVA_JFW_CLASSPATH_URLS";
- Value = "${${$ORIGIN/$UNO_SETTINGS:PKG_UserUnoFile}:PKG_UNO_JAVA_CLASSPATH}";
- ValueList1 = "${${$ORIGIN/$UNO_SETTINGS:PKG_SharedUnoFile}:PKG_UNO_JAVA_CLASSPATH}";
+ Value = "${${$ORIGIN/$UNO_SETTINGS:PKG_UserUnoFile}:UNO_JAVA_CLASSPATH}";
+ ValueList1 = "${${$ORIGIN/$UNO_SETTINGS:PKG_SharedUnoFile}:UNO_JAVA_CLASSPATH}";
ValueList2 = "$ORIGIN/classes/jurt.jar $ORIGIN/classes/ridl.jar";
ValueList3 = "$ORIGIN/classes/java_uno.jar";
#ifndef GCJ