diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2005-01-11 11:58:42 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2005-01-11 11:58:42 +0000 |
| commit | d2acc1ddd274ab554d8e92f93eec4ba3183371ee (patch) | |
| tree | 60511fcf893090ab739912dad6c8fcd86dd9aebc /svx/source | |
| parent | 3538e941ed32c0e06c92ff67d46dfb53271f5ed7 (diff) | |
INTEGRATION: CWS sb19 (1.11.472); FILE MERGED
2004/10/27 07:30:34 mba 1.11.472.1: #110407#: remove static BaseURL
Diffstat (limited to 'svx/source')
| -rw-r--r-- | svx/source/editeng/eehtml.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/svx/source/editeng/eehtml.cxx b/svx/source/editeng/eehtml.cxx index 7a494e80b18c..179164effc7f 100644 --- a/svx/source/editeng/eehtml.cxx +++ b/svx/source/editeng/eehtml.cxx @@ -2,9 +2,9 @@ * * $RCSfile: eehtml.cxx,v $ * - * $Revision: 1.11 $ + * $Revision: 1.12 $ * - * last change: $Author: vg $ $Date: 2004-01-06 15:28:16 $ + * last change: $Author: rt $ $Date: 2005-01-11 12:58:42 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -82,8 +82,9 @@ #define STYLE_PRE 101 -EditHTMLParser::EditHTMLParser( SvStream& rIn, SvKeyValueIterator* pHTTPHeaderAttrs, int bReadNewDoc ) +EditHTMLParser::EditHTMLParser( SvStream& rIn, const String& rBaseURL, SvKeyValueIterator* pHTTPHeaderAttrs, int bReadNewDoc ) : SfxHTMLParser( rIn, bReadNewDoc ) + , aBaseURL( rBaseURL ) { pImpEditEngine = 0; pCurAnchor = 0; @@ -815,12 +816,11 @@ void EditHTMLParser::AnchorStart() if ( aRef.Len() ) { - // BaseURL muss gesetzt sein! String aURL = aRef; if ( aURL.Len() && ( aURL.GetChar( 0 ) != '#' ) ) { INetURLObject aTargetURL; - INetURLObject aRootURL( INetURLObject::GetBaseURL() ); + INetURLObject aRootURL( aBaseURL ); aRootURL.GetNewAbsURL( aRef, &aTargetURL ); aURL = aTargetURL.GetMainURL( INetURLObject::DECODE_TO_IURI ); } |