diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 11:50:09 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 11:50:09 +0000 |
| commit | de89bb83d634a85bcc9ee5f0febaa13308560ca0 (patch) | |
| tree | 56d2c8e50b7d25054ec7965d740f05b0eabe6495 /forms/source/component/FormsCollection.hxx | |
| parent | 22cc1e9e7893d05d32b24b263aa10ac85a9bd8d6 (diff) | |
INTEGRATION: CWS warnings01 (1.5.68); FILE MERGED
2006/03/15 07:55:33 fs 1.5.68.2: #i57457# warning-free code (unxsols4)
2006/03/14 15:20:26 fs 1.5.68.1: #i57457# warning-free code
Diffstat (limited to 'forms/source/component/FormsCollection.hxx')
| -rw-r--r-- | forms/source/component/FormsCollection.hxx | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/forms/source/component/FormsCollection.hxx b/forms/source/component/FormsCollection.hxx index 091887f57e01..08b1975af4ff 100644 --- a/forms/source/component/FormsCollection.hxx +++ b/forms/source/component/FormsCollection.hxx @@ -4,9 +4,9 @@ * * $RCSfile: FormsCollection.hxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: rt $ $Date: 2005-09-08 22:41:46 $ + * last change: $Author: hr $ $Date: 2006-06-19 12:50:09 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -36,6 +36,9 @@ #ifndef _FRM_INTERFACE_CONTAINER_HXX_ #include "InterfaceContainer.hxx" #endif +#ifndef _FRM_IDS_HXX_ +#include "ids.hxx" +#endif #ifndef _CPPUHELPER_COMPONENT_HXX_ #include <cppuhelper/component.hxx> @@ -47,9 +50,6 @@ #ifndef _COMPHELPER_UNO3_HXX_ #include <comphelper/uno3.hxx> #endif -#ifndef _FRM_IDS_HXX_ -#include "ids.hxx" -#endif #ifndef _COM_SUN_STAR_LANG_XSERVICEINFO_HPP_ #include <com/sun/star/lang/XServiceInfo.hpp> @@ -90,24 +90,27 @@ public: virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation(const ::com::sun::star::uno::Type& _rType) throw(::com::sun::star::uno::RuntimeException); -// XTypeProvider + // XTypeProvider virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException); -// XPersistObject + // XPersistObject virtual ::rtl::OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException); -// XServiceInfo + // XServiceInfo virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); virtual StringSequence SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); -// OComponentHelper + // OComponentHelper virtual void SAL_CALL disposing(); -// ::com::sun::star::container::XChild + // ::com::sun::star::container::XChild virtual ::comphelper::InterfaceRef SAL_CALL getParent() throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setParent(const ::comphelper::InterfaceRef& Parent) throw(::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException); + + // prevent method hiding + using OInterfaceContainer::disposing; }; //......................................................................... |