diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2008-01-15 13:21:34 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2008-01-15 13:21:34 +0000 |
| commit | 0b4ab28169ec1cdee06554fa140167b287817298 (patch) | |
| tree | 59fca73311be74b2b78af49356df785f4b6e47d9 /toolkit | |
| parent | a645b143b62a88a4336c58a15e2b71d52fdb6dae (diff) | |
INTEGRATION: CWS tkr08 (1.23.16); FILE MERGED
2007/12/10 13:06:34 tkr 1.23.16.1: #i84312# Property DIALOGSOURCEURL assertion if null
Diffstat (limited to 'toolkit')
| -rw-r--r-- | toolkit/source/controls/dialogcontrol.cxx | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/toolkit/source/controls/dialogcontrol.cxx b/toolkit/source/controls/dialogcontrol.cxx index a8a28f18c848..74306614a2ee 100644 --- a/toolkit/source/controls/dialogcontrol.cxx +++ b/toolkit/source/controls/dialogcontrol.cxx @@ -4,9 +4,9 @@ * * $RCSfile: dialogcontrol.cxx,v $ * - * $Revision: 1.23 $ + * $Revision: 1.24 $ * - * last change: $Author: ihi $ $Date: 2007-11-26 16:27:22 $ + * last change: $Author: ihi $ $Date: 2008-01-15 14:21:34 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -2110,6 +2110,8 @@ throw (RuntimeException) ::rtl::OUString getPhysicalLocation( const ::com::sun::star::uno::Any& rbase, const ::com::sun::star::uno::Any& rUrl ) { + + ::rtl::OUString ret; ::rtl::OUString baseLocation; @@ -2118,10 +2120,13 @@ throw (RuntimeException) rbase >>= baseLocation; rUrl >>= url; - INetURLObject urlObj(baseLocation); - urlObj.removeSegment(); - baseLocation = urlObj.GetMainURL( INetURLObject::NO_DECODE ); - ::osl::FileBase::getAbsoluteFileURL( baseLocation, url, ret ); + if ( url.getLength() > 0 ) + { + INetURLObject urlObj(baseLocation); + urlObj.removeSegment(); + baseLocation = urlObj.GetMainURL( INetURLObject::NO_DECODE ); + ::osl::FileBase::getAbsoluteFileURL( baseLocation, url, ret ); + } return ret; } |