diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2006-10-18 12:18:14 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2006-10-18 12:18:14 +0000 |
| commit | 26fe7929ebd2dd1b2a7da4148c678f7da71d96ea (patch) | |
| tree | 11d9287204fba5df845e47342ecdd5c39b734116 /forms | |
| parent | 45b6b0ec4d3c9769811ac4f500a3773af68ae67d (diff) | |
INTEGRATION: CWS dba205b (1.11.16); FILE MERGED
2006/09/04 11:22:24 oj 1.11.16.2: RESYNC: (1.11-1.12); FILE MERGED
2006/08/03 14:40:20 fs 1.11.16.1: #i64593# +m_aWindowStateGuard/impl_resetStateGuard_nothrow
Diffstat (limited to 'forms')
| -rw-r--r-- | forms/source/inc/FormComponent.hxx | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/forms/source/inc/FormComponent.hxx b/forms/source/inc/FormComponent.hxx index 743441a97..c4fa574cd 100644 --- a/forms/source/inc/FormComponent.hxx +++ b/forms/source/inc/FormComponent.hxx @@ -4,9 +4,9 @@ * * $RCSfile: FormComponent.hxx,v $ * - * $Revision: 1.12 $ + * $Revision: 1.13 $ * - * last change: $Author: ihi $ $Date: 2006-08-28 14:57:38 $ + * last change: $Author: ihi $ $Date: 2006-10-18 13:18:14 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -164,6 +164,9 @@ #ifndef _FRM_IDS_HXX_ #include "ids.hxx" #endif +#ifndef FORMS_WINDOWSTATEGUARD_HXX +#include "windowstateguard.hxx" +#endif #ifndef _COMPHELPER_PROPERTY_MULTIPLEX_HXX_ #include <comphelper/propmultiplex.hxx> @@ -216,6 +219,7 @@ protected: ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xServiceFactory; + WindowStateGuard m_aWindowStateGuard; public: /** constructs a control @@ -307,6 +311,9 @@ protected: // overwrite this and call the base class if you have additional types ::com::sun::star::uno::Sequence< ::rtl::OUString > getAggregateServiceNames(); + +private: + void impl_resetStateGuard_nothrow(); }; //================================================================== |