diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-06-30 14:14:41 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-06-30 14:14:41 +0000 |
| commit | 25dd4bb046bcb0acdcb245e857fc092378bad2ea (patch) | |
| tree | 779746a9b52167b61ad5131f4887548e29e3e640 /extensions | |
| parent | 907a34f2451320fa40f722ec832ee277eb1391a0 (diff) | |
INTEGRATION: CWS pl01 (1.1.1.1.44); FILE MERGED
2003/06/25 14:27:06 pl 1.1.1.1.44.1: #110428# fixed a model problem
Diffstat (limited to 'extensions')
| -rw-r--r-- | extensions/source/plugin/inc/plugin/plctrl.hxx | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/extensions/source/plugin/inc/plugin/plctrl.hxx b/extensions/source/plugin/inc/plugin/plctrl.hxx index b94b782f29c9..98985595fa8b 100644 --- a/extensions/source/plugin/inc/plugin/plctrl.hxx +++ b/extensions/source/plugin/inc/plugin/plctrl.hxx @@ -2,9 +2,9 @@ * * $RCSfile: plctrl.hxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:16:51 $ + * last change: $Author: hr $ $Date: 2003-06-30 15:14:41 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -151,7 +151,7 @@ #include <com/sun/star/awt/PosSize.hpp> #endif -#include <cppuhelper/implbase5.hxx> +#include <cppuhelper/implbase4.hxx> #include <list> @@ -160,9 +160,8 @@ using namespace com::sun::star::uno; class SystemChildWindow; //================================================================================================== -class PluginControl_Impl : public ::cppu::WeakAggImplHelper5< +class PluginControl_Impl : public ::cppu::WeakAggImplHelper4< ::com::sun::star::awt::XControl, - ::com::sun::star::awt::XControlModel, ::com::sun::star::awt::XWindow, ::com::sun::star::awt::XFocusListener, ::com::sun::star::awt::XView > @@ -174,10 +173,9 @@ public: virtual Reference< XInterface > SAL_CALL getContext() throw( RuntimeException ) { return _xContext; } - virtual sal_Bool SAL_CALL setModel( const Reference< ::com::sun::star::awt::XControlModel > & Model ) throw( RuntimeException ) - { DBG_ERROR( "### setModel() illegal on plugincontrol!" ); return sal_False; } - virtual Reference< ::com::sun::star::awt::XControlModel > SAL_CALL getModel() throw( RuntimeException ) - { return (::com::sun::star::awt::XControlModel*)this; } + virtual sal_Bool SAL_CALL setModel( const Reference< ::com::sun::star::awt::XControlModel > & Model ) throw( RuntimeException ) = NULL; +// { DBG_ERROR( "### setModel() illegal on plugincontrol!" ); return sal_False; } + virtual Reference< ::com::sun::star::awt::XControlModel > SAL_CALL getModel() throw( RuntimeException ) = NULL; virtual Reference< ::com::sun::star::awt::XView > SAL_CALL getView() throw( RuntimeException ) { return (::com::sun::star::awt::XView*)this; } |