diff options
| author | Daniel Rentz <dr@openoffice.org> | 2010-08-26 18:37:44 +0200 |
|---|---|---|
| committer | Daniel Rentz <dr@openoffice.org> | 2010-08-26 18:37:44 +0200 |
| commit | 04c272eb8396e58376d2b61baee01c4a95f993b4 (patch) | |
| tree | 489606116a897ec3c0186161269670b0e8c66146 /oox/source/shape | |
| parent | 4d9f54e9f020c91c7fda048bcf3f7549d58bc2b4 (diff) | |
dr77: #i114128# import legacy drawing controls
Diffstat (limited to 'oox/source/shape')
| -rw-r--r-- | oox/source/shape/ShapeContextHandler.cxx | 2 | ||||
| -rw-r--r-- | oox/source/shape/ShapeFilterBase.cxx | 6 | ||||
| -rw-r--r-- | oox/source/shape/ShapeFilterBase.hxx | 5 |
3 files changed, 10 insertions, 3 deletions
diff --git a/oox/source/shape/ShapeContextHandler.cxx b/oox/source/shape/ShapeContextHandler.cxx index e253d43e56e7..9313184d6865 100644 --- a/oox/source/shape/ShapeContextHandler.cxx +++ b/oox/source/shape/ShapeContextHandler.cxx @@ -68,7 +68,7 @@ ShapeContextHandler::getGraphicShapeContext(::sal_Int32 Element ) switch (Element & 0xffff) { case XML_graphic: - mpShape.reset(new Shape("com.sun.star.drawing.OLE2Shape" )); + mpShape.reset(new Shape("com.sun.star.drawing.GraphicObjectShape" )); mxGraphicShapeContext.set (new GraphicalObjectFrameContext(*rFragmentHandler, pMasterShape, mpShape, true)); break; diff --git a/oox/source/shape/ShapeFilterBase.cxx b/oox/source/shape/ShapeFilterBase.cxx index 7ed001ffc96c..c0a4857479a7 100644 --- a/oox/source/shape/ShapeFilterBase.cxx +++ b/oox/source/shape/ShapeFilterBase.cxx @@ -27,6 +27,7 @@ #include "ShapeFilterBase.hxx" #include "oox/drawingml/chart/chartconverter.hxx" +#include "oox/ole/vbaproject.hxx" namespace oox { namespace shape { @@ -65,6 +66,11 @@ const ::oox::drawingml::table::TableStyleListPtr ShapeFilterBase::getTableStyles return *mxChartConv; } +::oox::ole::VbaProject* ShapeFilterBase::implCreateVbaProject() const +{ + return new ::oox::ole::VbaProject( getGlobalFactory(), getModel(), CREATE_OUSTRING( "Writer" ) ); +} + ::rtl::OUString ShapeFilterBase::implGetImplementationName() const { return ::rtl::OUString(); diff --git a/oox/source/shape/ShapeFilterBase.hxx b/oox/source/shape/ShapeFilterBase.hxx index 09cbc75e01aa..748b92389b0c 100644 --- a/oox/source/shape/ShapeFilterBase.hxx +++ b/oox/source/shape/ShapeFilterBase.hxx @@ -60,12 +60,13 @@ public: virtual ::oox::drawingml::chart::ChartConverter& getChartConverter(); - virtual rtl::OUString implGetImplementationName() const; - virtual bool importDocument() { return true; } virtual bool exportDocument() { return true; } private: + virtual ::oox::ole::VbaProject* implCreateVbaProject() const; + virtual rtl::OUString implGetImplementationName() const; + ::boost::shared_ptr< ::oox::drawingml::chart::ChartConverter > mxChartConv; }; |