Tag: cws_src680_dba24 User: oj Date: 05/03/08 02:53:30 Modified: /dba/dbaccess/source/core/dataaccess/ databasedocument.hxx /dba/dbaccess/source/ui/dlg/ DBSetupConnectionPages.hxx
Log: merge conflict resolved 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.1.2.4&r2=1.1.2.5 Delta lines: +11 -10 --------------------- --- databasedocument.hxx 23 Feb 2005 13:23:10 -0000 1.1.2.4 +++ databasedocument.hxx 8 Mar 2005 10:53:26 -0000 1.1.2.5 @@ -2,9 +2,9 @@ * * $RCSfile: databasedocument.hxx,v $ * - * $Revision: 1.1.2.4 $ + * $Revision: 1.1.2.5 $ * - * last change: $Author: oj $ $Date: 2005/02/23 13:23:10 $ + * last change: $Author: oj $ $Date: 2005/03/08 10:53:26 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -61,8 +61,8 @@ #ifndef _DBA_COREDATAACCESS_DATABASEDOCUMENT_HXX_ #define _DBA_COREDATAACCESS_DATABASEDOCUMENT_HXX_ -#ifndef _DRAFTS_COM_SUN_STAR_UI_XUICONFIGURATIONMANAGERSUPPLIER_HPP_ -#include <drafts/com/sun/star/ui/XUIConfigurationManagerSupplier.hpp> +#ifndef _COM_SUN_STAR_UI_XUICONFIGURATIONMANAGERSUPPLIER_HPP_ +#include <com/sun/star/ui/XUIConfigurationManagerSupplier.hpp> #endif #ifndef _COM_SUN_STAR_DOCUMENT_XDOCUMENTSUBSTORAGESUPPLIER_HPP_ #include <com/sun/star/document/XDocumentSubStorageSupplier.hpp> @@ -121,16 +121,17 @@ ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > ODatabaseDocument_CreateInstance(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&); -typedef ::cppu::WeakComponentImplHelper10< ::com::sun::star::frame::XModel +typedef ::cppu::WeakComponentImplHelper11< ::com::sun::star::frame::XModel , ::com::sun::star::util::XModifiable , ::com::sun::star::frame::XStorable , ::com::sun::star::document::XEventBroadcaster + , ::com::sun::star::document::XEventListener , ::com::sun::star::embed::XTransactionListener , ::com::sun::star::view::XPrintable , ::com::sun::star::util::XCloseable , ::com::sun::star::lang::XServiceInfo , ::com::sun::star::sdb::XOfficeDatabaseDocument - , ::drafts::com::sun::star::ui::XUIConfigurationManagerSupplier + , ::com::sun::star::ui::XUIConfigurationManagerSupplier //, ::com::sun::star::document::XStorageBasedDocument > ODatabaseDocument_OfficeDocument; @@ -143,7 +144,7 @@ ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xServiceFactory; - ::com::sun::star::uno::Reference< ::drafts::com::sun::star::ui::XUIConfigurationManager> m_xUIConfigurationManager; + ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIConfigurationManager> m_xUIConfigurationManager; ::com::sun::star::uno::Reference< ::com::sun::star::document::XEventListener > m_xDocEventBroadcaster; OChildCommitListen_Impl* m_pChildCommitListen; @@ -283,7 +284,7 @@ virtual void SAL_CALL removeCloseListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloseListener >& Listener ) throw (::com::sun::star::uno::RuntimeException); // XUIConfigurationManagerSupplier - virtual ::com::sun::star::uno::Reference< ::drafts::com::sun::star::ui::XUIConfigurationManager > SAL_CALL getUIConfigurationManager( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIConfigurationManager > SAL_CALL getUIConfigurationManager( ) throw (::com::sun::star::uno::RuntimeException); // XDocumentSubStorageSupplier virtual ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > SAL_CALL getDocumentSubStorage( const ::rtl::OUString& aStorageName, sal_Int32 nMode ) throw (::com::sun::star::uno::RuntimeException); Directory: /dba/dbaccess/source/ui/dlg/ ======================================= File [changed]: DBSetupConnectionPages.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx?r1=1.2.48.1&r2=1.2.48.2 Delta lines: +4 -3 ------------------- --- DBSetupConnectionPages.hxx 4 Feb 2005 11:06:25 -0000 1.2.48.1 +++ DBSetupConnectionPages.hxx 8 Mar 2005 10:53:27 -0000 1.2.48.2 @@ -2,9 +2,9 @@ * * $RCSfile: DBSetupConnectionPages.hxx,v $ * - * $Revision: 1.2.48.1 $ + * $Revision: 1.2.48.2 $ * - * last change: $Author: oj $ $Date: 2005/02/04 11:06:25 $ + * last change: $Author: oj $ $Date: 2005/03/08 10:53:27 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -102,6 +102,7 @@ class OSpreadSheetConnectionPageSetup : public OConnectionTabPageSetup { public: + virtual BOOL FillItemSet ( SfxItemSet& _rCoreAttrs ); static OGenericAdministrationPage* CreateSpreadSheetTabPage( Window* pParent, const SfxItemSet& _rAttrSet ); OSpreadSheetConnectionPageSetup(Window* pParent, const SfxItemSet& _rCoreAttrs); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
