diff options
| author | Kurt Zenker <kz@openoffice.org> | 2005-03-01 18:26:17 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2005-03-01 18:26:17 +0000 |
| commit | a90a04dc138cc7d60f128e2b25a534ff15d10af1 (patch) | |
| tree | ca2716d2c3e86820ceea7745094685155df610e1 /framework/inc | |
| parent | 46008e8b0046c6d962da7dab953c2c855d8464ef (diff) | |
INTEGRATION: CWS removedrafts (1.2.204); FILE MERGED
2005/02/17 12:45:51 cd 1.2.204.1: #i42557# move UNOIDL types from drafts to com
Diffstat (limited to 'framework/inc')
| -rw-r--r-- | framework/inc/services/popupmenucontrollerfactory.hxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/framework/inc/services/popupmenucontrollerfactory.hxx b/framework/inc/services/popupmenucontrollerfactory.hxx index 22d8137a128f..c5e946b9d20c 100644 --- a/framework/inc/services/popupmenucontrollerfactory.hxx +++ b/framework/inc/services/popupmenucontrollerfactory.hxx @@ -2,9 +2,9 @@ * * $RCSfile: popupmenucontrollerfactory.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: kz $ $Date: 2004-02-25 17:35:43 $ + * last change: $Author: kz $ $Date: 2005-03-01 19:26:17 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -113,8 +113,8 @@ #include <com/sun/star/lang/XMultiComponentFactory.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_FRAME_XUICONTROLLERREGISTRATION_HPP_ -#include <drafts/com/sun/star/frame/XUIControllerRegistration.hpp> +#ifndef _COM_SUN_STAR_FRAME_XUICONTROLLERREGISTRATION_HPP_ +#include <com/sun/star/frame/XUIControllerRegistration.hpp> #endif //_________________________________________________________________________________________________________________ @@ -136,7 +136,7 @@ class ConfigurationAccess_PopupMenuControllerFactory; class PopupMenuControllerFactory : public com::sun::star::lang::XTypeProvider , public com::sun::star::lang::XServiceInfo , public com::sun::star::lang::XMultiComponentFactory , - public drafts::com::sun::star::frame::XUIControllerRegistration , + public ::com::sun::star::frame::XUIControllerRegistration , private ThreadHelpBase , // Struct for right initalization of mutex member! Must be first of baseclasses. public ::cppu::OWeakObject { |