diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-03-23 17:13:46 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-03-23 17:13:46 +0100 |
| commit | ba6f8af8a73c21b94c99e33c933bb8e689384d6f (patch) | |
| tree | fe0c13c24684fe7801bed94b6323138cd1580e93 /toolkit/inc | |
| parent | 932fb7b958f8e7204275cb709965b30e390c76ad (diff) | |
| parent | f8de01dde2707bcfd4bccf3cb0dc5b26bde851e9 (diff) | |
Merge branch 'master' of git://anongit.freedesktop.org/libreoffice/libs-gui
Diffstat (limited to 'toolkit/inc')
| -rw-r--r-- | toolkit/inc/toolkit/controls/controlmodelcontainerbase.hxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/toolkit/inc/toolkit/controls/controlmodelcontainerbase.hxx b/toolkit/inc/toolkit/controls/controlmodelcontainerbase.hxx index f6859690ce24..9e006f4afd1b 100644 --- a/toolkit/inc/toolkit/controls/controlmodelcontainerbase.hxx +++ b/toolkit/inc/toolkit/controls/controlmodelcontainerbase.hxx @@ -65,6 +65,7 @@ typedef ::cppu::AggImplInheritanceHelper8 < ControlModel_Base class ControlModelContainerBase : public ControlModelContainer_IBase { public: + enum ChildOperation { Insert = 0, Remove }; // would like to make this typedef private, too, but the Forte 7 compiler does have // problems with this ..... typedef ::std::pair< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >, ::rtl::OUString > @@ -97,13 +98,13 @@ protected: sal_Int16 m_nTabPageId; void Clone_Impl(ControlModelContainerBase& _rClone) const; - protected: ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const; ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); UnoControlModelHolderList::iterator ImplFindElement( const ::rtl::OUString& rName ); + void updateUserFormChildren( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& xAllChildren, const rtl::OUString& aName, ChildOperation Operation, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& xTarget ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); public: ControlModelContainerBase( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory ); ControlModelContainerBase( const ControlModelContainerBase& rModel ); |