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

[tml svn gnome org]

Author: tml
Date: Thu Dec  4 14:02:12 2008
New Revision: 14743
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14743&view=rev

Log:
2008-12-04  Tor Lillqvist  <tml novell com>

	* patches/dev300/apply
	* patches/dev300/form-control-visibility.diff
	* patches/dev300/form-control-visibility-m36.diff:
	Split at m37.



Added:
   trunk/patches/dev300/form-control-visibility-m36.diff   (props changed)
      - copied unchanged from r14741, /trunk/patches/dev300/form-control-visibility.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply
   trunk/patches/dev300/form-control-visibility.diff

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Thu Dec  4 14:02:12 2008
@@ -479,9 +479,15 @@
 [ Fixes ]
 localize-pl-cygwin-paths.diff, tml
 
+[ Fixes < dev300-m37 ]
+# import/export form control's visibility
+form-control-visibility-m36.diff, i#88878, jianhua
+
+[ Fixes >= dev300-m37 ]
 # import/export form control's visibility
 form-control-visibility.diff, i#88878, jianhua
 
+[ Fixes ]
 # import tooltip for userforms
 import-controls-tooltip.diff, i#90124, noelpwer
 

Modified: trunk/patches/dev300/form-control-visibility.diff
==============================================================================
--- trunk/patches/dev300/form-control-visibility.diff	(original)
+++ trunk/patches/dev300/form-control-visibility.diff	Thu Dec  4 14:02:12 2008
@@ -52,10 +52,10 @@
 --- toolkit/inc/toolkit/helper/property.hxx.orig	2008-05-20 22:32:24.000000000 +0800
 +++ toolkit/inc/toolkit/helper/property.hxx	2008-06-04 15:24:06.000000000 +0800
 @@ -188,6 +188,7 @@ namespace rtl {
- #define BASEPROPERTY_URL                            134  // ::rtl::OUString
  #define BASEPROPERTY_UNIT                           135  // ::awt::FieldUnit
  #define BASEPROPERTY_CUSTOMUNITTEXT                 136  // ::rtl::OUString
-+#define BASEPROPERTY_ENABLEVISIBLE                  137  // sal_Bool
+ #define BASEPROPERTY_IMAGE_SCALE_MODE               137
++#define BASEPROPERTY_ENABLEVISIBLE                  138  // sal_Bool
  
  // Keine gebundenen Properties, werden immer aus der Property BASEPROPERTY_FONTDESCRIPTOR entnommen.
  #define BASEPROPERTY_FONTDESCRIPTORPART_START			1000