From 289cb1efed62825b6e1cb2b0d0572a34b9dabb0e Mon Sep 17 00:00:00 2001 From: Kurt Zenker Date: Tue, 1 Mar 2005 18:53:55 +0000 Subject: [PATCH] INTEGRATION: CWS removedrafts (1.14.8); FILE MERGED 2005/02/17 12:41:54 cd 1.14.8.1: #i42557# move UNOIDL types from drafts to com --- embedserv/source/inc/docholder.hxx | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/embedserv/source/inc/docholder.hxx b/embedserv/source/inc/docholder.hxx index 97049fd2aef2..cfc9855194f4 100644 --- a/embedserv/source/inc/docholder.hxx +++ b/embedserv/source/inc/docholder.hxx @@ -2,9 +2,9 @@ * * $RCSfile: docholder.hxx,v $ * - * $Revision: 1.14 $ + * $Revision: 1.15 $ * - * last change: $Author: kz $ $Date: 2004-10-04 20:01:16 $ + * last change: $Author: kz $ $Date: 2005-03-01 19:53:55 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -64,8 +64,8 @@ #include "common.h" -#ifndef _DRAFTS_COM_SUN_STAR_FRAME_XLAYOUTMANAGER_HPP_ -#include +#ifndef _COM_SUN_STAR_FRAME_XLAYOUTMANAGER_HPP_ +#include #endif #ifndef _COM_SUN_STAR_UTIL_XCLOSELISTENER_HPP_ #include @@ -97,7 +97,7 @@ class DocumentHolder : ::com::sun::star::util::XCloseListener, ::com::sun::star::frame::XTerminateListener, ::com::sun::star::util::XModifyListener, - ::drafts::com::sun::star::ui::XDockingAreaAcceptor> + ::com::sun::star::ui::XDockingAreaAcceptor> { private: BOOL m_bAllowInPlace; @@ -132,7 +132,7 @@ private: ::com::sun::star::frame::XModel > m_xDocument; ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::frame::XLayoutManager> m_xLayoutManager; + ::com::sun::star::frame::XLayoutManager> m_xLayoutManager; ::com::sun::star::uno::Reference<