diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2006-08-04 12:51:17 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2006-08-04 12:51:17 +0000 |
| commit | 025597c15a5f97dd5c439d38eb56510e49e25d3a (patch) | |
| tree | 0f965ee1811aa0a50af425124d2a573e1b33051e /forms/source/component/Grid.cxx | |
| parent | fb92d3b8b5a1d05357986f69b90dc5234ba4b770 (diff) | |
INTEGRATION: CWS dba204c (1.38.12); FILE MERGED
2006/07/21 07:27:23 fs 1.38.12.1: #i47884# BorderColor is MAYBEVOID
Diffstat (limited to 'forms/source/component/Grid.cxx')
| -rw-r--r-- | forms/source/component/Grid.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/forms/source/component/Grid.cxx b/forms/source/component/Grid.cxx index 191cff8f2952..df53848d362b 100644 --- a/forms/source/component/Grid.cxx +++ b/forms/source/component/Grid.cxx @@ -4,9 +4,9 @@ * * $RCSfile: Grid.cxx,v $ * - * $Revision: 1.38 $ + * $Revision: 1.39 $ * - * last change: $Author: hr $ $Date: 2006-06-19 12:50:21 $ + * last change: $Author: ihi $ $Date: 2006-08-04 13:51:17 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -461,7 +461,7 @@ void OGridControlModel::fillProperties( DECL_PROP2(HASNAVIGATION, sal_Bool, BOUND, MAYBEDEFAULT); DECL_PROP1(ENABLED, sal_Bool, BOUND); DECL_PROP1(BORDER, sal_Int16, BOUND); - DECL_PROP1(BORDERCOLOR, sal_Int16, BOUND); + DECL_PROP2(BORDERCOLOR, sal_Int16, BOUND, MAYBEVOID); DECL_PROP1(DEFAULTCONTROL, ::rtl::OUString, BOUND); DECL_PROP3(TEXTCOLOR, sal_Int32, BOUND, MAYBEDEFAULT, MAYBEVOID); DECL_PROP3(BACKGROUNDCOLOR, sal_Int32, BOUND, MAYBEDEFAULT, MAYBEVOID); |