diff options
| author | Kurt Zenker <kz@openoffice.org> | 2005-03-01 18:45:33 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2005-03-01 18:45:33 +0000 |
| commit | 9ecaf5521598ed37f255510456bddf4fa439375c (patch) | |
| tree | 077a47e86a3fa6661cfdf752557fc7e9d8bf4f15 /framework | |
| parent | 68d37f4be9989415af00b1168f1bfcea5d478717 (diff) | |
INTEGRATION: CWS removedrafts (1.2.160); FILE MERGED
2005/02/17 12:47:51 cd 1.2.160.1: #i42557# move UNOIDL types from drafts to com
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/source/uifactory/addonstoolboxfactory.cxx | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/framework/source/uifactory/addonstoolboxfactory.cxx b/framework/source/uifactory/addonstoolboxfactory.cxx index fb9d642ce4c5..7bef885f5b2d 100644 --- a/framework/source/uifactory/addonstoolboxfactory.cxx +++ b/framework/source/uifactory/addonstoolboxfactory.cxx @@ -2,9 +2,9 @@ * * $RCSfile: addonstoolboxfactory.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: obo $ $Date: 2004-07-06 17:02:43 $ + * last change: $Author: kz $ $Date: 2005-03-01 19:45:33 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -95,12 +95,12 @@ #include <com/sun/star/lang/XInitialization.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_XUICONFIGURATIONMANAGERSUPLLIER_HPP_ -#include <drafts/com/sun/star/ui/XUIConfigurationManagerSupplier.hpp> +#ifndef _COM_SUN_STAR_UI_XUICONFIGURATIONMANAGERSUPLLIER_HPP_ +#include <com/sun/star/ui/XUIConfigurationManagerSupplier.hpp> #endif //_________________________________________________________________________________________________________________ @@ -128,7 +128,7 @@ using namespace com::sun::star::lang; using namespace com::sun::star::frame; using namespace com::sun::star::beans; using namespace com::sun::star::util; -using namespace drafts::com::sun::star::ui; +using namespace ::com::sun::star::ui; namespace framework { @@ -140,13 +140,13 @@ DEFINE_XINTERFACE_3 ( AddonsToolBoxFactory OWeakObject , DIRECT_INTERFACE( css::lang::XTypeProvider ), DIRECT_INTERFACE( css::lang::XServiceInfo ), - DIRECT_INTERFACE( drafts::com::sun::star::ui::XUIElementFactory ) + DIRECT_INTERFACE( ::com::sun::star::ui::XUIElementFactory ) ) DEFINE_XTYPEPROVIDER_3 ( AddonsToolBoxFactory , css::lang::XTypeProvider , css::lang::XServiceInfo , - drafts::com::sun::star::ui::XUIElementFactory + ::com::sun::star::ui::XUIElementFactory ) DEFINE_XSERVICEINFO_ONEINSTANCESERVICE ( AddonsToolBoxFactory , @@ -162,7 +162,7 @@ AddonsToolBoxFactory::AddonsToolBoxFactory( ThreadHelpBase( &Application::GetSolarMutex() ) , m_xServiceManager( xServiceManager ) , m_xModuleManager( xServiceManager->createInstance( - OUString( RTL_CONSTASCII_USTRINGPARAM( "drafts.com.sun.star.frame.ModuleManager" ))), + OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.ModuleManager" ))), UNO_QUERY ) { } @@ -264,7 +264,7 @@ throw ( ::com::sun::star::container::NoSuchElementException, } } - Reference< drafts::com::sun::star::ui::XUIElement > xToolBar; + Reference< ::com::sun::star::ui::XUIElement > xToolBar; if ( xFrame.is() && ( aConfigData.getLength()> 0 ) && hasButtonsInContext( aConfigData, xModel )) @@ -283,7 +283,7 @@ throw ( ::com::sun::star::container::NoSuchElementException, vos::OGuard aGuard( Application::GetSolarMutex() ); AddonsToolBarWrapper* pToolBarWrapper = new AddonsToolBarWrapper( m_xServiceManager ); - xToolBar = Reference< drafts::com::sun::star::ui::XUIElement >( (OWeakObject *)pToolBarWrapper, UNO_QUERY ); + xToolBar = Reference< ::com::sun::star::ui::XUIElement >( (OWeakObject *)pToolBarWrapper, UNO_QUERY ); Reference< XInitialization > xInit( xToolBar, UNO_QUERY ); xInit->initialize( aPropSeq ); } |