summaryrefslogtreecommitdiff
path: root/toolkit
diff options
context:
space:
mode:
authorJürgen Schmidt <jsc@apache.org>2013-12-20 12:40:17 +0000
committerCaolán McNamara <caolanm@redhat.com>2013-12-20 15:26:15 +0000
commit1c80f3ab5c6dde9ff9399885390d4e6d9013be57 (patch)
tree1968c53ea7759ff063dccdb7331c1df551ab579f /toolkit
parent5bf9565fb731bd685c563f643ca8474289bf4f88 (diff)
Resolves: #i120358# apply patch to support properties from tab model
Patch By: hanya Review By: jsc (cherry picked from commit aa098b9e612b30a916cd4ce002133d499d7f711a) Conflicts: include/toolkit/controls/controlmodelcontainerbase.hxx Change-Id: I4c038c08d24ceceba606154573abbb1cd41cf7cb
Diffstat (limited to 'toolkit')
-rw-r--r--toolkit/source/awt/vclxtabpagecontainer.cxx1
-rw-r--r--toolkit/source/controls/controlmodelcontainerbase.cxx2
-rw-r--r--toolkit/source/controls/tabpagemodel.cxx4
3 files changed, 2 insertions, 5 deletions
diff --git a/toolkit/source/awt/vclxtabpagecontainer.cxx b/toolkit/source/awt/vclxtabpagecontainer.cxx
index 12d7af6c755a..154e373476c8 100644
--- a/toolkit/source/awt/vclxtabpagecontainer.cxx
+++ b/toolkit/source/awt/vclxtabpagecontainer.cxx
@@ -188,6 +188,7 @@ void SAL_CALL VCLXTabPageContainer::elementInserted( const ::com::sun::star::con
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);
}
}
diff --git a/toolkit/source/controls/controlmodelcontainerbase.cxx b/toolkit/source/controls/controlmodelcontainerbase.cxx
index 6f1674460355..586af4a3cc79 100644
--- a/toolkit/source/controls/controlmodelcontainerbase.cxx
+++ b/toolkit/source/controls/controlmodelcontainerbase.cxx
@@ -215,6 +215,7 @@ ControlModelContainerBase::ControlModelContainerBase( const Reference< XComponen
,maContainerListeners( *this )
,maChangeListeners ( GetMutex() )
,mbGroupsUpToDate( sal_False )
+ ,m_bEnabled( sal_True )
{
}
@@ -801,7 +802,6 @@ OUString SAL_CALL ControlModelContainerBase::getTitle() throw (::com::sun::star:
OUString sTitle;
xThis->getPropertyValue(GetPropertyName(BASEPROPERTY_TITLE)) >>= sTitle;
return sTitle;
- //return m_sTitle;
}
void SAL_CALL ControlModelContainerBase::setTitle( const OUString& _title ) throw (::com::sun::star::uno::RuntimeException)
{
diff --git a/toolkit/source/controls/tabpagemodel.cxx b/toolkit/source/controls/tabpagemodel.cxx
index c3ca4552988b..ec12abbc069c 100644
--- a/toolkit/source/controls/tabpagemodel.cxx
+++ b/toolkit/source/controls/tabpagemodel.cxx
@@ -70,8 +70,6 @@ UnoControlTabPageModel::UnoControlTabPageModel( Reference< XComponentContext > c
ImplRegisterProperty( BASEPROPERTY_TITLE );
ImplRegisterProperty( BASEPROPERTY_HELPTEXT );
ImplRegisterProperty( BASEPROPERTY_HELPURL );
- ImplRegisterProperty( BASEPROPERTY_IMAGEURL );
- ImplRegisterProperty( BASEPROPERTY_ENABLED );
}
OUString UnoControlTabPageModel::getServiceName( ) throw(RuntimeException)
@@ -156,9 +154,7 @@ void SAL_CALL UnoControlTabPageModel::initialize (const Sequence<Any>& rArgument
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)));
}
}