ooo-build r12337 - in trunk: . patches/dev300

[noelpwer svn gnome org]

Author: noelpwer
Date: Fri Apr 25 14:07:13 2008
New Revision: 12337
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12337&view=rev

Log:
2008-04-25  Noel Power  <noel power novell com>

        * patches/dev300/apply: fix for i#88739 needed for vba to work
        with dev300
        * patches/dev300/vba-3-layer-missingtypes.diff:


Added:
   trunk/patches/dev300/vba-3-layer-missingtypes.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Fri Apr 25 14:07:13 2008
@@ -452,6 +452,8 @@
 
 localize-pl-cygwin-paths.diff, tml
 
+# vba types are not available, causes all sort strangeness
+vba-3-layer-missingtypes.diff, i#88739, noelpwer
 [ RadioButtons ]
 # Add a GroupName property to RadioButtons so that RadioButtons don't need to
 # share the same name to be part of the same group.

Added: trunk/patches/dev300/vba-3-layer-missingtypes.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/vba-3-layer-missingtypes.diff	Fri Apr 25 14:07:13 2008
@@ -0,0 +1,15 @@
+diff -up scp2/source/ooo/profileitem_ooo.scp scp2.patched/source/ooo/profileitem_ooo.scp
+--- scp2/source/ooo/profileitem_ooo.scp	2008-03-18 13:33:06.000000000 +0000
++++ scp2/source/ooo/profileitem_ooo.scp	2008-04-25 14:57:01.000000000 +0100
+@@ -469,7 +469,11 @@ ProfileItem gid_Profileitem_Fundamentalb
+     ProfileID = gid_Profile_Fundamentalbasis_Ini;
+     Section = "Bootstrap";
+     Key = "URE_MORE_TYPES";
++#if defined ENABLE_VBA && !defined VBA_EXTENSION
++    Value = "$ORIGIN/oovbaapi.rdb $ORIGIN/offapi.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