User: kz      
Date: 05/03/01 11:14:10

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

Log:
 INTEGRATION: CWS removedrafts (1.25.8); FILE MERGED
 2005/02/17 12:40:49 cd 1.25.8.1: #i42557# move UNOIDL types from drafts to com

File Changes:

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

File [changed]: datasource.hxx
Url: 
http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/dataaccess/datasource.hxx?r1=1.26&r2=1.27
Delta lines:  +5 -5
-------------------
--- datasource.hxx      16 Feb 2005 15:59:18 -0000      1.26
+++ datasource.hxx      1 Mar 2005 19:14:07 -0000       1.27
@@ -176,8 +176,8 @@
 #ifndef DBA_CONTENTHELPER_HXX
 #include "ContentHelper.hxx"
 #endif
-#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>
@@ -224,7 +224,7 @@
                                                        ,       
::com::sun::star::sdb::XFormDocumentsSupplier
                                                        ,       
::com::sun::star::sdb::XReportDocumentsSupplier
                                                        ,       
::com::sun::star::util::XCloseable
-                                                       ,       
::drafts::com::sun::star::ui::XUIConfigurationManagerSupplier
+                                                       ,       
::com::sun::star::ui::XUIConfigurationManagerSupplier
                                                        ,       
::com::sun::star::document::XDocumentSubStorageSupplier
                             , ::com::sun::star::embed::XTransactionListener
                                                        >       
ODatabaseSource_OfficeDocument; 
@@ -299,7 +299,7 @@
        ::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;
-       ::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;
 
 
@@ -506,7 +506,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);




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

Reply via email to