summaryrefslogtreecommitdiff
path: root/cppuhelper
diff options
context:
space:
mode:
authorKurt Zenker <kz@openoffice.org>2007-05-10 08:46:03 +0000
committerKurt Zenker <kz@openoffice.org>2007-05-10 08:46:03 +0000
commit8d5bf2341464e33f44c0f2d7a92a05a5bba16d2a (patch)
treedb8f28df382000f978cd7f57a6615fd324f1db9a /cppuhelper
parentc10de813f4dd812eec6a5741e0ede1c2be4c6a7b (diff)
INTEGRATION: CWS dba23a (1.15.38); FILE MERGED
2007/04/02 06:49:58 fs 1.15.38.2: OPropertySetHelper::getTypes made const (suggested by SB after review) 2007/03/01 11:13:25 fs 1.15.38.1: copying changes from CWS repcontrol herein (repcontrol has a pretty unknown due date)
Diffstat (limited to 'cppuhelper')
-rw-r--r--cppuhelper/source/propshlp.cxx17
1 files changed, 15 insertions, 2 deletions
diff --git a/cppuhelper/source/propshlp.cxx b/cppuhelper/source/propshlp.cxx
index 8fb5f877a167..11f505be3310 100644
--- a/cppuhelper/source/propshlp.cxx
+++ b/cppuhelper/source/propshlp.cxx
@@ -4,9 +4,9 @@
*
* $RCSfile: propshlp.cxx,v $
*
- * $Revision: 1.15 $
+ * $Revision: 1.16 $
*
- * last change: $Author: obo $ $Date: 2006-09-16 12:42:03 $
+ * last change: $Author: kz $ $Date: 2007-05-10 09:46:03 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -190,6 +190,19 @@ Any OPropertySetHelper::queryInterface( const ::com::sun::star::uno::Type & rTyp
static_cast< XFastPropertySet * >( this ) );
}
+/**
+ * called from the derivee's XTypeProvider::getTypes implementation
+ */
+::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > OPropertySetHelper::getTypes() const
+ throw (RuntimeException)
+{
+ Sequence< ::com::sun::star::uno::Type > aTypes( 3 );
+ aTypes[ 0 ] = XPropertySet::static_type();
+ aTypes[ 1 ] = XMultiPropertySet::static_type();
+ aTypes[ 2 ] = XFastPropertySet::static_type();
+ return aTypes;
+}
+
// ComponentHelper
void OPropertySetHelper::disposing() SAL_THROW( () )
{