View | Details | Raw Unified | Return to issue 120358
Collapse All | Expand All

(-)toolkit/source/controls/tabpagemodel.cxx (-4 lines)
Lines 80-87 Link Here
80
    ImplRegisterProperty( BASEPROPERTY_TITLE );
80
    ImplRegisterProperty( BASEPROPERTY_TITLE );
81
    ImplRegisterProperty( BASEPROPERTY_HELPTEXT );
81
    ImplRegisterProperty( BASEPROPERTY_HELPTEXT );
82
	ImplRegisterProperty( BASEPROPERTY_HELPURL );
82
	ImplRegisterProperty( BASEPROPERTY_HELPURL );
83
    ImplRegisterProperty( BASEPROPERTY_IMAGEURL );
84
    ImplRegisterProperty( BASEPROPERTY_ENABLED );
85
}
83
}
86
84
87
::rtl::OUString UnoControlTabPageModel::getServiceName( ) throw(RuntimeException)
85
::rtl::OUString UnoControlTabPageModel::getServiceName( ) throw(RuntimeException)
Lines 166-174 Link Here
166
                Reference<XPropertySet> xThis(*this,UNO_QUERY);
164
                Reference<XPropertySet> xThis(*this,UNO_QUERY);
167
                xThis->setPropertyValue(s_sResourceResolver,xDialogProp->getPropertyValue(s_sResourceResolver));
165
                xThis->setPropertyValue(s_sResourceResolver,xDialogProp->getPropertyValue(s_sResourceResolver));
168
                xThis->setPropertyValue(GetPropertyName(BASEPROPERTY_TITLE),xDialogProp->getPropertyValue(GetPropertyName(BASEPROPERTY_TITLE)));
166
                xThis->setPropertyValue(GetPropertyName(BASEPROPERTY_TITLE),xDialogProp->getPropertyValue(GetPropertyName(BASEPROPERTY_TITLE)));
169
                xThis->setPropertyValue(GetPropertyName(BASEPROPERTY_IMAGEURL),xDialogProp->getPropertyValue(GetPropertyName(BASEPROPERTY_IMAGEURL)));
170
                xThis->setPropertyValue(GetPropertyName(BASEPROPERTY_HELPTEXT),xDialogProp->getPropertyValue(GetPropertyName(BASEPROPERTY_HELPTEXT)));
167
                xThis->setPropertyValue(GetPropertyName(BASEPROPERTY_HELPTEXT),xDialogProp->getPropertyValue(GetPropertyName(BASEPROPERTY_HELPTEXT)));
171
                xThis->setPropertyValue(GetPropertyName(BASEPROPERTY_ENABLED),xDialogProp->getPropertyValue(GetPropertyName(BASEPROPERTY_ENABLED)));
172
                xThis->setPropertyValue(GetPropertyName(BASEPROPERTY_HELPURL),xDialogProp->getPropertyValue(GetPropertyName(BASEPROPERTY_HELPURL)));                
168
                xThis->setPropertyValue(GetPropertyName(BASEPROPERTY_HELPURL),xDialogProp->getPropertyValue(GetPropertyName(BASEPROPERTY_HELPURL)));                
173
            }
169
            }
174
        }
170
        }
(-)toolkit/inc/toolkit/controls/controlmodelcontainerbase.hxx (-2 / +1 lines)
Lines 85-92 Link Here
85
	AllGroups							maGroups;
85
	AllGroups							maGroups;
86
	sal_Bool							mbGroupsUpToDate;
86
	sal_Bool							mbGroupsUpToDate;
87
87
88
	bool									m_bEnabled;
88
	sal_Bool								m_bEnabled;
89
	::rtl::OUString							m_sTitle;
90
	::rtl::OUString							m_sImageURL;
89
	::rtl::OUString							m_sImageURL;
91
	::rtl::OUString							m_sTooltip;
90
	::rtl::OUString							m_sTooltip;
92
	sal_Int16								m_nTabPageId;
91
	sal_Int16								m_nTabPageId;
(-)toolkit/source/controls/controlmodelcontainerbase.cxx (-1 / +1 lines)
Lines 221-226 Link Here
221
	,maContainerListeners( *this )
221
	,maContainerListeners( *this )
222
	,maChangeListeners ( GetMutex() )
222
	,maChangeListeners ( GetMutex() )
223
	,mbGroupsUpToDate( sal_False )
223
	,mbGroupsUpToDate( sal_False )
224
    ,m_bEnabled( sal_True )
224
{
225
{
225
}
226
}
226
227
Lines 765-771 Link Here
765
    ::rtl::OUString sTitle;
766
    ::rtl::OUString sTitle;
766
    xThis->getPropertyValue(GetPropertyName(BASEPROPERTY_TITLE)) >>= sTitle;
767
    xThis->getPropertyValue(GetPropertyName(BASEPROPERTY_TITLE)) >>= sTitle;
767
    return sTitle;
768
    return sTitle;
768
	//return m_sTitle;
769
}
769
}
770
void SAL_CALL ControlModelContainerBase::setTitle( const ::rtl::OUString& _title ) throw (::com::sun::star::uno::RuntimeException)
770
void SAL_CALL ControlModelContainerBase::setTitle( const ::rtl::OUString& _title ) throw (::com::sun::star::uno::RuntimeException)
771
{
771
{
(-)toolkit/source/awt/vclxtabpagecontainer.cxx (+1 lines)
Lines 208-213 Link Here
208
        pTabCtrl->SetHelpText(nPageID,xP->getToolTip());
208
        pTabCtrl->SetHelpText(nPageID,xP->getToolTip());
209
        pTabCtrl->SetPageImage(nPageID,TkResMgr::getImageFromURL(xP->getImageURL()));
209
        pTabCtrl->SetPageImage(nPageID,TkResMgr::getImageFromURL(xP->getImageURL()));
210
        pTabCtrl->SelectTabPage(nPageID);
210
        pTabCtrl->SelectTabPage(nPageID);
211
        pTabCtrl->EnablePage(nPageID,xP->getEnabled());
211
        m_aTabPages.push_back(xTabPage);
212
        m_aTabPages.push_back(xTabPage);
212
    }
213
    }
213
}
214
}

Return to issue 120358