diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2004-07-14 09:19:42 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2004-07-14 09:19:42 +0000 |
| commit | 6c2f290d57312c7d94c2f7ff5eb5d629926a80b6 (patch) | |
| tree | 7d3b97fb6c7e1663f1d548ddb62f4a1c55443ea4 /xmloff/source/draw/shapeimport.cxx | |
| parent | 1386b8fdd5f12d130ade41866aaab7335d34c31c (diff) | |
#i10000# Fix wrongly resolved merge conflict.
Diffstat (limited to 'xmloff/source/draw/shapeimport.cxx')
| -rw-r--r-- | xmloff/source/draw/shapeimport.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/xmloff/source/draw/shapeimport.cxx b/xmloff/source/draw/shapeimport.cxx index 151928936c80..d4d47a92406d 100644 --- a/xmloff/source/draw/shapeimport.cxx +++ b/xmloff/source/draw/shapeimport.cxx @@ -2,9 +2,9 @@ * * $RCSfile: shapeimport.cxx,v $ * - * $Revision: 1.51 $ + * $Revision: 1.52 $ * - * last change: $Author: rt $ $Date: 2004-07-13 08:25:22 $ + * last change: $Author: rt $ $Date: 2004-07-14 10:19:42 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -893,7 +893,7 @@ SvXMLShapeContext* XMLShapeImportHelper::CreateGroupChildContext( } // add other shapes here... default: - return new SvXMLImportContext( rImport, nPrefix, rLocalName ); + return new SvXMLShapeContext( rImport, nPrefix, rLocalName ); } // now parse the attribute list and call the child context for each unknown attribute |