diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2005-01-11 12:28:34 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2005-01-11 12:28:34 +0000 |
| commit | e7ffe100ce62d5460f60bd73c60fd2114335ac42 (patch) | |
| tree | 7531bd540e451329f278192560cc444ed9f6499a /sfx2/source/bastyp/frmhtmlw.cxx | |
| parent | 4555333e79faa7544135a5ea4b387f0ca5f30ea6 (diff) | |
INTEGRATION: CWS sb19 (1.7.44); FILE MERGED
2004/11/03 15:19:41 sb 1.7.44.2: #108948# Fixed wrong replacement for INetURLObject::AbsToRel.
2004/10/20 15:38:36 mba 1.7.44.1: #110407#: remove static BaseURL
Diffstat (limited to 'sfx2/source/bastyp/frmhtmlw.cxx')
| -rw-r--r-- | sfx2/source/bastyp/frmhtmlw.cxx | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/sfx2/source/bastyp/frmhtmlw.cxx b/sfx2/source/bastyp/frmhtmlw.cxx index 3446a42b1542..4d1f4a362aa6 100644 --- a/sfx2/source/bastyp/frmhtmlw.cxx +++ b/sfx2/source/bastyp/frmhtmlw.cxx @@ -2,9 +2,9 @@ * * $RCSfile: frmhtmlw.cxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: hr $ $Date: 2004-12-13 12:51:36 $ + * last change: $Author: rt $ $Date: 2005-01-11 13:28:34 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -72,6 +72,7 @@ #endif #include <unotools/configmgr.hxx> +#include "svtools/urihelper.hxx" #include "docinf.hxx" #include "frmhtmlw.hxx" @@ -137,7 +138,7 @@ void SfxFrameHTMLWriter::OutMeta( SvStream& rStrm, HTMLOutFuncs::Out_String( rStrm, rContent, eDestEnc, pNonConvertableChars ) << "\">"; } -void SfxFrameHTMLWriter::Out_DocInfo( SvStream& rStrm, +void SfxFrameHTMLWriter::Out_DocInfo( SvStream& rStrm, const String& rBaseURL, const SfxDocumentInfo* pInfo, const sal_Char *pIndent, rtl_TextEncoding eDestEnc, @@ -202,7 +203,9 @@ void SfxFrameHTMLWriter::Out_DocInfo( SvStream& rStrm, if( rReloadURL.Len() ) { sContent.AppendAscii( ";URL=" ); - sContent += String(INetURLObject::AbsToRel(rReloadURL)); + sContent += String( + URIHelper::simpleNormalizedMakeRelative( + rBaseURL, rReloadURL)); } OutMeta( rStrm, pIndent, sHTML_META_refresh, sContent, TRUE, @@ -293,7 +296,7 @@ void SfxFrameHTMLWriter::OutHeader( rtl_TextEncoding eDestEnc ) */ void SfxFrameHTMLWriter::Out_FrameDescriptor( - SvStream& rOut, const uno::Reference < beans::XPropertySet >& xSet, + SvStream& rOut, const String& rBaseURL, const uno::Reference < beans::XPropertySet >& xSet, rtl_TextEncoding eDestEnc, String *pNonConvertableChars ) { try @@ -306,7 +309,8 @@ void SfxFrameHTMLWriter::Out_FrameDescriptor( String aURL = INetURLObject( aStr ).GetMainURL( INetURLObject::DECODE_TO_IURI ); if( aURL.Len() ) { - aURL = INetURLObject::AbsToRel( aURL ); + aURL = URIHelper::simpleNormalizedMakeRelative( + rBaseURL, aURL ); ((sOut += ' ') += sHTML_O_src) += "=\""; rOut << sOut.GetBuffer(); HTMLOutFuncs::Out_String( rOut, aURL, eDestEnc, pNonConvertableChars ); |