User: kz Date: 05/03/01 11:13:56 Modified: /dba/dbaccess/source/core/dataaccess/ databasedocument.cxx
Log: INTEGRATION: CWS removedrafts (1.9.6); FILE MERGED 2005/02/17 12:40:48 cd 1.9.6.1: #i42557# move UNOIDL types from drafts to com File Changes: Directory: /dba/dbaccess/source/core/dataaccess/ ================================================ File [changed]: databasedocument.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/dataaccess/databasedocument.cxx?r1=1.11&r2=1.12 Delta lines: +9 -9 ------------------- --- databasedocument.cxx 18 Feb 2005 10:58:28 -0000 1.11 +++ databasedocument.cxx 1 Mar 2005 19:13:53 -0000 1.12 @@ -103,8 +103,8 @@ #ifndef _COMPHELPER_MEDIADESCRIPTOR_HXX_ #include <comphelper/mediadescriptor.hxx> #endif -#ifndef _DRAFTS_COM_SUN_STAR_UI_XUICONFIGURATIONSTORAGE_HPP_ -#include <drafts/com/sun/star/ui/XUIConfigurationStorage.hpp> +#ifndef _COM_SUN_STAR_UI_XUICONFIGURATIONSTORAGE_HPP_ +#include <com/sun/star/ui/XUIConfigurationStorage.hpp> #endif #ifndef DBA_COREDATAACCESS_COMMITLISTENER_HXX #include "commitlistener.hxx" @@ -976,19 +976,19 @@ setModified(sal_True); } // ----------------------------------------------------------------------------- -Reference< ::drafts::com::sun::star::ui::XUIConfigurationManager > SAL_CALL ODatabaseSource::getUIConfigurationManager( ) throw (RuntimeException) +Reference< ::com::sun::star::ui::XUIConfigurationManager > SAL_CALL ODatabaseSource::getUIConfigurationManager( ) throw (RuntimeException) { MutexGuard aGuard(m_aMutex); if (OComponentHelper::rBHelper.bDisposed) throw DisposedException(); if ( !m_xUIConfigurationManager.is() ) { - m_xUIConfigurationManager = Reference< ::drafts::com::sun::star::ui::XUIConfigurationManager >( + m_xUIConfigurationManager = Reference< ::com::sun::star::ui::XUIConfigurationManager >( m_xServiceFactory->createInstance( - ::rtl::OUString::createFromAscii( "drafts.com.sun.star.ui.UIConfigurationManager" )), + ::rtl::OUString::createFromAscii( "com.sun.star.ui.UIConfigurationManager" )), UNO_QUERY ); - Reference< ::drafts::com::sun::star::ui::XUIConfigurationStorage > xUIConfigStorage( m_xUIConfigurationManager, UNO_QUERY ); + Reference< ::com::sun::star::ui::XUIConfigurationStorage > xUIConfigStorage( m_xUIConfigurationManager, UNO_QUERY ); if ( xUIConfigStorage.is() ) { rtl::OUString aUIConfigFolderName( RTL_CONSTASCII_USTRINGPARAM( "Configurations2" )); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
