diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2009-05-25 12:21:03 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2009-05-25 12:21:03 +0000 |
| commit | 6c8a6d114da643b699e0e1395d319b3ad4e65503 (patch) | |
| tree | 685b78bb16eb31f813b2fd70c32ff87734e64198 /sd | |
| parent | 33a1d0fc8e5acca3da971a3129bc1e25619b4820 (diff) | |
#i10000#: aBookmarkURL: use Getter/Setter
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/filter/pptin.cxx | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sd/source/filter/pptin.cxx b/sd/source/filter/pptin.cxx index c4e59cd4275b..97141ecdb5d4 100644 --- a/sd/source/filter/pptin.cxx +++ b/sd/source/filter/pptin.cxx @@ -2169,11 +2169,13 @@ void ImplSdPPTImport::FillSdAnimationInfo( SdAnimationInfo* pInfo, PptInteractiv if ( pDocShell ) { String aBaseURL = pDocShell->GetMedium()->GetBaseURL(); + String aBookmarkURL( pInfo->GetBookmark() ); INetURLObject aURL( pPtr->aTarget ); if( INET_PROT_NOT_VALID == aURL.GetProtocol() ) - utl::LocalFileHelper::ConvertSystemPathToURL( pPtr->aTarget, aBaseURL, pInfo->maBookmark ); - if( !pInfo->maBookmark.Len() ) - pInfo->maBookmark = URIHelper::SmartRel2Abs( INetURLObject(aBaseURL), pPtr->aTarget, URIHelper::GetMaybeFileHdl(), true ); + utl::LocalFileHelper::ConvertSystemPathToURL( pPtr->aTarget, aBaseURL, aBookmarkURL ); + if( !aBookmarkURL.Len() ) + aBookmarkURL = URIHelper::SmartRel2Abs( INetURLObject(aBaseURL), pPtr->aTarget, URIHelper::GetMaybeFileHdl(), true ); + pInfo->SetBookmark( aBookmarkURL ); pInfo->meClickAction = ::com::sun::star::presentation::ClickAction_PROGRAM; } } |