diff options
author | Jens-Heiner Rechtien <hr@openoffice.org> | 2010-02-12 16:56:44 +0100 |
---|---|---|
committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2010-02-12 16:56:44 +0100 |
commit | 29d7a3467f9622ac11870d7788fee3554efae5a3 (patch) | |
tree | e14b09fd6849f9d5b0e0f0a31e943e1ce7e7ab7b /oox/inc/oox/vml | |
parent | ea6543401c1cd17e18aba93603aeeafd332fff15 (diff) |
changefileheader2: #i10000#: convert files with CR/LF characters to CR only
Diffstat (limited to 'oox/inc/oox/vml')
-rw-r--r-- | oox/inc/oox/vml/vmldrawing.hxx | 2 | ||||
-rw-r--r-- | oox/inc/oox/vml/vmlshape.hxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/oox/inc/oox/vml/vmldrawing.hxx b/oox/inc/oox/vml/vmldrawing.hxx index d78d21c284f5..1af14903793b 100644 --- a/oox/inc/oox/vml/vmldrawing.hxx +++ b/oox/inc/oox/vml/vmldrawing.hxx @@ -143,7 +143,7 @@ public: /** Derived classes may convert additional form control properties from the passed VML shape client data. */ virtual void convertControlClientData( - const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& rxCtrlModel,
+ const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& rxCtrlModel, const ShapeClientData& rClientData ) const; protected: diff --git a/oox/inc/oox/vml/vmlshape.hxx b/oox/inc/oox/vml/vmlshape.hxx index c1822cf68315..18eaa7513fc5 100644 --- a/oox/inc/oox/vml/vmlshape.hxx +++ b/oox/inc/oox/vml/vmlshape.hxx @@ -292,7 +292,7 @@ protected: /** A group shape that extends the basic shape by a container of child shapes. */ class GroupShape : public ShapeBase { -public:
+public: explicit GroupShape( const Drawing& rDrawing ); virtual ~GroupShape(); |