diff options
author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 10:05:23 +0000 |
---|---|---|
committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 10:05:23 +0000 |
commit | b81a0015a52c01d5a1790c5cfa173f7ba0e003fd (patch) | |
tree | cc0f88a03b638f59af8acf4396242b5049d03887 /framework/inc/uielement/rootitemcontainer.hxx | |
parent | ef653ff0bd09b3bc8e6251b8c5ee115ef37173ff (diff) |
INTEGRATION: CWS warnings01 (1.5.32); FILE MERGED
2005/11/16 15:20:13 pl 1.5.32.2: #i55991# removed warnings
2005/10/28 14:48:21 cd 1.5.32.1: #i55991# Warning free code changes for gcc
Diffstat (limited to 'framework/inc/uielement/rootitemcontainer.hxx')
-rw-r--r-- | framework/inc/uielement/rootitemcontainer.hxx | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/framework/inc/uielement/rootitemcontainer.hxx b/framework/inc/uielement/rootitemcontainer.hxx index 8e9c77671c96..9f7daa498a20 100644 --- a/framework/inc/uielement/rootitemcontainer.hxx +++ b/framework/inc/uielement/rootitemcontainer.hxx @@ -4,9 +4,9 @@ * * $RCSfile: rootitemcontainer.hxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: rt $ $Date: 2005-09-09 00:46:29 $ + * last change: $Author: hr $ $Date: 2006-06-19 11:05:23 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -130,8 +130,8 @@ class RootItemContainer : public ::com::sun::star::lang::XTypeProvider //--------------------------------------------------------------------------------------------------------- // XInterface, XTypeProvider //--------------------------------------------------------------------------------------------------------- - DECLARE_XINTERFACE - DECLARE_XTYPEPROVIDER + FWK_DECLARE_XINTERFACE + FWK_DECLARE_XTYPEPROVIDER // XUnoTunnel static const ::com::sun::star::uno::Sequence< sal_Int8 >& GetUnoTunnelId() throw(); @@ -178,6 +178,7 @@ class RootItemContainer : public ::com::sun::star::lang::XTypeProvider const com::sun::star::uno::Any& aValue ) throw( com::sun::star::lang::IllegalArgumentException ); virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle , const com::sun::star::uno::Any& aValue ) throw( com::sun::star::uno::Exception ); + using cppu::OPropertySetHelper::getFastPropertyValue; virtual void SAL_CALL getFastPropertyValue( com::sun::star::uno::Any& aValue , sal_Int32 nHandle ) const; virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); |