diff options
| author | Thomas Benisch <tbe@openoffice.org> | 2002-08-01 13:57:01 +0000 |
|---|---|---|
| committer | Thomas Benisch <tbe@openoffice.org> | 2002-08-01 13:57:01 +0000 |
| commit | a86d339b52ca8a5c53d280ddcbf02458aac025e3 (patch) | |
| tree | 126389712122668b28ae8aa2822e1a2ab83a21ed /forms/source/component | |
| parent | b2f27987b2c766f511dad8415942109042a36b2a (diff) | |
#101437# Merged in 1.16.14.1
Diffstat (limited to 'forms/source/component')
| -rw-r--r-- | forms/source/component/FormComponent.cxx | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/forms/source/component/FormComponent.cxx b/forms/source/component/FormComponent.cxx index 19adad0a9563..2b3c74916f80 100644 --- a/forms/source/component/FormComponent.cxx +++ b/forms/source/component/FormComponent.cxx @@ -2,9 +2,9 @@ * * $RCSfile: FormComponent.cxx,v $ * - * $Revision: 1.18 $ + * $Revision: 1.19 $ * - * last change: $Author: fs $ $Date: 2002-03-04 13:59:21 $ + * last change: $Author: tbe $ $Date: 2002-08-01 14:57:01 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -92,6 +92,9 @@ #ifndef _COM_SUN_STAR_SDBC_COLUMNVALUE_HPP_ #include <com/sun/star/sdbc/ColumnValue.hpp> #endif +#ifndef _COM_SUN_STAR_UTIL_XCLONEABLE_HPP_ +#include <com/sun/star/util/XCloneable.hpp> +#endif #ifndef _COMPHELPER_PROPERTY_HXX_ #include <comphelper/property.hxx> @@ -460,7 +463,7 @@ Any SAL_CALL OControlModel::queryAggregation(const Type& _rType) throw (RuntimeE { aReturn = OControlModel_BASE::queryInterface(_rType); // our aggregate - if (!aReturn.hasValue() && m_xAggregate.is()) + if (!aReturn.hasValue() && m_xAggregate.is() && !_rType.equals(::getCppuType(static_cast< Reference< XCloneable>* >(NULL)))) aReturn = m_xAggregate->queryAggregation(_rType); } } |