diff options
| author | Kurt Zenker <kz@openoffice.org> | 2005-03-01 18:32:03 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2005-03-01 18:32:03 +0000 |
| commit | 93eb69aa09f4177665182987b265adcfd5684996 (patch) | |
| tree | 484d6cfa218711882577804b7c1939d0a1a72598 /framework/inc/uifactory | |
| parent | 589dd7e85e5eac3a9e417ee61d90a2ec9b7538c5 (diff) | |
INTEGRATION: CWS removedrafts (1.2.160); FILE MERGED
2005/02/17 12:45:56 cd 1.2.160.1: #i42557# move UNOIDL types from drafts to com
Diffstat (limited to 'framework/inc/uifactory')
| -rw-r--r-- | framework/inc/uifactory/addonstoolboxfactory.hxx | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/framework/inc/uifactory/addonstoolboxfactory.hxx b/framework/inc/uifactory/addonstoolboxfactory.hxx index df1f1efbf108..f80e75064b6c 100644 --- a/framework/inc/uifactory/addonstoolboxfactory.hxx +++ b/framework/inc/uifactory/addonstoolboxfactory.hxx @@ -2,9 +2,9 @@ * * $RCSfile: addonstoolboxfactory.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: obo $ $Date: 2004-07-06 16:54:12 $ + * last change: $Author: kz $ $Date: 2005-03-01 19:32:03 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -114,12 +114,12 @@ #include <com/sun/star/beans/PropertyValue.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_UI_XUIELEMENTFACTORY_HPP_ -#include <drafts/com/sun/star/ui/XUIElementFactory.hpp> +#ifndef _COM_SUN_STAR_UI_XUIELEMENTFACTORY_HPP_ +#include <com/sun/star/ui/XUIElementFactory.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_FRAME_XMODULEMANAGER_HPP_ -#include <drafts/com/sun/star/frame/XModuleManager.hpp> +#ifndef _COM_SUN_STAR_FRAME_XMODULEMANAGER_HPP_ +#include <com/sun/star/frame/XModuleManager.hpp> #endif #ifndef _COM_SUN_STAR_FRAME_XFRAME_HPP_ @@ -147,7 +147,7 @@ namespace framework class AddonsToolBoxFactory : public com::sun::star::lang::XTypeProvider , public com::sun::star::lang::XServiceInfo , - public drafts::com::sun::star::ui::XUIElementFactory , + public ::com::sun::star::ui::XUIElementFactory , protected ThreadHelpBase , // Struct for right initalization of mutex member! Must be first of baseclasses. public ::cppu::OWeakObject { @@ -161,14 +161,14 @@ class AddonsToolBoxFactory : public com::sun::star::lang::XTypeProvider DECLARE_XTYPEPROVIDER // XUIElementFactory - virtual ::com::sun::star::uno::Reference< ::drafts::com::sun::star::ui::XUIElement > SAL_CALL createUIElement( const ::rtl::OUString& ResourceURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& Args ) throw ( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIElement > SAL_CALL createUIElement( const ::rtl::OUString& ResourceURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& Args ) throw ( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException ); sal_Bool hasButtonsInContext( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > >& rPropSeq, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& rModel ); private: ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xServiceManager; - ::com::sun::star::uno::Reference< ::drafts::com::sun::star::frame::XModuleManager > m_xModuleManager; + ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModuleManager > m_xModuleManager; }; } |