diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-07-31 13:07:38 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-07-31 13:07:38 +0000 |
| commit | 70e6a5d6194c349de50861c28fdafa40e3920b43 (patch) | |
| tree | d2ee3fb3b4a9d4a6adcb6398db3818603f95ca38 /extensions/source/propctrlr/formmetadata.cxx | |
| parent | 505ebd2b0f735e590e60696a88aa8a6021e011d9 (diff) | |
INTEGRATION: CWS dba23c (1.45.18); FILE MERGED
2007/07/20 21:02:54 fs 1.45.18.1: #i79731# remove ROW_HEIGHT, it is already present as ROWHEIGHT
Diffstat (limited to 'extensions/source/propctrlr/formmetadata.cxx')
| -rw-r--r-- | extensions/source/propctrlr/formmetadata.cxx | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/extensions/source/propctrlr/formmetadata.cxx b/extensions/source/propctrlr/formmetadata.cxx index 950bda0c1090..6a1fc67a656b 100644 --- a/extensions/source/propctrlr/formmetadata.cxx +++ b/extensions/source/propctrlr/formmetadata.cxx @@ -4,9 +4,9 @@ * * $RCSfile: formmetadata.cxx,v $ * - * $Revision: 1.45 $ + * $Revision: 1.46 $ * - * last change: $Author: rt $ $Date: 2007-07-03 13:06:11 $ + * last change: $Author: hr $ $Date: 2007-07-31 14:07:38 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -318,7 +318,7 @@ namespace pcr DEF_INFO_4( VISUALEFFECT, VISUALEFFECT, VISUALEFFECT, FORM_VISIBLE, DIALOG_VISIBLE, ENUM_ONE, COMPOSEABLE ), DEF_INFO_4( ALIGN, ALIGN, ALIGN, FORM_VISIBLE, DIALOG_VISIBLE, ENUM, COMPOSEABLE ), DEF_INFO_3( VERTICAL_ALIGN, VERTICAL_ALIGN, VERTICAL_ALIGN, FORM_VISIBLE, ENUM, COMPOSEABLE ), - DEF_INFO_2( ROWHEIGHT, ROWHEIGHT, ROWHEIGHT, FORM_VISIBLE, COMPOSEABLE ), + DEF_INFO_3( ROWHEIGHT, ROWHEIGHT, ROWHEIGHT, FORM_VISIBLE, DIALOG_VISIBLE, COMPOSEABLE ), DEF_INFO_3( BACKGROUNDCOLOR, BACKGROUNDCOLOR, BACKGROUNDCOLOR, FORM_VISIBLE, DIALOG_VISIBLE, COMPOSEABLE ), DEF_INFO_3( SYMBOLCOLOR, SYMBOLCOLOR, SYMBOLCOLOR, FORM_VISIBLE, DIALOG_VISIBLE, COMPOSEABLE ), DEF_INFO_3( FILLCOLOR, FILLCOLOR, FILLCOLOR, FORM_VISIBLE, DIALOG_VISIBLE, COMPOSEABLE ), @@ -374,8 +374,6 @@ namespace pcr DEF_INFO_2( SHOWS_ROOT_HANDLES, SHOWS_ROOT_HANDLES, SHOWS_ROOT_HANDLES, DIALOG_VISIBLE, COMPOSEABLE ), DEF_INFO_2( EDITABLE, EDITABLE, EDITABLE, DIALOG_VISIBLE, COMPOSEABLE ), DEF_INFO_2( INVOKES_STOP_NOT_EDITING, INVOKES_STOP_NOT_EDITING, INVOKES_STOP_NOT_EDITING, DIALOG_VISIBLE, COMPOSEABLE ), - DEF_INFO_2( ROW_HEIGHT, ROW_HEIGHT, ROW_HEIGHT, DIALOG_VISIBLE, COMPOSEABLE ), - DEF_INFO_3( HELPURL, HELPURL, HELPURL, FORM_VISIBLE, DIALOG_VISIBLE, COMPOSEABLE ), DEF_INFO_2( DECORATION, DECORATION, DECORATION, DIALOG_VISIBLE, COMPOSEABLE ) }; @@ -388,6 +386,13 @@ namespace pcr sizeof(OPropertyInfoImpl), &PropertyInfoCompare); +#if OSL_DEBUG_LEVEL > 0 + for ( const OPropertyInfoImpl* pCheck = s_pPropertyInfos; pCheck != s_pPropertyInfos + s_nCount - 1; ++pCheck ) + { + OSL_ENSURE( pCheck->sName != ( pCheck + 1 )->sName, "OPropertyInfoService::getPropertyInfo: duplicate entry in the table!" ); + } +#endif + return s_pPropertyInfos; } |