From 7dadac512bb8328243aa50008bbf8ad78a9d0f5f Mon Sep 17 00:00:00 2001 From: Vladimir Glazounov Date: Tue, 1 Apr 2003 14:25:15 +0000 Subject: [PATCH] INTEGRATION: CWS sw008 (1.9.136); FILE MERGED 2003/03/07 11:13:03 oj 1.9.136.1: #97593# change BaseClass member method --- sw/inc/unodraw.hxx | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/sw/inc/unodraw.hxx b/sw/inc/unodraw.hxx index 5e3985c90f7a..534a12c190a6 100644 --- a/sw/inc/unodraw.hxx +++ b/sw/inc/unodraw.hxx @@ -2,9 +2,9 @@ * * $RCSfile: unodraw.hxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: vg $ $Date: 2001-09-13 10:58:39 $ + * last change: $Author: vg $ $Date: 2003-04-01 15:25:15 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -211,9 +211,11 @@ class SwXShape : public SwXShapeBaseClass, SwFrmFmt* GetFrmFmt() const { return (SwFrmFmt*)GetRegisteredIn(); } SvxShape* GetSvxShape(); +protected: + virtual ~SwXShape(); public: SwXShape(::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > & xShape); - virtual ~SwXShape(); + TYPEINFO(); static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId(); @@ -267,9 +269,11 @@ class SwXGroupShape : public SwXShape, public ::com::sun::star::drawing::XShapes { +protected: + virtual ~SwXGroupShape(); public: SwXGroupShape(::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > & xShape); - virtual ~SwXGroupShape(); + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL acquire( ) throw();