diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-06-16 13:15:05 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-06-16 13:15:05 +0000 |
| commit | 67e862f3b1f4e37b10550d28c5e1a66e35036fc0 (patch) | |
| tree | f26aa8f248be40bc93501bc80a4e8f9724b2883c /scp2 | |
| parent | 4d939118edf891e85c25ada02ac857a122c975dc (diff) | |
INTEGRATION: CWS sb88 (1.60.10); FILE MERGED
2008/06/11 10:49:18 sb 1.60.10.3: RESYNC: (1.60-1.64); FILE MERGED
2008/06/11 09:04:05 sb 1.60.10.2: #i90601# fixed relative order of Brand Layer CFG_Strata
2008/05/15 11:07:54 sb 1.60.10.1: #88739# VBA types were missing (fix by npower)
Diffstat (limited to 'scp2')
| -rw-r--r-- | scp2/source/ooo/profileitem_ooo.scp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/scp2/source/ooo/profileitem_ooo.scp b/scp2/source/ooo/profileitem_ooo.scp index ffe4fb707746..0bbcdc4bc8fe 100644 --- a/scp2/source/ooo/profileitem_ooo.scp +++ b/scp2/source/ooo/profileitem_ooo.scp @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: profileitem_ooo.scp,v $ - * $Revision: 1.64 $ + * $Revision: 1.65 $ * * This file is part of OpenOffice.org. * @@ -272,7 +272,7 @@ ProfileItem gid_Profileitem_Configmgr_Strata Section = "Bootstrap"; Order = 25; Key = "CFG_Strata"; - Value = "${CFG_LocalDataSvc}:$CFG_DefaultLayerUrl;${CFG_LocalModuleDataSvc}:$CFG_ModuleLayerUrl;${CFG_LocalResDataSvc}:$CFG_DefaultLayerUrl;${CFG_LocalDataSvc}:$CFG_UnoSharedPackages;?com.sun.star.comp.configuration.backend.SystemIntegration:;?com.sun.star.comp.configuration.backend.PolicyLayerBackend:;?${CFG_LocalDataSvc}:$CFG_CustomLayerUrl;?${CFG_LocalModuleDataSvc}:$CFG_CustomLayerModulesUrl;${CFG_LocalDataSvc}:$CFG_UnoUserPackages;${CFG_LocalDataSvc}:$CFG_UserLayerUrl;"; + Value = "${CFG_LocalDataSvc}:$CFG_DefaultLayerUrl;${CFG_LocalModuleDataSvc}:$CFG_ModuleLayerUrl;${CFG_LocalResDataSvc}:$CFG_DefaultLayerUrl;?${CFG_LocalDataSvc}:$CFG_CustomLayerUrl;?${CFG_LocalModuleDataSvc}:$CFG_CustomLayerModulesUrl;${CFG_LocalDataSvc}:$CFG_UnoSharedPackages;?com.sun.star.comp.configuration.backend.SystemIntegration:;?com.sun.star.comp.configuration.backend.PolicyLayerBackend:;${CFG_LocalDataSvc}:$CFG_UnoUserPackages;${CFG_LocalDataSvc}:$CFG_UserLayerUrl;"; End ProfileItem gid_Profileitem_Configmgr_Ldapmappingurl @@ -520,7 +520,11 @@ ProfileItem gid_Profileitem_Fundamentalbasis_Ure_More_Types ProfileID = gid_Profile_Fundamentalbasis_Ini; Section = "Bootstrap"; Key = "URE_MORE_TYPES"; +#if defined ENABLE_VBA && !defined VBA_EXTENSION + Value = "$ORIGIN/offapi.rdb $ORIGIN/oovbaapi.rdb ${${$ORIGIN/" PROFILENAME(uno) ":PKG_SharedUnoFile}:UNO_TYPES} ${${$ORIGIN/" PROFILENAME(uno) ":PKG_UserUnoFile}:UNO_TYPES}"; +#else Value = "$ORIGIN/offapi.rdb ${${$ORIGIN/" PROFILENAME(uno) ":PKG_SharedUnoFile}:UNO_TYPES} ${${$ORIGIN/" PROFILENAME(uno) ":PKG_UserUnoFile}:UNO_TYPES}"; +#endif End ProfileItem gid_Profileitem_Fundamentalbasis_Ure_More_Services |