ooo-build r14864 - in trunk: . patches/dev300 patches/vba

[kyoshida svn gnome org]

Author: kyoshida
Date: Tue Dec 16 05:05:13 2008
New Revision: 14864
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14864&view=rev

Log:
2008-12-16  Kohei Yoshida  <kyoshida novell com>

	* patches/vba/vba-userform-geometry-tweak-m36.diff: forgot to provide a
	patch for dev300-m36.

	* patches/dev300/apply: use the above patch for dev300-m36 or older.


Added:
   trunk/patches/vba/vba-userform-geometry-tweak-m36.diff   (contents, props changed)
      - copied, changed from r14863, /trunk/patches/vba/vba-userform-geometry-tweak.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Tue Dec 16 05:05:13 2008
@@ -1723,6 +1723,11 @@
 # fix bug comparing string that can't be converted to number
 stringnumbercompare.diff, n#422559
 
+[ VBAObjects <= dev300-m36 ]
+# fix import sizes and geometry of userforms
+vba-userform-geometry-tweak-m36.diff
+
+[ VBAObjects > dev300-m36 ]
 # fix import sizes and geometry of userforms
 vba-userform-geometry-tweak.diff
 

Copied: trunk/patches/vba/vba-userform-geometry-tweak-m36.diff (from r14863, /trunk/patches/vba/vba-userform-geometry-tweak.diff)
==============================================================================
--- /trunk/patches/vba/vba-userform-geometry-tweak.diff	(original)
+++ trunk/patches/vba/vba-userform-geometry-tweak-m36.diff	Tue Dec 16 05:05:13 2008
@@ -288,10 +288,10 @@
 --- toolkit/inc/toolkit/helper/property.hxx
 +++ toolkit/inc/toolkit/helper/property.hxx
 @@ -190,6 +190,7 @@ namespace rtl {
- #define BASEPROPERTY_IMAGE_SCALE_MODE               137
- #define BASEPROPERTY_ENABLEVISIBLE                  138  // sal_Bool
- #define BASEPROPERTY_GROUPNAME                      139  // ::rtl::OUString
-+#define BASEPROPERTY_VBAFORM                        140  // sal_Bool
+ #define BASEPROPERTY_CUSTOMUNITTEXT                 136  // ::rtl::OUString
+ #define BASEPROPERTY_ENABLEVISIBLE                  137  // sal_Bool
+ #define BASEPROPERTY_GROUPNAME                      138  // ::rtl::OUString
++#define BASEPROPERTY_VBAFORM                      139  // sal_Bool
  
  // Keine gebundenen Properties, werden immer aus der Property BASEPROPERTY_FONTDESCRIPTOR entnommen.
  #define BASEPROPERTY_FONTDESCRIPTORPART_START			1000