[ooo-build-commit] patches/vba

[Tor Lillqvist]

 patches/vba/vba-userform-geometry-tweak.diff |   28 +++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

New commits:
commit 5cc5a9f480b91d82531c9f846b38e98aa88b2f1f
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Mon Sep 7 13:32:12 2009 +0300

    Adapt vba-userform-geometry-tweak.diff to dev300-m57

diff --git a/patches/vba/vba-userform-geometry-tweak.diff b/patches/vba/vba-userform-geometry-tweak.diff
index 6f89149..3124a22 100644
--- a/patches/vba/vba-userform-geometry-tweak.diff
+++ b/patches/vba/vba-userform-geometry-tweak.diff
@@ -283,16 +283,16 @@ index bf3bca5..2a94b6f 100644
                  OCX_UserForm aForm(xVBAStg, *aIter, *aIter, xDialog, xSF );
                  aForm.pDocSh = &rDocSh;
                  sal_Bool bOk = aForm.Read(xTypes);
---- toolkit/inc/toolkit/helper/property.hxx.old	2009-04-06 20:47:34.000000000 +0200
-+++ toolkit/inc/toolkit/helper/property.hxx	2009-04-06 21:04:40.000000000 +0200
+--- toolkit/inc/toolkit/helper/property.hxx
++++ toolkit/inc/toolkit/helper/property.hxx
 @@ -193,6 +193,7 @@ namespace rtl {
- #define BASEPROPERTY_CONTEXT_WRITING_MODE           139
- #define BASEPROPERTY_ENABLEVISIBLE                  140  // sal_Bool
- #define BASEPROPERTY_GROUPNAME                      141  // ::rtl::OUString
-+#define BASEPROPERTY_VBAFORM                        142  // sal_Bool
+ #define BASEPROPERTY_GRID_SELECTIONMODE             144
+ #define BASEPROPERTY_ENABLEVISIBLE                  145  // sal_Bool
+ #define BASEPROPERTY_GROUPNAME                      146  // ::rtl::OUString
++#define BASEPROPERTY_VBAFORM                        147  // sal_Bool
+ 
  
  // Keine gebundenen Properties, werden immer aus der Property BASEPROPERTY_FONTDESCRIPTOR entnommen.
- #define BASEPROPERTY_FONTDESCRIPTORPART_START			1000
 diff --git toolkit/source/controls/dialogcontrol.cxx toolkit/source/controls/dialogcontrol.cxx
 index be06bbb..f976562 100644
 --- toolkit/source/controls/dialogcontrol.cxx
@@ -351,18 +351,18 @@ index be06bbb..f976562 100644
  		nWidth = aTmp.Width();
  		nHeight = aTmp.Height();
  	}
---- toolkit/source/helper/property.cxx.old	2009-04-06 20:47:34.000000000 +0200
-+++ toolkit/source/helper/property.cxx	2009-04-06 21:04:40.000000000 +0200
+--- toolkit/source/helper/property.cxx
++++ toolkit/source/helper/property.cxx
 @@ -274,7 +274,8 @@ ImplPropertyInfo* ImplGetPropertyInfos(
-             DECL_PROP_2     ( "URL",                    URL,                    ::rtl::OUString,    BOUND, MAYBEDEFAULT ),
-             DECL_PROP_2     ( "WritingMode",            WRITING_MODE,           sal_Int16,          BOUND, MAYBEDEFAULT ),
-             DECL_PROP_3     ( "ContextWritingMode",     CONTEXT_WRITING_MODE,   sal_Int16,          BOUND, MAYBEDEFAULT, TRANSIENT ),
+             DECL_PROP_3     ( "GridDataModel",		GRID_DATAMODEL,   Reference< ::com::sun::star::awt::grid::XGridDataModel >,          BOUND, MAYBEDEFAULT, MAYBEVOID ),
+             DECL_PROP_3     ( "ColumnModel",		GRID_COLUMNMODEL,   Reference< ::com::sun::star::awt::grid::XGridColumnModel >,          BOUND, MAYBEDEFAULT, MAYBEVOID ),
+             DECL_PROP_3     ( "SelectionModel",		GRID_SELECTIONMODE,   ::com::sun::star::view::SelectionType,          BOUND, MAYBEDEFAULT, MAYBEVOID ),
 -            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;
- 			nElements = sizeof( aImplPropertyInfos ) / sizeof( ImplPropertyInfo );
+             pPropertyInfos = aImplPropertyInfos;
+             nElements = sizeof( aImplPropertyInfos ) / sizeof( ImplPropertyInfo );
 diff --git xmlscript/source/xmldlg_imexp/xmldlg_import.cxx xmlscript/source/xmldlg_imexp/xmldlg_import.cxx
 index 9abe014..816731a 100644
 --- xmlscript/source/xmldlg_imexp/xmldlg_import.cxx