diff options
| author | Mihaela Kedikova <misheto@openoffice.org> | 2010-11-02 17:50:53 +0100 |
|---|---|---|
| committer | Mihaela Kedikova <misheto@openoffice.org> | 2010-11-02 17:50:53 +0100 |
| commit | 2630589392305450ef7e490ffe4c87df44c37fd8 (patch) | |
| tree | 26a8809f6bb514e5e0ce8f48673b15e4f834c670 /toolkit/source/controls | |
| parent | d5d43684658173ae7abf93d22d696b5266cbda23 (diff) | |
| parent | d5d2a1cffc728100f8119252ff26f95949e6d35c (diff) | |
tabcontrol: merge with DEV300_m91
Diffstat (limited to 'toolkit/source/controls')
| -rw-r--r-- | toolkit/source/controls/dialogcontrol.cxx | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/toolkit/source/controls/dialogcontrol.cxx b/toolkit/source/controls/dialogcontrol.cxx index 343bf67c146f..7a7f7444645b 100644 --- a/toolkit/source/controls/dialogcontrol.cxx +++ b/toolkit/source/controls/dialogcontrol.cxx @@ -482,36 +482,9 @@ void UnoDialogControl::ImplModelPropertiesChanged( const Sequence< PropertyChang xGraphic = Impl_getGraphicFromURL_nothrow( absoluteUrl ); } - -//<<<<<<< local ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_GRAPHIC), uno::makeAny( xGraphic ), sal_True ); break; -//======= -// rbase >>= baseLocation; -// rUrl >>= url; -// -// ::rtl::OUString absoluteURL( url ); -// if ( url.getLength() > 0 ) -// { -// INetURLObject urlObj(baseLocation); -// urlObj.removeSegment(); -// baseLocation = urlObj.GetMainURL( INetURLObject::NO_DECODE ); -// -// const INetURLObject protocolCheck( url ); -// const INetProtocol protocol = protocolCheck.GetProtocol(); -// if ( protocol == INET_PROT_NOT_VALID ) -// { -// ::rtl::OUString testAbsoluteURL; -// if ( ::osl::FileBase::E_None == ::osl::FileBase::getAbsoluteFileURL( baseLocation, url, testAbsoluteURL ) ) -// absoluteURL = testAbsoluteURL; -//>>>>>>> other } -//<<<<<<< local } ControlContainerBase::ImplModelPropertiesChanged(rEvents); -//======= -// } -// -// return absoluteURL; -//>>>>>>> other } |