merge the formfield patch from ooo-build
[ooovba.git] / applied_patches / 0243-scp2-3layer-nicer-paths.diff
blob0abee797e9d096486990c360262fc67a5238c59b
1 diff --git scp2/source/ooo/common_brand.scp scp2/source/ooo/common_brand.scp
2 index 5e29ab3..8d268c1 100644
3 --- scp2/source/ooo/common_brand.scp
4 +++ scp2/source/ooo/common_brand.scp
5 @@ -323,7 +323,7 @@ Unixlink gid_Brand_Unixlink_BasisLink
6 // Styles = (LAYERLINK);
7 Name = "basis-link";
8 Dir = gid_Dir_Brand_Root;
9 - Target = "../${UNIXBASISROOTNAME}/basis${OOOBASEVERSION}";
10 + Target = "basis${OOOBASEVERSION}";
11 End
12 #endif
14 diff --git scp2/source/ooo/directory_ooo.scp scp2/source/ooo/directory_ooo.scp
15 index 354f8c0..95f4c17 100644
16 --- scp2/source/ooo/directory_ooo.scp
17 +++ scp2/source/ooo/directory_ooo.scp
18 @@ -93,7 +93,7 @@ Directory gid_Dir_Ooo_Openofficeorg
19 #ifdef WNT
20 HostName = "${BASISROOTNAME}";
21 #else
22 - HostName = "${UNIXBASISROOTNAME}";
23 + HostName = ".";
24 #endif
25 End
26 #endif
27 diff --git scp2/source/ooo/ooo_brand.scp scp2/source/ooo/ooo_brand.scp
28 index 663ce28..ecc87d2 100644
29 --- scp2/source/ooo/ooo_brand.scp
30 +++ scp2/source/ooo/ooo_brand.scp
31 @@ -36,7 +36,7 @@ Directory gid_Dir_Brand_Root
32 #ifdef WNT
33 HostName = "${PRODUCTNAME} ${BRANDPACKAGEVERSION}";
34 #else
35 - HostName = "${UNIXPRODUCTNAME}${BRANDPACKAGEVERSION}";
36 + HostName = ".";
37 #endif
38 Styles = (OFFICEDIRECTORY);
39 End
40 --- scp2/source/sdkoo/sdkoo.scp-old 2008-07-16 20:49:43.000000000 +0200
41 +++ scp2/source/sdkoo/sdkoo.scp 2008-07-16 20:50:36.000000000 +0200
42 @@ -55,7 +55,7 @@
43 #ifdef WNT
44 HostName = "${BASISROOTNAME}";
45 #else
46 - HostName = "${UNIXBASISROOTNAME}";
47 + HostName = ".";
48 #endif
49 End
50 #endif