summaryrefslogtreecommitdiff
path: root/toolkit/source/controls/dialogcontrol.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'toolkit/source/controls/dialogcontrol.cxx')
-rw-r--r--toolkit/source/controls/dialogcontrol.cxx26
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
}