diff options
| author | Kurt Zenker <kz@openoffice.org> | 2005-03-01 18:32:30 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2005-03-01 18:32:30 +0000 |
| commit | 11e3022bcb80a9c30e535f35108a57e148c26eaf (patch) | |
| tree | 472a1680a8b7521ce5ff4a3f95da718291a3b247 | |
| parent | 62d9bd0762fae7b488024e442ec8d0aeb55d8950 (diff) | |
INTEGRATION: CWS removedrafts (1.3.114); FILE MERGED
2005/02/17 12:45:57 cd 1.3.114.1: #i42557# move UNOIDL types from drafts to com
| -rw-r--r-- | framework/inc/uifactory/popupmenucontrollerfactory.hxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/framework/inc/uifactory/popupmenucontrollerfactory.hxx b/framework/inc/uifactory/popupmenucontrollerfactory.hxx index b0360c88a2..995fb73305 100644 --- a/framework/inc/uifactory/popupmenucontrollerfactory.hxx +++ b/framework/inc/uifactory/popupmenucontrollerfactory.hxx @@ -2,9 +2,9 @@ * * $RCSfile: popupmenucontrollerfactory.hxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: rt $ $Date: 2004-09-08 14:07:53 $ + * last change: $Author: kz $ $Date: 2005-03-01 19:32:30 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -112,8 +112,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 //_________________________________________________________________________________________________________________ @@ -135,7 +135,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 { |