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

[noelpwer svn gnome org]

Author: noelpwer
Date: Fri Nov 28 17:05:32 2008
New Revision: 14662
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14662&view=rev

Log:
2008-11-28  Noel Power  <noel power novell com>

        * patches/vba/apply: enable form-control-visibility.diff 
        also enable default-autotext-and-form-name.diff, additionally clean
        up FIXME messages
        * patches/vba/vba-userform-geometry-tweak.diff: tweak this  because
        of patch enabled above


Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply
   trunk/patches/vba/vba-userform-geometry-tweak.diff

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Fri Nov 28 17:05:32 2008
@@ -475,8 +475,7 @@
 localize-pl-cygwin-paths.diff, tml
 
 # import/export form control's visibility
-# FIXME 2008-11-26: doesn't apply to dev300-m35
-#form-control-visibility.diff, i#88878, jianhua
+form-control-visibility.diff, i#88878, jianhua
 
 # import tooltip for userforms
 import-controls-tooltip.diff, i#90124, noelpwer
@@ -721,8 +720,6 @@
 sc-excel-chart-default-xlabels.diff, n#257079, i#83679, kohei
 
 # Fix autoshape excel hyperlink import OOo ( depends on vba-sc-handleautoshapemacro-import.diff )
-# FIXME 2008-11-26: doesn't apply to dev300-m35, maybe because of lack of diffs
-# above that has also been bypassed
 vba-sc-autoshapes-hyperlinks.diff, i#66550, noelpwer
 
 # Delete Rows/Delete Columns should remember the content so that the user is
@@ -1522,7 +1519,6 @@
 mono-climaker-config.diff
 mono-climaker-bridgetest.diff
 
-# FIXME 2008-11-26: easiest to skip all this...
 [ VBAObjects ]
 SectionOwner => noelpwer
 
@@ -1577,14 +1573,13 @@
 
 # attributes present in the vba streams can override the default shape name
 # used for the control in the binary format
-# FIXME 2008-11-26: doesn't apply to dev300-m35
 sc-vbaimport-override-controlname.diff, n#359933, noelpwer
 
 
 # Application.Caller
 api-application-caller.diff, n#339941, noelpwer
-# FIXME 2008-11-26: doesn't apply to dev300-m35
-#default-autotext-and-form-name.diff, n#353687, i#85358
+
+default-autotext-and-form-name.diff, n#353687, i#85358
 
 # fix --disable-vba build
 oovbaapi-disable-vba.diff

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	Fri Nov 28 17:05:32 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_URL                            134  // ::rtl::OUString
  #define BASEPROPERTY_UNIT                           135  // ::awt::FieldUnit
  #define BASEPROPERTY_CUSTOMUNITTEXT                 136  // ::rtl::OUString
-+#define BASEPROPERTY_VBAFORM                      137  // sal_Bool
+ #define BASEPROPERTY_ENABLEVISIBLE                  137  // sal_Bool
++#define BASEPROPERTY_VBAFORM                      138  // sal_Bool
  
  // Keine gebundenen Properties, werden immer aus der Property BASEPROPERTY_FONTDESCRIPTOR entnommen.
  #define BASEPROPERTY_FONTDESCRIPTORPART_START			1000
@@ -358,11 +358,11 @@
 --- toolkit/source/helper/property.cxx
 +++ toolkit/source/helper/property.cxx
 @@ -271,7 +271,8 @@ ImplPropertyInfo* ImplGetPropertyInfos( 
- 			DECL_PROP_3		( "RowHeight",				TREE_ROWHEIGHT,			sal_Int32,			BOUND, MAYBEDEFAULT, MAYBEVOID ),
  			DECL_PROP_2		( "InvokesStopNodeEditing",	TREE_INVOKESSTOPNODEEDITING, sal_Bool,		BOUND, MAYBEDEFAULT ),
              DECL_PROP_2     ( "DialogSourceURL",        DIALOGSOURCEURL,        ::rtl::OUString,    BOUND, MAYBEDEFAULT ),
--            DECL_PROP_2     ( "URL",                    URL,                    ::rtl::OUString,    BOUND, MAYBEDEFAULT )
-+            DECL_PROP_2     ( "URL",                    URL,                    ::rtl::OUString,    BOUND, MAYBEDEFAULT ),
+             DECL_PROP_2     ( "URL",                    URL,                    ::rtl::OUString,    BOUND, MAYBEDEFAULT ),
+-            DECL_PROP_2     ( "EnableVisible",          ENABLEVISIBLE,          sal_Bool,    BOUND, MAYBEDEFAULT )
++            DECL_PROP_2     ( "EnableVisible",          ENABLEVISIBLE,          sal_Bool,    BOUND, MAYBEDEFAULT ),
 +            DECL_PROP_2     ( "VBAForm",          VBAFORM,          sal_Bool,    BOUND, MAYBEDEFAULT ),
              };
  			pPropertyInfos = aImplPropertyInfos;