diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-04-13 10:12:46 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-04-13 10:12:46 +0000 |
| commit | d1c90e3424fc6c9b1fb3657c992afd35731f50f0 (patch) | |
| tree | 90c656d1414e61f5acfd330b092ac0bc43f5db3a /forms/source/component/Columns.hxx | |
| parent | e41a1a8e6b2cc90c5895550e8a0ddf30063091e8 (diff) | |
INTEGRATION: CWS frmcontrols02 (1.6.20); FILE MERGED
2004/01/23 17:45:14 fs 1.6.20.1: changed some string definitions during #i24411#
Diffstat (limited to 'forms/source/component/Columns.hxx')
| -rw-r--r-- | forms/source/component/Columns.hxx | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/forms/source/component/Columns.hxx b/forms/source/component/Columns.hxx index c04374ff0..323096d8f 100644 --- a/forms/source/component/Columns.hxx +++ b/forms/source/component/Columns.hxx @@ -2,9 +2,9 @@ * * $RCSfile: Columns.hxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: obo $ $Date: 2003-10-21 08:55:24 $ + * last change: $Author: hr $ $Date: 2004-04-13 11:12:46 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -74,7 +74,9 @@ #ifndef _COMPHELPER_UNO3_HXX_ #include <comphelper/uno3.hxx> #endif -#include "strings.hxx" +#ifndef FRM_STRINGS_HXX +#include "frm_strings.hxx" +#endif #ifndef _COM_SUN_STAR_CONTAINER_XCHILD_HPP_ #include <com/sun/star/container/XChild.hpp> @@ -226,19 +228,6 @@ void ClassName::fillProperties( \ } \ } \ -// liste der moeglichen Controls -DECLARE_CONSTASCII_USTRING(FRM_COL_TEXTFIELD); -DECLARE_CONSTASCII_USTRING(FRM_COL_CHECKBOX); -DECLARE_CONSTASCII_USTRING(FRM_COL_COMBOBOX); -DECLARE_CONSTASCII_USTRING(FRM_COL_LISTBOX); -DECLARE_CONSTASCII_USTRING(FRM_COL_NUMERICFIELD); -DECLARE_CONSTASCII_USTRING(FRM_COL_DATEFIELD); -DECLARE_CONSTASCII_USTRING(FRM_COL_TIMEFIELD); -DECLARE_CONSTASCII_USTRING(FRM_COL_CURRENCYFIELD); -DECLARE_CONSTASCII_USTRING(FRM_COL_PATTERNFIELD); -DECLARE_CONSTASCII_USTRING(FRM_COL_FORMATTEDFIELD); - - // column type ids #define TYPE_CHECKBOX 0 #define TYPE_COMBOBOX 1 |