Index: toolkit/source/controls/tabpagemodel.cxx =================================================================== --- toolkit/source/controls/tabpagemodel.cxx (revision 1364979) +++ toolkit/source/controls/tabpagemodel.cxx (working copy) @@ -80,8 +80,6 @@ ImplRegisterProperty( BASEPROPERTY_TITLE ); ImplRegisterProperty( BASEPROPERTY_HELPTEXT ); ImplRegisterProperty( BASEPROPERTY_HELPURL ); - ImplRegisterProperty( BASEPROPERTY_IMAGEURL ); - ImplRegisterProperty( BASEPROPERTY_ENABLED ); } ::rtl::OUString UnoControlTabPageModel::getServiceName( ) throw(RuntimeException) @@ -166,9 +164,7 @@ Reference xThis(*this,UNO_QUERY); xThis->setPropertyValue(s_sResourceResolver,xDialogProp->getPropertyValue(s_sResourceResolver)); xThis->setPropertyValue(GetPropertyName(BASEPROPERTY_TITLE),xDialogProp->getPropertyValue(GetPropertyName(BASEPROPERTY_TITLE))); - xThis->setPropertyValue(GetPropertyName(BASEPROPERTY_IMAGEURL),xDialogProp->getPropertyValue(GetPropertyName(BASEPROPERTY_IMAGEURL))); xThis->setPropertyValue(GetPropertyName(BASEPROPERTY_HELPTEXT),xDialogProp->getPropertyValue(GetPropertyName(BASEPROPERTY_HELPTEXT))); - xThis->setPropertyValue(GetPropertyName(BASEPROPERTY_ENABLED),xDialogProp->getPropertyValue(GetPropertyName(BASEPROPERTY_ENABLED))); xThis->setPropertyValue(GetPropertyName(BASEPROPERTY_HELPURL),xDialogProp->getPropertyValue(GetPropertyName(BASEPROPERTY_HELPURL))); } } Index: toolkit/inc/toolkit/controls/controlmodelcontainerbase.hxx =================================================================== --- toolkit/inc/toolkit/controls/controlmodelcontainerbase.hxx (revision 1364979) +++ toolkit/inc/toolkit/controls/controlmodelcontainerbase.hxx (working copy) @@ -85,8 +85,7 @@ AllGroups maGroups; sal_Bool mbGroupsUpToDate; - bool m_bEnabled; - ::rtl::OUString m_sTitle; + sal_Bool m_bEnabled; ::rtl::OUString m_sImageURL; ::rtl::OUString m_sTooltip; sal_Int16 m_nTabPageId; Index: toolkit/source/controls/controlmodelcontainerbase.cxx =================================================================== --- toolkit/source/controls/controlmodelcontainerbase.cxx (revision 1364979) +++ toolkit/source/controls/controlmodelcontainerbase.cxx (working copy) @@ -221,6 +221,7 @@ ,maContainerListeners( *this ) ,maChangeListeners ( GetMutex() ) ,mbGroupsUpToDate( sal_False ) + ,m_bEnabled( sal_True ) { } @@ -765,7 +766,6 @@ ::rtl::OUString sTitle; xThis->getPropertyValue(GetPropertyName(BASEPROPERTY_TITLE)) >>= sTitle; return sTitle; - //return m_sTitle; } void SAL_CALL ControlModelContainerBase::setTitle( const ::rtl::OUString& _title ) throw (::com::sun::star::uno::RuntimeException) { Index: toolkit/source/awt/vclxtabpagecontainer.cxx =================================================================== --- toolkit/source/awt/vclxtabpagecontainer.cxx (revision 1364979) +++ toolkit/source/awt/vclxtabpagecontainer.cxx (working copy) @@ -208,6 +208,7 @@ pTabCtrl->SetHelpText(nPageID,xP->getToolTip()); pTabCtrl->SetPageImage(nPageID,TkResMgr::getImageFromURL(xP->getImageURL())); pTabCtrl->SelectTabPage(nPageID); + pTabCtrl->EnablePage(nPageID,xP->getEnabled()); m_aTabPages.push_back(xTabPage); } }