1. mst
  2. ooo340

Commits

hr  committed 9dfb333

#i10000#: aBookmarkURL: use Getter/Setter

  • Participants
  • Parent commits 46b7b02
  • Branches default

Comments (0)

Files changed (1)

File sd/source/filter/pptin.cxx

View file
  • Ignore whitespace
 							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;
 							}
 						}