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

INTEGRATION: CWS removedrafts (1.2.206); FILE MERGED

Browse source 
2005/02/17 12:45:54 cd 1.2.206.1: #i42557# move UNOIDL types from drafts to com
This commit is contained in:
Kurt Zenker 2005-03-01 18:28:55 +00:00
parent 10462e1042
commit bff055ebe0
2 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
framework/inc/uielement/fontmenucontroller.hxx
View file

@ -2,9 +2,9 @@
*
* $RCSfile: fontmenucontroller.hxx,v $
*
* $Revision: 1.2 $
* $Revision: 1.3 $
*
* last change: $Author: kz $ $Date: 2004-02-25 17:36:46 $
* last change: $Author: kz $ $Date: 2005-03-01 19:28:41 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -106,8 +106,8 @@
#include <com/sun/star/frame/XStatusListener.hpp>
#endif
#ifndef _DRAFTS_COM_SUN_STAR_FRAME_XPOPUPMENUCONTROLLER_HPP_
#include <drafts/com/sun/star/frame/XPopupMenuController.hpp>
#ifndef _COM_SUN_STAR_FRAME_XPOPUPMENUCONTROLLER_HPP_
#include <com/sun/star/frame/XPopupMenuController.hpp>
#endif
//_________________________________________________________________________________________________________________

14
framework/inc/uielement/fontsizemenucontroller.hxx
View file

@ -2,9 +2,9 @@
*
* $RCSfile: fontsizemenucontroller.hxx,v $
*
* $Revision: 1.2 $
* $Revision: 1.3 $
*
* last change: $Author: kz $ $Date: 2004-02-25 17:36:57 $
* last change: $Author: kz $ $Date: 2005-03-01 19:28:55 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -106,12 +106,12 @@
#include <com/sun/star/frame/XStatusListener.hpp>
#endif
#ifndef _DRAFTS_COM_SUN_STAR_FRAME_XPOPUPMENUCONTROLLER_HPP_
#include <drafts/com/sun/star/frame/XPopupMenuController.hpp>
#ifndef _COM_SUN_STAR_FRAME_XPOPUPMENUCONTROLLER_HPP_
#include <com/sun/star/frame/XPopupMenuController.hpp>
#endif
#ifndef _DRAFTS_COM_SUN_STAR_FRAME_STATUS_FONTHEIGHT_HPP_
#include <drafts/com/sun/star/frame/status/FontHeight.hpp>
#ifndef _COM_SUN_STAR_FRAME_STATUS_FONTHEIGHT_HPP_
#include <com/sun/star/frame/status/FontHeight.hpp>
#endif
//_________________________________________________________________________________________________________________
@ -168,7 +168,7 @@ namespace framework
long* m_pHeightArray;
sal_Bool m_bRebuildMenu;
com::sun::star::awt::FontDescriptor m_aFontDescriptor;
drafts::com::sun::star::frame::status::FontHeight m_aFontHeight;
::com::sun::star::frame::status::FontHeight m_aFontHeight;
com::sun::star::uno::Reference< com::sun::star::frame::XDispatch > m_xCurrentFontDispatch;
};
}