From c8b80525e80a8ae15faa10ca8f9fb3b35596d24c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=BCdiger=20Timm?= Date: Fri, 2 Apr 2004 09:56:22 +0000 Subject: [PATCH] INTEGRATION: CWS frmvalidation (1.2.40); FILE MERGED 2004/03/11 16:46:20 fs 1.2.40.1: mass checkin - #i25106# core for validating form controls via external XValidator instances - moved the services/interfaces related to binding form controls to external value suppliers into css.form.binding (out of drafts.css.form/component) --- forms/source/component/entrylisthelper.cxx | 6 ++-- forms/source/component/entrylisthelper.hxx | 32 +++++++++++----------- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/forms/source/component/entrylisthelper.cxx b/forms/source/component/entrylisthelper.cxx index 1f42aeb2ecfa..e117a6ddec5a 100644 --- a/forms/source/component/entrylisthelper.cxx +++ b/forms/source/component/entrylisthelper.cxx @@ -2,9 +2,9 @@ * * $RCSfile: entrylisthelper.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: obo $ $Date: 2003-10-21 09:00:54 $ + * last change: $Author: rt $ $Date: 2004-04-02 10:56:10 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -80,7 +80,7 @@ namespace frm using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; - using namespace ::drafts::com::sun::star::form; + using namespace ::com::sun::star::form::binding; //===================================================================== //= OEntryListHelper diff --git a/forms/source/component/entrylisthelper.hxx b/forms/source/component/entrylisthelper.hxx index dc8af9a096c0..bc699981abd3 100644 --- a/forms/source/component/entrylisthelper.hxx +++ b/forms/source/component/entrylisthelper.hxx @@ -2,9 +2,9 @@ * * $RCSfile: entrylisthelper.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: obo $ $Date: 2003-10-21 09:01:03 $ + * last change: $Author: rt $ $Date: 2004-04-02 10:56:22 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -62,11 +62,11 @@ #ifndef FORMS_ENTRYLISTHELPER_HXX #define FORMS_ENTRYLISTHELPER_HXX -#ifndef _DRAFTS_COM_SUN_STAR_FORM_XLISTENTRYSINK_HDL_ -#include +#ifndef _COM_SUN_STAR_FORM_BINDING_XLISTENTRYSINK_HDL_ +#include #endif -#ifndef _DRAFTS_COM_SUN_STAR_FORM_XLISTENTRYLISTENER_HDL_ -#include +#ifndef _COM_SUN_STAR_FORM_BINDING_XLISTENTRYLISTENER_HDL_ +#include #endif #ifndef _COM_SUN_STAR_LANG_ILLEGALARGUMENTEXCEPTION_HPP_ #include @@ -83,8 +83,8 @@ namespace frm //===================================================================== //= OEntryListHelper //===================================================================== - typedef ::cppu::ImplHelper2 < ::drafts::com::sun::star::form::XListEntrySink - , ::drafts::com::sun::star::form::XListEntryListener + typedef ::cppu::ImplHelper2 < ::com::sun::star::form::binding::XListEntrySink + , ::com::sun::star::form::binding::XListEntryListener > OEntryListHelper_BASE; class OEntryListHelper : public OEntryListHelper_BASE @@ -92,7 +92,7 @@ namespace frm private: ::osl::Mutex& m_rMutex; - ::com::sun::star::uno::Reference< ::drafts::com::sun::star::form::XListEntrySource > + ::com::sun::star::uno::Reference< ::com::sun::star::form::binding::XListEntrySource > m_xListSource; /// our external list source ::com::sun::star::uno::Sequence< ::rtl::OUString > m_aStringItems; /// "overridden" StringItemList property value @@ -104,7 +104,7 @@ namespace frm /// returns the current string item list inline const ::com::sun::star::uno::Sequence< ::rtl::OUString >& getStringItemList() const { return m_aStringItems; } - inline const ::com::sun::star::uno::Reference< ::drafts::com::sun::star::form::XListEntrySource >& + inline const ::com::sun::star::uno::Reference< ::com::sun::star::form::binding::XListEntrySource >& getExternalListEntrySource() const { return m_xListSource; } /// determines whether we actually have an external list source @@ -165,13 +165,13 @@ namespace frm private: // XListEntrySink - virtual void SAL_CALL setListEntrySource( const ::com::sun::star::uno::Reference< ::drafts::com::sun::star::form::XListEntrySource >& _rxSource ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::drafts::com::sun::star::form::XListEntrySource > SAL_CALL getListEntrySource( ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setListEntrySource( const ::com::sun::star::uno::Reference< ::com::sun::star::form::binding::XListEntrySource >& _rxSource ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::form::binding::XListEntrySource > SAL_CALL getListEntrySource( ) throw (::com::sun::star::uno::RuntimeException); // XListEntryListener - virtual void SAL_CALL entryChanged( const ::drafts::com::sun::star::form::ListEntryEvent& _rSource ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL entryRangeInserted( const ::drafts::com::sun::star::form::ListEntryEvent& _rSource ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL entryRangeRemoved( const ::drafts::com::sun::star::form::ListEntryEvent& _rSource ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL entryChanged( const ::com::sun::star::form::binding::ListEntryEvent& _rSource ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL entryRangeInserted( const ::com::sun::star::form::binding::ListEntryEvent& _rSource ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL entryRangeRemoved( const ::com::sun::star::form::binding::ListEntryEvent& _rSource ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL allEntriesChanged( const ::com::sun::star::lang::EventObject& _rSource ) throw (::com::sun::star::uno::RuntimeException); private: /** disconnects from the active external list source, if present @@ -185,7 +185,7 @@ namespace frm @see disconnectExternalListSource */ void connectExternalListSource( - const ::com::sun::star::uno::Reference< ::drafts::com::sun::star::form::XListEntrySource >& _rxSource + const ::com::sun::star::uno::Reference< ::com::sun::star::form::binding::XListEntrySource >& _rxSource ); private: