Tag: cws_src680_warnings01
User: sb      
Date: 06/04/07 13:47:12

Modified:
 /dba/dbaccess/source/core/dataaccess/
  databasedocument.hxx

Log:
 RESYNC: (1.7-1.9); FILE MERGED

File Changes:

Directory: /dba/dbaccess/source/core/dataaccess/
================================================

File [changed]: databasedocument.hxx
Url: 
http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/dataaccess/databasedocument.hxx?r1=1.7.28.1&r2=1.7.28.2
Delta lines:  +43 -9
--------------------
--- databasedocument.hxx        24 Mar 2006 15:35:52 -0000      1.7.28.1
+++ databasedocument.hxx        7 Apr 2006 20:47:09 -0000       1.7.28.2
@@ -117,7 +117,9 @@
     ::cppu::OInterfaceContainerHelper                                  
m_aModifyListeners;
        ::cppu::OInterfaceContainerHelper                                       
m_aCloseListener;
     ::cppu::OInterfaceContainerHelper                                  
m_aDocEventListeners;
-    sal_Bool                                            m_bCommitMasterStorage;
+
+       ::com::sun::star::uno::WeakReference< 
::com::sun::star::container::XNameAccess >        m_xForms;
+       ::com::sun::star::uno::WeakReference< 
::com::sun::star::container::XNameAccess >        m_xReports;
 
        void setMeAsParent(const ::com::sun::star::uno::Reference< 
::com::sun::star::container::XNameAccess >& _xName);
 
@@ -306,10 +308,42 @@
         determines if the ownership should be transfered to the component which
         possibly vetos the closing
 
-    @throws ::com::sun::star::util::CloseVetoException
+    @raises ::com::sun::star::util::CloseVetoException
         if the closing was vetoed by any instance
     */
     void    impl_closeControllerFrames( sal_Bool _bDeliverOwnership );
+
+    /** does a reparenting at the given object container to ourself
+
+        Calls XChild::setParent at the given object, which must be one of our 
impl's or our
+        object containers (m_xForms, m_xReports, m_xTableDefinitions, 
m_xCommandDefinitions)
+    */
+    void    impl_reparent_nothrow( const ::com::sun::star::uno::WeakReference< 
::com::sun::star::container::XNameAccess >& _rxContainer );
+
+    /** clears the given object container
+
+        Clearing is done via disposal - the method calls XComponent::dispose 
at the given object,
+        which must be one of our impl's or our object containers (m_xForms, 
m_xReports,
+        m_xTableDefinitions, m_xCommandDefinitions)
+
+        @param _rxContainer
+            the container to clear
+        @param _bResetAndRelease
+            <TRUE/> if and only if the given container should also be reset 
and release.
+    */
+    void    impl_clearObjectContainer(
+                ::com::sun::star::uno::WeakReference< 
::com::sun::star::container::XNameAccess >& _rxContainer,
+                bool _bResetAndRelease = false );
+
+    /** retrieves the forms or reports contained, creates and initializes it, 
if necessary
+
+        @raises DisposedException
+            if the instance is already disposed
+        @raises IllegalArgumentException
+            if <arg>_eType</arg> is not ODatabaseModelImpl::E_FORM and not 
ODatabaseModelImpl::E_REPORT
+    */
+    ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess 
>
+            impl_getDocumentContainer_throw( ODatabaseModelImpl::ObjectType 
_eType );
 };
 
 //........................................................................




---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to