diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2006-11-14 11:28:00 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2006-11-14 11:28:00 +0000 |
| commit | 7152b189982197b6019d55f5531dbc55c566cb01 (patch) | |
| tree | 5134c52365e1664936ee41d36a11725e2a32d1b5 /toolkit | |
| parent | f30e524a03fe809486a597d8ffb7f5c170ab867d (diff) | |
INTEGRATION: CWS aw024 (1.14.62); FILE MERGED
2006/01/30 07:16:46 fs 1.14.62.1: merge the changes from CWS formcontacts into this CWS
Diffstat (limited to 'toolkit')
| -rw-r--r-- | toolkit/inc/toolkit/controls/unocontrol.hxx | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/toolkit/inc/toolkit/controls/unocontrol.hxx b/toolkit/inc/toolkit/controls/unocontrol.hxx index 6f19482e0c7e..61114198ce4f 100644 --- a/toolkit/inc/toolkit/controls/unocontrol.hxx +++ b/toolkit/inc/toolkit/controls/unocontrol.hxx @@ -4,9 +4,9 @@ * * $RCSfile: unocontrol.hxx,v $ * - * $Revision: 1.14 $ + * $Revision: 1.15 $ * - * last change: $Author: rt $ $Date: 2005-09-09 12:51:35 $ + * last change: $Author: ihi $ $Date: 2006-11-14 12:28:00 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -43,8 +43,8 @@ #ifndef _COM_SUN_STAR_AWT_XCONTROL_HPP_ #include <com/sun/star/awt/XControl.hpp> #endif -#ifndef _COM_SUN_STAR_AWT_XWINDOW_HPP_ -#include <com/sun/star/awt/XWindow.hpp> +#ifndef _COM_SUN_STAR_AWT_XWINDOW2_HPP_ +#include <com/sun/star/awt/XWindow2.hpp> #endif #ifndef _COM_SUN_STAR_AWT_XView_HPP_ #include <com/sun/star/awt/XView.hpp> @@ -123,7 +123,7 @@ struct UnoControlComponentInfos // class UnoControl // ---------------------------------------------------- typedef ::cppu::WeakAggImplHelper7 < ::com::sun::star::awt::XControl - , ::com::sun::star::awt::XWindow + , ::com::sun::star::awt::XWindow2 , ::com::sun::star::awt::XView , ::com::sun::star::beans::XPropertiesChangeListener , ::com::sun::star::lang::XServiceInfo @@ -205,6 +205,14 @@ public: // XEventListener void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException); + // ::com::sun::star::awt::XWindow2 + virtual void SAL_CALL setOutputSize( const ::com::sun::star::awt::Size& aSize ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::awt::Size SAL_CALL getOutputSize( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL isVisible( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL isActive( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL isEnabled( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL hasFocus( ) throw (::com::sun::star::uno::RuntimeException); + // ::com::sun::star::awt::XWindow void SAL_CALL setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height, sal_Int16 Flags ) throw(::com::sun::star::uno::RuntimeException); ::com::sun::star::awt::Rectangle SAL_CALL getPosSize( ) throw(::com::sun::star::uno::RuntimeException); |