diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2005-01-11 11:12:11 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2005-01-11 11:12:11 +0000 |
| commit | 97139a3519cd649cd4775d189bdba9601c1c731b (patch) | |
| tree | bcfe5071d7e5c3c31c3c46c37598d48095e8c8fa /sd/source | |
| parent | cd0a78eb26234d17fe7948e9c05b12f01732cda0 (diff) | |
INTEGRATION: CWS sb19 (1.28.40); FILE MERGED
2004/12/22 08:26:08 sb 1.28.40.3: #i10000# Cleaned up merge conflict.
2004/12/08 14:52:43 sb 1.28.40.2: RESYNC: (1.28-1.30); FILE MERGED
2004/10/27 07:32:35 mba 1.28.40.1: #110407#: remove static BaseURL
Diffstat (limited to 'sd/source')
| -rw-r--r-- | sd/source/ui/func/fusel.cxx | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/sd/source/ui/func/fusel.cxx b/sd/source/ui/func/fusel.cxx index ec793ad14175..dbb3d5ec9026 100644 --- a/sd/source/ui/func/fusel.cxx +++ b/sd/source/ui/func/fusel.cxx @@ -2,9 +2,9 @@ * * $RCSfile: fusel.cxx,v $ * - * $Revision: 1.30 $ + * $Revision: 1.31 $ * - * last change: $Author: rt $ $Date: 2004-11-26 20:07:50 $ + * last change: $Author: rt $ $Date: 2005-01-11 12:12:11 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1429,7 +1429,10 @@ BOOL FuSelection::AnimateObj(SdrObject* pObj, const Point& rPos) case presentation::ClickAction_PROGRAM: { - INetURLObject aURL( ::URIHelper::SmartRelToAbs( pInfo->aBookmark, FALSE, INetURLObject::WAS_ENCODED, INetURLObject::DECODE_UNAMBIGUOUS ) ); + String aBaseURL = GetDocSh()->GetMedium()->GetBaseURL(); + INetURLObject aURL( ::URIHelper::SmartRel2Abs( INetURLObject(aBaseURL), pInfo->aBookmark, + URIHelper::GetMaybeFileHdl(), true, false, + INetURLObject::WAS_ENCODED, INetURLObject::DECODE_UNAMBIGUOUS ) ); if( INET_PROT_FILE == aURL.GetProtocol() ) { |