diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2013-12-12 12:48:55 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2013-12-12 15:10:35 +0100 |
| commit | ab9e014d6fc1050de8510dbec816535972569bab (patch) | |
| tree | 7d35a3fd5f93f32bd65914ae953ab237bbd5cef5 /include | |
| parent | 3f3c755475728b2f73ac45be3229970b5d616496 (diff) | |
Some clean-up
Change-Id: I8ea3018efb01069b9a0555d9ac4ddfa89a990ba8
Diffstat (limited to 'include')
| -rw-r--r-- | include/comphelper/ChainablePropertySetInfo.hxx | 22 | ||||
| -rw-r--r-- | include/comphelper/MasterPropertySetInfo.hxx | 20 |
2 files changed, 20 insertions, 22 deletions
diff --git a/include/comphelper/ChainablePropertySetInfo.hxx b/include/comphelper/ChainablePropertySetInfo.hxx index e5d731d429c6..5da0dc79032d 100644 --- a/include/comphelper/ChainablePropertySetInfo.hxx +++ b/include/comphelper/ChainablePropertySetInfo.hxx @@ -37,21 +37,13 @@ namespace comphelper public ::cppu::WeakImplHelper1< ::com::sun::star::beans::XPropertySetInfo > { - friend class ChainablePropertySet; - friend class MasterPropertySet; - protected: - PropertyInfoHash maMap; - com::sun::star::uno::Sequence < com::sun::star::beans::Property > maProperties; public: - ChainablePropertySetInfo( PropertyInfo const * pMap ) - throw(); + ChainablePropertySetInfo( PropertyInfo const * pMap ); - virtual ~ChainablePropertySetInfo() - throw(); + void remove( const OUString& aName ); - void add( PropertyInfo const * pMap, sal_Int32 nCount = -1 ) - throw(); - void remove( const OUString& aName ) + private: + virtual ~ChainablePropertySetInfo() throw(); // XPropertySetInfo @@ -61,6 +53,12 @@ namespace comphelper throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL hasPropertyByName( const OUString& Name ) throw(::com::sun::star::uno::RuntimeException); + + PropertyInfoHash maMap; + com::sun::star::uno::Sequence < com::sun::star::beans::Property > maProperties; + + friend class ChainablePropertySet; + friend class MasterPropertySet; }; } #endif diff --git a/include/comphelper/MasterPropertySetInfo.hxx b/include/comphelper/MasterPropertySetInfo.hxx index e3553a9a6fc9..f44f455a06e4 100644 --- a/include/comphelper/MasterPropertySetInfo.hxx +++ b/include/comphelper/MasterPropertySetInfo.hxx @@ -30,19 +30,14 @@ namespace comphelper public ::cppu::WeakImplHelper1< ::com::sun::star::beans::XPropertySetInfo > { - friend class MasterPropertySet; - protected: - PropertyDataHash maMap; - com::sun::star::uno::Sequence < com::sun::star::beans::Property > maProperties; public: - MasterPropertySetInfo( PropertyInfo const * pMap ) - throw(); + MasterPropertySetInfo( PropertyInfo const * pMap ); + + private: virtual ~MasterPropertySetInfo() throw(); - void add( PropertyInfo const * pMap, sal_Int32 nCount = -1, sal_uInt8 nMapId = 0 ) - throw(); - void add( PropertyInfoHash &rHash, sal_uInt8 nMapId ) - throw(); + + void add( PropertyInfoHash &rHash, sal_uInt8 nMapId ); // XPropertySetInfo virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > SAL_CALL getProperties() @@ -51,6 +46,11 @@ namespace comphelper throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL hasPropertyByName( const OUString& Name ) throw(::com::sun::star::uno::RuntimeException); + + PropertyDataHash maMap; + com::sun::star::uno::Sequence < com::sun::star::beans::Property > maProperties; + + friend class MasterPropertySet; }; } #endif |