User: rt Date: 2007-07-24 12:04:21+0000 Modified: dba/dbaccess/source/core/dataaccess/ModelImpl.hxx
Log: INTEGRATION: CWS dba23b (1.14.66); FILE MERGED 2007/07/07 20:21:09 fs 1.14.66.3: during #i78593#: don't re-create the Settings property bag when it's not necessary 2007/06/28 09:02:47 fs 1.14.66.2: #i78362# controllers and current controller now maintained by the DatabaseDocument, not by the ModelImpl (since they're an XModel aspect) 2007/06/12 13:17:53 fs 1.14.66.1: removed declaration of non-existent methods File Changes: Directory: /dba/dbaccess/source/core/dataaccess/ ================================================ File [changed]: ModelImpl.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/dataaccess/ModelImpl.hxx?r1=1.14&r2=1.15 Delta lines: +5 -51 -------------------- --- ModelImpl.hxx 2006-12-01 17:29:08+0000 1.14 +++ ModelImpl.hxx 2007-07-24 12:04:18+0000 1.15 @@ -213,8 +213,6 @@ //============================================================ DECLARE_STL_USTRINGACCESS_MAP(::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >,TStorages); -typedef ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController > > ControllerArray; - class ODatabaseContext; class DocumentStorageAccess; class OSharedConnectionManager; @@ -242,7 +240,6 @@ ::std::vector<TContentPtr> m_aContainer; TStorages m_aStorages; - ControllerArray m_aControllers; ::com::sun::star::uno::WeakReference< ::com::sun::star::container::XNameAccess > m_xCommandDefinitions; ::com::sun::star::uno::WeakReference< ::com::sun::star::container::XNameAccess > m_xTableDefinitions; @@ -287,7 +284,6 @@ // ::cppu::OInterfaceContainerHelper m_aStorageListeners; ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener> m_xSharedConnectionManager; - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController> m_xCurrentController; ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > m_xStorage; ODatabaseContext* m_pDBContext; @@ -297,7 +293,7 @@ sal_Bool m_bOwnStorage; - void lateInit(); + void reset(); /** determines whether the database document has an embedded data storage */ @@ -320,22 +316,6 @@ SAL_THROW(( ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException )); - /** dispose all frames for registered controllers - */ - void disposeControllerFrames(); - - /** notifies the global event broadcaster - @param _sEventName - One of - OnNew => new document - OnLoad => load document - OnUnload => close document - OnSaveDone => "Save" ended - OnSaveAsDone => "SaveAs" ended - OnModifyChanged => modified/unmodified - */ - void notifyEvent(const ::rtl::OUString& _sEventName); - ODatabaseModelImpl( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory , const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel>& _xModel = ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel>() @@ -348,44 +328,15 @@ ,ODatabaseContext* _pDBContext = NULL ); -// com::sun::star::beans::XPropertySet - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); // XEventListener void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException); void setModified( sal_Bool bModified ); -// ::com::sun::star::sdb::XCompletedConnection - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL connectWithCompletion( const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& handler ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - -// ::com::sun::star::sdbc::XDataSource - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL getConnection( const ::rtl::OUString& user, const ::rtl::OUString& password ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - void SAL_CALL setLoginTimeout( sal_Int32 seconds ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - sal_Int32 SAL_CALL getLoginTimeout( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - -// :: com::sun::star::sdb::XBookmarksSupplier - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getBookmarks( ) throw (::com::sun::star::uno::RuntimeException); - -// :: com::sun::star::sdb::XQueryDefinitionsSupplier - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getQueryDefinitions( ) throw(::com::sun::star::uno::RuntimeException); - -// ::com::sun::star::sdbc::XIsolatedConnection - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL getIsolatedConnection( const ::rtl::OUString& user, const ::rtl::OUString& password ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL getIsolatedConnectionWithCompletion( const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& handler ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); void dispose(); ::rtl::OUString getURL(); -// ::com::sun::star::util::XModifyBroadcaster - void SAL_CALL addModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) throw (::com::sun::star::uno::RuntimeException); - void SAL_CALL removeModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) throw (::com::sun::star::uno::RuntimeException); - -// ::com::sun::star::document::XEventListener - void SAL_CALL notifyEvent( const ::com::sun::star::document::EventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException); - -// XCloseable - void SAL_CALL close( sal_Bool DeliverOwnership ) throw (::com::sun::star::util::CloseVetoException, ::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage> getStorage(const ::rtl::OUString& _sStorageName,sal_Int32 nMode = ::com::sun::star::embed::ElementModes::READWRITE); // helper const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier >& @@ -468,6 +419,9 @@ /// returns a all known data source settings, including their default values static const AsciiPropertyValue* getDefaultDataSourceSettings(); + +private: + void impl_construct_nothrow(); }; /** a small base class for UNO components whose functionality depends on a ODatabaseModelImpl --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
