From 39231e4907824750aab7c8378cb75627ee3820d4 Mon Sep 17 00:00:00 2001 From: Rüdiger Timm Date: Tue, 11 Jan 2005 12:15:43 +0000 Subject: INTEGRATION: CWS sb19 (1.4.74); FILE MERGED 2004/10/27 07:31:01 mba 1.4.74.1: #110407#: remove static BaseURL --- sc/inc/filter.hxx | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'sc/inc/filter.hxx') diff --git a/sc/inc/filter.hxx b/sc/inc/filter.hxx index 5b45ee9a367f..2d185a455b9b 100644 --- a/sc/inc/filter.hxx +++ b/sc/inc/filter.hxx @@ -2,9 +2,9 @@ * * $RCSfile: filter.hxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: obo $ $Date: 2004-08-11 08:57:26 $ + * last change: $Author: rt $ $Date: 2005-01-11 13:15:43 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -135,9 +135,9 @@ FltError ScImportStarCalc10( SvStream&, ScDocument* ); FltError ScImportDif( SvStream&, ScDocument*, const ScAddress& rInsPos, const CharSet eSrc = RTL_TEXTENCODING_DONTKNOW, UINT32 nDifOption = SC_DIFOPT_EXCEL ); -FltError ScImportRTF( SvStream&, ScDocument*, ScRange& rRange ); +FltError ScImportRTF( SvStream&, const String& rBaseURL, ScDocument*, ScRange& rRange ); -FltError ScImportHTML( SvStream&, ScDocument*, ScRange& rRange, double nOutputFactor = 1.0, BOOL bCalcWidthHeight = TRUE ); +FltError ScImportHTML( SvStream&, const String& rBaseURL, ScDocument*, ScRange& rRange, double nOutputFactor = 1.0, BOOL bCalcWidthHeight = TRUE ); // *********************************************************************** // Diverse Exportfilter @@ -155,7 +155,7 @@ FltError ScExportDif( SvStream&, ScDocument*, const ScAddress& rOutPos, const Ch FltError ScExportDif( SvStream&, ScDocument*, const ScRange& rRange, const CharSet eDest, UINT32 nDifOption = SC_DIFOPT_EXCEL ); -FltError ScExportHTML( SvStream&, ScDocument*, const ScRange& rRange, const CharSet eDest, BOOL bAll, +FltError ScExportHTML( SvStream&, const String& rBaseURL, ScDocument*, const ScRange& rRange, const CharSet eDest, BOOL bAll, const String& rStreamPath, String& rNonConvertibleChars ); FltError ScExportRTF( SvStream&, ScDocument*, const ScRange& rRange, const CharSet eDest ); -- cgit