INTEGRATION: CWS eforms4 (1.2.6); FILE MERGED

2005/01/06 16:38:56 mbu 1.2.6.7: #i36198
2004/12/28 09:39:27 fs 1.2.6.6: #i39451# derive from another PropertySet helper class, which also allows listener handling
2004/12/27 15:24:44 fs 1.2.6.5: #i10000#
2004/12/15 12:05:55 mbu 1.2.6.4: cloneBindingAsGhost introduced
2004/12/15 11:03:18 dvo 1.2.6.3: #i35397# use model namespaces (when possible)
Issue number:
Submitted by:
Reviewed by:
2004/12/15 10:47:57 dvo 1.2.6.2: #i38991# remove useless bindings
Issue number:
Submitted by:
Reviewed by:
2004/12/14 16:08:28 dvo 1.2.6.1: #i36765# use Interaction Handler for submission warning & submission itself
Issue number:
Submitted by:
Reviewed by:

1 files changed, 28 insertions, 29 deletions

diff --git a/forms/source/xforms/model.hxx b/forms/source/xforms/model.hxx
index af1f89e16776..ddd8f008463c 100644
--- a/forms/source/xforms/model.hxx
+++ b/forms/source/xforms/model.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: model.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: obo $ $Date: 2004-11-16 10:54:06 $
+ *  last change: $Author: vg $ $Date: 2005-03-23 11:37:16 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -113,7 +113,13 @@ namespace xforms
  *
  * See http://www.w3.org/TR/xforms/ for more information.
  */
-typedef cppu::ImplInheritanceHelper4<PropertySetBase,com::sun::star::xforms::XModel,com::sun::star::xforms::XFormsUIHelper1,com::sun::star::util::XUpdatable,com::sun::star::lang::XUnoTunnel> Model_t;
+typedef cppu::ImplInheritanceHelper4<
+    PropertySetBase,
+    com::sun::star::xforms::XModel,
+    com::sun::star::xforms::XFormsUIHelper1,
+    com::sun::star::util::XUpdatable,
+    com::sun::star::lang::XUnoTunnel
+> Model_t;
 class Model : public Model_t
 {
     // a number of local typedefs, to make the remaining header readable
@@ -127,7 +133,7 @@ class Model : public Model_t
     typedef com::sun::star::uno::Reference<com::sun::star::xforms::XSubmission> XSubmission_t;
     typedef com::sun::star::uno::Reference<com::sun::star::frame::XModel> Frame_XModel_t;
     typedef com::sun::star::uno::Reference<com::sun::star::xforms::XModel> XModel_t;
-    typedef com::sun::star::uno::Reference<com::sun::star::task::XInteractionHandler> XInteraction_t;
+    typedef com::sun::star::uno::Reference<com::sun::star::task::XInteractionHandler> XInteractionHandler_t;
 
     typedef com::sun::star::uno::Reference<com::sun::star::container::XSet> XSet_t;
     typedef com::sun::star::beans::PropertyVetoException PropertyVetoException_t;
@@ -164,7 +170,7 @@ private:
 
     bool mbInitialized;                     /// has model been initialized ?
 
-    static comphelper::PropertySetInfo* _getPropertySetInfo();
+    void initializePropertySet();
 
     void ensureAtLeastOneInstance();
 
@@ -192,6 +198,10 @@ public:
     rtl::OUString getSchemaRef() const;
     void setSchemaRef( const rtl::OUString& );
 
+    // get/set namespaces for entire model
+    XNameContainer_t getNamespaces() const;
+    void setNamespaces( const XNameContainer_t& );
+
 
 #if OSL_DEBUG_LEVEL > 1
     void dbg_assertInvariant() const;
@@ -229,6 +239,9 @@ public:
     /// has model been initialized?
     bool isInitialized() const;
 
+    /// is model currently valid (for submission)?
+    bool isValid() const;
+
 
 
     //
@@ -261,7 +274,7 @@ public:
     virtual void SAL_CALL submit( const rtl::OUString& sID )
         throw( VetoException_t, WrappedTargetException_t, RuntimeException_t );
 
-    virtual void SAL_CALL submitWithInteraction( const ::rtl::OUString& id, const XInteraction_t& _rxHandler )
+    virtual void SAL_CALL submitWithInteraction( const ::rtl::OUString& id, const XInteractionHandler_t& _rxHandler )
         throw( VetoException_t, WrappedTargetException_t, RuntimeException_t );
 
     virtual XDataTypeRepository_t SAL_CALL getDataTypeRepository(  )
@@ -346,13 +359,21 @@ public:
                                                       sal_Bool bDetail )
         throw( RuntimeException_t );
 
+    virtual XPropertySet_t SAL_CALL cloneBindingAsGhost( const XPropertySet_t& )
+        throw( RuntimeException_t );
+
+    virtual void SAL_CALL removeBindingIfUseless( const XPropertySet_t& )
+        throw( RuntimeException_t );
+
     virtual XDocument_t SAL_CALL newInstance( const rtl::OUString& sName,
                                               const rtl::OUString& sURL,
                                               sal_Bool bURLOnce )
         throw( RuntimeException_t );
 
     virtual void SAL_CALL renameInstance( const rtl::OUString& sFrom,
-                                          const rtl::OUString& sTo )
+                                          const rtl::OUString& sTo,
+                                          const rtl::OUString& sURL,
+                                          sal_Bool bURLOnce )
         throw( RuntimeException_t );
 
     virtual void SAL_CALL removeInstance( const rtl::OUString& sName )
@@ -410,28 +431,6 @@ public:
 
 
     //
-    // XPropertySet & friends:
-    //   implement abstract methods from PropertySetHelper
-    //
-
-protected:
-
-    virtual void _setPropertyValues(
-        const comphelper::PropertyMapEntry** ppEntries,
-        const Any_t* pValues )
-        throw( UnknownPropertyException_t,
-               PropertyVetoException_t,
-               IllegalArgumentException_t,
-               WrappedTargetException_t );
-
-    virtual void _getPropertyValues(
-        const comphelper::PropertyMapEntry** ppEntries,
-        Any_t* pValue )
-        throw( UnknownPropertyException_t,
-               WrappedTargetException_t );
-
-
-    //
     // XUpdatable
     //