diff options
| author | Mihaela Kedikova <misheto@openoffice.org> | 2010-10-14 13:49:43 +0200 |
|---|---|---|
| committer | Mihaela Kedikova <misheto@openoffice.org> | 2010-10-14 13:49:43 +0200 |
| commit | 281d75599812f39484df4124d5bcf0a5cc91f30b (patch) | |
| tree | 8434bd52ccad09c7c52b806fe7bd492877160d2a /toolkit/source/controls/dialogcontrol.cxx | |
| parent | 5de58a084612c45d20b58ef95159c67b5df422bb (diff) | |
| parent | 525de6f8eeac6e357167467da0f9a9448433bb25 (diff) | |
tabcontrol: merge with DEV300_m89
Diffstat (limited to 'toolkit/source/controls/dialogcontrol.cxx')
| -rw-r--r-- | toolkit/source/controls/dialogcontrol.cxx | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/toolkit/source/controls/dialogcontrol.cxx b/toolkit/source/controls/dialogcontrol.cxx index a5c6db27d855..343bf67c146f 100644 --- a/toolkit/source/controls/dialogcontrol.cxx +++ b/toolkit/source/controls/dialogcontrol.cxx @@ -483,9 +483,35 @@ 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 } |