Tag: cws_src680_toolbars4 User: cd Date: 05/03/06 00:41:51 Modified: /dba/dbaccess/source/ui/control/ toolboxcontroller.cxx
Log: RESYNC: (1.3-1.5); FILE MERGED File Changes: 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.60.1&r2=1.3.60.2 Delta lines: +16 -16 --------------------- --- toolboxcontroller.cxx 16 Feb 2005 14:37:19 -0000 1.3.60.1 +++ toolboxcontroller.cxx 6 Mar 2005 08:41:49 -0000 1.3.60.2 @@ -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) @@ -244,8 +244,8 @@ try { - Reference<XModuleUIConfigurationManagerSupplier> xModuleCfgMgrSupplier(getServiceManager()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("drafts.com.sun.star.ui.ModuleUIConfigurationManagerSupplier"))),UNO_QUERY); - Reference<XUIConfigurationManager> xUIConfigMgr = xModuleCfgMgrSupplier->getUIConfigurationManager(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdb.DatabaseDocument"))); + 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); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
