Tag: cws_src680_removedrafts User: cd Date: 05/02/17 04:40:57 Modified: /dba/dbaccess/source/core/dataaccess/ databasedocument.cxx, datasource.hxx /dba/dbaccess/source/ui/app/ AppController.cxx, AppController.hxx, AppControllerGen.cxx, AppDetailView.cxx /dba/dbaccess/source/ui/browser/ brwctrlr.cxx, genericcontroller.cxx, unodatbr.cxx /dba/dbaccess/source/ui/control/ toolboxcontroller.cxx /dba/dbaccess/source/ui/inc/ brwctrlr.hxx, genericcontroller.hxx, querycontroller.hxx /dba/dbaccess/source/ui/querydesign/ querycontroller.cxx
Log: #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.9&r2=1.9.6.1 Delta lines: +9 -9 ------------------- --- databasedocument.cxx 2 Feb 2005 14:01:30 -0000 1.9 +++ databasedocument.cxx 17 Feb 2005 12:40:48 -0000 1.9.6.1 @@ -2,9 +2,9 @@ * * $RCSfile: databasedocument.cxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.9.6.1 $ * - * last change: $Author: rt $ $Date: 2005/02/02 14:01:30 $ + * last change: $Author: cd $ $Date: 2005/02/17 12:40:48 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -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" @@ -985,19 +985,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" )); File [changed]: datasource.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/dataaccess/datasource.hxx?r1=1.25&r2=1.25.8.1 Delta lines: +8 -8 ------------------- --- datasource.hxx 2 Feb 2005 13:59:48 -0000 1.25 +++ datasource.hxx 17 Feb 2005 12:40:49 -0000 1.25.8.1 @@ -2,9 +2,9 @@ * * $RCSfile: datasource.hxx,v $ * - * $Revision: 1.25 $ + * $Revision: 1.25.8.1 $ * - * last change: $Author: rt $ $Date: 2005/02/02 13:59:48 $ + * last change: $Author: cd $ $Date: 2005/02/17 12:40:49 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -170,8 +170,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> @@ -218,7 +218,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 > ODatabaseSource_OfficeDocument; @@ -292,7 +292,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; @@ -499,7 +499,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/app/ ======================================= File [changed]: AppController.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/app/AppController.cxx?r1=1.12&r2=1.12.16.1 Delta lines: +4 -4 ------------------- --- AppController.cxx 21 Jan 2005 17:05:05 -0000 1.12 +++ AppController.cxx 17 Feb 2005 12:40:49 -0000 1.12.16.1 @@ -2,9 +2,9 @@ * * $RCSfile: AppController.cxx,v $ * - * $Revision: 1.12 $ + * $Revision: 1.12.16.1 $ * - * last change: $Author: kz $ $Date: 2005/01/21 17:05:05 $ + * last change: $Author: cd $ $Date: 2005/02/17 12:40:49 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1543,7 +1543,7 @@ sal_Bool OApplicationController::onContainerSelect(ElementType _eType) { OSL_ENSURE(getContainer(),"View is NULL! -> GPF"); - Reference< drafts::com::sun::star::frame::XLayoutManager > xLayoutManager = getLayoutManager(getFrame()); + Reference< ::com::sun::star::frame::XLayoutManager > xLayoutManager = getLayoutManager(getFrame()); if ( xLayoutManager.is() ) { File [changed]: AppController.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/app/AppController.hxx?r1=1.8&r2=1.8.20.1 Delta lines: +4 -4 ------------------- --- AppController.hxx 21 Jan 2005 17:05:23 -0000 1.8 +++ AppController.hxx 17 Feb 2005 12:40:50 -0000 1.8.20.1 @@ -2,9 +2,9 @@ * * $RCSfile: AppController.hxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.8.20.1 $ * - * last change: $Author: kz $ $Date: 2005/01/21 17:05:23 $ + * last change: $Author: cd $ $Date: 2005/02/17 12:40:50 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -463,7 +463,7 @@ // OGenericUnoController virtual void updateTitle( ); - virtual void onLoadedMenu( const ::com::sun::star::uno::Reference< drafts::com::sun::star::frame::XLayoutManager >& _xLayoutManager ); + virtual void onLoadedMenu( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XLayoutManager >& _xLayoutManager ); virtual void impl_initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ); File [changed]: AppControllerGen.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/app/AppControllerGen.cxx?r1=1.9&r2=1.9.20.1 Delta lines: +4 -4 ------------------- --- AppControllerGen.cxx 21 Jan 2005 17:06:03 -0000 1.9 +++ AppControllerGen.cxx 17 Feb 2005 12:40:50 -0000 1.9.20.1 @@ -2,9 +2,9 @@ * * $RCSfile: AppControllerGen.cxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.9.20.1 $ * - * last change: $Author: kz $ $Date: 2005/01/21 17:06:03 $ + * last change: $Author: cd $ $Date: 2005/02/17 12:40:50 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -612,7 +612,7 @@ return bEnabled; } // ----------------------------------------------------------------------------- -void OApplicationController::onLoadedMenu(const Reference< drafts::com::sun::star::frame::XLayoutManager >& _xLayoutManager) +void OApplicationController::onLoadedMenu(const Reference< ::com::sun::star::frame::XLayoutManager >& _xLayoutManager) { if ( _xLayoutManager.is() ) File [changed]: AppDetailView.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/app/AppDetailView.cxx?r1=1.6&r2=1.6.18.1 Delta lines: +13 -13 --------------------- --- AppDetailView.cxx 21 Jan 2005 17:06:53 -0000 1.6 +++ AppDetailView.cxx 17 Feb 2005 12:40:50 -0000 1.6.18.1 @@ -2,9 +2,9 @@ * * $RCSfile: AppDetailView.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.6.18.1 $ * - * last change: $Author: kz $ $Date: 2005/01/21 17:06:53 $ + * last change: $Author: cd $ $Date: 2005/02/17 12:40:50 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -76,17 +76,17 @@ #ifndef DBAUI_IAPPELEMENTNOTIFICATION_HXX #include "IAppElementNotification.hxx" #endif -#ifndef _DRAFTS_COM_SUN_STAR_UI_XUICONFIGURATIONMANAGER_HPP_ -#include <drafts/com/sun/star/ui/XUIConfigurationManager.hpp> +#ifndef _COM_SUN_STAR_UI_XUICONFIGURATIONMANAGER_HPP_ +#include <com/sun/star/ui/XUIConfigurationManager.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_UI_XMODULEUICONFIGURATIONMANAGERSUPPLIER_HPP_ -#include <drafts/com/sun/star/ui/XModuleUIConfigurationManagerSupplier.hpp> +#ifndef _COM_SUN_STAR_UI_XMODULEUICONFIGURATIONMANAGERSUPPLIER_HPP_ +#include <com/sun/star/ui/XModuleUIConfigurationManagerSupplier.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_UI_XIMAGEMANAGER_HPP_ -#include <drafts/com/sun/star/ui/XImageManager.hpp> +#ifndef _COM_SUN_STAR_UI_XIMAGEMANAGER_HPP_ +#include <com/sun/star/ui/XImageManager.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_UI_IMAGETYPE_HPP_ -#include <drafts/com/sun/star/ui/ImageType.hpp> +#ifndef _COM_SUN_STAR_UI_IMAGETYPE_HPP_ +#include <com/sun/star/ui/ImageType.hpp> #endif #ifndef _COM_SUN_STAR_SDBCX_XVIEWSSUPPLIER_HPP_ #include <com/sun/star/sdbcx/XViewsSupplier.hpp> @@ -133,7 +133,7 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::ucb; using namespace ::com::sun::star::graphic; -using namespace ::drafts::com::sun::star::ui; +using namespace ::com::sun::star::ui; using namespace ::com::sun::star::container; #define SPACEBETWEENENTRIES 4 @@ -261,7 +261,7 @@ try { - Reference<XModuleUIConfigurationManagerSupplier> xModuleCfgMgrSupplier(getDetailView()->getBorderWin()->getView()->getORB()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("drafts.com.sun.star.ui.ModuleUIConfigurationManagerSupplier"))),UNO_QUERY); + Reference<XModuleUIConfigurationManagerSupplier> xModuleCfgMgrSupplier(getDetailView()->getBorderWin()->getView()->getORB()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ui.ModuleUIConfigurationManagerSupplier"))),UNO_QUERY); Reference<XUIConfigurationManager> xUIConfigMgr = xModuleCfgMgrSupplier->getUIConfigurationManager(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdb.DatabaseDocument"))); Reference<XImageManager> xImageMgr(xUIConfigMgr->getImageManager(),UNO_QUERY); Directory: /dba/dbaccess/source/ui/browser/ =========================================== File [changed]: brwctrlr.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/browser/brwctrlr.cxx?r1=1.85&r2=1.85.32.1 Delta lines: +4 -4 ------------------- --- brwctrlr.cxx 5 Jan 2005 12:33:18 -0000 1.85 +++ brwctrlr.cxx 17 Feb 2005 12:40:50 -0000 1.85.32.1 @@ -2,9 +2,9 @@ * * $RCSfile: brwctrlr.cxx,v $ * - * $Revision: 1.85 $ + * $Revision: 1.85.32.1 $ * - * last change: $Author: obo $ $Date: 2005/01/05 12:33:18 $ + * last change: $Author: cd $ $Date: 2005/02/17 12:40:50 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -2954,7 +2954,7 @@ xFormError->addSQLErrorListener((::com::sun::star::sdb::XSQLErrorListener*)this); } // ----------------------------------------------------------------------------- -void SbaXDataBrowserController::onLoadedMenu(const Reference< drafts::com::sun::star::frame::XLayoutManager >& _xLayoutManager) +void SbaXDataBrowserController::onLoadedMenu(const Reference< ::com::sun::star::frame::XLayoutManager >& _xLayoutManager) { OGenericUnoController::onLoadedMenu( _xLayoutManager ); File [changed]: genericcontroller.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/browser/genericcontroller.cxx?r1=1.60&r2=1.60.4.1 Delta lines: +6 -6 ------------------- --- genericcontroller.cxx 9 Feb 2005 15:18:26 -0000 1.60 +++ genericcontroller.cxx 17 Feb 2005 12:40:51 -0000 1.60.4.1 @@ -2,9 +2,9 @@ * * $RCSfile: genericcontroller.cxx,v $ * - * $Revision: 1.60 $ + * $Revision: 1.60.4.1 $ * - * last change: $Author: rt $ $Date: 2005/02/09 15:18:26 $ + * last change: $Author: cd $ $Date: 2005/02/17 12:40:51 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -962,10 +962,10 @@ ::dbaui::showError(_rInfo,getView(),getORB()); } // ----------------------------------------------------------------------------- -Reference< drafts::com::sun::star::frame::XLayoutManager > OGenericUnoController::getLayoutManager(const Reference< XFrame >& _xFrame) const +Reference< ::com::sun::star::frame::XLayoutManager > OGenericUnoController::getLayoutManager(const Reference< XFrame >& _xFrame) const { Reference< XPropertySet > xPropSet( _xFrame, UNO_QUERY ); - Reference< drafts::com::sun::star::frame::XLayoutManager > xLayoutManager; + Reference< ::com::sun::star::frame::XLayoutManager > xLayoutManager; if ( xPropSet.is() ) { try @@ -982,7 +982,7 @@ void OGenericUnoController::loadMenu(const Reference< XFrame >& _xFrame) { - Reference< drafts::com::sun::star::frame::XLayoutManager > xLayoutManager = getLayoutManager(_xFrame); + Reference< ::com::sun::star::frame::XLayoutManager > xLayoutManager = getLayoutManager(_xFrame); if ( xLayoutManager.is() ) @@ -998,7 +998,7 @@ } // ----------------------------------------------------------------------------- -void OGenericUnoController::onLoadedMenu(const Reference< drafts::com::sun::star::frame::XLayoutManager >& _xLayoutManager) +void OGenericUnoController::onLoadedMenu(const Reference< ::com::sun::star::frame::XLayoutManager >& _xLayoutManager) { // not interested in } File [changed]: unodatbr.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/browser/unodatbr.cxx?r1=1.165&r2=1.165.18.1 Delta lines: +8 -8 ------------------- --- unodatbr.cxx 21 Jan 2005 17:09:34 -0000 1.165 +++ unodatbr.cxx 17 Feb 2005 12:40:51 -0000 1.165.18.1 @@ -2,9 +2,9 @@ * * $RCSfile: unodatbr.cxx,v $ * - * $Revision: 1.165 $ + * $Revision: 1.165.18.1 $ * - * last change: $Author: kz $ $Date: 2005/01/21 17:09:34 $ + * last change: $Author: cd $ $Date: 2005/02/17 12:40:51 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -110,8 +110,8 @@ #ifndef _COM_SUN_STAR_SDBCX_XRENAME_HPP_ #include <com/sun/star/sdbcx/XRename.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_FRAME_XLAYOUTMANAGER_HPP_ -#include <drafts/com/sun/star/frame/XLayoutManager.hpp> +#ifndef _COM_SUN_STAR_FRAME_XLAYOUTMANAGER_HPP_ +#include <com/sun/star/frame/XLayoutManager.hpp> #endif #ifndef _URLOBJ_HXX //autogen #include <tools/urlobj.hxx> @@ -351,8 +351,8 @@ using namespace ::dbtools; using namespace ::svx; -using ::drafts::com::sun::star::frame::XLayoutManager; // obsolete of interface is moved outside drafts -using ::drafts::com::sun::star::ui::XUIElement; // dito +using ::com::sun::star::frame::XLayoutManager; // obsolete of interface is moved outside drafts +using ::com::sun::star::ui::XUIElement; // dito // ......................................................................... namespace dbaui @@ -3730,7 +3730,7 @@ } else if ( !m_bPreview ) { - Reference< drafts::com::sun::star::frame::XLayoutManager > xLayoutManager = getLayoutManager(_xFrame); + Reference< ::com::sun::star::frame::XLayoutManager > xLayoutManager = getLayoutManager(_xFrame); if ( xLayoutManager.is() ) { Directory: /dba/dbaccess/source/ui/control/ =========================================== File [changed]: toolboxcontroller.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/control/toolboxcontroller.cxx?r1=1.3&r2=1.3.62.1 Delta lines: +15 -15 --------------------- --- toolboxcontroller.cxx 22 Oct 2004 12:04:40 -0000 1.3 +++ toolboxcontroller.cxx 17 Feb 2005 12:40:52 -0000 1.3.62.1 @@ -2,9 +2,9 @@ * * $RCSfile: toolboxcontroller.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.3.62.1 $ * - * last change: $Author: pjunck $ $Date: 2004/10/22 12:04:40 $ + * last change: $Author: cd $ $Date: 2005/02/17 12:40:52 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -61,8 +61,8 @@ #ifndef DBACCESS_TOOLBOXCONTROLLER_HXX #include "toolboxcontroller.hxx" #endif -#ifndef _DRAFTS_COM_SUN_STAR_UI_IMAGETYPE_HPP_ -#include <drafts/com/sun/star/ui/ImageType.hpp> +#ifndef _COM_SUN_STAR_UI_IMAGETYPE_HPP_ +#include <com/sun/star/ui/ImageType.hpp> #endif #ifndef _COM_SUN_STAR_FRAME_XDISPATCHPROVIDER_HPP_ #include <com/sun/star/frame/XDispatchProvider.hpp> @@ -73,17 +73,17 @@ #ifndef _SV_MENU_HXX #include <vcl/menu.hxx> #endif -#ifndef _DRAFTS_COM_SUN_STAR_UI_XUICONFIGURATIONMANAGER_HPP_ -#include <drafts/com/sun/star/ui/XUIConfigurationManager.hpp> +#ifndef _COM_SUN_STAR_UI_XUICONFIGURATIONMANAGER_HPP_ +#include <com/sun/star/ui/XUIConfigurationManager.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_UI_XMODULEUICONFIGURATIONMANAGERSUPPLIER_HPP_ -#include <drafts/com/sun/star/ui/XModuleUIConfigurationManagerSupplier.hpp> +#ifndef _COM_SUN_STAR_UI_XMODULEUICONFIGURATIONMANAGERSUPPLIER_HPP_ +#include <com/sun/star/ui/XModuleUIConfigurationManagerSupplier.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_UI_XIMAGEMANAGER_HPP_ -#include <drafts/com/sun/star/ui/XImageManager.hpp> +#ifndef _COM_SUN_STAR_UI_XIMAGEMANAGER_HPP_ +#include <com/sun/star/ui/XImageManager.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_UI_IMAGETYPE_HPP_ -#include <drafts/com/sun/star/ui/ImageType.hpp> +#ifndef _COM_SUN_STAR_UI_IMAGETYPE_HPP_ +#include <com/sun/star/ui/ImageType.hpp> #endif #ifndef _COM_SUN_STAR_GRAPHIC_XGRAPHIC_HPP_ #include <com/sun/star/graphic/XGraphic.hpp> @@ -137,7 +137,7 @@ using namespace com::sun::star::lang; using namespace ::com::sun::star::frame; using namespace ::com::sun::star::util; - using namespace ::drafts::com::sun::star::ui; + using namespace ::com::sun::star::ui; OToolboxController::OToolboxController(const Reference< XMultiServiceFactory >& _rxORB) : m_nToolBoxId(1) @@ -239,7 +239,7 @@ try { - Reference<XModuleUIConfigurationManagerSupplier> xModuleCfgMgrSupplier(getServiceManager()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("drafts.com.sun.star.ui.ModuleUIConfigurationManagerSupplier"))),UNO_QUERY); + Reference<XModuleUIConfigurationManagerSupplier> xModuleCfgMgrSupplier(getServiceManager()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ui.ModuleUIConfigurationManagerSupplier"))),UNO_QUERY); Reference<XUIConfigurationManager> xUIConfigMgr = xModuleCfgMgrSupplier->getUIConfigurationManager(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdb.DatabaseDocument"))); Reference<XImageManager> xImageMgr(xUIConfigMgr->getImageManager(),UNO_QUERY); Directory: /dba/dbaccess/source/ui/inc/ ======================================= File [changed]: brwctrlr.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/inc/brwctrlr.hxx?r1=1.30&r2=1.30.32.1 Delta lines: +4 -4 ------------------- --- brwctrlr.hxx 5 Jan 2005 12:36:10 -0000 1.30 +++ brwctrlr.hxx 17 Feb 2005 12:40:53 -0000 1.30.32.1 @@ -2,9 +2,9 @@ * * $RCSfile: brwctrlr.hxx,v $ * - * $Revision: 1.30 $ + * $Revision: 1.30.32.1 $ * - * last change: $Author: obo $ $Date: 2005/01/05 12:36:10 $ + * last change: $Author: cd $ $Date: 2005/02/17 12:40:53 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -371,7 +371,7 @@ virtual sal_Bool SaveModified(sal_Bool bAskFor = sal_True); // save the modified record - virtual void onLoadedMenu(const ::com::sun::star::uno::Reference< drafts::com::sun::star::frame::XLayoutManager >& _xLayoutManager); + virtual void onLoadedMenu(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XLayoutManager >& _xLayoutManager); ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > getBoundField(sal_uInt16 nViewPos = (sal_uInt16)-1) const; // a PropertySet corresponding to the cursor field a column is bound to File [changed]: genericcontroller.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/inc/genericcontroller.hxx?r1=1.32&r2=1.32.32.1 Delta lines: +7 -7 ------------------- --- genericcontroller.hxx 5 Jan 2005 12:36:24 -0000 1.32 +++ genericcontroller.hxx 17 Feb 2005 12:40:53 -0000 1.32.32.1 @@ -2,9 +2,9 @@ * * $RCSfile: genericcontroller.hxx,v $ * - * $Revision: 1.32 $ + * $Revision: 1.32.32.1 $ * - * last change: $Author: obo $ $Date: 2005/01/05 12:36:24 $ + * last change: $Author: cd $ $Date: 2005/02/17 12:40:53 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -73,8 +73,8 @@ #ifndef _COM_SUN_STAR_FRAME_XDISPATCHPROVIDERINTERCEPTOR_HPP_ #include <com/sun/star/frame/XDispatchProviderInterceptor.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_FRAME_XLAYOUTMANAGER_HPP_ -#include <drafts/com/sun/star/frame/XLayoutManager.hpp> +#ifndef _COM_SUN_STAR_FRAME_XLAYOUTMANAGER_HPP_ +#include <com/sun/star/frame/XLayoutManager.hpp> #endif #ifndef _COM_SUN_STAR_FRAME_XDISPATCHINFORMATIONPROVIDER_HPP_ #include <com/sun/star/frame/XDispatchInformationProvider.hpp> @@ -296,7 +296,7 @@ @param _xLayoutManager The layout manager. */ - virtual void onLoadedMenu(const ::com::sun::star::uno::Reference< drafts::com::sun::star::frame::XLayoutManager >& _xLayoutManager); + virtual void onLoadedMenu(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XLayoutManager >& _xLayoutManager); // all the features which should be handled by this class virtual void describeSupportedFeatures(); @@ -427,7 +427,7 @@ @return The layout manager of the frame, can be <NULL/> if the frame isn't initialized. */ - ::com::sun::star::uno::Reference< drafts::com::sun::star::frame::XLayoutManager > getLayoutManager(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _xFrame) const; + ::com::sun::star::uno::Reference< ::com::sun::star::frame::XLayoutManager > getLayoutManager(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _xFrame) const; // IController virtual void executeUnChecked(const ::com::sun::star::util::URL& _rCommand, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& aArgs); File [changed]: querycontroller.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/inc/querycontroller.hxx?r1=1.30&r2=1.30.40.1 Delta lines: +4 -4 ------------------- --- querycontroller.hxx 16 Nov 2004 14:32:12 -0000 1.30 +++ querycontroller.hxx 17 Feb 2005 12:40:53 -0000 1.30.40.1 @@ -2,9 +2,9 @@ * * $RCSfile: querycontroller.hxx,v $ * - * $Revision: 1.30 $ + * $Revision: 1.30.40.1 $ * - * last change: $Author: obo $ $Date: 2004/11/16 14:32:12 $ + * last change: $Author: cd $ $Date: 2005/02/17 12:40:53 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -225,7 +225,7 @@ SAL_CALL Create(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&); protected: - virtual void onLoadedMenu(const ::com::sun::star::uno::Reference< drafts::com::sun::star::frame::XLayoutManager >& _xLayoutManager); + virtual void onLoadedMenu(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XLayoutManager >& _xLayoutManager); virtual OTableWindowData* createTableWindowData(); virtual OJoinDesignView* getJoinView(); Directory: /dba/dbaccess/source/ui/querydesign/ =============================================== File [changed]: querycontroller.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/querydesign/querycontroller.cxx?r1=1.97&r2=1.97.40.1 Delta lines: +5 -5 ------------------- --- querycontroller.cxx 16 Nov 2004 14:32:49 -0000 1.97 +++ querycontroller.cxx 17 Feb 2005 12:40:54 -0000 1.97.40.1 @@ -2,9 +2,9 @@ * * $RCSfile: querycontroller.cxx,v $ * - * $Revision: 1.97 $ + * $Revision: 1.97.40.1 $ * - * last change: $Author: obo $ $Date: 2004/11/16 14:32:49 $ + * last change: $Author: cd $ $Date: 2005/02/17 12:40:54 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -328,7 +328,7 @@ { void ensureToolbars( OQueryController* _pController, OQueryContainerWindow* _pWindow, sal_Bool _bDesign ) { - Reference< drafts::com::sun::star::frame::XLayoutManager > xLayoutManager = _pController->getLayoutManager(_pController->getFrame()); + Reference< ::com::sun::star::frame::XLayoutManager > xLayoutManager = _pController->getLayoutManager(_pController->getFrame()); if ( xLayoutManager.is() ) { xLayoutManager->lock(); @@ -896,7 +896,7 @@ } // ----------------------------------------------------------------------------- -void OQueryController::onLoadedMenu(const Reference< drafts::com::sun::star::frame::XLayoutManager >& _xLayoutManager) +void OQueryController::onLoadedMenu(const Reference< ::com::sun::star::frame::XLayoutManager >& _xLayoutManager) { ensureToolbars( this, getContainer(), m_bDesign ); } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
