diff options
| author | Luboš Luňák <l.lunak@suse.cz> | 2012-06-12 17:11:10 +0200 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@suse.cz> | 2012-06-19 11:52:39 +0200 |
| commit | 831c2d95289f41529ea1f85c90f8bb112e522d97 (patch) | |
| tree | ab7a925e4e6b1110ccbd486600d08220bd91f8c1 /oox/inc | |
| parent | e28c8f3b75cb46906a8479cf9a52f272fdb17682 (diff) | |
Revert "rework getting shape for the .docx import filter"
Stupid containers with shared_ptr. Trying to remove the object
from it gets it deleted because it's owned by the shared_ptr
and there's no sensible way to wrestle it out of it. This will
need to be redone somehow.
This reverts commit 04d600d4be7c50db4b3b505039eb8bc96856f593.
Diffstat (limited to 'oox/inc')
| -rw-r--r-- | oox/inc/oox/vml/vmlshapecontainer.hxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/oox/inc/oox/vml/vmlshapecontainer.hxx b/oox/inc/oox/vml/vmlshapecontainer.hxx index 973890e8c829..20671bbb05f3 100644 --- a/oox/inc/oox/vml/vmlshapecontainer.hxx +++ b/oox/inc/oox/vml/vmlshapecontainer.hxx @@ -92,14 +92,16 @@ public: template< typename Functor > const ShapeBase* findShape( const Functor& rFunctor ) const; - /** Returns and removes the last shape in the collection (Word only). */ - const ShapeBase* takeLastShape(); + /** Returns the first shape in the collection (Word only). */ + const ShapeBase* getFirstShape() const; /** Creates and inserts all UNO shapes into the passed container. */ void convertAndInsert( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rxShapes, const ShapeParentAnchor* pParentAnchor = 0 ) const; + inline void clearShapes( ) { maShapes.clear( ); } + private: typedef RefVector< ShapeType > ShapeTypeVector; typedef RefVector< ShapeBase > ShapeVector; |