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.cxx | |
| parent | fa6a680fd62f7cbd6cfac3a44d064bfac87ff2b1 (diff) | |
#80594# fixed merge problems
Diffstat (limited to 'xmloff/source/draw/ximp3dscene.cxx')
| -rw-r--r-- | xmloff/source/draw/ximp3dscene.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/xmloff/source/draw/ximp3dscene.cxx b/xmloff/source/draw/ximp3dscene.cxx index 26ab93ada831..212cffb6a003 100644 --- a/xmloff/source/draw/ximp3dscene.cxx +++ b/xmloff/source/draw/ximp3dscene.cxx @@ -2,9 +2,9 @@ * * $RCSfile: ximp3dscene.cxx,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 @@ -152,7 +152,7 @@ SdXML3DSceneShapeContext::SdXML3DSceneShapeContext( const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, uno::Reference< drawing::XShapes >& rShapes) -: SvXMLImportContext( rImport, nPrfx, rLocalName ), +: SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes ), mxShapes(rShapes), mbSetTransform( FALSE ), mxPrjMode(drawing::ProjectionMode_PERSPECTIVE), |