diff options
author | Kurt Zenker <kz@openoffice.org> | 2005-03-01 19:52:28 +0000 |
---|---|---|
committer | Kurt Zenker <kz@openoffice.org> | 2005-03-01 19:52:28 +0000 |
commit | fc15d5f78890578a6ecdc7f596974935177d662c (patch) | |
tree | 037114b3d1d842a54f7cace72feaca4abd325165 /dbaccess/source/ui/control/toolboxcontroller.cxx | |
parent | 618cc0ec5c3956a7ea02d7545b79624f2bc64db5 (diff) |
INTEGRATION: CWS removedrafts (1.3.62); FILE MERGED
2005/02/17 12:40:52 cd 1.3.62.1: #i42557# move UNOIDL types from drafts to com
Diffstat (limited to 'dbaccess/source/ui/control/toolboxcontroller.cxx')
-rw-r--r-- | dbaccess/source/ui/control/toolboxcontroller.cxx | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/dbaccess/source/ui/control/toolboxcontroller.cxx b/dbaccess/source/ui/control/toolboxcontroller.cxx index 7ba70ccfdda7..c0ad3ea64244 100644 --- a/dbaccess/source/ui/control/toolboxcontroller.cxx +++ b/dbaccess/source/ui/control/toolboxcontroller.cxx @@ -2,9 +2,9 @@ * * $RCSfile: toolboxcontroller.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: vg $ $Date: 2005-02-17 11:07:19 $ + * last change: $Author: kz $ $Date: 2005-03-01 20:52:28 $ * * 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 @@ namespace dbaui 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 @@ namespace dbaui 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.OfficeDatabaseDocument"))); Reference<XImageManager> xImageMgr(xUIConfigMgr->getImageManager(),UNO_QUERY); |