diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-11-01 13:54:18 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-11-01 13:54:18 +0000 |
| commit | 9281f1ef37805bb799db5e9fbed47fe3729e406a (patch) | |
| tree | 20c5182d4ead02b178a86518d9d2f6675e3fa7f4 /forms | |
| parent | d087bb2f16827cbf50ab6788c62b89137d74a58d (diff) | |
INTEGRATION: CWS dba24b (1.11.38); FILE MERGED
2007/09/06 08:02:25 fs 1.11.38.2: fix #i76024# for combo boxes, too
2007/09/04 21:34:57 fs 1.11.38.1: #i73237# use the new FormatterColumnValue class, which encapsulates what we previously did manually (format column values according to the column's format)
Diffstat (limited to 'forms')
| -rw-r--r-- | forms/source/component/ComboBox.hxx | 54 |
1 files changed, 19 insertions, 35 deletions
diff --git a/forms/source/component/ComboBox.hxx b/forms/source/component/ComboBox.hxx index 4661ff06610f..f4e319c10d8c 100644 --- a/forms/source/component/ComboBox.hxx +++ b/forms/source/component/ComboBox.hxx @@ -4,9 +4,9 @@ * * $RCSfile: ComboBox.hxx,v $ * - * $Revision: 1.11 $ + * $Revision: 1.12 $ * - * last change: $Author: obo $ $Date: 2007-03-09 13:22:08 $ + * last change: $Author: hr $ $Date: 2007-11-01 14:54:18 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -36,43 +36,27 @@ #ifndef _FORMS_COMBOBOX_HXX_ #define _FORMS_COMBOBOX_HXX_ -#ifndef _FORMS_FORMCOMPONENT_HXX_ #include "FormComponent.hxx" -#endif -#ifndef _CPPUHELPER_INTERFACECONTAINER_HXX_ -#include <cppuhelper/interfacecontainer.hxx> -#endif -#ifndef _DATE_HXX -#include <tools/date.hxx> -#endif -#ifndef _SV_TIMER_HXX -#include <vcl/timer.hxx> -#endif +#include "errorbroadcaster.hxx" +#include "entrylisthelper.hxx" +#include "cachedrowset.hxx" -#ifndef _COM_SUN_STAR_UTIL_XREFRESHABLE_HPP_ +/** === begin UNO includes === **/ #include <com/sun/star/util/XRefreshable.hpp> -#endif -#ifndef _COM_SUN_STAR_UTIL_XNUMBERFORMATTER_HPP_ #include <com/sun/star/util/XNumberFormatter.hpp> -#endif -#ifndef _COM_SUN_STAR_SDB_XSQLERRORBROADCASTER_HPP_ #include <com/sun/star/sdb/XSQLErrorBroadcaster.hpp> -#endif -#ifndef _COM_SUN_STAR_FORM_LISTSOURCETYPE_HPP_ #include <com/sun/star/form/ListSourceType.hpp> -#endif -#ifndef _COM_SUN_STAR_AWT_XITEMLISTENER_HPP_ #include <com/sun/star/awt/XItemListener.hpp> -#endif -#ifndef _COM_SUN_STAR_AWT_XFOCUSLISTENER_HPP_ #include <com/sun/star/awt/XFocusListener.hpp> -#endif -#ifndef FORMS_ERRORBROADCASTER_HXX -#include "errorbroadcaster.hxx" -#endif -#ifndef FORMS_ENTRYLISTHELPER_HXX -#include "entrylisthelper.hxx" -#endif +/** === end UNO includes === **/ + +#include <connectivity/formattedcolumnvalue.hxx> + +#include <cppuhelper/interfacecontainer.hxx> + +#include <vcl/timer.hxx> + +#include <tools/date.hxx> //......................................................................... namespace frm @@ -86,6 +70,7 @@ class OComboBoxModel ,public OEntryListHelper ,public OErrorBroadcaster { + CachedRowSet m_aListRowSet; // the row set to fill the list ::com::sun::star::uno::Any m_aBoundColumn; // obsolet ::rtl::OUString m_aListSource; // ::rtl::OUString m_aDefaultText; // DefaultText @@ -99,12 +84,11 @@ class OComboBoxModel ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter> m_xFormatter; ::com::sun::star::form::ListSourceType m_eListSourceType; // type der list source - ::com::sun::star::util::Date m_aNullDate; - sal_Int32 m_nFormatKey; - sal_Int16 m_nFieldType; - sal_Int16 m_nKeyType; sal_Bool m_bEmptyIsNull; // LeerString wird als NULL interpretiert + ::std::auto_ptr< ::dbtools::FormattedColumnValue > + m_pValueFormatter; + protected: |