diff options
| author | Oliver Bolte <obo@openoffice.org> | 2004-11-16 09:36:30 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2004-11-16 09:36:30 +0000 |
| commit | 594a290bfe4cbd28a8abb211fb698a0fd9f9662a (patch) | |
| tree | 7cfdabc7ea794e4e591369ed882b4c29d84aa231 /forms/source/component/DatabaseForm.hxx | |
| parent | 25517ffb6bc251c835a77a61b671873f75afcfd1 (diff) | |
INTEGRATION: CWS eforms2 (1.20.22); FILE MERGED
2004/08/19 11:01:15 fs 1.20.22.3: #i28195# safe notification of the reset listeners
2004/08/16 17:08:44 dvo 1.20.22.2: RESYNC: (1.20-1.21); FILE MERGED
2004/08/05 10:37:44 fs 1.20.22.1: #i31958# +ControlBorderColorOnInvalid
Diffstat (limited to 'forms/source/component/DatabaseForm.hxx')
| -rw-r--r-- | forms/source/component/DatabaseForm.hxx | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/forms/source/component/DatabaseForm.hxx b/forms/source/component/DatabaseForm.hxx index f7c155831..e4098f15c 100644 --- a/forms/source/component/DatabaseForm.hxx +++ b/forms/source/component/DatabaseForm.hxx @@ -2,9 +2,9 @@ * * $RCSfile: DatabaseForm.hxx,v $ * - * $Revision: 1.21 $ + * $Revision: 1.22 $ * - * last change: $Author: hr $ $Date: 2004-08-02 16:28:00 $ + * last change: $Author: obo $ $Date: 2004-11-16 10:36:30 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -163,6 +163,9 @@ #ifndef FORMS_SOURCE_COMPONENT_FORMFILTERMANAGER_HXX #include "formfiltermanager.hxx" #endif +#ifndef FORMS_SOURCE_MISC_LISTENERCONTAINERS_HXX +#include "listenercontainers.hxx" +#endif #ifndef _COMPHELPER_PROPERTY_AGGREGATION_HXX_ #include <comphelper/propagg.hxx> @@ -210,8 +213,6 @@ namespace frm const sal_uInt16 SUCCESSFUL_REPRESENT_TEXT = 0x0001; const sal_uInt16 SUCCESSFUL_REPRESENT_FILE = 0x0002; -const ::rtl::OUString ALL_COMPONENTS_GROUP_NAME = ::rtl::OUString::createFromAscii("AllComponentGroup"); - //------------------------------------------------------------------------------ class HtmlSuccessfulObj { @@ -280,9 +281,9 @@ class ODatabaseForm :public OFormComponents ::cppu::OInterfaceContainerHelper m_aLoadListeners; ::cppu::OInterfaceContainerHelper m_aRowSetApproveListeners; ::cppu::OInterfaceContainerHelper m_aRowSetListeners; - ::cppu::OInterfaceContainerHelper m_aResetListeners; ::cppu::OInterfaceContainerHelper m_aSubmitListeners; ::cppu::OInterfaceContainerHelper m_aErrorListeners; + ResetListeners m_aResetListeners; ::osl::Mutex m_aResetSafety; ::com::sun::star::uno::Any m_aCycle; ::com::sun::star::uno::Any m_aIgnoreResult; // set when we are a subform and our master form positioned on a new row @@ -315,6 +316,7 @@ class ODatabaseForm :public OFormComponents // <properties> ::com::sun::star::uno::Any m_aControlBorderColorFocus; ::com::sun::star::uno::Any m_aControlBorderColorMouse; + ::com::sun::star::uno::Any m_aControlBorderColorInvalid; ::com::sun::star::uno::Any m_aDynamicControlBorder; ::rtl::OUString m_sName; ::rtl::OUString m_aTargetURL; |