strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS removedrafts (1.3.114); FILE MERGED

Browse source 
2005/02/17 12:45:57 cd 1.3.114.1: #i42557# move UNOIDL types from drafts to com
This commit is contained in:
Kurt Zenker 2005-03-01 18:32:30 +00:00
parent 958318e46d
commit 01fcafeb59
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
framework/inc/uifactory/popupmenucontrollerfactory.hxx
View file

@ -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
{