diff options
| author | Miklos Vajna <vmiklos@suse.cz> | 2013-01-30 16:43:35 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@suse.cz> | 2013-01-30 17:19:31 +0100 |
| commit | 7877638814de86202d33b5653a0f91d63341e98c (patch) | |
| tree | 8f4a5b4fafb3af2a57c3ac99b76b51cd0ba19182 /oox/inc | |
| parent | 1e33b3dc73e96c6c005d13e20c3f546fcb301ed8 (diff) | |
n#792778 oox: implement import of v:line inside v:group
The problem was that in ShapeBase::convertAndInsert(), the rectangle
calculated for a line was zero, that's why it wasn't imported. Fix this
by overriding the get*Rectangle() methods in LineShape, instead of doing
so with implConvertAndInsert().
Change-Id: Ie4bb2f7964b438cb56e4f5ee7a4ebe9f8f8eb734
Diffstat (limited to 'oox/inc')
| -rw-r--r-- | oox/inc/oox/vml/vmlshape.hxx | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/oox/inc/oox/vml/vmlshape.hxx b/oox/inc/oox/vml/vmlshape.hxx index 1ef305864d17..8373d4ff8674 100644 --- a/oox/inc/oox/vml/vmlshape.hxx +++ b/oox/inc/oox/vml/vmlshape.hxx @@ -128,12 +128,10 @@ protected: ::com::sun::star::awt::Rectangle getCoordSystem() const; /** Returns the absolute shape rectangle according to the passed anchor. */ ::com::sun::star::awt::Rectangle getRectangle( const ShapeParentAnchor* pParentAnchor ) const; - -private: /** Returns the absolute shape rectangle. */ - ::com::sun::star::awt::Rectangle getAbsRectangle() const; + virtual ::com::sun::star::awt::Rectangle getAbsRectangle() const; /** Returns the rectangle relative to the parent coordinate system. */ - ::com::sun::star::awt::Rectangle getRelRectangle() const; + virtual ::com::sun::star::awt::Rectangle getRelRectangle() const; protected: Drawing& mrDrawing; ///< The VML drawing page that contains this shape. @@ -341,11 +339,10 @@ public: explicit LineShape( Drawing& rDrawing ); protected: - /** Creates the corresponding XShape and inserts it into the passed container. */ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > - implConvertAndInsert( - const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rxShapes, - const ::com::sun::star::awt::Rectangle& rShapeRect ) const; + /** Returns the absolute shape rectangle. */ + virtual ::com::sun::star::awt::Rectangle getAbsRectangle() const; + /** Returns the rectangle relative to the parent coordinate system. */ + virtual ::com::sun::star::awt::Rectangle getRelRectangle() const; }; /** Bezier shape object that supports to, from, control1 and control2 |