diff options
Diffstat (limited to 'oox/source/vml/vmldrawing.cxx')
| -rw-r--r-- | oox/source/vml/vmldrawing.cxx | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/oox/source/vml/vmldrawing.cxx b/oox/source/vml/vmldrawing.cxx index 9c1bb761532a..9a5f4451ec04 100644 --- a/oox/source/vml/vmldrawing.cxx +++ b/oox/source/vml/vmldrawing.cxx @@ -29,7 +29,7 @@ #include <com/sun/star/drawing/XShapes.hpp> #include "tokens.hxx" #include "oox/core/xmlfilterbase.hxx" -#include "oox/ole/axcontrolhelper.hxx" +#include "oox/ole/axcontrol.hxx" #include "oox/vml/vmlshape.hxx" #include "oox/vml/vmlshapecontainer.hxx" @@ -97,15 +97,12 @@ Drawing::~Drawing() { } -::oox::ole::AxControlHelper& Drawing::getControlHelper() const +::oox::ole::EmbeddedForm& Drawing::getControlForm() const { - // create the helper object on demand - if( !mxCtrlHelper.get() ) - { - mxCtrlHelper.reset( createControlHelper() ); - OSL_ENSURE( mxCtrlHelper.get(), "Drawing::getControlHelper - cannot create form controls helper" ); - } - return *mxCtrlHelper; + if( !mxCtrlForm.get() ) + mxCtrlForm.reset( new ::oox::ole::EmbeddedForm( + mrFilter.getModelFactory(), mxDrawPage, mrFilter.getGraphicHelper() ) ); + return *mxCtrlForm; } void Drawing::registerOleObject( const OleObjectInfo& rOleObject ) @@ -158,11 +155,6 @@ void Drawing::convertControlClientData( const Reference< XControlModel >& /*rxCt { } -::oox::ole::AxControlHelper* Drawing::createControlHelper() const -{ - return new ::oox::ole::AxEmbeddedControlHelper( mrFilter, mxDrawPage ); -} - // ============================================================================ } // namespace vml |