diff options
| author | Kurt Zenker <kz@openoffice.org> | 2004-10-04 17:58:57 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2004-10-04 17:58:57 +0000 |
| commit | 602525055ca5b765fbc066563ffffa8a9d0558b2 (patch) | |
| tree | 189820f2a790da896b9967426184b3b364ef75c8 /sw/inc/ndarr.hxx | |
| parent | f9747eb81e9ea5e74ef6ea3d7828d52bf4c121b4 (diff) | |
INTEGRATION: CWS mav09 (1.6.14); FILE MERGED
2004/09/16 19:13:29 mav 1.6.14.3: RESYNC: (1.6-1.7); FILE MERGED
2004/06/10 16:49:39 mba 1.6.14.2: #i27773#: some fixed to make InPlace Editing work
2004/05/18 16:43:04 mba 1.6.14.1: RESYNC to m39
Diffstat (limited to 'sw/inc/ndarr.hxx')
| -rw-r--r-- | sw/inc/ndarr.hxx | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/sw/inc/ndarr.hxx b/sw/inc/ndarr.hxx index e17b9c7b3974..9f4d9d461fcd 100644 --- a/sw/inc/ndarr.hxx +++ b/sw/inc/ndarr.hxx @@ -2,9 +2,9 @@ * * $RCSfile: ndarr.hxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: obo $ $Date: 2004-08-12 12:03:39 $ + * last change: $Author: kz $ $Date: 2004-10-04 18:58:57 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -62,6 +62,10 @@ #ifndef _NDARR_HXX #define _NDARR_HXX +#ifndef _COM_SUN_STAR_EMBED_XEMBEDDEDOBJECT_HPP_ +#include <com/sun/star/embed/XEmbeddedObject.hpp> +#endif + #ifndef _SVARRAY_HXX //autogen #include <svtools/svarray.hxx> #endif @@ -73,10 +77,11 @@ #include <ndtyp.hxx> #endif +#include <svtools/embedhlp.hxx> + class Graphic; class GraphicObject; class UniString; -class SvInPlaceObject; class SwAttrSet; class SwCntntFrm; class SwCntntNode; @@ -273,7 +278,7 @@ public: SwAttrSet* pAutoAttr = 0 ); // in ndgrf.cxx SwOLENode *MakeOLENode( const SwNodeIndex & rWhere, - SvInPlaceObject *pObj, + const svt::EmbeddedObjectRef&, SwGrfFmtColl *pColl, SwAttrSet* pAutoAttr = 0 ); // in ndole.cxx SwOLENode *MakeOLENode( const SwNodeIndex & rWhere, |