ooo-build r14964 - in trunk: . patches/dev300 patches/vba
- From: kyoshida svn gnome org
- To: svn-commits-list gnome org
- Subject: ooo-build r14964 - in trunk: . patches/dev300 patches/vba
- Date: Tue, 30 Dec 2008 00:42:53 +0000 (UTC)
Author: kyoshida
Date: Tue Dec 30 00:42:53 2008
New Revision: 14964
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14964&view=rev
Log:
2008-12-29 Kohei Yoshida <kyoshida novell com>
* patches/dev300/forms-radio-button-group-names.diff:
* patches/vba/vba-userform-geometry-tweak.diff: re-adjusted these
patches due to their dependency on form-control-visibility.diff which
was just re-enabled in the previous commit.
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 30 00:42:53 2008
@@ -474,11 +474,12 @@
index 30a7a89..a342099 100644
--- toolkit/inc/toolkit/helper/property.hxx
+++ toolkit/inc/toolkit/helper/property.hxx
-@@ -191,6 +191,7 @@ namespace rtl {
+@@ -191,7 +191,8 @@ namespace rtl {
#define BASEPROPERTY_IMAGE_SCALE_MODE 137
#define BASEPROPERTY_WRITING_MODE 138
#define BASEPROPERTY_CONTEXT_WRITING_MODE 139
-+#define BASEPROPERTY_GROUPNAME 140 // ::rtl::OUString
+ #define BASEPROPERTY_ENABLEVISIBLE 140 // sal_Bool
++#define BASEPROPERTY_GROUPNAME 141 // ::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 30 00:42:53 2008
@@ -287,11 +287,12 @@
index a342099..5b01dd3 100644
--- toolkit/inc/toolkit/helper/property.hxx
+++ toolkit/inc/toolkit/helper/property.hxx
-@@ -192,6 +192,7 @@ namespace rtl {
+@@ -192,7 +192,8 @@ namespace rtl {
#define BASEPROPERTY_WRITING_MODE 138
#define BASEPROPERTY_CONTEXT_WRITING_MODE 139
- #define BASEPROPERTY_GROUPNAME 140 // ::rtl::OUString
-+#define BASEPROPERTY_VBAFORM 141 // sal_Bool
+ #define BASEPROPERTY_ENABLEVISIBLE 140 // sal_Bool
+ #define BASEPROPERTY_GROUPNAME 141 // ::rtl::OUString
++#define BASEPROPERTY_VBAFORM 142 // sal_Bool
// Keine gebundenen Properties, werden immer aus der Property BASEPROPERTY_FONTDESCRIPTOR entnommen.
#define BASEPROPERTY_FONTDESCRIPTORPART_START 1000
@@ -357,12 +358,13 @@
index abd26ae..3663c2e 100644
--- toolkit/source/helper/property.cxx
+++ toolkit/source/helper/property.cxx
-@@ -273,7 +273,8 @@ ImplPropertyInfo* ImplGetPropertyInfos( sal_uInt16& rElementCount )
+@@ -273,8 +273,9 @@ ImplPropertyInfo* ImplGetPropertyInfos( sal_uInt16& rElementCount )
DECL_PROP_2 ( "DialogSourceURL", DIALOGSOURCEURL, ::rtl::OUString, BOUND, MAYBEDEFAULT ),
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 ( "ContextWritingMode", CONTEXT_WRITING_MODE, sal_Int16, BOUND, MAYBEDEFAULT, TRANSIENT ),
+ DECL_PROP_3 ( "ContextWritingMode", CONTEXT_WRITING_MODE, sal_Int16, BOUND, MAYBEDEFAULT, TRANSIENT ),
+- 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;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]