diff options
author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-08-14 16:07:44 +0000 |
---|---|---|
committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-08-14 16:07:44 +0000 |
commit | 8c426a341b8b1fa95c8c63c9658868843b928875 (patch) | |
tree | e5c5c0372a93996f9d320388a5500ac870c4ef3b /sw/source/filter/html/wrthtml.hxx | |
parent | 77fb227910f534b6de6607bd22a9b4a3ffa9d24d (diff) |
INTEGRATION: CWS writercorehandoff (1.12.252); FILE MERGED
2006/04/28 13:36:33 fme 1.12.252.5: RESYNC: (1.14-1.15); FILE MERGED
2006/04/05 13:17:02 tra 1.12.252.4: RESYNC: (1.13-1.14); FILE MERGED
2006/01/11 21:17:13 tra 1.12.252.3: #i50348#
2005/09/13 15:20:23 tra 1.12.252.2: RESYNC: (1.12-1.13); FILE MERGED
2005/06/07 14:14:54 fme 1.12.252.1: #i50348# General cleanup - removed unused header files, functions, members, declarations etc.
Diffstat (limited to 'sw/source/filter/html/wrthtml.hxx')
-rw-r--r-- | sw/source/filter/html/wrthtml.hxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sw/source/filter/html/wrthtml.hxx b/sw/source/filter/html/wrthtml.hxx index 38977bebc82f..d6c8637840c5 100644 --- a/sw/source/filter/html/wrthtml.hxx +++ b/sw/source/filter/html/wrthtml.hxx @@ -4,9 +4,9 @@ * * $RCSfile: wrthtml.hxx,v $ * - * $Revision: 1.15 $ + * $Revision: 1.16 $ * - * last change: $Author: vg $ $Date: 2006-04-07 15:14:16 $ + * last change: $Author: hr $ $Date: 2006-08-14 17:07:44 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -32,7 +32,6 @@ * MA 02111-1307 USA * ************************************************************************/ - #ifndef _WRTHTML_HXX #define _WRTHTML_HXX @@ -71,7 +70,6 @@ class SwFmtVertOrient; class SwFmtFtn; class SwStartNode; class SwTableNode; -class SwNoTxtNode; class SwPageDesc; class SwNodeIndex; class ImageMap; @@ -217,6 +215,8 @@ SV_DECL_PTRARR( INetFmts, SwFmtINetFmt*, 1, 1 ) struct SwHTMLFmtInfo; SV_DECL_PTRARR_SORT_DEL( SwHTMLFmtInfos, SwHTMLFmtInfo*, 1, 1 ) +class IDocumentStylePoolAccess; + class SwHTMLWriter : public Writer { SwHTMLPosFlyFrms *pHTMLPosFlyFrms; @@ -480,7 +480,7 @@ public: String& rClass, sal_uInt16& rRefPoolId, String *pPseudo=0 ); - static const SwFmt *GetTemplateFmt( sal_uInt16 nPoolId, SwDoc *pTemplate ); + static const SwFmt *GetTemplateFmt( sal_uInt16 nPoolId, IDocumentStylePoolAccess* /*SwDoc*/ pTemplate ); static const SwFmt *GetParentFmt( const SwFmt& rFmt, sal_uInt16 nDeep ); static void SubtractItemSet( SfxItemSet& rItemSet, |