diff --git a/framework/inc/uielement/fontmenucontroller.hxx b/framework/inc/uielement/fontmenucontroller.hxx index a0c7a192bcff..eda0a2226fab 100644 --- a/framework/inc/uielement/fontmenucontroller.hxx +++ b/framework/inc/uielement/fontmenucontroller.hxx @@ -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 #endif -#ifndef _DRAFTS_COM_SUN_STAR_FRAME_XPOPUPMENUCONTROLLER_HPP_ -#include +#ifndef _COM_SUN_STAR_FRAME_XPOPUPMENUCONTROLLER_HPP_ +#include #endif //_________________________________________________________________________________________________________________ diff --git a/framework/inc/uielement/fontsizemenucontroller.hxx b/framework/inc/uielement/fontsizemenucontroller.hxx index a6ce0aaae93d..9b984944eb07 100644 --- a/framework/inc/uielement/fontsizemenucontroller.hxx +++ b/framework/inc/uielement/fontsizemenucontroller.hxx @@ -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 #endif -#ifndef _DRAFTS_COM_SUN_STAR_FRAME_XPOPUPMENUCONTROLLER_HPP_ -#include +#ifndef _COM_SUN_STAR_FRAME_XPOPUPMENUCONTROLLER_HPP_ +#include #endif -#ifndef _DRAFTS_COM_SUN_STAR_FRAME_STATUS_FONTHEIGHT_HPP_ -#include +#ifndef _COM_SUN_STAR_FRAME_STATUS_FONTHEIGHT_HPP_ +#include #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; }; }