From 29d7a3467f9622ac11870d7788fee3554efae5a3 Mon Sep 17 00:00:00 2001 From: Jens-Heiner Rechtien Date: Fri, 12 Feb 2010 16:56:44 +0100 Subject: changefileheader2: #i10000#: convert files with CR/LF characters to CR only --- oox/inc/oox/vml/vmldrawing.hxx | 2 +- oox/inc/oox/vml/vmlshape.hxx | 2 +- oox/inc/oox/xls/drawingfragment.hxx | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'oox/inc') 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(); diff --git a/oox/inc/oox/xls/drawingfragment.hxx b/oox/inc/oox/xls/drawingfragment.hxx index 658f487fdffb..a75baf41149a 100644 --- a/oox/inc/oox/xls/drawingfragment.hxx +++ b/oox/inc/oox/xls/drawingfragment.hxx @@ -181,7 +181,7 @@ public: /** Converts 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 ::oox::vml::ShapeClientData& rClientData ) const; }; -- cgit v1.2.3