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

[kyoshida svn gnome org]

Author: kyoshida
Date: Tue Dec 16 04:58:22 2008
New Revision: 14863
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14863&view=rev

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

	* patches/dev300/forms-radio-button-group-names.diff:
	* patches/vba/vba-userform-geometry-tweak.diff: re-adjusted toolkit's
	property IDs for BASEPROPERTY_GROUPNAME and BASEPROPERTY_VBAFORM to get
	it to build again.


Modified:
   trunk/ChangeLog
   trunk/patches/dev300/forms-radio-button-group-names.diff
   trunk/patches/vba/vba-userform-geometry-tweak.diff

Modified: trunk/patches/dev300/forms-radio-button-group-names.diff
==============================================================================
--- trunk/patches/dev300/forms-radio-button-group-names.diff	(original)
+++ trunk/patches/dev300/forms-radio-button-group-names.diff	Tue Dec 16 04:58:22 2008
@@ -477,7 +477,7 @@
  #define BASEPROPERTY_CUSTOMUNITTEXT                 136  // ::rtl::OUString
  #define BASEPROPERTY_IMAGE_SCALE_MODE               137
  #define BASEPROPERTY_ENABLEVISIBLE                  138  // sal_Bool
-+#define BASEPROPERTY_GROUPNAME                      138  // ::rtl::OUString
++#define BASEPROPERTY_GROUPNAME                      139  // ::rtl::OUString
  
  // Keine gebundenen Properties, werden immer aus der Property BASEPROPERTY_FONTDESCRIPTOR entnommen.
  #define BASEPROPERTY_FONTDESCRIPTORPART_START			1000

Modified: trunk/patches/vba/vba-userform-geometry-tweak.diff
==============================================================================
--- trunk/patches/vba/vba-userform-geometry-tweak.diff	(original)
+++ trunk/patches/vba/vba-userform-geometry-tweak.diff	Tue Dec 16 04:58:22 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_CUSTOMUNITTEXT                 136  // ::rtl::OUString
- #define BASEPROPERTY_ENABLEVISIBLE                  137  // sal_Bool
- #define BASEPROPERTY_GROUPNAME                      138  // ::rtl::OUString
-+#define BASEPROPERTY_VBAFORM                      139  // sal_Bool
+ #define BASEPROPERTY_IMAGE_SCALE_MODE               137
+ #define BASEPROPERTY_ENABLEVISIBLE                  138  // sal_Bool
+ #define BASEPROPERTY_GROUPNAME                      139  // ::rtl::OUString
++#define BASEPROPERTY_VBAFORM                        140  // sal_Bool
  
  // Keine gebundenen Properties, werden immer aus der Property BASEPROPERTY_FONTDESCRIPTOR entnommen.
  #define BASEPROPERTY_FONTDESCRIPTORPART_START			1000