Author: jsc
Date: Fri Dec 20 12:40:17 2013
New Revision: 1552621
URL: http://svn.apache.org/r1552621
Log:
#120358# apply patch to support properties from tab model
Patch By: hanya
Review By: jsc
Modified:
openoffice/trunk/main/toolkit/inc/toolkit/controls/controlmodelcontainerbase.hxx
openoffice/trunk/main/toolkit/source/awt/vclxtabpagecontainer.cxx
openoffice/trunk/main/toolkit/source/controls/controlmodelcontainerbase.cxx
openoffice/trunk/main/toolkit/source/controls/tabpagemodel.cxx
Modified:
openoffice/trunk/main/toolkit/inc/toolkit/controls/controlmodelcontainerbase.hxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/toolkit/inc/toolkit/controls/controlmodelcontainerbase.hxx?rev=1552621&r1=1552620&r2=1552621&view=diff
==============================================================================
---
openoffice/trunk/main/toolkit/inc/toolkit/controls/controlmodelcontainerbase.hxx
(original)
+++
openoffice/trunk/main/toolkit/inc/toolkit/controls/controlmodelcontainerbase.hxx
Fri Dec 20 12:40:17 2013
@@ -85,8 +85,7 @@ protected:
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;
Modified: openoffice/trunk/main/toolkit/source/awt/vclxtabpagecontainer.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/toolkit/source/awt/vclxtabpagecontainer.cxx?rev=1552621&r1=1552620&r2=1552621&view=diff
==============================================================================
--- openoffice/trunk/main/toolkit/source/awt/vclxtabpagecontainer.cxx (original)
+++ openoffice/trunk/main/toolkit/source/awt/vclxtabpagecontainer.cxx Fri Dec
20 12:40:17 2013
@@ -208,6 +208,7 @@ void SAL_CALL VCLXTabPageContainer::elem
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);
}
}
Modified:
openoffice/trunk/main/toolkit/source/controls/controlmodelcontainerbase.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/toolkit/source/controls/controlmodelcontainerbase.cxx?rev=1552621&r1=1552620&r2=1552621&view=diff
==============================================================================
--- openoffice/trunk/main/toolkit/source/controls/controlmodelcontainerbase.cxx
(original)
+++ openoffice/trunk/main/toolkit/source/controls/controlmodelcontainerbase.cxx
Fri Dec 20 12:40:17 2013
@@ -221,6 +221,7 @@ ControlModelContainerBase::ControlModelC
,maContainerListeners( *this )
,maChangeListeners ( GetMutex() )
,mbGroupsUpToDate( sal_False )
+ ,m_bEnabled( sal_True )
{
}
@@ -765,7 +766,6 @@ void SAL_CALL ControlModelContainerBase:
::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)
{
Modified: openoffice/trunk/main/toolkit/source/controls/tabpagemodel.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/toolkit/source/controls/tabpagemodel.cxx?rev=1552621&r1=1552620&r2=1552621&view=diff
==============================================================================
--- openoffice/trunk/main/toolkit/source/controls/tabpagemodel.cxx (original)
+++ openoffice/trunk/main/toolkit/source/controls/tabpagemodel.cxx Fri Dec 20
12:40:17 2013
@@ -80,8 +80,6 @@ UnoControlTabPageModel::UnoControlTabPag
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 @@ void SAL_CALL UnoControlTabPageModel::in
Reference<XPropertySet> 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)));
}
}
