Tag: cws_src680_dba30 User: fs Date: 06/03/21 10:25:01 Modified: /dba/dbaccess/source/core/dataaccess/ documentdefinition.hxx
Log: RESYNC: (1.15-1.17); FILE MERGED File Changes: Directory: /dba/dbaccess/source/core/dataaccess/ ================================================ File [changed]: documentdefinition.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/dataaccess/documentdefinition.hxx?r1=1.12.4.4&r2=1.12.4.5 Delta lines: +12 -14 --------------------- --- documentdefinition.hxx 23 Nov 2005 10:16:15 -0000 1.12.4.4 +++ documentdefinition.hxx 21 Mar 2006 18:24:58 -0000 1.12.4.5 @@ -60,9 +60,6 @@ #ifndef _COMPHELPER_UNO3_HXX_ #include <comphelper/uno3.hxx> #endif -#ifndef _COM_SUN_STAR_EMBED_XEMBEDDEDCLIENT_HPP_ -#include <com/sun/star/embed/XEmbeddedClient.hpp> -#endif #ifndef _COM_SUN_STAR_SDBC_XCONNECTION_HPP_ #include <com/sun/star/sdbc/XConnection.hpp> #endif @@ -81,9 +78,6 @@ { //........................................................................ - typedef ::cppu::ImplHelper1< ::com::sun::star::embed::XEmbeddedClient - > ODocumentDefinition_Base; - class OInterceptor; class OEmbeddedClientHelper; //========================================================================== @@ -91,6 +85,9 @@ //= document //========================================================================== + typedef ::cppu::ImplHelper1< ::com::sun::star::embed::XComponentSupplier + > ODocumentDefinition_Base; + class ODocumentDefinition :public OContentHelper ,public ::comphelper::OPropertyStateContainer @@ -99,7 +96,7 @@ { ::com::sun::star::uno::Reference< ::com::sun::star::embed::XEmbeddedObject> m_xEmbeddedObject; ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStateChangeListener > m_xListener; - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XComponentLoader > m_xFrameLoader; + ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFramesSupplier > m_xDesktop; ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > m_xLastKnownConnection; OInterceptor* m_pInterceptor; @@ -168,18 +165,12 @@ // XComponentSupplier virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloseable > SAL_CALL getComponent( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL visibilityChanged( ::sal_Bool bVisible ) throw (::com::sun::star::embed::WrongStateException, ::com::sun::star::uno::RuntimeException); - // OPropertySetHelper virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); // XCommandProcessor virtual ::com::sun::star::uno::Any SAL_CALL execute( const ::com::sun::star::ucb::Command& aCommand, sal_Int32 CommandId, const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >& Environment ) throw (::com::sun::star::uno::Exception, ::com::sun::star::ucb::CommandAbortedException, ::com::sun::star::uno::RuntimeException) ; - // XEmbeddedClient - virtual void SAL_CALL saveObject( ) throw (::com::sun::star::embed::ObjectSaveVetoException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL onShowWindow( sal_Bool bVisible ) throw (::com::sun::star::uno::RuntimeException); - // XRename virtual void SAL_CALL rename( const ::rtl::OUString& newName ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException); @@ -200,6 +191,8 @@ */ bool prepareClose(); + static ::com::sun::star::uno::Sequence< sal_Int8 > getDefaultDocumentTypeClassId(); + /** does necessary initializations after our embedded object has been switched to ACTIVE @param _bOpenedInDesignMode determines whether the embedded object has been opened for designing it or for data display @@ -215,6 +208,11 @@ the controller which belongs to the XModel of our (active) embedded object */ void impl_initObjectEditView( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController >& _rxController ); + + /** removes the given frame from the desktop's frame collection + @raises ::com::sun::star::uno::RuntimeException + */ + void impl_removeFrameFromDesktop_throw( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _rxFrame ); protected: // OPropertyArrayUsageHelper --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
