summaryrefslogtreecommitdiff
path: root/sd/source/ui/slideshow
diff options
context:
space:
mode:
authorRüdiger Timm <rt@openoffice.org>2005-01-11 11:12:52 +0000
committerRüdiger Timm <rt@openoffice.org>2005-01-11 11:12:52 +0000
commit2cd874cfb1389f042e78be73c9cd87eda6d8e9de (patch)
tree0c0c77fef4fce8cde1c228b6466176b1f6392133 /sd/source/ui/slideshow
parent011e1dba7f565b6c8a125ee9f18b2b3291a46d75 (diff)
INTEGRATION: CWS sb19 (1.2.18); FILE MERGED
2004/12/21 09:07:28 sb 1.2.18.2: RESYNC: (1.2-1.3); FILE MERGED 2004/12/10 08:37:01 sb 1.2.18.1: #110411# Adapted to removal of static base URL stuff.
Diffstat (limited to 'sd/source/ui/slideshow')
-rw-r--r--sd/source/ui/slideshow/slideshowimpl.cxx12
1 files changed, 9 insertions, 3 deletions
diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx
index 46f2ee1f2932..2d347dfeffa0 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: slideshowimpl.cxx,v $
*
- * $Revision: 1.3 $
+ * $Revision: 1.4 $
*
- * last change: $Author: kz $ $Date: 2004-12-09 16:11:06 $
+ * last change: $Author: rt $ $Date: 2005-01-11 12:12:52 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -96,6 +96,7 @@
#ifndef _SFXREQUEST_HXX
#include <sfx2/request.hxx>
#endif
+#include "sfx2/docfile.hxx"
#ifndef _SVX_UNOAPI_HXX_
#include <svx/unoapi.hxx>
@@ -1133,7 +1134,12 @@ void SAL_CALL SlideshowImpl::click( const Reference< XShape >& xShape, sal_Int32
case ClickAction_PROGRAM:
{
- INetURLObject aURL( ::URIHelper::SmartRelToAbs( pEvent->maStrBookmark, FALSE, INetURLObject::WAS_ENCODED, INetURLObject::DECODE_UNAMBIGUOUS ) );
+ INetURLObject aURL(
+ ::URIHelper::SmartRel2Abs(
+ INetURLObject(mpDocSh->GetMedium()->GetBaseURL()),
+ pEvent->maStrBookmark, ::URIHelper::GetMaybeFileHdl(), true,
+ false, INetURLObject::WAS_ENCODED,
+ INetURLObject::DECODE_UNAMBIGUOUS ) );
if( INET_PROT_FILE == aURL.GetProtocol() )
{