From 4555333e79faa7544135a5ea4b387f0ca5f30ea6 Mon Sep 17 00:00:00 2001 From: Rüdiger Timm Date: Tue, 11 Jan 2005 12:28:19 +0000 Subject: INTEGRATION: CWS sb19 (1.6.184); FILE MERGED 2004/12/21 09:37:52 sb 1.6.184.2: RESYNC: (1.6-1.7); FILE MERGED 2004/10/20 15:38:36 mba 1.6.184.1: #110407#: remove static BaseURL --- sfx2/source/bastyp/frmhtml.cxx | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'sfx2/source/bastyp') diff --git a/sfx2/source/bastyp/frmhtml.cxx b/sfx2/source/bastyp/frmhtml.cxx index da0ec4bb0031..54fa835ec7ad 100644 --- a/sfx2/source/bastyp/frmhtml.cxx +++ b/sfx2/source/bastyp/frmhtml.cxx @@ -2,9 +2,9 @@ * * $RCSfile: frmhtml.cxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: hr $ $Date: 2004-12-13 12:51:23 $ + * last change: $Author: rt $ $Date: 2005-01-11 13:28:19 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -108,8 +108,7 @@ static HTMLOptionEnum __READONLY_DATA aScollingTable[] = { 0, 0 } }; -void SfxFrameHTMLParser::ParseFrameOptions( SfxFrameDescriptor *pFrame, - const HTMLOptions *pOptions ) +void SfxFrameHTMLParser::ParseFrameOptions( SfxFrameDescriptor *pFrame, const HTMLOptions *pOptions, const String& rBaseURL ) { // die Optionen holen und setzen Size aMargin( pFrame->GetMargin() ); @@ -136,7 +135,9 @@ void SfxFrameHTMLParser::ParseFrameOptions( SfxFrameDescriptor *pFrame, } case HTML_O_SRC: pFrame->SetURL( - String(INetURLObject::RelToAbs(pOption->GetString()) )); + String( + INetURLObject::GetAbsURL( + rBaseURL, pOption->GetString())) ); break; case HTML_O_NAME: pFrame->SetName( pOption->GetString() ); -- cgit