diff options
author | Christian Lippka <cl@openoffice.org> | 2000-11-26 18:51:29 +0000 |
---|---|---|
committer | Christian Lippka <cl@openoffice.org> | 2000-11-26 18:51:29 +0000 |
commit | 1f74fe9e3c28c3fbefd157fa129466caf820f3f5 (patch) | |
tree | 81494caa762f15d95749dce49c1a0a63cfbd6dc2 /xmloff/source/draw/ximp3dscene.hxx | |
parent | #80699# added support for Connector and Measures Shapes (diff) | |
download | core-1f74fe9e3c28c3fbefd157fa129466caf820f3f5.tar.gz core-1f74fe9e3c28c3fbefd157fa129466caf820f3f5.zip |
#80594# fixed merge problems
Diffstat (limited to 'xmloff/source/draw/ximp3dscene.hxx')
-rw-r--r-- | xmloff/source/draw/ximp3dscene.hxx | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/xmloff/source/draw/ximp3dscene.hxx b/xmloff/source/draw/ximp3dscene.hxx index 3ade9fd46362..36bacd717849 100644 --- a/xmloff/source/draw/ximp3dscene.hxx +++ b/xmloff/source/draw/ximp3dscene.hxx @@ -2,9 +2,9 @@ * * $RCSfile: ximp3dscene.hxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: aw $ $Date: 2000-11-24 16:36:47 $ + * last change: $Author: cl $ $Date: 2000-11-26 19:51:29 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -102,6 +102,10 @@ #include <goodies/vector3d.hxx> #endif +#ifndef _XIMPSHAPE_HXX +#include <ximpshap.hxx> +#endif + ////////////////////////////////////////////////////////////////////////////// // dr3d:3dlight context @@ -131,7 +135,7 @@ DECLARE_LIST(Imp3DLightList, SdXML3DLightContext*); ////////////////////////////////////////////////////////////////////////////// // dr3d:3dscene context -class SdXML3DSceneShapeContext : public SvXMLImportContext +class SdXML3DSceneShapeContext : public SdXMLShapeContext { // the shape group this group is working on // this is the scene at the same time |