diff options
| author | Noel Power <noel.power@novell.com> | 2012-05-04 12:51:27 +0100 |
|---|---|---|
| committer | Noel Power <noel.power@novell.com> | 2012-05-04 12:51:27 +0100 |
| commit | b2af4b20a009cce57f547865b02fde41d1232a17 (patch) | |
| tree | 179288e195e2389bd90919d3cb7e628ab8ef04af /oox | |
| parent | 4d7047860fc5869576f330a437edd6744d59bd61 (diff) | |
Revert "reorganise code a little so ole controls are catered for wrt fdo#49430"
This reverts commit 76bab166e21bc3646ae2d3079aae2c5d9ce0d1e5.
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/inc/oox/vml/vmldrawing.hxx | 1 | ||||
| -rw-r--r-- | oox/source/vml/vmldrawing.cxx | 2 | ||||
| -rw-r--r-- | oox/source/vml/vmlshape.cxx | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/oox/inc/oox/vml/vmldrawing.hxx b/oox/inc/oox/vml/vmldrawing.hxx index 4a0cf5021bab..b9b626e10b83 100644 --- a/oox/inc/oox/vml/vmldrawing.hxx +++ b/oox/inc/oox/vml/vmldrawing.hxx @@ -157,7 +157,6 @@ public: model into the form, and the shape into the passed UNO shape container. */ ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > createAndInsertXControlShape( - const ClientData* pClientData, const ::oox::ole::EmbeddedControl& rControl, const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rxShapes, const ::com::sun::star::awt::Rectangle& rShapeRect, diff --git a/oox/source/vml/vmldrawing.cxx b/oox/source/vml/vmldrawing.cxx index 5a6d76db0f8f..1a3530db9449 100644 --- a/oox/source/vml/vmldrawing.cxx +++ b/oox/source/vml/vmldrawing.cxx @@ -247,7 +247,7 @@ Reference< XShape > Drawing::createAndInsertXShape( const OUString& rService, return xShape; } -Reference< XShape > Drawing::createAndInsertXControlShape( const ClientData* pClientData, const ::oox::ole::EmbeddedControl& rControl, +Reference< XShape > Drawing::createAndInsertXControlShape( const ::oox::ole::EmbeddedControl& rControl, const Reference< XShapes >& rxShapes, const Rectangle& rShapeRect, sal_Int32& rnCtrlIndex ) const { Reference< XShape > xShape; diff --git a/oox/source/vml/vmlshape.cxx b/oox/source/vml/vmlshape.cxx index 92a45385af04..4000932ca127 100644 --- a/oox/source/vml/vmlshape.cxx +++ b/oox/source/vml/vmlshape.cxx @@ -557,7 +557,7 @@ Reference< XShape > ComplexShape::implConvertAndInsert( const Reference< XShapes { // create and return the control shape (including control model) sal_Int32 nCtrlIndex = -1; - Reference< XShape > xShape = mrDrawing.createAndInsertXControlShape( *this, aControl, rxShapes, rShapeRect, nCtrlIndex ); + Reference< XShape > xShape = mrDrawing.createAndInsertXControlShape( aControl, rxShapes, rShapeRect, nCtrlIndex ); // on error, proceed and try to create picture from replacement image if( xShape.is() ) return xShape; |